X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7628f1560a56ef7065bedd89cb5b10bb358c4327..982426b8a364eae49577cb0906e84f0ff83499dc:/remove-sent-files.diff

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index 4b21eff..5bd4061 100644
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- io.c	9 Jun 2004 03:07:50 -0000	1.129
-+++ io.c	18 Jun 2004 17:24:12 -0000
-@@ -225,6 +225,14 @@ static void read_msg_fd(void)
+--- orig/io.c	2004-07-24 16:52:09
++++ io.c	2004-07-03 20:17:10
+@@ -240,6 +240,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:
-@@ -636,6 +644,16 @@ static int readfd_unbuffered(int fd, cha
- 			read_loop(fd, buffer, remaining);
- 			bufferIdx = 0;
+@@ -673,6 +681,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,8 +38,8 @@ command before "make":
  		case MSG_INFO:
  		case MSG_ERROR:
  			if (remaining >= sizeof line) {
---- main.c	18 Jun 2004 16:50:20 -0000	1.198
-+++ main.c	18 Jun 2004 17:24:12 -0000
+--- orig/main.c	2004-07-24 16:52:09
++++ main.c	2004-07-22 03:06:20
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
  extern int log_got_error;
@@ -48,44 +48,39 @@ command before "make":
  extern int orig_umask;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
-@@ -575,6 +576,8 @@ void start_server(int f_in, int f_out, i
+@@ -611,6 +612,8 @@ void start_server(int f_in, int f_out, i
  
  	if (am_sender) {
  		keep_dirlinks = 0; /* Must be disabled on the sender. */
 +		if (need_messages_from_generator)
 +			io_start_multiplex_in(f_in);
- 		if (!read_batch) {
- 			recv_exclude_list(f_in);
- 			if (cvs_exclude)
-@@ -642,6 +645,9 @@ int client_run(int f_in, int f_out, pid_
+ 
+ 		recv_exclude_list(f_in);
+ 		if (cvs_exclude)
+@@ -682,6 +685,9 @@ int client_run(int f_in, int f_out, pid_
  		exit_cleanup(status);
  	}
  
-+	if (need_messages_from_generator)
++	if (need_messages_from_generator && !read_batch)
 +		io_start_multiplex_out(f_out);
 +
  	if (argc == 0)
  		list_only = 1;
  
---- options.c	7 Jun 2004 22:05:22 -0000	1.156
-+++ options.c	18 Jun 2004 17:24:12 -0000
-@@ -87,6 +87,7 @@ int size_only = 0;
+--- orig/options.c	2004-07-23 17:16:13
++++ options.c	2004-07-16 20:09:54
+@@ -87,8 +87,10 @@ int size_only = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
  int delete_after = 0;
 +int delete_sent_files = 0;
  int only_existing = 0;
  int opt_ignore_existing = 0;
++int need_messages_from_generator = 0;
  int max_delete = 0;
-@@ -94,6 +95,7 @@ int ignore_errors = 0;
+ int ignore_errors = 0;
  int modify_window = 0;
- int blocking_io = -1;
- int checksum_seed = 0;
-+int need_messages_from_generator = 0;
- unsigned int block_size = 0;
- 
- 
-@@ -258,6 +260,7 @@ void usage(enum logcode F)
+@@ -265,6 +267,7 @@ void usage(enum logcode F)
    rprintf(F,"     --delete                delete files that don't exist on the sending side\n");
    rprintf(F,"     --delete-excluded       also delete excluded files on the receiving side\n");
    rprintf(F,"     --delete-after          receiver deletes after transferring, not before\n");
@@ -93,7 +88,7 @@ command before "make":
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
    rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
    rprintf(F,"     --partial               keep partially transferred files\n");
-@@ -308,8 +311,8 @@ void usage(enum logcode F)
+@@ -315,8 +318,8 @@ void usage(enum logcode F)
  }
  
  enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
@@ -104,7 +99,7 @@ command before "make":
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
        OPT_REFUSED_BASE = 9000};
  
-@@ -328,6 +331,7 @@ static struct poptOption long_options[] 
+@@ -335,6 +338,7 @@ static struct poptOption long_options[] 
    {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing, 0, 0, 0 },
    {"delete-after",     0,  POPT_ARG_NONE,   0,              OPT_DELETE_AFTER, 0, 0 },
    {"delete-excluded",  0,  POPT_ARG_NONE,   0,              OPT_DELETE_EXCLUDED, 0, 0 },
@@ -112,7 +107,7 @@ command before "make":
    {"force",            0,  POPT_ARG_NONE,   &force_delete, 0, 0, 0 },
    {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
    {"exclude",          0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE, 0, 0 },
-@@ -513,6 +517,11 @@ int parse_arguments(int *argc, const cha
+@@ -521,6 +525,11 @@ int parse_arguments(int *argc, const cha
  			delete_mode = 1;
  			break;
  
@@ -124,7 +119,7 @@ command before "make":
  		case OPT_EXCLUDE:
  			if (am_server || sanitize_paths)
  				return 0; /* Impossible... */
-@@ -989,6 +998,9 @@ void server_options(char **args,int *arg
+@@ -1025,6 +1034,9 @@ void server_options(char **args,int *arg
  		}
  	}
  
@@ -134,26 +129,26 @@ command before "make":
  	*argc = ac;
  	return;
  
---- receiver.c	14 Jun 2004 15:09:36 -0000	1.82
-+++ receiver.c	18 Jun 2004 17:24:13 -0000
-@@ -48,6 +48,7 @@ extern int ignore_errors;
- extern int orig_umask;
- extern int keep_partial;
- extern int checksum_seed;
+--- orig/receiver.c	2004-07-26 16:20:00
++++ receiver.c	2004-07-26 06:21:43
+@@ -45,6 +45,7 @@ extern char *backup_dir;
+ extern char *backup_suffix;
+ extern int backup_suffix_len;
+ extern int cleanup_got_literal;
 +extern int delete_sent_files;
- 
- static void delete_one(char *fn, int is_dir)
- {
-@@ -300,7 +301,7 @@ int recv_files(int f_in,struct file_list
+ extern int module_id;
+ extern int ignore_errors;
+ extern int orig_umask;
+@@ -342,7 +343,7 @@ int recv_files(int f_in, struct file_lis
  	char *fname, fbuf[MAXPATHLEN];
  	char template[MAXPATHLEN];
  	char fnametmp[MAXPATHLEN];
 -	char *fnamecmp;
 +	char *fnamecmp, numbuf[4];
  	char fnamecmpbuf[MAXPATHLEN];
- 	struct map_struct *mapbuf;
  	struct file_struct *file;
-@@ -482,16 +483,20 @@ int recv_files(int f_in,struct file_list
+ 	struct stats initial_stats;
+@@ -555,7 +556,12 @@ int recv_files(int f_in, struct file_lis
  
  		cleanup_disable();
  
@@ -164,13 +159,14 @@ command before "make":
 +				send_msg(MSG_SUCCESS, numbuf, 4);
 +			}
 +		} else {
- 			if (csum_length == SUM_LENGTH) {
- 				rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
- 					full_fname(fname));
- 			} else {
+ 			int msgtype = csum_length == SUM_LENGTH || read_batch ?
+ 				FERROR : FINFO;
+ 			if (msgtype == FERROR || verbose) {
+@@ -575,9 +581,8 @@ int recv_files(int f_in, struct file_lis
+ 					keptstr, redostr);
+ 			}
+ 			if (csum_length != SUM_LENGTH) {
 -				char buf[4];
- 				if (verbose > 1)
- 					rprintf(FINFO,"redoing %s(%d)\n",fname,i);
 -				SIVAL(buf, 0, i);
 -				send_msg(MSG_REDO, buf, 4);
 +				SIVAL(numbuf, 0, i);
@@ -178,8 +174,8 @@ command before "make":
  			}
  		}
  	}
---- rsync.h	16 May 2004 07:28:24 -0000	1.204
-+++ rsync.h	18 Jun 2004 17:24:13 -0000
+--- orig/rsync.h	2004-07-23 17:16:13
++++ rsync.h	2004-07-03 20:17:10
 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
  #define FLAG_HLINK_EOL (1<<1)	/* generator only */
@@ -196,9 +192,9 @@ command before "make":
  	MSG_DONE=5,	/* current phase is done */
  	MSG_REDO=4,	/* reprocess indicated flist index */
  	MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
---- rsync.yo	5 Jun 2004 16:16:30 -0000	1.171
-+++ rsync.yo	18 Jun 2004 17:24:14 -0000
-@@ -313,6 +313,7 @@ verb(
+--- orig/rsync.yo	2004-07-24 16:52:10
++++ rsync.yo	2004-07-03 20:17:10
+@@ -314,6 +314,7 @@ verb(
       --delete                delete files that don't exist on sender
       --delete-excluded       also delete excluded files on receiver
       --delete-after          receiver deletes after transfer, not before
@@ -206,7 +202,7 @@ command before "make":
       --ignore-errors         delete even if there are I/O errors
       --max-delete=NUM        don't delete more than NUM files
       --partial               keep partially transferred files
-@@ -603,6 +604,11 @@ receiving side before transferring files
+@@ -618,6 +619,11 @@ receiving side before transferring files
  sufficient space on the receiving filesystem. If you want to delete
  after transferring, use the --delete-after switch. Implies --delete.
  
@@ -218,17 +214,17 @@ command before "make":
  dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
  even when there are I/O errors.
  
---- sender.c	18 Jun 2004 16:55:12 -0000	1.41
-+++ sender.c	18 Jun 2004 17:24:14 -0000
-@@ -27,6 +27,7 @@ extern int dry_run;
+--- orig/sender.c	2004-07-26 16:27:00
++++ sender.c	2004-07-26 16:49:19
+@@ -26,6 +26,7 @@ extern int io_error;
+ extern int dry_run;
  extern int am_server;
  extern int am_daemon;
- extern int protocol_version;
 +extern int delete_sent_files;
+ extern int protocol_version;
+ extern struct stats stats;
  
- 
- /**
-@@ -104,7 +105,29 @@ static struct sum_struct *receive_sums(i
+@@ -107,7 +108,29 @@ static struct sum_struct *receive_sums(i
  	return s;
  }
  
@@ -258,7 +254,7 @@ command before "make":
  
  void send_files(struct file_list *flist, int f_out, int f_in)
  {
-@@ -129,6 +152,8 @@ void send_files(struct file_list *flist,
+@@ -125,6 +148,8 @@ void send_files(struct file_list *flist,
  	if (verbose > 2)
  		rprintf(FINFO, "send_files starting\n");
  
@@ -267,10 +263,10 @@ command before "make":
  	while (1) {
  		unsigned int offset;
  
-@@ -300,6 +325,9 @@ void send_files(struct file_list *flist,
- 
- 		if (verbose > 2)
- 			rprintf(FINFO, "sender finished %s\n", fname);
+@@ -248,6 +273,9 @@ void send_files(struct file_list *flist,
+ 			rprintf(FINFO, "sender finished %s\n",
+ 				safe_fname(fname));
+ 		}
 +
 +		/* Flag that we actually sent this entry. */
 +		file->flags |= FLAG_SENT;