X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/33a04593ee76204d277574bd34c352df2fbd4e42..aabb50d4e391be5768fa76170372e28e85902f95:/options.c

diff --git a/options.c b/options.c
index 4e26ebef..e4fe5bd8 100644
--- a/options.c
+++ b/options.c
@@ -1003,15 +1003,17 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 			if (sanitize_paths)
 				arg = sanitize_path(NULL, arg, NULL, 0, NULL);
 			if (server_filter_list.head) {
+				int rej;
 				char *cp = strdup(arg);
 				if (!cp)
 					out_of_memory("parse_arguments");
 				if (!*cp)
 					goto options_rejected;
 				clean_fname(cp, 1);
-				if (check_filter(&server_filter_list, cp, 0) < 0)
-					goto options_rejected;
+				rej = check_filter(&server_filter_list, cp, 0) < 0;
 				free(cp);
+				if (rej)
+					goto options_rejected;
 			}
 			parse_filter_file(&filter_list, arg,
 				opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
@@ -1198,9 +1200,9 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 			break;
 #else
 			/* FIXME: this should probably be ignored with a
- 			 * warning and then countermeasures taken to
- 			 * restrict group and other access in the presence
- 			 * of any more restrictive ACLs, but this is safe
+			 * warning and then countermeasures taken to
+			 * restrict group and other access in the presence
+			 * of any more restrictive ACLs, but this is safe
 			 * for now */
 			snprintf(err_buf,sizeof(err_buf),
                                  "ACLs are not supported on this %s\n",
@@ -1247,7 +1249,6 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 		else
 			need_unsorted_flist = 1;
 	}
-	setup_iconv();
 #endif
 
 	if (protect_args == 1) {
@@ -1444,10 +1445,10 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 		snprintf(err_buf, sizeof err_buf,
 			"--suffix cannot be a null string without --backup-dir\n");
 		return 0;
- 	} else if (make_backups && delete_mode && !delete_excluded && !am_server) {
- 		snprintf(backup_dir_buf, sizeof backup_dir_buf,
+	} else if (make_backups && delete_mode && !delete_excluded && !am_server) {
+		snprintf(backup_dir_buf, sizeof backup_dir_buf,
 			"P *%s", backup_suffix);
- 		parse_rule(&filter_list, backup_dir_buf, 0, 0);
+		parse_rule(&filter_list, backup_dir_buf, 0, 0);
 	}
 
 	if (make_backups && !backup_dir) {
@@ -1643,12 +1644,8 @@ void server_options(char **args, int *argc_p)
 	static char argstr[64];
 	int ac = *argc_p;
 	char *arg;
-
 	int i, x;
 
-	if (blocking_io == -1)
-		blocking_io = 0;
-
 	/* This should always remain first on the server's command-line. */
 	args[ac++] = "--server";
 
@@ -1680,7 +1677,8 @@ void server_options(char **args, int *argc_p)
 		argstr[x++] = 'n';
 	if (preserve_links)
 		argstr[x++] = 'l';
-	if (xfer_dirs > (recurse || !delete_mode || !am_sender ? 1 : 0))
+	if ((list_only && !recurse) || xfer_dirs > 1
+	 || (xfer_dirs && !recurse && delete_mode && am_sender))
 		argstr[x++] = 'd';
 	if (am_sender) {
 		if (keep_dirlinks)
@@ -1750,20 +1748,20 @@ void server_options(char **args, int *argc_p)
 	if (do_compression)
 		argstr[x++] = 'z';
 
-	/* This is a complete hack - blame Rusty.  FIXME!
-	 * This hack is only needed for older rsync versions that
-	 * don't understand the --list-only option. */
-	if (list_only == 1 && !recurse)
-		argstr[x++] = 'r';
-
+	/* We make use of the -e option to let the server know about any
+	 * pre-release protocol version && our allow_inc_recurse status. */
+	set_allow_inc_recurse();
 #if SUBPROTOCOL_VERSION != 0
-	/* If we're speaking a pre-release version of a protocol, we tell
-	 * the server about this by (ab)using the -e option. */
 	if (protocol_version == PROTOCOL_VERSION) {
 		x += snprintf(argstr+x, sizeof argstr - x,
-			      "e%d.%d", PROTOCOL_VERSION, SUBPROTOCOL_VERSION);
-	}
+			      "e%d.%d%s", PROTOCOL_VERSION, SUBPROTOCOL_VERSION,
+			      allow_inc_recurse ? "i" : "");
+	} else
 #endif
+	if (allow_inc_recurse) {
+		argstr[x++] = 'e';
+		argstr[x++] = 'i';
+	}
 
 	argstr[x] = '\0';
 
@@ -1929,8 +1927,8 @@ void server_options(char **args, int *argc_p)
 	if (numeric_ids)
 		args[ac++] = "--numeric-ids";
 
-	if (!allow_inc_recurse)
-		args[ac++] = "--no-i-r";
+	if (use_qsort)
+		args[ac++] = "--use-qsort";
 
 	if (am_sender) {
 		if (ignore_existing)