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

[Derek Robert Price]

Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.432 ccvs/src/client.c:1.433
--- ccvs/src/client.c:1.432     Thu Sep 29 04:42:48 2005
+++ ccvs/src/client.c   Thu Sep 29 20:20:34 2005
@@ -2807,9 +2807,6 @@
 static void
 handle_m (char *args, size_t len)
 {
-    fd_set wfds;
-    int s;
-
     /* In the case where stdout and stderr point to the same place,
        fflushing stderr will make output happen in the correct order.
        Often stderr will be line-buffered and this won't be needed,
@@ -2817,12 +2814,6 @@
        based on being confused between default buffering between
        stdout and stderr.  But I'm not sure).  */
     fflush (stderr);
-    FD_ZERO (&wfds);
-    FD_SET (STDOUT_FILENO, &wfds);
-    errno = 0;
-    s = fd_select (STDOUT_FILENO+1, NULL, &wfds, NULL, NULL);
-    if (s < 1 && errno != 0)
-        perror ("cannot write to stdout");
     fwrite (args, sizeof *args, len, stdout);
     putc ('\n', stdout);
 }
@@ -2868,24 +2859,9 @@
 static void
 handle_e (char *args, size_t len)
 {
-    fd_set wfds;
-    int s;
-
     /* In the case where stdout and stderr point to the same place,
        fflushing stdout will make output happen in the correct order.  */
     fflush (stdout);
-    FD_ZERO (&wfds);
-    FD_SET (STDERR_FILENO, &wfds);
-    errno = 0;
-    s = fd_select (STDERR_FILENO+1, NULL, &wfds, NULL, NULL);
-    /*
-     * If stderr has problems, then adding a call to
-     *   perror ("cannot write to stderr")
-     * will not work. So, try to write a message on stdout and
-     * terminate cvs.
-     */
-    if (s < 1 && errno != 0)
-        fperrmsg (stdout, 1, errno, "cannot write to stderr");
     fwrite (args, sizeof *args, len, stderr);
     putc ('\n', stderr);
 }
@@ -3849,7 +3825,7 @@
     TRACE (TRACE_FUNCTION, "Forking server: %s %s",
           command[0] ? command[0] : "(null)", command[1]);
 
-    child_pid = piped_child (command, &tofd, &fromfd);
+    child_pid = piped_child (command, &tofd, &fromfd, false);
     if (child_pid < 0)
        error (1, 0, "could not fork server process");