X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6ba9279fb2c52280cedaaca94783caf44ae9d324..593fde2d3bfeaaeff4103ce354215783be1cec9f:/io.c

diff --git a/io.c b/io.c
index b5ceff12..b48ae0f9 100644
--- a/io.c
+++ b/io.c
@@ -45,8 +45,8 @@ static int buffer_f_in = -1;
 
 void setup_nonblocking(int f_in,int f_out)
 {
-  set_blocking(f_out,0);
-  buffer_f_in = f_in;
+	set_blocking(f_out,0);
+	buffer_f_in = f_in;
 }
 
 
@@ -61,39 +61,42 @@ static int read_buffer_size;
  * ssh will clag up. Uggh.  */
 static void read_check(int f)
 {
-  int n;
+	int n;
 
-  if (f == -1) return;
+	if (f == -1) return;
 
-  if (read_buffer_len == 0) {
-    read_buffer_p = read_buffer;
-  }
+	if (read_buffer_len == 0) {
+		read_buffer_p = read_buffer;
+	}
 
-  if ((n=num_waiting(f)) <= 0)
-    return;
+	if ((n=num_waiting(f)) <= 0)
+		return;
 
-  /* things could deteriorate if we read in really small chunks */
-  if (n < 10) n = 1024;
+	/* things could deteriorate if we read in really small chunks */
+	if (n < 10) n = 1024;
 
-  if (read_buffer_p != read_buffer) {
-    memmove(read_buffer,read_buffer_p,read_buffer_len);
-    read_buffer_p = read_buffer;
-  }
+	if (n > MAX_READ_BUFFER/4)
+		n = MAX_READ_BUFFER/4;
 
-  if (n > (read_buffer_size - read_buffer_len)) {
-    read_buffer_size += n;
-    if (!read_buffer)
-      read_buffer = (char *)malloc(read_buffer_size);
-    else
-      read_buffer = (char *)realloc(read_buffer,read_buffer_size);
-    if (!read_buffer) out_of_memory("read check");      
-    read_buffer_p = read_buffer;      
-  }
+	if (read_buffer_p != read_buffer) {
+		memmove(read_buffer,read_buffer_p,read_buffer_len);
+		read_buffer_p = read_buffer;
+	}
 
-  n = read(f,read_buffer+read_buffer_len,n);
-  if (n > 0) {
-    read_buffer_len += n;
-  }
+	if (n > (read_buffer_size - read_buffer_len)) {
+		read_buffer_size += n;
+		if (!read_buffer)
+			read_buffer = (char *)malloc(read_buffer_size);
+		else
+			read_buffer = (char *)realloc(read_buffer,read_buffer_size);
+		if (!read_buffer) out_of_memory("read check");      
+		read_buffer_p = read_buffer;      
+	}
+
+	n = read(f,read_buffer+read_buffer_len,n);
+	if (n > 0) {
+		read_buffer_len += n;
+	}
 }
 
 static time_t last_io;
@@ -113,7 +116,7 @@ static void check_timeout(void)
 	t = time(NULL);
 
 	if (last_io && io_timeout && (t-last_io)>io_timeout) {
-		fprintf(FERROR,"read timeout after %d second - exiting\n", 
+		rprintf(FERROR,"read timeout after %d second - exiting\n", 
 			(int)(t-last_io));
 		exit_cleanup(1);
 	}
@@ -134,6 +137,7 @@ static int readfd(int fd,char *buffer,int N)
 			memcpy(buffer+total,read_buffer_p,ret);
 			read_buffer_p += ret;
 			read_buffer_len -= ret;
+			total += ret;
 			continue;
 		} 
 
@@ -147,7 +151,8 @@ static int readfd(int fd,char *buffer,int N)
 			tv.tv_sec = io_timeout;
 			tv.tv_usec = 0;
 
-			if (select(fd+1, &fds, NULL, NULL, &tv) != 1) {
+			if (select(fd+1, &fds, NULL, NULL, 
+				   io_timeout?&tv:NULL) != 1) {
 				check_timeout();
 			}
 		}
@@ -163,13 +168,13 @@ static int readfd(int fd,char *buffer,int N)
 }
 
 
