From: Wayne Davison <wayned@samba.org>
Date: Sat, 17 Jul 2004 15:34:53 +0000 (+0000)
Subject: Fixed for latest source.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/9cd8d7aafa65ac1414689cf1126226bb93a7b38c

Fixed for latest source.
---

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index f347d2d..bc0546c 100644
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/io.c	2004-07-15 02:21:10
+--- orig/io.c	2004-07-17 15:20:05
 +++ io.c	2004-07-03 20:17:10
-@@ -231,6 +231,14 @@ static void read_msg_fd(void)
+@@ -239,6 +239,14 @@ static void read_msg_fd(void)
  		read_loop(fd, buf, 4);
  		redo_list_add(IVAL(buf,0));
  		break;
@@ -21,9 +21,9 @@ command before "make":
  	case MSG_INFO:
  	case MSG_ERROR:
  	case MSG_LOG:
-@@ -640,6 +648,16 @@ static int readfd_unbuffered(int fd, cha
- 			read_loop(fd, buffer, remaining);
- 			bufferIdx = 0;
+@@ -672,6 +680,16 @@ static int readfd_unbuffered(int fd, cha
+ 			read_loop(fd, iobuf_in, remaining);
+ 			iobuf_in_ndx = 0;
  			break;
 +		case MSG_SUCCESS:
 +			if (remaining != 4) {
@@ -38,7 +38,7 @@ command before "make":
  		case MSG_INFO:
  		case MSG_ERROR:
  			if (remaining >= sizeof line) {
---- orig/main.c	2004-07-15 17:02:03
+--- orig/main.c	2004-07-17 15:20:05
 +++ main.c	2004-07-15 02:29:03
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
@@ -48,7 +48,7 @@ command before "make":
  extern int orig_umask;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
-@@ -598,6 +599,8 @@ void start_server(int f_in, int f_out, i
+@@ -600,6 +601,8 @@ void start_server(int f_in, int f_out, i
  
  	if (am_sender) {
  		keep_dirlinks = 0; /* Must be disabled on the sender. */
@@ -57,7 +57,7 @@ command before "make":
  
  		recv_exclude_list(f_in);
  		if (cvs_exclude)
-@@ -677,6 +680,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -680,6 +683,9 @@ int client_run(int f_in, int f_out, pid_
  		exit_cleanup(status);
  	}
  
diff --git a/time-limit.diff b/time-limit.diff
index 1556a06..0078960 100644
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,17 +3,17 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime()?
 
---- orig/io.c	2004-07-15 02:21:10
-+++ io.c	2004-07-03 20:23:22
-@@ -44,6 +44,7 @@ static int io_multiplexing_in;
- static int multiplex_in_fd = -1;
- static int multiplex_out_fd = -1;
- static time_t last_io;
+--- orig/io.c	2004-07-17 15:20:05
++++ io.c	2004-07-17 15:28:36
+@@ -49,6 +49,7 @@ extern int am_sender;
+ extern int eol_nulls;
+ extern int checksum_seed;
+ extern int protocol_version;
 +extern time_t stop_at_utime;
- static int no_flush;
+ extern char *remote_filesfrom_file;
+ extern struct stats stats;
  
- extern int bwlimit;
-@@ -134,16 +135,21 @@ static void check_timeout(void)
+@@ -134,17 +135,22 @@ static void check_timeout(void)
  {
  	time_t t;
  
@@ -36,9 +36,11 @@ Do we need configure support for mktime()?
  
 -	t = time(NULL);
 -
- 	if (last_io && io_timeout && (t-last_io) >= io_timeout) {
+-	if (t - last_io >= io_timeout) {
++	if (io_timeout && t - last_io >= io_timeout) {
  		if (!am_server && !am_daemon) {
  			rprintf(FERROR, "io timeout after %d seconds - exiting\n",
+ 				(int)(t-last_io));
 --- orig/options.c	2004-07-16 20:07:22
 +++ options.c	2004-07-15 17:06:09
 @@ -96,6 +96,7 @@ int blocking_io = -1;