X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b6008dc6452b8173fde6e04ab327e34f74097026..1a7f3d99c5d4bcb5f38e2143bfb99fdf571fab69:/options.c

diff --git a/options.c b/options.c
index 6ed96c6a..a568643f 100644
--- a/options.c
+++ b/options.c
@@ -303,7 +303,7 @@ void usage(enum logcode F)
   rprintf(F," -H, --hard-links            preserve hard links\n");
   rprintf(F," -p, --perms                 preserve permissions\n");
   rprintf(F," -E, --executability         preserve the file's executability\n");
-  rprintf(F,"     --chmod=CHMOD           change the permissions of transferred files\n");
+  rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
   rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
   rprintf(F," -g, --group                 preserve group\n");
   rprintf(F,"     --devices               preserve device files (super-user only)\n");
@@ -902,10 +902,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		case OPT_EXCLUDE_FROM:
 		case OPT_INCLUDE_FROM:
 			arg = poptGetOptArg(pc);
-			if (sanitize_paths) {
+			if (sanitize_paths)
 				arg = sanitize_path(NULL, arg, NULL, 0, NULL);
-				die_on_unsafe_path((char*)arg, 0);
-			}
 			if (server_filter_list.head) {
 				char *cp = strdup(arg);
 				if (!cp)
@@ -1223,14 +1221,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		int i;
 		for (i = *argc; i-- > 0; )
 			(*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0, NULL);
-		if (tmpdir) {
+		if (tmpdir)
 			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
-			die_on_unsafe_path(tmpdir, 0);
-		}
-		if (backup_dir) {
+		if (backup_dir)
 			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
-			die_on_unsafe_path(backup_dir, 0);
-		}
 	}
 	if (server_filter_list.head && !am_sender) {
 		struct filter_list_struct *elp = &server_filter_list;