diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-02-18 15:13:36 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-03-10 13:26:34 +0000 |
| commit | d54d4574229c619db9b2c633953939c19a574def (patch) | |
| tree | 9554b194342195770972a41179ec98899c7f34f6 | |
| parent | a33729a44512d8257df9ef728e71c993b53d0118 (diff) | |
Remove /usr/adm/Xnmsgs
As it stands, this code could prevent us from listening on one of our
well-known listener sockets, if it happened to get assigned fd 2
We write log output to the logfile, I don't really see why we need to
write it all to another file as well
| -rw-r--r-- | man/Xserver.man | 3 | ||||
| -rw-r--r-- | os/osinit.c | 37 |
2 files changed, 0 insertions, 40 deletions
diff --git a/man/Xserver.man b/man/Xserver.man index b103551fa..a4020139b 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -563,9 +563,6 @@ Outline font directories .I /tmp/.X11-unix/X\fBn\fP Unix domain socket for display number \fBn\fP .TP 30 -.I /usr/adm/X\fBn\fPmsgs -Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__) -.TP 30 .I __projectroot__/lib/X11/xdm/xdm-errors Default error log file if the server is run from \fIxdm\fP(1) .SH "SEE ALSO" diff --git a/os/osinit.c b/os/osinit.c index 0a9436952..49c4d297d 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -72,10 +72,6 @@ SOFTWARE. #include <sys/resource.h> #endif -#ifndef ADMPATH -#define ADMPATH "/usr/adm/X%smsgs" -#endif - extern char *display; #ifdef RLIMIT_DATA int limitDataSpace = -1; @@ -203,39 +199,6 @@ OsInit(void) fclose(stdin); fclose(stdout); #endif - /* - * If a write of zero bytes to stderr returns non-zero, i.e. -1, - * then writing to stderr failed, and we'll write somewhere else - * instead. (Apparently this never happens in the Real World.) - */ - if (write (2, fname, 0) == -1) - { - FILE *err; - - if ((display) && (strlen (display) + strlen (ADMPATH) + 1 < sizeof fname)) - snprintf (fname, sizeof(fname), ADMPATH, display); - else - strcpy (fname, devnull); - /* - * uses stdio to avoid os dependencies here, - * a real os would use - * open (fname, O_WRONLY|O_APPEND|O_CREAT, 0666) - */ - if (!(err = fopen (fname, "a+"))) - err = fopen (devnull, "w"); - if (err && (fileno(err) != 2)) { - dup2 (fileno (err), 2); - fclose (err); - } -#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__) - { - static char buf[BUFSIZ]; - setvbuf (stderr, buf, _IOLBF, BUFSIZ); - } -#else - setlinebuf(stderr); -#endif - } if (getpgrp () == 0) setpgid (0, 0); |