int bwlimit = 0;
int fuzzy_basis = 0;
size_t bwlimit_writemax = 0;
-int only_existing = 0;
-int opt_ignore_existing = 0;
+int ignore_existing = 0;
+int ignore_non_existing = 0;
int need_messages_from_generator = 0;
int max_delete = 0;
OFF_T max_size = 0;
rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n");
- rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
+ rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... DEST\n");
+ rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
+ rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n");
+ rprintf(F," or rsync [OPTION]... SRC [SRC]... rsync://[USER@]HOST[:PORT]/DEST\n");
rprintf(F," or rsync [OPTION]... [USER@]HOST:SRC [DEST]\n");
- rprintf(F," or rsync [OPTION]... SRC [SRC]... DEST\n");
rprintf(F," or rsync [OPTION]... [USER@]HOST::SRC [DEST]\n");
- rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n");
rprintf(F," or rsync [OPTION]... rsync://[USER@]HOST[:PORT]/SRC [DEST]\n");
- rprintf(F," or rsync [OPTION]... SRC [SRC]... rsync://[USER@]HOST[:PORT]/DEST\n");
- rprintf(F,"SRC on single-colon remote HOST will be expanded by remote shell\n");
- rprintf(F,"SRC on server remote HOST may contain shell wildcards or multiple\n");
- rprintf(F," sources separated by space as long as they have same top-level\n");
+ rprintf(F,"The ':' usages connect via remote shell, while '::' & 'rsync://' usages connect\n");
+ rprintf(F,"to an rsync daemon, and require SRC or DEST to start with a module name.\n");
rprintf(F,"\nOptions\n");
rprintf(F," -v, --verbose increase verbosity\n");
rprintf(F," -q, --quiet suppress non-error messages\n");
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
- {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 },
- {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 },
- {"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 },
+ {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
+ {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 },
+ {"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
+ {"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 },
{"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
{"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 },
{"append", 0, POPT_ARG_VAL, &append_mode, 1, 0, 0 },
{"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 },
+ {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
+ {"no-verbose", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 },
+ {"no-v", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 },
{"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
{0,0,0,0, 0, 0, 0}
};
}
-static OFF_T parse_size_arg(const char *size_arg)
+static OFF_T parse_size_arg(char **size_arg)
{
const char *arg;
OFF_T size;
+ int mult, make_compatible = 0;
- for (arg = size_arg; isdigit(*(uchar*)arg); arg++) {}
+ for (arg = *size_arg; isdigit(*(uchar*)arg); arg++) {}
if (*arg == '.')
for (arg++; isdigit(*(uchar*)arg); arg++) {}
+ if (*arg && (arg[1] == 't' || arg[1] == 'T'))
+ mult = 1000, make_compatible = 1;
+ else
+ mult = 1024;
switch (*arg) {
case 'k': case 'K':
- size = atof(size_arg) * 1024;
+ size = atof(*size_arg) * mult;
break;
case 'm': case 'M':
- size = atof(size_arg) * 1024*1024;
+ size = atof(*size_arg) * mult*mult;
break;
case 'g': case 'G':
- size = atof(size_arg) * 1024*1024*1024;
+ size = atof(*size_arg) * mult*mult*mult;
break;
- case '\0':
- size = atof(size_arg);
+ case '\0': case '+': case '-':
+ size = atof(*size_arg);
break;
default:
- size = 0;
+ size = -1;
break;
}
+ if (strchr(arg, '+'))
+ size++, make_compatible = 1;
+ else if (strchr(arg, '-'))
+ size--, make_compatible = 1;
+ if (size > 0 && make_compatible) {
+ /* We convert this manually because we many need %lld
+ * precision, and that's not portable. */
+ char buf[128], *s = buf + sizeof buf;
+ OFF_T num = size;
+ *--s = '\0';
+ while (num) {
+ if (s == buf) /* impossible... */
+ out_of_memory("parse_size_arg@buf");
+ *--s = (num % 10) + '0';
+ num /= 10;
+ }
+ if (!(*size_arg = strdup(s)))
+ out_of_memory("parse_size_arg");
+ }
return size;
}
goto daemon_error;
}
}
+
+ if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) {
+ snprintf(err_buf, sizeof err_buf,
+ "the --temp-dir path is WAY too long.\n");
+ return 0;
+ }
+
if (!daemon_opt) {
rprintf(FERROR, "Daemon option(s) used without --daemon.\n");
daemon_error:
"(Type \"rsync --daemon --help\" for assistance with daemon mode.)\n");
exit_cleanup(RERR_SYNTAX);
}
+
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
am_starting_up = 0;
break;
case OPT_MAX_SIZE:
- if ((max_size = parse_size_arg(max_size_arg)) <= 0) {
+ if ((max_size = parse_size_arg(&max_size_arg)) <= 0) {
snprintf(err_buf, sizeof err_buf,
"--max-size value is invalid: %s\n",
max_size_arg);
"You may not combine multiple --delete-WHEN options.\n");
return 0;
}
- if (!recurse) {
+ if (!xfer_dirs) {
delete_before = delete_during = delete_after = 0;
delete_mode = delete_excluded = 0;
} else if (delete_before || delete_during || delete_after)
bwlimit_writemax = 512;
}
+ if (sparse_files && inplace) {
+ /* Note: we don't check for this below, because --append is
+ * OK with --sparse (as long as redos are handled right). */
+ snprintf(err_buf, sizeof err_buf,
+ "--sparse cannot be used with --inplace\n");
+ return 0;
+ }
+
if (append_mode) {
if (whole_file > 0) {
snprintf(err_buf, sizeof err_buf,
if (numeric_ids)
args[ac++] = "--numeric-ids";
- if (only_existing && am_sender)
- args[ac++] = "--existing";
-
- if (opt_ignore_existing && am_sender)
+ if (ignore_existing && am_sender)
args[ac++] = "--ignore-existing";
+ /* Backward compatibility: send --existing, not --ignore-non-existing. */
+ if (ignore_non_existing && am_sender)
+ args[ac++] = "--existing";
+
if (append_mode)
args[ac++] = "--append";
else if (inplace)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff