#include "rsync.h"
#include "popt.h"
+extern int module_id;
extern int sanitize_paths;
extern int select_timeout;
extern struct filter_list_struct filter_list;
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 numeric_ids = 0;
int force_delete = 0;
int io_timeout = 0;
-int read_only = 0;
-int module_id = -1;
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. **/
-#ifdef INET6
+#if INET6
int default_af_hint = 0; /* Any protocol */
#else
int default_af_hint = AF_INET; /* Must use IPv4 */
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-#ifdef HAVE_SOCKETPAIR
+#if HAVE_SOCKETPAIR
got_socketpair = "";
#endif
rprintf(F," sources separated by space as long as they have same top-level\n");
rprintf(F,"\nOptions\n");
rprintf(F," -v, --verbose increase verbosity\n");
- rprintf(F," -q, --quiet decrease verbosity\n");
- rprintf(F," -c, --checksum always checksum\n");
- rprintf(F," -a, --archive archive mode, equivalent to -rlptgoD (no -H)\n");
+ 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," -r, --recursive recurse into directories\n");
rprintf(F," -R, --relative use relative path names\n");
rprintf(F," --no-relative turn off --relative\n");
rprintf(F," --no-implied-dirs don't send implied dirs with -R\n");
rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n");
- rprintf(F," --backup-dir make backups into this directory\n");
- rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
- rprintf(F," -u, --update update only (don't overwrite newer files)\n");
+ rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n");
+ rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
+ 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," -d, --dirs transfer directories without recursing\n");
rprintf(F," -l, --links copy symlinks as symlinks\n");
- rprintf(F," -L, --copy-links copy the referent of all symlinks\n");
- rprintf(F," --copy-unsafe-links copy the referent of \"unsafe\" symlinks\n");
- rprintf(F," --safe-links ignore \"unsafe\" symlinks\n");
+ rprintf(F," -L, --copy-links transform symlink into referent file/dir\n");
+ rprintf(F," --copy-unsafe-links only \"unsafe\" symlinks are transformed\n");
+ rprintf(F," --safe-links ignore symlinks that point outside the source tree\n");
rprintf(F," -H, --hard-links preserve hard links\n");
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -p, --perms preserve permissions\n");
rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
- rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
- rprintf(F," --no-whole-file turn off --whole-file\n");
+ rprintf(F," -W, --whole-file copy files whole\n");
+ rprintf(F," --no-whole-file always use incremental rsync algorithm\n");
rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n");
rprintf(F," -B, --block-size=SIZE force a fixed checksum block-size\n");
- rprintf(F," -e, --rsh=COMMAND specify the remote shell\n");
+ rprintf(F," -e, --rsh=COMMAND specify the remote shell to use\n");
rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n");
- rprintf(F," --existing only update files that already exist\n");
+ rprintf(F," --existing only update files that already exist on receiver\n");
rprintf(F," --ignore-existing ignore files that already exist on receiving side\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," --max-size=SIZE don't transfer any file larger than SIZE\n");
rprintf(F," --partial keep partially transferred files\n");
rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
- rprintf(F," --delay-updates update all transferred files into place at end\n");
+ rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
- rprintf(F," -I, --ignore-times turn off mod time & file size quick check\n");
- rprintf(F," --size-only ignore mod time for quick check (use size)\n");
- rprintf(F," --modify-window=NUM compare mod times with reduced accuracy\n");
+ rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
+ rprintf(F," --size-only skip files that match in size\n");
+ rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
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," -P equivalent to --partial --progress\n");
rprintf(F," -z, --compress compress file data\n");
- rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\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," repeated: --filter='- .rsync-filter'\n");
rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n");
- rprintf(F," --exclude-from=FILE exclude patterns listed in FILE\n");
+ rprintf(F," --exclude-from=FILE read exclude patterns from FILE\n");
rprintf(F," --include=PATTERN don't exclude files matching PATTERN\n");
- rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n");
- rprintf(F," --files-from=FILE read FILE for list of source-file names\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 file lists are delimited by nulls\n");
rprintf(F," --version print version number\n");
rprintf(F," --port=PORT specify double-colon alternate port number\n");
rprintf(F," --blocking-io use blocking I/O for the remote shell\n");
- rprintf(F," --no-blocking-io turn off --blocking-io\n");
- rprintf(F," --stats give some file transfer stats\n");
+ rprintf(F," --no-blocking-io turn off blocking I/O when it is the default\n");
+ rprintf(F," --stats give some file-transfer stats\n");
rprintf(F," --progress show progress during transfer\n");
- rprintf(F," --log-format=FORMAT log file transfers using specified format\n");
- rprintf(F," --password-file=FILE get password from FILE\n");
+ rprintf(F," -P same as --partial --progress\n");
+ rprintf(F," --log-format=FORMAT log file-transfers using specified format\n");
+ rprintf(F," --password-file=FILE read password from FILE\n");
rprintf(F," --list-only list the files instead of copying them\n");
- rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n");
- rprintf(F," --write-batch=FILE write a batch to FILE\n");
- rprintf(F," --read-batch=FILE read a batch from FILE\n");
-#ifdef INET6
+ 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
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
{"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 },
-#ifdef INET6
+#if 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,"\nUsage: rsync --daemon [OPTION]...\n");
rprintf(F," --address=ADDRESS bind to the specified address\n");
- rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n");
+ rprintf(F," --bwlimit=KBPS limit I/O bandwidth; KBytes per second\n");
rprintf(F," --config=FILE specify alternate rsyncd.conf file\n");
rprintf(F," --no-detach do not detach from the parent\n");
- rprintf(F," --port=PORT specify alternate rsyncd port number\n");
-#ifdef INET6
+ rprintf(F," --port=PORT listen on alternate port number\n");
+ rprintf(F," -v, --verbose increase verbosity\n");
+#if 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 },
-#ifdef INET6
+#if 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
{"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 },
+ {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
{"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
{0,0,0,0, 0, 0, 0}
};
daemon_usage(FINFO);
exit_cleanup(0);
+ case 'v':
+ verbose++;
+ break;
+
default:
rprintf(FERROR,
"rsync: %s: %s (in daemon mode)\n",
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:
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;
break;
case OPT_MAX_SIZE:
- for (arg = max_size_arg; isdigit(*arg); arg++) {}
+ for (arg = max_size_arg; isdigit(*(uchar*)arg); arg++) {}
if (*arg == '.')
- for (arg++; isdigit(*arg); arg++) {}
+ for (arg++; isdigit(*(uchar*)arg); arg++) {}
switch (*arg) {
case 'k': case 'K':
max_size = atof(max_size_arg) * 1024;
}
}
+ if (am_sender < 0)
+ am_sender = 0;
+
#if !SUPPORT_LINKS
if (preserve_links && !am_sender) {
snprintf(err_buf, sizeof err_buf,
"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;
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");
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);
}
keep_partial = 1;
}
if (copy_links)
argstr[x++] = 'L';
if (xfer_dirs > 1)
- argstr[x++] = 'k';
+ argstr[x++] = 'd';
if (keep_dirlinks && am_sender)
argstr[x++] = 'K';
args[ac++] = "--delete-excluded";
else if (delete_before == 1 || delete_after)
args[ac++] = "--delete";
- if (delete_before == 2)
+ if (delete_before > 1)
args[ac++] = "--delete-before";
if (delete_during)
args[ac++] = "--delete-during";
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff