diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-29 12:18:06 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-29 12:18:06 +0000 |
| commit | 2e21f2380eb372be8656c33267a10cc6f3b5e0ef (patch) | |
| tree | 5da0ec95ee247d7a8237e3d366f4dba6d8e2c600 | |
| parent | e38761a2465796289193a2ce9a9c5048c97f5f6d (diff) | |
merge with XORG-RELEASE-1CYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
| -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 9b52c35..83a7b91 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 } |