X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/05724c07cf61a5bb2d3d10c6b60849d7b184afc6..c2c5682c0b5b56b455d9e7bada05f211213818c2:/options.c

diff --git a/options.c b/options.c
index df14a81b..a66c8e0f 100644
--- a/options.c
+++ b/options.c
@@ -272,7 +272,7 @@ void usage(enum logcode F)
   rprintf(F," -q, --quiet                 suppress non-error messages\n");
   rprintf(F," -c, --checksum              skip based on checksum, not mod-time & size\n");
   rprintf(F," -a, --archive               archive mode; same as -rlptgoD (no -H)\n");
-  rprintf(F,"     --no-OPTION             turn of an implied OPTION (e.g. --no-D)\n");
+  rprintf(F,"     --no-OPTION             turn off an implied OPTION (e.g. --no-D)\n");
   rprintf(F," -r, --recursive             recurse into directories\n");
   rprintf(F," -R, --relative              use relative path names\n");
   rprintf(F,"     --no-implied-dirs       don't send implied dirs with --relative\n");
@@ -670,41 +670,44 @@ static int count_args(const char **argv)
 
 static OFF_T parse_size_arg(char **size_arg, char def_suf)
 {
-	int mult, make_compatible = 0;
-	const char *arg, *p;
-	OFF_T size = 0;
+	int reps, mult, make_compatible = 0;
+	const char *arg;
+	OFF_T size = 1;
 
 	for (arg = *size_arg; isdigit(*(uchar*)arg); arg++) {}
 	if (*arg == '.')
 		for (arg++; isdigit(*(uchar*)arg); arg++) {}
-	if (*arg && (arg[1] == 'b' || arg[1] == 'B'))
-		mult = 1000, make_compatible = 1;
-	else
-		mult = 1024;
-	if ((p = strstr(arg, "+1")) != NULL
-	 || (p = strstr(arg, "-1")) != NULL) {
-		if (p[2] != '\0')
-			return -1;
-		size = atoi(p);
-		make_compatible = 1;
-	}
-	switch (*arg && arg != p ? *arg : def_suf) {
+	switch (*arg && *arg != '+' && *arg != '-' ? *arg++ : def_suf) {
 	case 'b': case 'B':
-		size += atof(*size_arg);
+		reps = 0;
 		break;
 	case 'k': case 'K':
-		size += atof(*size_arg) * mult;
+		reps = 1;
 		break;
 	case 'm': case 'M':
-		size += atof(*size_arg) * mult*mult;
+		reps = 2;
 		break;
 	case 'g': case 'G':
-		size += atof(*size_arg) * mult*mult*mult;
+		reps = 3;
 		break;
 	default:
-		size = -1;
-		break;
+		return -1;
 	}
+	if (*arg == 'b' || *arg == 'B')
+		mult = 1000, make_compatible = 1, arg++;
+	else if (!*arg || *arg == '+' || *arg == '-')
+		mult = 1024;
+	else if (strncasecmp(arg, "ib", 2) == 0)
+		mult = 1024, arg += 2;
+	else
+		return -1;
+	while (reps--)
+		size *= mult;
+	size *= atof(*size_arg);
+	if ((*arg == '+' || *arg == '-') && arg[1] == '1')
+		size += atoi(arg), make_compatible = 1, arg += 2;
+	if (*arg)
+		return -1;
 	if (size > 0 && make_compatible) {
 		/* We convert this manually because we may need %lld precision,
 		 * and that's not a portable sprintf() escape. */
@@ -1204,6 +1207,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		snprintf(err_buf, sizeof err_buf,
 			"--suffix cannot be a null string without --backup-dir\n");
 		return 0;
+	} else if (delete_mode && !delete_excluded) {
+		snprintf(backup_dir_buf, sizeof backup_dir_buf,
+			"P *%s", backup_suffix);
+		parse_rule(&filter_list, backup_dir_buf, 0, 0);
 	}
 	if (make_backups && !backup_dir)
 		omit_dir_times = 1;