In read_batch mode, we read ints from the new batch_gen_fd pipe and

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 909bc65..4cf3302 100644 (file)
--- a/io.c
+++ b/io.c
@@ -55,6 +55,7 @@ extern struct stats stats;
 const char phase_unknown[] = "unknown";
 int select_timeout = SELECT_TIMEOUT;
 int batch_fd = -1;
+int batch_gen_fd = -1;
 
 /**
  * The connection might be dropped at some point; perhaps because the
@@ -761,14 +762,14 @@ void read_buf(int f,char *buf,size_t len)
 
 void read_sbuf(int f,char *buf,size_t len)
 {
-       read_buf(f,buf,len);
+       readfd(f, buf, len);
        buf[len] = 0;
 }
 
 unsigned char read_byte(int f)
 {
        unsigned char c;
-       read_buf(f, (char *)&c, 1);
+       readfd(f, (char *)&c, 1);
        return c;
 }
 
@@ -1035,15 +1036,14 @@ void write_buf(int f,char *buf,size_t len)
 }
 
 /** Write a string to the connection */
-static void write_sbuf(int f,char *buf)
+void write_sbuf(int f, char *buf)
 {
-       write_buf(f, buf, strlen(buf));
+       writefd(f, buf, strlen(buf));
 }
 
-
 void write_byte(int f,unsigned char c)
 {
-       write_buf(f,(char *)&c,1);
+       writefd(f, (char *)&c, 1);
 }