summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-15 10:15:12 +0000
committerEgbert Eich <eich@suse.de>2004-04-15 10:15:12 +0000
commit971181922014a4685cbbae545d062642d6d597a1 (patch)
tree58cf3f50de11d588aa6a557323895021aeb233a3
parente7743f4b397fae6fdf62f9a5980bdc8e89955fbf (diff)
-rw-r--r--Xtranssock.c9
-rw-r--r--Xtransutil.c4
2 files changed, 7 insertions, 6 deletions
diff --git a/Xtranssock.c b/Xtranssock.c
index 4a5afae..0609c90 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$ */
/* $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
}