X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/65b4e4b2a93de8e5bff93b5c7a2a529613cbc5e8..6db1db54883508cd572e24f93e7bee14e286967d:/receiver.c

diff --git a/receiver.c b/receiver.c
index 3834ce26..ce6b7394 100644
--- a/receiver.c
+++ b/receiver.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@ extern char *tmpdir;
 extern char *partial_dir;
 extern char *basis_dir[];
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
-extern struct filter_list_struct server_filter_list;
+extern struct filter_list_struct daemon_filter_list;
 
 static struct bitbag *delayed_bits = NULL;
 static int phase = 0, redoing = 0;
@@ -352,10 +352,11 @@ static int get_next_gen_ndx(int fd, int next_gen_ndx, int desired_ndx)
 {
 	while (next_gen_ndx < desired_ndx) {
 		if (next_gen_ndx >= 0) {
-			rprintf(FINFO,
+			struct file_struct *file = cur_flist->files[next_gen_ndx];
+			rprintf(FERROR_XFER,
 				"(No batched update for%s \"%s\")\n",
-				redoing ? " resend of" : "",
-				f_name(cur_flist->files[next_gen_ndx], NULL));
+				file->flags & FLAG_FILE_SENT ? " resend of" : "",
+				f_name(file, NULL));
 		}
 		next_gen_ndx = read_int(fd);
 		if (next_gen_ndx == -1) {
@@ -488,8 +489,8 @@ int recv_files(int f_in, char *local_name)
 
 		cleanup_got_literal = 0;
 
-		if (server_filter_list.head
-		    && check_filter(&server_filter_list, fname, 0) < 0) {
+		if (daemon_filter_list.head
+		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
 			rprintf(FERROR, "attempt to hack rsync failed.\n");
 			exit_cleanup(RERR_PROTOCOL);
 		}
@@ -501,7 +502,7 @@ int recv_files(int f_in, char *local_name)
 			continue;
 		}
 		if (write_batch < 0) {
-			log_item(FINFO, file, &stats, iflags, NULL);
+			log_item(FCLIENT, file, &stats, iflags, NULL);
 			if (!am_server)
 				discard_receive_data(f_in, F_LENGTH(file));
 			continue;
@@ -554,8 +555,8 @@ int recv_files(int f_in, char *local_name)
 				fnamecmp = fnamecmpbuf;
 				break;
 			}
-			if (!fnamecmp || (server_filter_list.head
-			  && check_filter(&server_filter_list, fname, 0) < 0)) {
+			if (!fnamecmp || (daemon_filter_list.head
+			  && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
 				fnamecmp = fname;
 				fnamecmp_type = FNAMECMP_FNAME;
 			}
@@ -688,26 +689,23 @@ int recv_files(int f_in, char *local_name)
 		}
 
 		if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
-			char *temp_copy_name;
 			if (partialptr == fname)
-				partialptr = temp_copy_name = NULL;
-			else if (*partial_dir == '/')
-				temp_copy_name = NULL;
-			else
-				temp_copy_name = partialptr;
-			finish_transfer(fname, fnametmp, fnamecmp,
-					temp_copy_name, file, recv_ok, 1);
-			if (fnamecmp == partialptr) {
+				partialptr = NULL;
+			if (!finish_transfer(fname, fnametmp, fnamecmp,
+					     partialptr, file, recv_ok, 1))
+				recv_ok = -1;
+			else if (fnamecmp == partialptr) {
 				do_unlink(partialptr);
 				handle_partial_dir(partialptr, PDIR_DELETE);
 			}
 		} else if (keep_partial && partialptr
 		    && handle_partial_dir(partialptr, PDIR_CREATE)) {
-			finish_transfer(partialptr, fnametmp, fnamecmp, NULL,
-					file, recv_ok, !partial_dir);
-			if (delay_updates && recv_ok) {
-				bitbag_set_bit(delayed_bits, ndx);
+			if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL,
+					     file, recv_ok, !partial_dir))
 				recv_ok = -1;
+			else if (delay_updates && recv_ok) {
+				bitbag_set_bit(delayed_bits, ndx);
+				recv_ok = 2;
 			}
 		} else {
 			partialptr = NULL;
@@ -716,13 +714,15 @@ int recv_files(int f_in, char *local_name)
 
 		cleanup_disable();
 
-		if (recv_ok > 0) {
+		switch (recv_ok) {
+		case 1:
 			if (remove_source_files || inc_recurse
 			 || (preserve_hard_links && F_IS_HLINKED(file)))
 				send_msg_int(MSG_SUCCESS, ndx);
-		} else if (!recv_ok) {
-			enum logcode msgtype = redoing || read_batch ? FERROR : FWARNING;
-			if (msgtype == FERROR || verbose) {
+			break;
+		case 0: {
+			enum logcode msgtype = redoing ? FERROR_XFER : FWARNING;
+			if (msgtype == FERROR_XFER || verbose) {
 				char *errstr, *redostr, *keptstr;
 				if (!(keep_partial && partialptr) && !inplace)
 					keptstr = "discarded";
@@ -730,22 +730,30 @@ int recv_files(int f_in, char *local_name)
 					keptstr = "put into partial-dir";
 				else
 					keptstr = "retained";
-				if (msgtype == FERROR) {
+				if (msgtype == FERROR_XFER) {
 					errstr = "ERROR";
 					redostr = "";
 				} else {
 					errstr = "WARNING";
-					redostr = " (will try again)";
+					redostr = read_batch ? " (may try again)"
+							     : " (will try again)";
 				}
 				rprintf(msgtype,
 					"%s: %s failed verification -- update %s%s.\n",
-					errstr, fname, keptstr, redostr);
+					errstr, local_name ? f_name(file, NULL) : fname,
+					keptstr, redostr);
 			}
 			if (!redoing) {
 				send_msg_int(MSG_REDO, ndx);
 				file->flags |= FLAG_FILE_SENT;
 			} else if (inc_recurse)
 				send_msg_int(MSG_NO_SEND, ndx);
+			break;
+		    }
+		case -1:
+			if (inc_recurse)
+				send_msg_int(MSG_NO_SEND, ndx);
+			break;
 		}
 	}
 	if (make_backups < 0)