diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-05-21 17:52:38 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-05-21 17:52:38 -0700 |
| commit | dfba9a82068b44429a08b307d26b91495c10c7c1 (patch) | |
| tree | 4e84d66523b9a5c309379fb6a19f2237b05fc453 | |
| parent | a73284c7aeeab7ee0c1b6027819955ef7b08f23d (diff) | |
Modernize list of Xservers printed when "X" is not found in $PATH
| -rw-r--r-- | xinit.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -111,12 +111,12 @@ char **newenvironlast = NULL; #define Execvpe(path, argv, envp) execvp(path, argv) #endif -char *bindir = BINDIR; -char *server_names[] = { +const char *bindir = BINDIR; +const char * const server_names[] = { #if defined(ultrix) && defined(mips) "Xdec Digital color display on DECstation", #endif -#ifdef sun /* Sun */ +#if defined(sun) && !defined(XORG) /* Sun */ "Xsun Sun BW2, CG2, CG3, CG4, or CG6 on Sun 2, 3, 4, or 386i", "Xsunmono Sun BW2 on Sun 2, 3, 4, or 386i ", "Xsun24 Sun BW2, CG2, CG3, CG4, CG6, or CG8 on Sun 4", @@ -134,14 +134,16 @@ char *server_names[] = { "XFree86 XFree86 displays", #endif #ifdef XORG - "Xorg X.Org displays", + "Xorg Common X server for most displays", #endif #ifdef __DARWIN__ "XDarwin Darwin/Mac OS X IOKit displays", "XDarwinQuartz Mac OS X Quartz displays", "XDarwinStartup Auto-select between XDarwin and XDarwinQuartz", #endif - + "Xvfb Virtual frame buffer", + "Xnest X server nested in a window on another X server", + "Xephyr kdrive-based nested X server", NULL}; #ifndef XINITRC @@ -616,7 +618,7 @@ startServer(char *server[]) Execute (server, environ); Error ("no server \"%s\" in PATH\n", server[0]); { - char **cpp; + const char * const *cpp; fprintf (stderr, "\nUse the -- option, or make sure that %s is in your path and\n", |