X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e7c67065c060d500eba8d073da9568db2c658aad..01d124d9e251317cdd9f12fb170a94e65f3c5e18:/options.c

diff --git a/options.c b/options.c
index c6d062a7..b6eae4e1 100644
--- a/options.c
+++ b/options.c
@@ -311,15 +311,15 @@ void usage(enum logcode F)
   rprintf(F," -B, --block-size=SIZE       force a fixed checksum block-size\n");
   rprintf(F," -e, --rsh=COMMAND           specify the remote shell to use\n");
   rprintf(F,"     --rsync-path=PROGRAM    specify the rsync to run on the remote machine\n");
-  rprintf(F,"     --existing              ignore non-existing files on receiving side\n");
-  rprintf(F,"     --ignore-existing       ignore files that already exist on receiving side\n");
-  rprintf(F,"     --remove-sent-files     sent files/symlinks are removed from sending side\n");
+  rprintf(F,"     --existing              skip creating new files on receiver\n");
+  rprintf(F,"     --ignore-existing       skip updating files that already exist on receiver\n");
+  rprintf(F,"     --remove-sent-files     sender removes successfully sent files (non-dirs)\n");
   rprintf(F,"     --del                   an alias for --delete-during\n");
-  rprintf(F,"     --delete                delete files that don't exist on the sending side\n");
+  rprintf(F,"     --delete                delete extraneous files from destination dirs\n");
   rprintf(F,"     --delete-before         receiver deletes before transfer (default)\n");
   rprintf(F,"     --delete-during         receiver deletes during transfer, not before\n");
   rprintf(F,"     --delete-after          receiver deletes after transfer, not before\n");
-  rprintf(F,"     --delete-excluded       also delete excluded files on the receiving side\n");
+  rprintf(F,"     --delete-excluded       also delete excluded files from destination dirs\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");
@@ -890,15 +890,20 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		case OPT_EXCLUDE_FROM:
 		case OPT_INCLUDE_FROM:
 			arg = poptGetOptArg(pc);
-			if (sanitize_paths)
-				arg = sanitize_path(NULL, arg, NULL, 0);
+			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 = (char *)arg;
+				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;
+				free(cp);
 			}
 			parse_filter_file(&filter_list, arg,
 				opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
@@ -1022,7 +1027,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			break;
 
 		case OPT_LINK_DEST:
-#ifdef HAVE_LINK
+#ifdef SUPPORT_HARD_LINKS
 			link_dest = 1;
 			dest_option = "--link-dest";
 			goto set_dest_dir;
@@ -1048,10 +1053,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 					MAX_BASIS_DIRS, dest_option);
 				return 0;
 			}
-			arg = poptGetOptArg(pc);
-			if (sanitize_paths)
-				arg = sanitize_path(NULL, arg, NULL, 0);
-			basis_dir[basis_dir_cnt++] = (char *)arg;
+			/* We defer sanitizing this arg until we know what
+			 * our destination directory is going to be. */
+			basis_dir[basis_dir_cnt++] = (char *)poptGetOptArg(pc);
 			break;
 
 		case OPT_CHMOD:
@@ -1206,17 +1210,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 	if (sanitize_paths) {
 		int i;
 		for (i = *argc; i-- > 0; )
-			(*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0);
-		if (tmpdir)
-			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
-		if (partial_dir)
-			partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
-		if (backup_dir)
-			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
+			(*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0, NULL);
+		if (tmpdir) {
+			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
+			die_on_unsafe_path(tmpdir, 0);
+		}
+		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;
-		int i;
 		if (tmpdir) {
 			if (!*tmpdir)
 				goto options_rejected;
@@ -1224,18 +1229,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			if (check_filter(elp, tmpdir, 1) < 0)
 				goto options_rejected;
 		}
-		if (partial_dir && *partial_dir) {
-			clean_fname(partial_dir, 1);
-			if (check_filter(elp, partial_dir, 1) < 0)
-				goto options_rejected;
-		}
-		for (i = 0; i < basis_dir_cnt; i++) {
-			if (!*basis_dir[i])
-				goto options_rejected;
-			clean_fname(basis_dir[i], 1);
-			if (check_filter(elp, basis_dir[i], 1) < 0)
-				goto options_rejected;
-		}
 		if (backup_dir) {
 			if (!*backup_dir)
 				goto options_rejected;
@@ -1416,7 +1409,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			}
 		} else {
 			if (sanitize_paths)
-				files_from = sanitize_path(NULL, files_from, NULL, 0);
+				files_from = sanitize_path(NULL, files_from, NULL, 0, NULL);
 			if (server_filter_list.head) {
 				if (!*files_from)
 					goto options_rejected;