extern int module_id;
extern int sanitize_paths;
+extern int daemon_over_rsh;
extern struct filter_list_struct filter_list;
extern struct filter_list_struct server_filter_list;
int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
-int omit_dir_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
int filesfrom_fd = -1;
char *filesfrom_host = NULL;
int eol_nulls = 0;
+int protect_args = 0;
int human_readable = 0;
int recurse = 0;
int allow_inc_recurse = 1;
int xfer_dirs = -1;
int am_daemon = 0;
-int daemon_over_rsh = 0;
int do_stats = 0;
int do_progress = 0;
int keep_partial = 0;
int ignore_existing = 0;
int ignore_non_existing = 0;
int need_messages_from_generator = 0;
-int max_delete = -1;
+int max_delete = INT_MIN;
OFF_T max_size = 0;
OFF_T min_size = 0;
int ignore_errors = 0;
char *skip_compress = NULL;
/** Network address family. **/
+int default_af_hint
#ifdef INET6
-int default_af_hint = 0; /* Any protocol */
+ = 0; /* Any protocol */
#else
-int default_af_hint = AF_INET; /* Must use IPv4 */
+ = AF_INET; /* Must use IPv4 */
+# ifdef AF_INET6
+# undef AF_INET6
+# endif
+# define AF_INET6 AF_INET /* make -6 option a no-op */
#endif
/** Do not go into the background when run as --daemon. Good
struct chmod_mode_struct *chmod_modes = NULL;
static int daemon_opt; /* sets am_daemon after option error-reporting */
+static int omit_dir_times = 0;
static int F_option_cnt = 0;
static int modify_window_set;
static int itemize_changes = 0;
rprintf(F," -u, --update skip files that are newer on the receiver\n");
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
rprintf(F," --append append data onto shorter files\n");
+ rprintf(F," --append-verify like --append, but with old data in file checksum\n");
rprintf(F," -d, --dirs transfer directories without recursing\n");
rprintf(F," -l, --links copy symlinks as symlinks\n");
rprintf(F," -L, --copy-links transform symlink into referent file/dir\n");
rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
#endif
#ifdef SUPPORT_XATTRS
- rprintf(F," -X, --xattrs preserve extended attributes (implies --perms)\n");
+ rprintf(F," -X, --xattrs preserve extended attributes\n");
#endif
rprintf(F," -o, --owner preserve owner (super-user only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," --include-from=FILE read include patterns from FILE\n");
rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n");
+ rprintf(F," -s, --protect-args no space-splitting; only wildcard special-chars\n");
rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
rprintf(F," --port=PORT specify double-colon alternate port number\n");
rprintf(F," --sockopts=OPTIONS specify custom TCP options\n");
#ifdef ICONV_OPTION
rprintf(F," --iconv=CONVERT_SPEC request charset conversion of filesnames\n");
#endif
-#ifdef INET6
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
-#endif
rprintf(F," --version print version number\n");
rprintf(F,"(-h) --help show this help (-h works with no other options)\n");
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
- OPT_NO_D,
+ OPT_NO_D, OPT_APPEND,
OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
{"no-r", 0, POPT_ARG_VAL, &recurse, 0, 0, 0 },
{"inc-recursive", 0, POPT_ARG_VAL, &allow_inc_recurse, 1, 0, 0 },
{"no-inc-recursive", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 },
- {"ir", 0, POPT_ARG_VAL, &allow_inc_recurse, 1, 0, 0 },
- {"no-ir", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 },
+ {"i-r", 0, POPT_ARG_VAL, &allow_inc_recurse, 1, 0, 0 },
+ {"no-i-r", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 },
+ {"no-ir", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 }, /* XXX remove soon */
{"dirs", 'd', POPT_ARG_VAL, &xfer_dirs, 2, 0, 0 },
{"no-dirs", 0, POPT_ARG_VAL, &xfer_dirs, 0, 0, 0 },
{"no-d", 0, POPT_ARG_VAL, &xfer_dirs, 0, 0, 0 },
{"xattrs", 'X', POPT_ARG_NONE, 0, 'X', 0, 0 },
{"no-xattrs", 0, POPT_ARG_VAL, &preserve_xattrs, 0, 0, 0 },
{"no-X", 0, POPT_ARG_VAL, &preserve_xattrs, 0, 0, 0 },
- {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
+ {"times", 't', POPT_ARG_VAL, &preserve_times, 2, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
- {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
+ {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
+ {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
+ {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
{"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
{"no-R", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
{"implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 1, 0, 0 },
{"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
+ {"i-d", 0, POPT_ARG_VAL, &implied_dirs, 1, 0, 0 },
+ {"no-i-d", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"min-size", 0, POPT_ARG_STRING, &min_size_arg, OPT_MIN_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 },
+ {"append", 0, POPT_ARG_NONE, 0, OPT_APPEND, 0, 0 },
+ {"append-verify", 0, POPT_ARG_VAL, &append_mode, 2, 0, 0 },
+ {"no-append", 0, POPT_ARG_VAL, &append_mode, 0, 0, 0 },
{"del", 0, POPT_ARG_NONE, &delete_during, 0, 0, 0 },
{"delete", 0, POPT_ARG_NONE, &delete_mode, 0, 0, 0 },
{"delete-before", 0, POPT_ARG_NONE, &delete_before, 0, 0, 0 },
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
{"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
+ {"protect-args", 's', POPT_ARG_VAL, &protect_args, 1, 0, 0},
+ {"no-protect-args", 0, POPT_ARG_VAL, &protect_args, 0, 0, 0},
+ {"no-s", 0, POPT_ARG_VAL, &protect_args, 0, 0, 0},
{"numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 1, 0, 0 },
{"no-numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
#ifdef ICONV_OPTION
{"iconv", 0, POPT_ARG_STRING, &iconv_opt, 0, 0, 0 },
#endif
-#ifdef INET6
{"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
-#endif
{"8-bit-output", '8', POPT_ARG_NONE, &allow_8bit_chars, 0, 0, 0 },
{"qsort", 0, POPT_ARG_NONE, &use_qsort, 0, 0, 0 },
{"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 },
rprintf(F," --log-file-format=FMT override the \"log format\" setting\n");
rprintf(F," --sockopts=OPTIONS specify custom TCP options\n");
rprintf(F," -v, --verbose increase verbosity\n");
-#ifdef INET6
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
-#endif
rprintf(F," --help show this help screen\n");
rprintf(F,"\n");
{"bwlimit", 0, POPT_ARG_INT, &daemon_bwlimit, 0, 0, 0 },
{"config", 0, POPT_ARG_STRING, &config_file, 0, 0, 0 },
{"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 },
-#ifdef INET6
{"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
-#endif
{"detach", 0, POPT_ARG_VAL, &no_detach, 0, 0, 0 },
{"no-detach", 0, POPT_ARG_VAL, &no_detach, 1, 0, 0 },
{"log-file", 0, POPT_ARG_STRING, &logfile_name, 0, 0, 0 },
*
* @retval 0 on error, with err_buf containing an explanation
**/
-int parse_arguments(int *argc, const char ***argv, int frommain)
+int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
{
- int opt;
+ static poptContext pc;
char *ref = lp_refuse_options(module_id);
- const char *arg;
- poptContext pc;
+ const char *arg, **argv = *argv_p;
+ int argc = *argc_p;
+ int opt;
if (ref && *ref)
set_refuse_options(ref);
/* The context leaks in case of an error, but if there's a
* problem we always exit anyhow. */
- pc = poptGetContext(RSYNC_NAME, *argc, *argv, long_options, 0);
- poptReadDefaultConfig(pc, 0);
+ if (pc)
+ poptFreeContext(pc);
+ pc = poptGetContext(RSYNC_NAME, argc, argv, long_options, 0);
+ if (!am_server)
+ poptReadDefaultConfig(pc, 0);
while ((opt = poptGetNextOpt(pc)) != -1) {
/* most options are handled automatically by popt;
/* Disable popt aliases on the server side and
* then start parsing the options again. */
poptFreeContext(pc);
- pc = poptGetContext(RSYNC_NAME, *argc, *argv,
+ pc = poptGetContext(RSYNC_NAME, argc, argv,
long_options, 0);
am_server = 1;
}
iconv_opt = NULL;
#endif
poptFreeContext(pc);
- pc = poptGetContext(RSYNC_NAME, *argc, *argv,
+ pc = poptGetContext(RSYNC_NAME, argc, argv,
long_daemon_options, 0);
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
exit_cleanup(RERR_SYNTAX);
}
- *argv = poptGetArgs(pc);
- *argc = count_args(*argv);
+ *argv_p = argv = poptGetArgs(pc);
+ *argc_p = argc = count_args(argv);
am_starting_up = 0;
daemon_opt = 0;
am_daemon = 1;
preserve_links = 1;
#endif
preserve_perms = 1;
- preserve_times = 1;
+ preserve_times = 2;
preserve_gid = 1;
preserve_uid = 1;
preserve_devices = 1;
}
break;
+ case OPT_APPEND:
+ if (am_server)
+ append_mode++;
+ else
+ append_mode = 1;
+ break;
+
case OPT_LINK_DEST:
#ifdef SUPPORT_HARD_LINKS
link_dest = 1;
case 'X':
#ifdef SUPPORT_XATTRS
preserve_xattrs++;
- preserve_perms = 1;
break;
#else
snprintf(err_buf,sizeof(err_buf),
}
}
- if (human_readable && *argc == 2) {
+ if (human_readable && argc == 2) {
/* Allow the old meaning of 'h' (--help) on its own. */
usage(FINFO);
exit_cleanup(0);
}
+ if (protect_args) {
+ if (!frommain)
+ protect_args = 0;
+ else if (am_server)
+ return 1;
+ }
+
#ifdef ICONV_OPTION
if (iconv_opt) {
if (!am_server && strcmp(iconv_opt, "-") == 0)
return 0;
}
+ if (max_delete < 0 && max_delete != INT_MIN) {
+ /* Negative numbers are treated as "no deletions". */
+ max_delete = 0;
+ }
+
if (compare_dest + copy_dest + link_dest > 1) {
snprintf(err_buf, sizeof err_buf,
"You may not mix --compare-dest, --copy-dest, and --link-dest.\n");
need_messages_from_generator = 1;
}
- *argv = poptGetArgs(pc);
- *argc = count_args(*argv);
+ *argv_p = argv = poptGetArgs(pc);
+ *argc_p = argc = count_args(argv);
if (sanitize_paths) {
int i;
- for (i = *argc; i-- > 0; )
- (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0, NULL);
+ for (i = argc; i-- > 0; )
+ argv[i] = sanitize_path(NULL, argv[i], "", 0, NULL);
if (tmpdir)
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
if (backup_dir)
"P *%s", backup_suffix);
parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
- if (make_backups && !backup_dir)
- omit_dir_times = 1;
+
+ if (make_backups && !backup_dir) {
+ omit_dir_times = 0; /* Implied, so avoid -O to sender. */
+ if (preserve_times > 1)
+ preserve_times = 1;
+ } else if (omit_dir_times) {
+ if (preserve_times > 1)
+ preserve_times = 1;
+ }
if (stdout_format) {
if (am_server && log_format_has(stdout_format, 'I'))
if (files_from) {
char *h, *p;
int q;
- if (*argc > 2 || (!am_daemon && *argc == 1)) {
+ if (argc > 2 || (!am_daemon && argc == 1)) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
* behave, and also filtering out options that are processed only
* locally.
**/
-void server_options(char **args,int *argc)
+void server_options(char **args, int *argc_p)
{
static char argstr[64];
- int ac = *argc;
+ int ac = *argc_p;
char *arg;
int i, x;
/* This should always remain first on the server's command-line. */
args[ac++] = "--server";
- if (daemon_over_rsh) {
+ if (daemon_over_rsh > 0) {
args[ac++] = "--daemon";
- *argc = ac;
+ *argc_p = ac;
/* if we're passing --daemon, we're done */
return;
}
argstr[x++] = 'K';
if (prune_empty_dirs)
argstr[x++] = 'm';
- if (omit_dir_times == 2)
+ if (omit_dir_times)
argstr[x++] = 'O';
} else {
if (copy_links)
args[ac++] = arg;
}
- if (max_delete >= 0 && am_sender) {
- if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
- goto oom;
- args[ac++] = arg;
- }
-
- if (min_size && am_sender) {
- args[ac++] = "--min-size";
- args[ac++] = min_size_arg;
- }
-
- if (max_size && am_sender) {
- args[ac++] = "--max-size";
- args[ac++] = max_size_arg;
- }
-
if (io_timeout) {
if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
goto oom;
}
if (am_sender) {
+ if (max_delete > 0) {
+ if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
+ goto oom;
+ args[ac++] = arg;
+ } else if (max_delete == 0)
+ args[ac++] = "--max-delete=-1";
+ if (min_size) {
+ args[ac++] = "--min-size";
+ args[ac++] = min_size_arg;
+ }
+ if (max_size) {
+ args[ac++] = "--max-size";
+ args[ac++] = max_size_arg;
+ }
if (delete_before)
args[ac++] = "--delete-before";
else if (delete_during == 2)
if (numeric_ids)
args[ac++] = "--numeric-ids";
+ if (!allow_inc_recurse)
+ args[ac++] = "--no-ir"; /* XXX change to --no-i-r soon */
+
if (am_sender) {
if (ignore_existing)
args[ac++] = "--ignore-existing";
}
}
- if (append_mode)
+ if (append_mode) {
+ if (append_mode > 1)
+ args[ac++] = "--append";
args[ac++] = "--append";
- else if (inplace)
+ } else if (inplace)
args[ac++] = "--inplace";
if (files_from && (!am_sender || filesfrom_host)) {
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
- *argc = ac;
+ *argc_p = ac;
return;
oom:
if (p[1] == ':')
*port_ptr = atoi(p+2);
} else {
- if ((p = strchr(s, ':')) != NULL) {
+ if ((p = strchr(s, ':')) != NULL && p < s + hostlen) {
hostlen = p - s;
*port_ptr = atoi(p+1);
}