diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-10 09:04:10 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-10 09:04:10 +0000 |
| commit | 4529e04d67dddaf83b56ac7c706cb83a5d7d1a88 (patch) | |
| tree | 5281cbf91664f6c47922ba3494c4f9730c0b010b | |
| parent | 503871d35fd6446d2da57ee8616269c2594e0c53 (diff) | |
Resync to 2004-04-10 XORG-RELEASE-1 branch
| -rw-r--r-- | Xtranssock.c | 9 | ||||
| -rw-r--r-- | Xtransutil.c | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Xtranssock.c b/Xtranssock.c index 4a5afae..f4d7560 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.1.4.5 2003/12/20 00:28:22 kaleb Exp $ */ +/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.1.4.6.2.2 2004/03/24 18:56:22 eich Exp $ */ /* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */ /* @@ -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 } |