diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-24 18:56:22 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-24 18:56:22 +0000 |
| commit | ed2a1313f9b6a8f8f8424072f6bd5b69d646e54e (patch) | |
| tree | b18102c6779ab3306aaab04bf0ec2ea039996bc1 | |
| parent | 503871d35fd6446d2da57ee8616269c2594e0c53 (diff) | |
61. Removed fontstosfnt from build as it is not ready and working, yetxo-6_7_0XORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0XORG-RELEASE-1-STSFXORG-RELEASE-1
(Egbert Eich).
60. Fixed error checking in the unix socket creation code so it doesn't
mistakenly always send an EADDRINUSE (Bugzilla #363, Jeremy Katz).
| -rw-r--r-- | Xtranssock.c | 7 | ||||
| -rw-r--r-- | Xtransutil.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Xtranssock.c b/Xtranssock.c index 4a5afae..3b9aa51 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -865,9 +865,10 @@ TRANS(SocketCreateListener) (XtransConnInfo ciptr, if (errno == EADDRINUSE) { if (flags & ADDR_IN_USE_ALLOWED) break; - } else - return TRANS_ADDR_IN_USE; - + else + return TRANS_ADDR_IN_USE; + } + if (retry-- == 0) { PRMSG (1, "SocketCreateListener: failed to bind listener\n", 0, 0, 0); diff --git a/Xtransutil.c b/Xtransutil.c index d84b1a8..865c20f 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -573,14 +573,14 @@ trans_mkdir(char *path, int mode) if (updateOwner && !updatedOwner) { PRMSG(1, "mkdir: Owner of %s should be set to root\n", path, 0, 0); -#if !defined(__CYGWIN__) && !defined(__DARWIN__) +#if 0 && !defined(__CYGWIN__) && !defined(__DARWIN__) sleep(5); #endif } if (updateMode && !updatedMode) { PRMSG(1, "mkdir: Mode of %s should be set to %04o\n", path, mode, 0); -#if !defined(__CYGWIN__) && !defined(__DARWIN__) +#if 0 && !defined(__CYGWIN__) && !defined(__DARWIN__) sleep(5); #endif } |