[Cvs-cvs] Changes to ccvs/src/buffer.c

[Mark D . Baushke]

Index: ccvs/src/buffer.c
diff -u ccvs/src/buffer.c:1.64 ccvs/src/buffer.c:1.65
--- ccvs/src/buffer.c:1.64      Thu Sep 29 04:42:48 2005
+++ ccvs/src/buffer.c   Wed Dec  7 09:17:20 2005
@@ -2118,7 +2118,7 @@
         */
        else if (fb->root && pclose (fb->fd) == EOF)
        {
-           error (1, errno, "closing connection to %s",
+           error (0, errno, "closing connection to %s",
                   fb->root->hostname);
            closefd = false;
        }
@@ -2158,13 +2158,16 @@
             /* Syslog this? */
        }
 # ifdef CLIENT_SUPPORT
+       /* We are already closing the connection.
+        * On error, print a warning and try to
+        * continue to avoid infinte loops.
+        */
        else if (fb->root)
-            error (1, errno, "closing down connection to %s",
+            error (0, errno, "closing down connection to %s",
                    fb->root->hostname);
-           /* EXITS */
 # endif /* CLIENT_SUPPORT */
-
-       error (0, errno, "closing down buffer");
+       else
+           error (0, errno, "closing down buffer");
     }
 
     /* If we were talking to a process, make sure it exited */
@@ -2175,8 +2178,13 @@
        do
            w = waitpid (fb->child_pid, NULL, 0);
        while (w == -1 && errno == EINTR);
+
+       /* We are already closing the connection.
+        * On error, print a warning and try to
+        * continue to avoid infinte loops.
+        */
        if (w == -1)
-           error (1, errno, "waiting for process %d", fb->child_pid);
+           error (0, errno, "waiting for process %d", fb->child_pid);
     }
 
     free (buf->closure);