int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-int local_server = 0;
int ignore_times = 0;
int delete_mode = 0;
int delete_during = 0;
int force_delete = 0;
int io_timeout = 0;
int am_server = 0;
-int am_sender = 0;
+int am_sender = -1;
int am_generator = 0;
char *files_from = NULL;
int filesfrom_fd = -1;
/** Network address family. **/
-#if INET6
+#ifdef INET6
int default_af_hint = 0; /* Any protocol */
#else
int default_af_hint = AF_INET; /* Must use IPv4 */
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int F_option_cnt = 0;
static int modify_window_set;
+static int refused_verbose, refused_delete, refused_archive_part;
+static int refused_partial, refused_progress;
static char *dest_option = NULL;
static char *max_size_arg;
+static char partialdir_for_delayupdate[] = ".~tmp~";
/** Local address to bind. As a character string because it's
* interpreted by the IPv6 layer: should be a numeric IP4 or IP6
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-#if HAVE_SOCKETPAIR
+#ifdef HAVE_SOCKETPAIR
got_socketpair = "";
#endif
-#if HAVE_FTRUNCATE
+#ifdef HAVE_FTRUNCATE
have_inplace = "";
#endif
-#if SUPPORT_HARD_LINKS
+#ifdef SUPPORT_HARD_LINKS
hardlinks = "";
#endif
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
links = "";
#endif
-#if INET6
+#ifdef INET6
ipv6 = "";
#endif
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
- rprintf(F," -z, --compress compress file data\n");
+ rprintf(F," -z, --compress compress file data during the transfer\n");
rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n");
rprintf(F," -f, --filter=RULE add a file-filtering RULE\n");
- rprintf(F," -F same as --filter=': /.rsync-filter'\n");
+ rprintf(F," -F same as --filter='dir-merge /.rsync-filter'\n");
rprintf(F," repeated: --filter='- .rsync-filter'\n");
rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n");
rprintf(F," --exclude-from=FILE read exclude patterns from FILE\n");
rprintf(F," --bwlimit=KBPS limit I/O bandwidth; KBytes per second\n");
rprintf(F," --write-batch=FILE write a batched update to FILE\n");
rprintf(F," --read-batch=FILE read a batched update from FILE\n");
-#if INET6
+#ifdef INET6
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
{"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 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 },
+ {"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_VAL, &delete_before, 2, 0, 0 },
{"delete-during", 0, POPT_ARG_NONE, &delete_during, 0, 0, 0 },
{"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
{"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 },
-#if INET6
+#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
rprintf(F," --no-detach do not detach from the parent\n");
rprintf(F," --port=PORT listen on alternate port number\n");
rprintf(F," -v, --verbose increase verbosity\n");
-#if INET6
+#ifdef INET6
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
{"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 },
-#if INET6
+#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
break;
if ((cp = strchr(bp, ' ')) != NULL)
*cp= '\0';
- /* If they specify "delete", reject all delete options. */
- if (strcmp(bp, "delete") == 0)
- bp = "delete*";
is_wild = strpbrk(bp, "*?[") != NULL;
found_match = 0;
for (op = long_options; ; op++) {
if (!op->longName && !*shortname)
break;
if ((op->longName && wildmatch(bp, op->longName))
- || (*shortname && wildmatch(bp, shortname))) {
+ || (*shortname && wildmatch(bp, shortname))
+ || op->val == OPT_DAEMON) {
if (op->argInfo == POPT_ARG_VAL)
op->argInfo = POPT_ARG_NONE;
op->val = (op - long_options) + OPT_REFUSED_BASE;
found_match = 1;
+ /* These flags are set to let us easily check
+ * an implied option later in the code. */
+ switch (*shortname) {
+ case 'v':
+ refused_verbose = op->val;
+ break;
+ case 'r': case 'd': case 'l': case 'p':
+ case 't': case 'g': case 'o': case 'D':
+ refused_archive_part = op->val;
+ break;
+ case '\0':
+ if (wildmatch("delete", op->longName))
+ refused_delete = op->val;
+ else if (wildmatch("partial", op->longName))
+ refused_partial = op->val;
+ else if (wildmatch("progress", op->longName))
+ refused_progress = op->val;
+ break;
+ }
if (!is_wild)
break;
}
}
+static void create_refuse_error(int which)
+{
+ /* The "which" value is the index + OPT_REFUSED_BASE. */
+ struct poptOption *op = &long_options[which - OPT_REFUSED_BASE];
+ int n = snprintf(err_buf, sizeof err_buf,
+ "The server is configured to refuse --%s\n",
+ op->longName) - 1;
+ if (op->shortName) {
+ snprintf(err_buf + n, sizeof err_buf - n,
+ " (-%c)\n", op->shortName);
+ }
+}
+
+
/**
* Process command line arguments. Called on both local and remote.
*
/* 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);
- {
- struct poptAlias my_alias;
- char **argv = new_array(char *, 1);
- argv[0] = strdup("--delete-during");
- my_alias.longName = "del", my_alias.shortName = '\0';
- my_alias.argc = 1;
- my_alias.argv = (const char **)argv;
- if (argv && argv[0])
- poptAddAlias(pc, my_alias, 0);
- }
poptReadDefaultConfig(pc, 0);
while ((opt = poptGetNextOpt(pc)) != -1) {
break;
case OPT_FILTER:
- add_filter(&filter_list, poptGetOptArg(pc), 0);
+ parse_rule(&filter_list, poptGetOptArg(pc), 0, 0);
break;
case OPT_EXCLUDE:
- add_filter(&filter_list, poptGetOptArg(pc),
- XFLG_DEF_EXCLUDE);
+ parse_rule(&filter_list, poptGetOptArg(pc),
+ 0, XFLG_OLD_PREFIXES);
break;
case OPT_INCLUDE:
- add_filter(&filter_list, poptGetOptArg(pc),
- XFLG_DEF_INCLUDE);
+ parse_rule(&filter_list, poptGetOptArg(pc),
+ MATCHFLG_INCLUDE, XFLG_OLD_PREFIXES);
break;
case OPT_EXCLUDE_FROM:
arg = sanitize_path(NULL, arg, NULL, 0);
if (server_filter_list.head) {
char *cp = (char *)arg;
+ if (!*cp)
+ goto options_rejected;
clean_fname(cp, 1);
if (check_filter(&server_filter_list, cp, 0) < 0)
goto options_rejected;
}
- add_filter_file(&filter_list, arg, XFLG_FATAL_ERRORS
- | (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE
- : XFLG_DEF_EXCLUDE));
+ parse_filter_file(&filter_list, arg,
+ opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
+ XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
break;
case 'h':
case 'F':
switch (++F_option_cnt) {
case 1:
- add_filter(&filter_list,
- ": /.rsync-filter", 0);
+ parse_rule(&filter_list,": /.rsync-filter",0,0);
break;
case 2:
- add_filter(&filter_list,
- "- .rsync-filter", 0);
+ parse_rule(&filter_list,"- .rsync-filter",0,0);
break;
}
break;
case 'P':
+ if (refused_partial || refused_progress) {
+ create_refuse_error(refused_partial
+ ? refused_partial : refused_progress);
+ return 0;
+ }
do_progress = 1;
keep_partial = 1;
break;
break;
case OPT_LINK_DEST:
-#if HAVE_LINK
+#ifdef HAVE_LINK
link_dest = 1;
dest_option = "--link-dest";
goto set_dest_dir;
default:
/* A large opt value means that set_refuse_options()
- * turned this option off (opt-BASE is its index). */
+ * turned this option off. */
if (opt >= OPT_REFUSED_BASE) {
- struct poptOption *op =
- &long_options[opt-OPT_REFUSED_BASE];
- int n = snprintf(err_buf, sizeof err_buf,
- "The server is configured to refuse --%s\n",
- op->longName) - 1;
- if (op->shortName) {
- snprintf(err_buf+n, sizeof err_buf-n,
- " (-%c)\n", op->shortName);
- }
- } else {
- snprintf(err_buf, sizeof err_buf, "%s%s: %s\n",
- am_server ? "on remote machine: " : "",
- poptBadOption(pc, POPT_BADOPTION_NOALIAS),
- poptStrerror(opt));
+ create_refuse_error(opt);
+ return 0;
}
+ snprintf(err_buf, sizeof err_buf, "%s%s: %s\n",
+ am_server ? "on remote machine: " : "",
+ poptBadOption(pc, POPT_BADOPTION_NOALIAS),
+ poptStrerror(opt));
return 0;
}
}
-#if !SUPPORT_LINKS
+ if (am_sender < 0)
+ am_sender = 0;
+
+#ifndef SUPPORT_LINKS
if (preserve_links && !am_sender) {
snprintf(err_buf, sizeof err_buf,
"symlinks are not supported on this %s\n",
}
#endif
-#if !SUPPORT_HARD_LINKS
+#ifndef SUPPORT_HARD_LINKS
if (preserve_hard_links) {
snprintf(err_buf, sizeof err_buf,
"hard links are not supported on this %s\n",
}
if (archive_mode) {
+ if (refused_archive_part) {
+ create_refuse_error(refused_archive_part);
+ return 0;
+ }
if (!files_from)
recurse = -1; /* infinite recursion */
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
preserve_links = 1;
#endif
preserve_perms = 1;
"You may not combine multiple --delete-WHEN options.\n");
return 0;
}
- if (delete_before || delete_during || delete_after)
+ if (!recurse) {
+ delete_before = delete_during = delete_after = 0;
+ delete_mode = delete_excluded = 0;
+ } else if (delete_before || delete_during || delete_after)
delete_mode = 1;
else if (delete_mode || delete_excluded)
delete_mode = delete_before = 1;
+ if (delete_mode && refused_delete) {
+ create_refuse_error(refused_delete);
+ return 0;
+ }
+
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
struct filter_list_struct *elp = &server_filter_list;
int i;
if (tmpdir) {
+ if (!*tmpdir)
+ goto options_rejected;
clean_fname(tmpdir, 1);
if (check_filter(elp, tmpdir, 1) < 0)
goto options_rejected;
}
- if (partial_dir) {
+ 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;
clean_fname(backup_dir, 1);
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (server_filter_list.head && files_from) {
+ if (!*files_from)
+ goto options_rejected;
clean_fname(files_from, 1);
if (check_filter(&server_filter_list, files_from, 0) < 0) {
options_rejected:
backup_dir_buf[backup_dir_len++] = '/';
backup_dir_buf[backup_dir_len] = '\0';
}
- if (verbose > 1 && !am_sender)
- rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf);
+ if (verbose > 1 && !am_sender) {
+ rprintf(FINFO, "backup_dir is %s\n",
+ safe_fname(backup_dir_buf));
+ }
} else if (!backup_suffix_len && (!am_server || !am_sender)) {
snprintf(err_buf, sizeof err_buf,
"--suffix cannot be a null string without --backup-dir\n");
return 0;
}
- if (do_progress && !verbose)
+ if (do_progress && !verbose) {
+ if (refused_verbose) {
+ create_refuse_error(refused_verbose);
+ return 0;
+ }
verbose = 1;
+ }
if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
bwlimit = daemon_bwlimit;
}
if (delay_updates && !partial_dir)
- partial_dir = ".~tmp~";
+ partial_dir = partialdir_for_delayupdate;
if (inplace) {
-#if HAVE_FTRUNCATE
+#ifdef HAVE_FTRUNCATE
if (partial_dir) {
snprintf(err_buf, sizeof err_buf,
"--inplace cannot be used with --%s\n",
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
+ /* --inplace implies --partial for refusal purposes, but we
+ * clear the keep_partial flag for internal logic purposes. */
+ if (refused_partial) {
+ create_refuse_error(refused_partial);
+ return 0;
+ }
keep_partial = 0;
#else
snprintf(err_buf, sizeof err_buf,
return 0;
#endif
} else {
- if (keep_partial && !partial_dir)
- partial_dir = getenv("RSYNC_PARTIAL_DIR");
+ if (keep_partial && !partial_dir) {
+ if ((arg = getenv("RSYNC_PARTIAL_DIR")) != NULL && *arg)
+ partial_dir = strdup(arg);
+ }
if (partial_dir) {
+ if (*partial_dir)
+ clean_fname(partial_dir, 1);
if (!*partial_dir || strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
else if (*partial_dir != '/') {
- add_filter(&filter_list, partial_dir,
- XFLG_DIRECTORY | XFLG_DEF_EXCLUDE);
+ parse_rule(&filter_list, partial_dir,
+ MATCHFLG_NO_PREFIXES|MATCHFLG_DIRECTORY, 0);
+ }
+ if (!partial_dir && refused_partial) {
+ create_refuse_error(refused_partial);
+ return 0;
}
keep_partial = 1;
}
}
if (partial_dir && am_sender) {
- args[ac++] = "--partial-dir";
- args[ac++] = partial_dir;
+ if (partial_dir != partialdir_for_delayupdate) {
+ args[ac++] = "--partial-dir";
+ args[ac++] = partial_dir;
+ }
if (delay_updates)
args[ac++] = "--delay-updates";
} else if (keep_partial)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff