X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/794f38099a79cb1150b72a93c86782f7f07aa361..f6d530b3fc8d95427a93d51b49ef20f9e3ee5054:/options.c

diff --git a/options.c b/options.c
index e699ff2c..34741a60 100644
--- a/options.c
+++ b/options.c
@@ -69,6 +69,7 @@ int delete_during = 0;
 int delete_before = 0;
 int delete_after = 0;
 int delete_excluded = 0;
+int delete_missing_args = 0;
 int remove_source_files = 0;
 int one_file_system = 0;
 int protocol_version = PROTOCOL_VERSION;
@@ -375,6 +376,7 @@ void usage(enum logcode F)
   rprintf(F,"     --delete-delay          find deletions during, delete after\n");
   rprintf(F,"     --delete-after          receiver deletes after transfer, not during\n");
   rprintf(F,"     --delete-excluded       also delete excluded files from destination dirs\n");
+  rprintf(F,"     --delete-missing-args   receiver deletes each missing source arg\n");
   rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
   rprintf(F,"     --force                 force deletion of directories even if not empty\n");
   rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
@@ -555,6 +557,7 @@ static struct poptOption long_options[] = {
   {"delete-delay",     0,  POPT_ARG_VAL,    &delete_during, 2, 0, 0 },
   {"delete-after",     0,  POPT_ARG_NONE,   &delete_after, 0, 0, 0 },
   {"delete-excluded",  0,  POPT_ARG_NONE,   &delete_excluded, 0, 0, 0 },
+  {"delete-missing-args",0,POPT_ARG_NONE,   &delete_missing_args, 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_VAL,    &force_delete, 1, 0, 0 },
@@ -1357,6 +1360,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			"--read-batch cannot be used with --files-from\n");
 		return 0;
 	}
+	if (read_batch && remove_source_files) {
+		snprintf(err_buf, sizeof err_buf,
+			"--read-batch cannot be used with --remove-%s-files\n",
+			remove_source_files == 1 ? "source" : "sent");
+		return 0;
+	}
 	if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {
 		snprintf(err_buf, sizeof err_buf,
 			"the batch-file name must be %d characters or less.\n",
@@ -1430,7 +1439,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		return 0;
 	}
 
-	if (delete_mode && refused_delete) {
+	if (refused_delete && (delete_mode || delete_missing_args)) {
 		create_refuse_error(refused_delete);
 		return 0;
 	}
@@ -1969,6 +1978,9 @@ void server_options(char **args, int *argc_p)
 		}
 	}
 
+	if (delete_missing_args)
+		args[ac++] = "--delete-missing-args";
+
 	if (modify_window_set) {
 		if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
 			goto oom;
@@ -2083,17 +2095,18 @@ void server_options(char **args, int *argc_p)
  * (required for parsing) [ and ] chars elided from the returned string. */
 static char *parse_hostspec(char *str, char **path_start_ptr, int *port_ptr)
 {
-	char *s = str;
-	char *host_start = str;
+	char *s, *host_start = str;
 	int hostlen = 0, userlen = 0;
 	char *ret;
 
-	for ( ; ; s++) {
+	for (s = str; ; s++) {
 		if (!*s) {
 			/* It is only OK if we run out of string with rsync:// */
-			if (port_ptr)
-				break;
-			return NULL;
+			if (!port_ptr)
+				return NULL;
+			if (!hostlen)
+				hostlen = s - host_start;
+			break;
 		}
 		if (*s == ':' || *s == '/') {
 			if (!hostlen)
@@ -2104,7 +2117,7 @@ static char *parse_hostspec(char *str, char **path_start_ptr, int *port_ptr)
 			} else if (port_ptr) {
 				*port_ptr = atoi(s);
 				while (isDigit(s)) s++;
-				if (*s++ != '/')
+				if (*s && *s++ != '/')
 					return NULL;
 			}
 			break;