X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/84e1a34eaae4d222ff852fc58df44cb670345056..e107b6b122812d88d531f3826e1a510abe916006:/options.c

diff --git a/options.c b/options.c
index 940d53a1..783ca594 100644
--- a/options.c
+++ b/options.c
@@ -185,8 +185,8 @@ int list_only = 0;
 #define MAX_BATCH_NAME_LEN 256	/* Must be less than MAXPATHLEN-13 */
 char *batch_name = NULL;
 
-#ifdef ICONV_OPTION
 int need_unsorted_flist = 0;
+#ifdef ICONV_OPTION
 char *iconv_opt = ICONV_OPTION;
 #endif
 
@@ -351,7 +351,7 @@ void usage(enum logcode F)
   rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
 #endif
   rprintf(F," -S, --sparse                handle sparse files efficiently\n");
-  rprintf(F," -n, --dry-run               show what would have been transferred\n");
+  rprintf(F," -n, --dry-run               perform a trial run with no changes made\n");
   rprintf(F," -W, --whole-file            copy files whole (without rsync algorithm)\n");
   rprintf(F," -x, --one-file-system       don't cross filesystem boundaries\n");
   rprintf(F," -B, --block-size=SIZE       force a fixed checksum block-size\n");
@@ -1001,7 +1001,7 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 		case OPT_INCLUDE_FROM:
 			arg = poptGetOptArg(pc);
 			if (sanitize_paths)
-				arg = sanitize_path(NULL, arg, NULL, 0, NULL);
+				arg = sanitize_path(NULL, arg, NULL, 0);
 			if (server_filter_list.head) {
 				int rej;
 				char *cp = strdup(arg);
@@ -1394,11 +1394,11 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 	if (sanitize_paths) {
 		int i;
 		for (i = argc; i-- > 0; )
-			argv[i] = sanitize_path(NULL, argv[i], "", 0, NULL);
+			argv[i] = sanitize_path(NULL, argv[i], "", 0);
 		if (tmpdir)
-			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
+			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
 		if (backup_dir)
-			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
+			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
 	}
 	if (server_filter_list.head && !am_sender) {
 		struct filter_list_struct *elp = &server_filter_list;
@@ -1602,7 +1602,7 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 			}
 		} else {
 			if (sanitize_paths)
-				files_from = sanitize_path(NULL, files_from, NULL, 0, NULL);
+				files_from = sanitize_path(NULL, files_from, NULL, 0);
 			if (server_filter_list.head) {
 				if (!*files_from)
 					goto options_rejected;