X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b1e436ec17499ff074d900e4545a6f8887ffb007..e208631a5b488a8bc6d0ad1d0a71a60faab2266e:/options.c

diff --git a/options.c b/options.c
index 5cde9e26..82fb24c7 100644
--- a/options.c
+++ b/options.c
@@ -25,6 +25,7 @@
 
 extern int module_id;
 extern int sanitize_paths;
+extern int daemon_over_rsh;
 extern struct filter_list_struct filter_list;
 extern struct filter_list_struct server_filter_list;
 
@@ -95,7 +96,6 @@ int recurse = 0;
 int allow_inc_recurse = 1;
 int xfer_dirs = -1;
 int am_daemon = 0;
-int daemon_over_rsh = 0;
 int do_stats = 0;
 int do_progress = 0;
 int keep_partial = 0;
@@ -109,7 +109,7 @@ size_t bwlimit_writemax = 0;
 int ignore_existing = 0;
 int ignore_non_existing = 0;
 int need_messages_from_generator = 0;
-int max_delete = -1;
+int max_delete = INT_MIN;
 OFF_T max_size = 0;
 OFF_T min_size = 0;
 int ignore_errors = 0;
@@ -329,7 +329,7 @@ void usage(enum logcode F)
   rprintf(F," -A, --acls                  preserve ACLs (implies --perms)\n");
 #endif
 #ifdef SUPPORT_XATTRS
-  rprintf(F," -X, --xattrs                preserve extended attributes (implies --perms)\n");
+  rprintf(F," -X, --xattrs                preserve extended attributes\n");
 #endif
   rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
   rprintf(F," -g, --group                 preserve group\n");
@@ -1190,7 +1190,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		case 'X':
 #ifdef SUPPORT_XATTRS
 			preserve_xattrs++;
-			preserve_perms = 1;
 			break;
 #else
 			snprintf(err_buf,sizeof(err_buf),
@@ -1291,6 +1290,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		return 0;
 	}
 
+	if (max_delete < 0 && max_delete != INT_MIN) {
+		/* Negative numbers are treated as "no deletions". */
+		max_delete = 0;
+	}
+
 	if (compare_dest + copy_dest + link_dest > 1) {
 		snprintf(err_buf, sizeof err_buf,
 			"You may not mix --compare-dest, --copy-dest, and --link-dest.\n");
@@ -1612,7 +1616,7 @@ void server_options(char **args,int *argc)
 	/* This should always remain first on the server's command-line. */
 	args[ac++] = "--server";
 
-	if (daemon_over_rsh) {
+	if (daemon_over_rsh > 0) {
 		args[ac++] = "--daemon";
 		*argc = ac;
 		/* if we're passing --daemon, we're done */
@@ -1780,22 +1784,6 @@ void server_options(char **args,int *argc)
 		args[ac++] = arg;
 	}
 
-	if (max_delete >= 0 && am_sender) {
-		if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
-			goto oom;
-		args[ac++] = arg;
-	}
-
-	if (min_size && am_sender) {
-		args[ac++] = "--min-size";
-		args[ac++] = min_size_arg;
-	}
-
-	if (max_size && am_sender) {
-		args[ac++] = "--max-size";
-		args[ac++] = max_size_arg;
-	}
-
 	if (io_timeout) {
 		if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
 			goto oom;
@@ -1822,6 +1810,20 @@ void server_options(char **args,int *argc)
 	}
 
 	if (am_sender) {
+		if (max_delete > 0) {
+			if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
+				goto oom;
+			args[ac++] = arg;
+		} else if (max_delete == 0)
+			args[ac++] = "--max_delete=-1";
+		if (min_size) {
+			args[ac++] = "--min-size";
+			args[ac++] = min_size_arg;
+		}
+		if (max_size) {
+			args[ac++] = "--max-size";
+			args[ac++] = max_size_arg;
+		}
 		if (delete_before)
 			args[ac++] = "--delete-before";
 		else if (delete_during == 2)
@@ -1884,6 +1886,9 @@ void server_options(char **args,int *argc)
 	if (numeric_ids)
 		args[ac++] = "--numeric-ids";
 
+	if (!allow_inc_recurse)
+		args[ac++] = "--no-ir";
+
 	if (am_sender) {
 		if (ignore_existing)
 			args[ac++] = "--ignore-existing";
@@ -1975,7 +1980,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
 			if (p[1] == ':')
 				*port_ptr = atoi(p+2);
 		} else {
-			if ((p = strchr(s, ':')) != NULL) {
+			if ((p = strchr(s, ':')) != NULL && p < s + hostlen) {
 				hostlen = p - s;
 				*port_ptr = atoi(p+1);
 			}