X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/876c9936803f81bafcbad42c3a4ec7e8bd1f7891..fa3e4a0548699ccaac41df2428fe1ad9d3659435:/options.c

diff --git a/options.c b/options.c
index 1c2cf332..266a2a85 100644
--- a/options.c
+++ b/options.c
@@ -179,7 +179,7 @@ static int refused_delete, refused_archive_part, refused_compress;
 static int refused_partial, refused_progress, refused_delete_before;
 static int refused_inplace;
 static char *max_size_arg, *min_size_arg;
-static char partialdir_for_delayupdate[] = ".~tmp~";
+static char tmp_partialdir[] = ".~tmp~";
 
 /** Local address to bind.  As a character string because it's
  * interpreted by the IPv6 layer: should be a numeric IP4 or IP6
@@ -1042,7 +1042,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
 		case OPT_CHMOD:
 			arg = poptGetOptArg(pc);
-			if (!(chmod_modes = parse_chmod(arg, chmod_modes))) {
+			if (!parse_chmod(arg, &chmod_modes)) {
 				snprintf(err_buf, sizeof err_buf,
 				    "Invalid argument passed to --chmod (%s)\n",
 				    arg);
@@ -1262,7 +1262,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		snprintf(err_buf, sizeof err_buf,
 			"--suffix cannot be a null string without --backup-dir\n");
 		return 0;
-	} else if (delete_mode && !delete_excluded) {
+	} else if (make_backups && delete_mode && !delete_excluded) {
 		snprintf(backup_dir_buf, sizeof backup_dir_buf,
 			"P *%s", backup_suffix);
 		parse_rule(&filter_list, backup_dir_buf, 0, 0);
@@ -1330,7 +1330,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 	}
 
 	if (delay_updates && !partial_dir)
-		partial_dir = partialdir_for_delayupdate;
+		partial_dir = tmp_partialdir;
 
 	if (inplace) {
 #ifdef HAVE_FTRUNCATE
@@ -1651,13 +1651,13 @@ void server_options(char **args,int *argc)
 	}
 
 	if (partial_dir && am_sender) {
-		if (partial_dir != partialdir_for_delayupdate) {
+		if (partial_dir != tmp_partialdir) {
 			args[ac++] = "--partial-dir";
 			args[ac++] = partial_dir;
 		}
 		if (delay_updates)
 			args[ac++] = "--delay-updates";
-	} else if (keep_partial)
+	} else if (keep_partial && am_sender)
 		args[ac++] = "--partial";
 
 	if (ignore_errors)
@@ -1684,7 +1684,7 @@ void server_options(char **args,int *argc)
 	else if (inplace)
 		args[ac++] = "--inplace";
 
-	if (tmpdir) {
+	if (tmpdir && am_sender) {
 		args[ac++] = "--temp-dir";
 		args[ac++] = tmpdir;
 	}