-int read_int(int f)
+int32 read_int(int f)
 {
   int ret;
   char b[4];
   if ((ret=readfd(f,b,4)) != 4) {
     if (verbose > 1) 
-      fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+      rprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
 	      getpid(),4,ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
@@ -184,16 +189,16 @@ int64 read_longint(int f)
 	char b[8];
 	ret = read_int(f);
 
-	if (ret != -1) return ret;
+	if ((int32)ret != (int32)0xffffffff) return ret;
 
-#ifndef HAVE_LONGLONG
-	fprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
+#ifdef NO_INT64
+	rprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
 	exit_cleanup(1);
 #else
 	if (remote_version >= 16) {
 		if ((ret=readfd(f,b,8)) != 8) {
 			if (verbose > 1) 
-				fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+				rprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
 					getpid(),8,ret==-1?strerror(errno):"EOF");
 			exit_cleanup(1);
 		}
@@ -210,13 +215,19 @@ void read_buf(int f,char *buf,int len)
   int ret;
   if ((ret=readfd(f,buf,len)) != len) {
     if (verbose > 1) 
-      fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+      rprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
 	      getpid(),len,ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
   total_read += len;
 }
 
+void read_sbuf(int f,char *buf,int len)
+{
+	read_buf(f,buf,len);
+	buf[len] = 0;
+}
+
 unsigned char read_byte(int f)
 {
   unsigned char c;
@@ -230,49 +241,70 @@ static int last_sparse;
 
 int sparse_end(int f)
 {
-  if (last_sparse) {
-    lseek(f,-1,SEEK_CUR);
-    return (write(f,&last_byte,1) == 1 ? 0 : -1);
-  }
-  last_sparse = 0;
-  return 0;
+	if (last_sparse) {
+		do_lseek(f,-1,SEEK_CUR);
+		return (write(f,&last_byte,1) == 1 ? 0 : -1);
+	}
+	last_sparse = 0;
+	return 0;
 }
 
-int write_sparse(int f,char *buf,int len)
+
+static int write_sparse(int f,char *buf,int len)
 {
-  int l1=0,l2=0;
-  int ret;
+	int l1=0,l2=0;
+	int ret;
 
-  if (!sparse_files) 
-    return write(f,buf,len);
+	for (l1=0;l1<len && buf[l1]==0;l1++) ;
+	for (l2=0;l2<(len-l1) && buf[len-(l2+1)]==0;l2++) ;
 
-  for (l1=0;l1<len && buf[l1]==0;l1++) ;
-  for (l2=0;l2<(len-l1) && buf[len-(l2+1)]==0;l2++) ;
+	last_byte = buf[len-1];
 
-  last_byte = buf[len-1];
+	if (l1 == len || l2 > 0)
+		last_sparse=1;
 
-  if (l1 == len || l2 > 0)
-    last_sparse=1;
+	if (l1 > 0)
+		do_lseek(f,l1,SEEK_CUR);  
 
-  if (l1 > 0)
-    lseek(f,l1,SEEK_CUR);  
+	if (l1 == len) 
+		return len;
 
-  if (l1 == len) 
-    return len;
+	if ((ret=write(f,buf+l1,len-(l1+l2))) != len-(l1+l2)) {
+		if (ret == -1 || ret == 0) return ret;
+		return (l1+ret);
+	}
 
-  if ((ret=write(f,buf+l1,len-(l1+l2))) != len-(l1+l2)) {
-    if (ret == -1 || ret == 0) return ret;
-    return (l1+ret);
-  }
+	if (l2 > 0)
+		do_lseek(f,l2,SEEK_CUR);
+	
+	return len;
+}
+
+
+
+int write_file(int f,char *buf,int len)
+{
+	int ret = 0;
 
-  if (l2 > 0)
-    lseek(f,l2,SEEK_CUR);
+	if (!sparse_files) 
+		return write(f,buf,len);
 
-  return len;
+	while (len>0) {
+		int len1 = MIN(len, SPARSE_WRITE_SIZE);
+		int r1 = write_sparse(f, buf, len1);
+		if (r1 <= 0) {
+			if (ret > 0) return ret;
+			return r1;
+		}
+		len -= r1;
+		buf += r1;
+		ret += r1;
+	}
+	return ret;
 }
 
 
-static int writefd(int fd,char *buf,int len)
+static int writefd_unbuffered(int fd,char *buf,int len)
 {
   int total = 0;
   fd_set w_fds, r_fds;
@@ -296,7 +328,7 @@ static int writefd(int fd,char *buf,int len)
 	       systems it seems (eg. IRIX) */
 	    u_sleep(1000);
 #if 0
-	    fprintf(FERROR,"write exception\n");
+	    rprintf(FERROR,"write exception\n");
 	    exit_cleanup(1);
 #endif
     }
@@ -305,38 +337,40 @@ static int writefd(int fd,char *buf,int len)
 
 
     if (ret == -1) {
-      read_check(buffer_f_in);
-
-      fd_count = fd+1;
-      FD_ZERO(&w_fds);
-      FD_ZERO(&r_fds);
-      FD_SET(fd,&w_fds);
-      if (buffer_f_in != -1) {
-	      FD_SET(buffer_f_in,&r_fds);
-	      if (buffer_f_in > fd) 
-		      fd_count = buffer_f_in+1;
-      }
-
-      tv.tv_sec = BLOCKING_TIMEOUT;
-      tv.tv_usec = 0;
-      count = select(fd_count,buffer_f_in == -1? NULL: &r_fds,
-		     &w_fds,NULL,&tv);
-      if (count == -1 && errno != EINTR) {
-	      if (verbose > 1) 
-		      fprintf(FERROR,"select error: %s\n", strerror(errno));
-	      exit_cleanup(1);
-      }
-
-      if (count == 0) {
-	      check_timeout();
-	      continue;
-      }
+	    if (read_buffer_len < MAX_READ_BUFFER)
+		    read_check(buffer_f_in);
+
+	    fd_count = fd+1;
+	    FD_ZERO(&w_fds);
+	    FD_ZERO(&r_fds);
+	    FD_SET(fd,&w_fds);
+	    if (buffer_f_in != -1) {
+		    FD_SET(buffer_f_in,&r_fds);
+		    if (buffer_f_in > fd) 
+			    fd_count = buffer_f_in+1;
+	    }
+
+	    tv.tv_sec = BLOCKING_TIMEOUT;
+	    tv.tv_usec = 0;
+	    count = select(fd_count,buffer_f_in == -1? NULL: &r_fds,
+			   &w_fds,NULL,&tv);
+
+	    if (count == -1 && errno != EINTR) {
+		    if (verbose > 1) 
+			    rprintf(FERROR,"select error: %s\n", strerror(errno));
+		    exit_cleanup(1);
+	    }
+
+	    if (count == 0) {
+		    check_timeout();
+		    continue;
+	    }
       
-      if (FD_ISSET(fd, &w_fds)) {
-	      got_select = 1;
-      }
+	    if (FD_ISSET(fd, &w_fds)) {
+		    got_select = 1;
+	    }
     } else {
-      total += ret;
+	    total += ret;
     }
   }
 
@@ -346,15 +380,67 @@ static int writefd(int fd,char *buf,int len)
   return total;
 }
 
+static char *io_buffer;
+static int io_buffer_count;
 
+void io_start_buffering(int fd)
+{
+	io_buffer = (char *)malloc(IO_BUFFER_SIZE);
+	if (!io_buffer) out_of_memory("writefd");
+	io_buffer_count = 0;
+}
 
-void write_int(int f,int x)
+void io_end_buffering(int fd)
+{
+	if (io_buffer_count) {
+		if (writefd_unbuffered(fd, io_buffer, 
+				       io_buffer_count) != 
+		    io_buffer_count) {
+			rprintf(FERROR,"write failed\n");
+			exit_cleanup(1);
+		}
+		io_buffer_count = 0;
+	}
+	free(io_buffer);
+	io_buffer = NULL;
+}
+
+static int writefd(int fd,char *buf,int len1)
+{
+	int len = len1;
+
+	if (!io_buffer) return writefd_unbuffered(fd, buf, len);
+
+	while (len) {
+		int n = MIN(len, IO_BUFFER_SIZE-io_buffer_count);
+		if (n > 0) {
+			memcpy(io_buffer+io_buffer_count, buf, n);
+			buf += n;
+			len -= n;
+			io_buffer_count += n;
+		}
+		
+		if (io_buffer_count == IO_BUFFER_SIZE) {
+			if (writefd_unbuffered(fd, io_buffer, 
+					       io_buffer_count) != 
+			    io_buffer_count) {
+				return -1;
+			}
+			io_buffer_count = 0;
+		}
+	}
+
+	return len1;
+}
+
+
+void write_int(int f,int32 x)
 {
   int ret;
   char b[4];
   SIVAL(b,0,x);
   if ((ret=writefd(f,b,4)) != 4) {
-    fprintf(FERROR,"write_int failed : %s\n",
+    rprintf(FERROR,"write_int failed : %s\n",
 	    ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
@@ -377,7 +463,7 @@ void write_longint(int f, int64 x)
 	SIVAL(b,4,((x>>32)&0xFFFFFFFF));
 
 	if ((ret=writefd(f,b,8)) != 8) {
-		fprintf(FERROR,"write_longint failed : %s\n",
+		rprintf(FERROR,"write_longint failed : %s\n",
 			ret==-1?strerror(errno):"EOF");
 		exit_cleanup(1);
 	}
@@ -388,17 +474,23 @@ void write_buf(int f,char *buf,int len)
 {
   int ret;
   if ((ret=writefd(f,buf,len)) != len) {
-    fprintf(FERROR,"write_buf failed : %s\n",
+    rprintf(FERROR,"write_buf failed : %s\n",
 	    ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
   total_written += len;
 }
 
+/* write a string to the connection */
+void write_sbuf(int f,char *buf)
+{
+	write_buf(f, buf, strlen(buf));
+}
+
 
 void write_byte(int f,unsigned char c)
 {
-  write_buf(f,(char *)&c,1);
+	write_buf(f,(char *)&c,1);
 }
 
 void write_flush(int f)
@@ -406,3 +498,38 @@ void write_flush(int f)
 }
 
 
+int read_line(int f, char *buf, int maxlen)
+{
+	while (maxlen) {
+		read_buf(f, buf, 1);
+		if (buf[0] == '\n') {
+			buf[0] = 0;
+			break;
+		}
+		if (buf[0] != '\r') {
+			buf++;
+			maxlen--;
+		}
+	}
+	if (maxlen == 0) {
+		*buf = 0;
+		return 0;
+	}
+	return 1;
+}
+
+
+void io_printf(int fd, const char *format, ...)
+{
+	va_list ap;  
+	char buf[1024];
+	int len;
+	
+	va_start(ap, format);
+	len = vslprintf(buf, sizeof(buf)-1, format, ap);
+	va_end(ap);
+
+	if (len < 0) exit_cleanup(1);
+
+	write_sbuf(fd, buf);
+}