[Cvs-cvs] ccvs/src ChangeLog buffer.c server.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/20 19:20:45

Modified files:
        src            : ChangeLog buffer.c server.c 

Log message:
        * buffer.c (fd_buffer_block), server.c (do_cvs_command): Use DEVNULL
        macro in place of string literal.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3372&tr2=1.3373&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/buffer.c.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?tr1=1.457&tr2=1.458&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3372 ccvs/src/ChangeLog:1.3373
--- ccvs/src/ChangeLog:1.3372   Thu Apr 13 14:31:10 2006
+++ ccvs/src/ChangeLog  Thu Apr 20 19:20:45 2006
@@ -1,3 +1,8 @@
+2006-04-20  Derek Price  <address@hidden>
+
+       * buffer.c (fd_buffer_block), server.c (do_cvs_command): Use DEVNULL
+       macro in place of string literal.
+
 2006-04-13  Derek Price  <address@hidden>
 
        * server.h (TRACE_NULL): New macro.
Index: ccvs/src/buffer.c
diff -u ccvs/src/buffer.c:1.67 ccvs/src/buffer.c:1.68
--- ccvs/src/buffer.c:1.67      Tue Mar 28 15:30:23 2006
+++ ccvs/src/buffer.c   Thu Apr 20 19:20:45 2006
@@ -1998,7 +1998,7 @@
                if (!blocking_error (errno))
                {
                    status = errno;
-                   break;
+                   goto block_done;
                }
                /* else Everything's fine, we just didn't get any data.  */
            }
@@ -2084,7 +2084,7 @@
        bool isdevnull = false;
 
        if (devnull_set == -1)
-           devnull_set = stat ("/dev/null", &devnull);
+           devnull_set = stat (DEVNULL, &devnull);
 
        if (devnull_set >= 0)
            /* Equivalent to /dev/null ? */
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.457 ccvs/src/server.c:1.458
--- ccvs/src/server.c:1.457     Fri Apr  7 01:49:03 2006
+++ ccvs/src/server.c   Thu Apr 20 19:20:45 2006
@@ -3666,7 +3666,7 @@
     dev_null_fd = CVS_OPEN (DEVNULL, O_RDONLY);
     if (dev_null_fd < 0)
     {
-       buf_output0 (buf_to_net, "E open /dev/null failed\n");
+       buf_output0 (buf_to_net, "E open " DEVNULL " failed\n");
        print_error (errno);
        goto error_exit;
     }