X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b64ee91a4138babc77ea06bb48bdad327a8b99b3..47c1197534c3247a2669df86fbc36d4094d6ba93:/options.c

diff --git a/options.c b/options.c
index f5b56391..4a5c65cd 100644
--- a/options.c
+++ b/options.c
@@ -65,7 +65,7 @@ int delete_during = 0;
 int delete_before = 0;
 int delete_after = 0;
 int delete_excluded = 0;
-int remove_sent_files = 0;
+int remove_source_files = 0;
 int one_file_system = 0;
 int protocol_version = PROTOCOL_VERSION;
 int sparse_files = 0;
@@ -321,7 +321,7 @@ void usage(enum logcode F)
   rprintf(F,"     --rsync-path=PROGRAM    specify the rsync to run on the remote machine\n");
   rprintf(F,"     --existing              skip creating new files on receiver\n");
   rprintf(F,"     --ignore-existing       skip updating files that already exist on receiver\n");
-  rprintf(F,"     --remove-sent-files     sender removes successfully sent files (non-dirs)\n");
+  rprintf(F,"     --remove-source-files   sender removes synchronized files (non-dirs)\n");
   rprintf(F,"     --del                   an alias for --delete-during\n");
   rprintf(F,"     --delete                delete extraneous files from destination dirs\n");
   rprintf(F,"     --delete-before         receiver deletes before transfer (default)\n");
@@ -475,7 +475,8 @@ static struct poptOption long_options[] = {
   {"delete-during",    0,  POPT_ARG_NONE,   &delete_during, 0, 0, 0 },
   {"delete-after",     0,  POPT_ARG_NONE,   &delete_after, 0, 0, 0 },
   {"delete-excluded",  0,  POPT_ARG_NONE,   &delete_excluded, 0, 0, 0 },
-  {"remove-sent-files",0,  POPT_ARG_NONE,   &remove_sent_files, 0, 0, 0 },
+  {"remove-sent-files",0,  POPT_ARG_VAL,    &remove_source_files, 2, 0, 0 }, /* deprecated */
+  {"remove-source-files",0,POPT_ARG_VAL,    &remove_source_files, 1, 0, 0 },
   {"force",            0,  POPT_ARG_NONE,   &force_delete, 0, 0, 0 },
   {"ignore-errors",    0,  POPT_ARG_NONE,   &ignore_errors, 0, 0, 0 },
   {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
@@ -1204,8 +1205,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		return 0;
 	}
 
-	if (remove_sent_files) {
-		/* We only want to infer this refusal of --remove-sent-files
+	if (remove_source_files) {
+		/* We only want to infer this refusal of --remove-source-files
 		 * via the refusal of "delete", not any of the "delete-FOO"
 		 * options. */
 		if (refused_delete && am_sender) {
@@ -1327,7 +1328,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			if (logfile_format_has_i || log_format_has(logfile_format, 'o'))
 				logfile_format_has_o_or_i = 1;
 		}
-		log_init();
+		log_init(0);
 	} else if (!am_daemon)
 		logfile_format = NULL;
 
@@ -1756,7 +1757,9 @@ void server_options(char **args,int *argc)
 	if (fuzzy_basis && am_sender)
 		args[ac++] = "--fuzzy";
 
-	if (remove_sent_files)
+	if (remove_source_files == 1)
+		args[ac++] = "--remove-source-files";
+	else if (remove_source_files)
 		args[ac++] = "--remove-sent-files";
 
 	*argc = ac;