X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/17d31b380b7c748837b30e7e0c54ab17974f7ab6..f855a7d01ab8401a307bb02cdcdee546df3e2423:/main.c

diff --git a/main.c b/main.c
index 2846f881..807409e3 100644
--- a/main.c
+++ b/main.c
@@ -23,8 +23,6 @@ time_t starttime = 0;
 
 struct stats stats;
 
-extern int csum_length;
-
 extern int verbose;
 
 static void report(int f)
@@ -42,8 +40,7 @@ static void report(int f)
 		if (f == -1 || !am_sender) return;
 	}
 
-	send_stats = verbose || 
-			((remote_version >= 20) && (PROTOCOL_VERSION >= 20));
+	send_stats = verbose || (remote_version >= 20);
 	if (am_server) {
 		if (am_sender && send_stats) {
 			int64 w;
@@ -71,7 +68,7 @@ static void report(int f)
 	if (do_stats) {
 		if (!am_sender && !send_stats) {
 		    /* missing the bytes written by the generator */
-		    rprintf(FINFO, "\nCannot show stats as receiver because protocol version is less than 20\n");
+		    rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n");
 		    rprintf(FINFO, "Use --stats -v to show stats\n");
 		    return;
 		}
@@ -209,7 +206,7 @@ static char *get_local_name(struct file_list *flist,char *name)
 		return name;
 	}
 
-	if (flist->count == 1)
+	if (flist->count <= 1)
 		return name;
 
 	if (do_mkdir(name,0777 & ~orig_umask) != 0) {
@@ -335,6 +332,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 	char *local_name=NULL;
 	char *dir = NULL;
 	extern int delete_mode;
+	extern int delete_excluded;
 	extern int am_daemon;
 
 	if (verbose > 2)
@@ -351,12 +349,12 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 		}    
 	}
 
-	if (delete_mode)
+	if (delete_mode && !delete_excluded)
 		recv_exclude_list(f_in);
 
 	flist = recv_file_list(f_in);
-	if (!flist || flist->count == 0) {
-		rprintf(FERROR,"server_recv: nothing to do\n");
+	if (!flist) {
+		rprintf(FERROR,"server_recv: recv_file_list error\n");
 		exit_cleanup(RERR_FILESELECT);
 	}
 	
@@ -408,9 +406,10 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 	if (am_sender) {
 		extern int cvs_exclude;
 		extern int delete_mode;
+		extern int delete_excluded;
 		if (cvs_exclude)
 			add_cvs_excludes();
-		if (delete_mode) 
+		if (delete_mode && !delete_excluded) 
 			send_exclude_list(f_out);
 		flist = send_file_list(f_out,argc,argv);
 		if (verbose > 3)