Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_0-MERGE

4 files changed, 10 insertions, 6 deletions

diff --git a/difs/fonts.c b/difs/fonts.c
index 6665de4..bbe8964 100644
--- a/difs/fonts.c
+++ b/difs/fonts.c
@@ -3,7 +3,7 @@
  * font control
  */
 /*
- 
+
 Copyright 1990, 1991, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -46,8 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.13 2001/12/14 20:01:34 dawes Exp $ */
-
+/*#define DEBUG*/
 #include        "FS.h"
 #include        "FSproto.h"
 #include	<stdio.h>
@@ -441,6 +440,9 @@ OpenFont(
 	SendErrToClient(client, FSBadName, (pointer) 0);
 	return FSBadName;
     }
+#ifdef DEBUG
+    fprintf(stderr,"OpenFont: %sn",name);
+#endif
     /*
     ** Check name cache.  If we find a cached version of this font that
     ** is cachable, immediately satisfy the request with it.  If we find
diff --git a/difs/main.c b/difs/main.c
index b7d8a4c..370005e 100644
--- a/difs/main.c
+++ b/difs/main.c
@@ -95,7 +95,6 @@ main(int argc, char *argv[])
 
     /* init stuff */
     ProcessCmdLine(argc, argv);
-    InitErrors();
 
     /*
      * Do this first thing, to get any options that only take effect at
@@ -104,6 +103,7 @@ main(int argc, char *argv[])
     if (ReadConfigFile(configfilename) != FSSuccess) {
 	FatalError("couldn't read config file\n");
     }
+    InitErrors();
 
     /* make sure at least world write access is disabled */
     if (((oldumask = umask(022)) & 002) == 002)
diff --git a/os/error.c b/os/error.c
index 3d21b10..8c72a65 100644
--- a/os/error.c
+++ b/os/error.c
@@ -86,6 +86,7 @@ Bool        UseSyslog;
 Bool        log_open = FALSE;
 #endif
 char        ErrorFile[PATH_MAX];
+static char	CurrentErrorFile[PATH_MAX];
 
 static void
 abort_server(void)
@@ -112,7 +113,7 @@ InitErrors(void)
     }
 #endif
 
-    if (ErrorFile[0]) {
+    if (ErrorFile[0] && strcmp(CurrentErrorFile, ErrorFile) != 0) {
 	i = creat(ErrorFile, 0666);
 	if (i != -1) {
 	    dup2(i, 2);
@@ -120,6 +121,7 @@ InitErrors(void)
 	} else {
 	    ErrorF("can't open error file \"%s\"\n", ErrorFile);
 	}
+	strncpy(CurrentErrorFile, ErrorFile, sizeof CurrentErrorFile);
     }
 }
 
diff --git a/os/waitfor.c b/os/waitfor.c
index 1c3ebef..09e30c8 100644
--- a/os/waitfor.c
+++ b/os/waitfor.c
@@ -196,7 +196,7 @@ WaitForSomething(int *pClientsReady)
 
 	if (current_time)	/* may not have been set */
 	    current_time = GetTimeInMillis();
-	for (i = 0; i < howmany(FD_SETSIZE, NFDBITS); i++) {
+	for (i = 0; i < howmany(XFD_SETSIZE, NFDBITS); i++) {
 	    while (clientsReadable.fds_bits[i]) {
 		curclient = ffs(clientsReadable.fds_bits[i]) - 1;
 		conn = ConnectionTranslation[curclient + (i << 5)];