extern int module_id;
extern int sanitize_paths;
-extern int select_timeout;
extern struct filter_list_struct filter_list;
extern struct filter_list_struct server_filter_list;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
+int do_xfers = 1;
int ignore_times = 0;
int delete_mode = 0;
int delete_during = 0;
int delete_before = 0;
int delete_after = 0;
int delete_excluded = 0;
+int remove_sent_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
int do_compression = 0;
int am_root = 0;
+int am_server = 0;
+int am_sender = 0;
+int am_generator = 0;
+int am_starting_up = 1;
int orig_umask = 0;
int relative_paths = -1;
int implied_dirs = 1;
int numeric_ids = 0;
int force_delete = 0;
int io_timeout = 0;
-int am_server = 0;
-int am_sender = -1;
-int am_generator = 0;
+int allowed_lull = 0;
char *files_from = NULL;
int filesfrom_fd = -1;
-char *remote_filesfrom_file = NULL;
+char *filesfrom_host = NULL;
int eol_nulls = 0;
int recurse = 0;
int xfer_dirs = 0;
int size_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
+int fuzzy_basis = 0;
size_t bwlimit_writemax = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
+int need_messages_from_generator = 0;
int max_delete = 0;
OFF_T max_size = 0;
int ignore_errors = 0;
/** Do not go into the background when run as --daemon. Good
* for debugging and required for running as a service on W32,
* or under Unix process-monitors. **/
-int no_detach = 0;
+int no_detach
+#if defined _WIN32 || defined __WIN32__
+ = 1;
+#else
+ = 0;
+#endif
int write_batch = 0;
int read_batch = 0;
int copy_dest = 0;
int link_dest = 0;
int basis_dir_cnt = 0;
+char *dest_option = NULL;
int verbose = 0;
int quiet = 0;
+int log_before_transfer = 0;
+int log_format_has_i = 0;
+int log_format_has_o_or_i = 0;
int always_checksum = 0;
int list_only = 0;
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 int itemize_changes = 0;
+static int refused_delete, refused_archive_part;
+static int refused_partial, refused_progress, refused_delete_before;
static char *max_size_arg;
static char partialdir_for_delayupdate[] = ".~tmp~";
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," or rsync [OPTION]... [USER@]HOST:SRC 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," -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 files whole\n");
+ rprintf(F," -W, --whole-file copy files whole (without rsync algorithm)\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 to use\n");
- rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n");
+ rprintf(F," --rsync-path=PROGRAM specify the rsync to run on the remote machine\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," --remove-sent-files sent files/symlinks are removed from sending 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," --delete-before receiver deletes before transfer (default)\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," -y, --fuzzy find similar file for basis if no dest file\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," --include=PATTERN don't exclude files matching PATTERN\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," -0, --from0 all *-from/filter files are delimited by 0s\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," --blocking-io use blocking I/O for the remote shell\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," -P same as --partial --progress\n");
- rprintf(F," --log-format=FORMAT log file-transfers using specified format\n");
+ rprintf(F," -i, --itemize-changes output a change-summary for all updates\n");
+ rprintf(F," --log-format=FORMAT output filenames using the 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 batched update to FILE\n");
+ rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n");
rprintf(F," --read-batch=FILE read a batched update from FILE\n");
+ rprintf(F," --protocol=NUM force an older protocol version to be used\n");
#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 screen\n");
rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
{"delete-during", 0, POPT_ARG_NONE, &delete_during, 0, 0, 0 },
{"delete-after", 0, POPT_ARG_NONE, &delete_after, 0, 0, 0 },
{"delete-excluded", 0, POPT_ARG_NONE, &delete_excluded, 0, 0, 0 },
+ {"remove-sent-files",0, POPT_ARG_NONE, &remove_sent_files, 0, 0, 0 },
{"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"filter", 'f', POPT_ARG_STRING, 0, OPT_FILTER, 0, 0 },
{"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 },
{"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 },
{"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
- {"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
+ {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
{"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
{"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
- {"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 },
+ {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
{"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
{"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
{"archive", 'a', POPT_ARG_NONE, &archive_mode, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 },
{"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 },
- {"recursive", 'r', POPT_ARG_VAL, &recurse, -1, 0, 0 },
+ {"recursive", 'r', POPT_ARG_NONE, &recurse, 0, 0, 0 },
{"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
{"relative", 'R', POPT_ARG_VAL, &relative_paths, 1, 0, 0 },
{"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
{"block-size", 'B', POPT_ARG_LONG, &block_size, 0, 0, 0 },
{"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
{"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 },
- {"timeout", 0, POPT_ARG_INT, &io_timeout, OPT_TIMEOUT, 0, 0 },
+ {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
+ {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
/* TODO: Should this take an optional int giving the compression level? */
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
{"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
{0, 'F', POPT_ARG_NONE, 0, 'F', 0, 0 },
{0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
+ {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 },
{"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
{"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
+ {"itemize-changes", 'i', POPT_ARG_NONE, &itemize_changes, 0, 0, 0 },
{"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 },
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
+ {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
{"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
#endif
/* All these options switch us into daemon-mode option-parsing. */
- {"address", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
+ {"detach", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
{"no-detach", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
{0,0,0,0, 0, 0, 0}
};
{"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
- {"no-detach", 0, POPT_ARG_NONE, &no_detach, 0, 0, 0 },
+ {"detach", 0, POPT_ARG_VAL, &no_detach, 0, 0, 0 },
+ {"no-detach", 0, POPT_ARG_VAL, &no_detach, 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 },
if (!op->longName && !*shortname)
break;
if ((op->longName && wildmatch(bp, op->longName))
- || (*shortname && wildmatch(bp, shortname))
- || op->val == OPT_DAEMON) {
+ || (*shortname && wildmatch(bp, shortname))) {
if (op->argInfo == POPT_ARG_VAL)
op->argInfo = POPT_ARG_NONE;
op->val = (op - long_options) + OPT_REFUSED_BASE;
/* 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;
case '\0':
if (wildmatch("delete", op->longName))
refused_delete = op->val;
+ else if (wildmatch("delete-before", op->longName))
+ refused_delete_before = op->val;
else if (wildmatch("partial", op->longName))
refused_partial = op->val;
else if (wildmatch("progress", op->longName))
*cp = ' ';
bp = cp + 1;
}
+
+ for (op = long_options; ; op++) {
+ *shortname = op->shortName;
+ if (!op->longName && !*shortname)
+ break;
+ if (op->val == OPT_DAEMON) {
+ if (op->argInfo == POPT_ARG_VAL)
+ op->argInfo = POPT_ARG_NONE;
+ op->val = (op - long_options) + OPT_REFUSED_BASE;
+ }
+ }
}
}
+static OFF_T parse_size_arg(const char *size_arg)
+{
+ const char *arg;
+ OFF_T size;
+
+ for (arg = size_arg; isdigit(*(uchar*)arg); arg++) {}
+ if (*arg == '.')
+ for (arg++; isdigit(*(uchar*)arg); arg++) {}
+ switch (*arg) {
+ case 'k': case 'K':
+ size = atof(size_arg) * 1024;
+ break;
+ case 'm': case 'M':
+ size = atof(size_arg) * 1024*1024;
+ break;
+ case 'g': case 'G':
+ size = atof(size_arg) * 1024*1024*1024;
+ break;
+ case '\0':
+ size = atof(size_arg);
+ break;
+ default:
+ size = 0;
+ break;
+ }
+ return size;
+}
+
+
static void create_refuse_error(int which)
{
/* The "which" value is the index + OPT_REFUSED_BASE. */
}
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
+ am_starting_up = 0;
daemon_opt = 0;
am_daemon = 1;
return 1;
write_batch = 1;
break;
+ case OPT_ONLY_WRITE_BATCH:
+ /* batch_name is already set */
+ write_batch = -1;
+ break;
+
case OPT_READ_BATCH:
/* batch_name is already set */
read_batch = 1;
break;
case OPT_MAX_SIZE:
- for (arg = max_size_arg; isdigit(*(uchar*)arg); arg++) {}
- if (*arg == '.')
- for (arg++; isdigit(*(uchar*)arg); arg++) {}
- switch (*arg) {
- case 'k': case 'K':
- max_size = atof(max_size_arg) * 1024;
- break;
- case 'm': case 'M':
- max_size = atof(max_size_arg) * 1024*1024;
- break;
- case 'g': case 'G':
- max_size = atof(max_size_arg) * 1024*1024*1024;
- break;
- case '\0':
- max_size = atof(max_size_arg);
- break;
- default:
- max_size = 0;
- break;
- }
- if (max_size <= 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);
}
break;
- case OPT_TIMEOUT:
- if (io_timeout && io_timeout < select_timeout)
- select_timeout = io_timeout;
- break;
-
case OPT_LINK_DEST:
#ifdef HAVE_LINK
link_dest = 1;
}
}
- if (am_sender < 0)
- am_sender = 0;
-
#ifndef SUPPORT_LINKS
if (preserve_links && !am_sender) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
return 0;
}
- if (write_batch || read_batch) {
- if (dry_run) {
- snprintf(err_buf, sizeof err_buf,
- "--%s-batch cannot be used with --dry_run (-n)\n",
- write_batch ? "write" : "read");
- return 0;
- }
+ if (write_batch > 0 || read_batch) {
if (am_server) {
rprintf(FINFO,
"ignoring --%s-batch option sent to server\n",
* batch args to server. */
read_batch = write_batch = 0;
batch_name = NULL;
- }
+ } else if (dry_run)
+ write_batch = 0;
}
if (read_batch && files_from) {
snprintf(err_buf, sizeof err_buf,
return 0;
}
if (!files_from)
- recurse = -1; /* infinite recursion */
+ recurse = 1;
#ifdef SUPPORT_LINKS
preserve_links = 1;
#endif
delete_mode = delete_excluded = 0;
} else if (delete_before || delete_during || delete_after)
delete_mode = 1;
- else if (delete_mode || delete_excluded)
+ else if (delete_mode || delete_excluded) {
+ if (refused_delete_before) {
+ create_refuse_error(refused_delete_before);
+ return 0;
+ }
delete_mode = delete_before = 1;
+ }
if (delete_mode && refused_delete) {
create_refuse_error(refused_delete);
return 0;
}
+ if (remove_sent_files) {
+ /* We only want to infer this refusal of --remove-sent-files
+ * via the refusal of "delete", not any of the "delete-FOO"
+ * options. */
+ if (refused_delete && am_sender) {
+ create_refuse_error(refused_delete);
+ return 0;
+ }
+ need_messages_from_generator = 1;
+ }
+
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
- if (files_from)
- files_from = sanitize_path(NULL, files_from, NULL, 0);
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
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:
- snprintf(err_buf, sizeof err_buf,
- "Your options have been rejected by the server.\n");
- return 0;
+ if (check_filter(elp, backup_dir, 1) < 0) {
+ options_rejected:
+ snprintf(err_buf, sizeof err_buf,
+ "Your options have been rejected by the server.\n");
+ return 0;
+ }
}
}
"--suffix cannot be a null string without --backup-dir\n");
return 0;
}
+ if (make_backups && !backup_dir)
+ omit_dir_times = 1;
+
+ if (log_format) {
+ if (log_format_has(log_format, 'i'))
+ log_format_has_i = 1;
+ if (!log_format_has(log_format, 'b')
+ && !log_format_has(log_format, 'c'))
+ log_before_transfer = !am_server;
+ } else if (itemize_changes) {
+ log_format = "%i %n%L";
+ log_format_has_i = 1;
+ log_before_transfer = !am_server;
+ }
- if (do_progress && !verbose) {
- if (refused_verbose) {
- create_refuse_error(refused_verbose);
- return 0;
- }
+ if ((do_progress || dry_run) && !verbose && !log_before_transfer
+ && !am_server)
verbose = 1;
+
+ if (dry_run)
+ do_xfers = 0;
+
+ set_io_timeout(io_timeout);
+
+ if (verbose && !log_format) {
+ log_format = "%n%L";
+ log_before_transfer = !am_server;
}
+ if (log_format_has_i || log_format_has(log_format, 'o'))
+ log_format_has_o_or_i = 1;
if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
bwlimit = daemon_bwlimit;
}
if (files_from) {
- char *colon;
+ char *h, *p;
+ int q;
if (*argc > 2 || (!am_daemon && *argc == 1)) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
if (strcmp(files_from, "-") == 0) {
filesfrom_fd = 0;
if (am_server)
- remote_filesfrom_file = "-";
- }
- else if ((colon = find_colon(files_from)) != 0) {
+ filesfrom_host = ""; /* reading from socket */
+ } else if ((p = check_for_hostspec(files_from, &h, &q)) != 0) {
if (am_server) {
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
+ snprintf(err_buf, sizeof err_buf,
+ "The --files-from sent to the server cannot specify a host.\n");
+ return 0;
}
- remote_filesfrom_file = colon+1 + (colon[1] == ':');
- if (strcmp(remote_filesfrom_file, "-") == 0) {
+ files_from = p;
+ filesfrom_host = h;
+ if (strcmp(files_from, "-") == 0) {
snprintf(err_buf, sizeof err_buf,
"Invalid --files-from remote filename\n");
return 0;
}
} else {
+ if (sanitize_paths)
+ files_from = sanitize_path(NULL, files_from, NULL, 0);
+ if (server_filter_list.head) {
+ if (!*files_from)
+ goto options_rejected;
+ clean_fname(files_from, 1);
+ if (check_filter(&server_filter_list, files_from, 0) < 0)
+ goto options_rejected;
+ }
filesfrom_fd = open(files_from, O_RDONLY|O_BINARY);
if (filesfrom_fd < 0) {
snprintf(err_buf, sizeof err_buf,
}
}
+ am_starting_up = 0;
+
return 1;
}
**/
void server_options(char **args,int *argc)
{
- static char argstr[50+MAX_BASIS_DIRS*2];
+ static char argstr[64];
int ac = *argc;
char *arg;
argstr[x++] = 'b';
if (update_only)
argstr[x++] = 'u';
- if (dry_run)
+ if (!do_xfers) /* NOT "dry_run"! */
argstr[x++] = 'n';
if (preserve_links)
argstr[x++] = 'l';
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
- if (omit_dir_times && am_sender)
+ if (omit_dir_times == 2 && am_sender)
argstr[x++] = 'O';
if (preserve_perms)
argstr[x++] = 'p';
- if (recurse < 0)
+ if (recurse)
argstr[x++] = 'r';
if (always_checksum)
argstr[x++] = 'c';
/* This is a complete hack - blame Rusty. FIXME!
* This hack is only needed for older rsync versions that
* don't understand the --list-only option. */
- if (list_only == 1 && recurse >= 0)
+ if (list_only == 1 && !recurse)
argstr[x++] = 'r';
argstr[x] = 0;
if (list_only > 1)
args[ac++] = "--list-only";
+ /* The server side doesn't use our log-format, but in certain
+ * circumstances they need to know a little about the option. */
+ if (log_format && am_sender) {
+ if (log_format_has_i)
+ args[ac++] = "--log-format=%i";
+ else if (log_format_has_o_or_i)
+ args[ac++] = "--log-format=%o";
+ else if (!verbose)
+ args[ac++] = "--log-format=X";
+ }
+
if (block_size) {
if (asprintf(&arg, "-B%lu", block_size) < 0)
goto oom;
args[ac++] = "--delete-after";
if (force_delete)
args[ac++] = "--force";
+ if (write_batch < 0)
+ args[ac++] = "--only-write-batch=X";
}
if (size_only)
}
}
- if (files_from && (!am_sender || remote_filesfrom_file)) {
- if (remote_filesfrom_file) {
+ if (files_from && (!am_sender || filesfrom_host)) {
+ if (filesfrom_host) {
args[ac++] = "--files-from";
- args[ac++] = remote_filesfrom_file;
+ args[ac++] = files_from;
if (eol_nulls)
args[ac++] = "--from0";
} else {
if (!implied_dirs && !am_sender)
args[ac++] = "--no-implied-dirs";
+ if (fuzzy_basis && am_sender)
+ args[ac++] = "--fuzzy";
+
+ if (remove_sent_files)
+ args[ac++] = "--remove-sent-files";
+
*argc = ac;
return;
out_of_memory("server_options");
}
-/**
- * Return the position of a ':' IF it is not part of a filename (i.e. as
- * long as it doesn't occur after a slash.
- */
-char *find_colon(char *s)
+/* Look for a HOST specfication of the form "HOST:PATH", "HOST::PATH", or
+ * "rsync://HOST:PORT/PATH". If found, *host_ptr will be set to some allocated
+ * memory with the HOST. If a daemon-accessing spec was specified, the value
+ * of *port_ptr will contain a non-0 port number, otherwise it will be set to
+ * 0. The return value is a pointer to the PATH. Note that the HOST spec can
+ * be an IPv6 literal address enclosed in '[' and ']' (such as "[::1]" or
+ * "[::ffff:127.0.0.1]") which is returned without the '[' and ']'. */
+char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
{
- char *p, *p2;
+ char *p;
+ int not_host;
+
+ if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) {
+ char *path;
+ int hostlen;
+ s += strlen(URL_PREFIX);
+ if ((p = strchr(s, '/')) != NULL) {
+ hostlen = p - s;
+ path = p + 1;
+ } else {
+ hostlen = strlen(s);
+ path = "";
+ }
+ if (*s == '[' && (p = strchr(s, ']')) != NULL) {
+ s++;
+ hostlen = p - s;
+ if (p[1] == ':')
+ *port_ptr = atoi(p+2);
+ } else {
+ if ((p = strchr(s, ':')) != NULL) {
+ hostlen = p - s;
+ *port_ptr = atoi(p+1);
+ }
+ }
+ if (!*port_ptr)
+ *port_ptr = RSYNC_PORT;
+ *host_ptr = new_array(char, hostlen + 1);
+ strlcpy(*host_ptr, s, hostlen + 1);
+ return path;
+ }
- p = strchr(s,':');
- if (!p)
- return NULL;
+ if (*s == '[' && (p = strchr(s, ']')) != NULL && p[1] == ':') {
+ s++;
+ *p = '\0';
+ not_host = strchr(s, '/') || !strchr(s, ':');
+ *p = ']';
+ if (not_host)
+ return NULL;
+ p++;
+ } else {
+ if (!(p = strchr(s, ':')))
+ return NULL;
+ *p = '\0';
+ not_host = strchr(s, '/') != NULL;
+ *p = ':';
+ if (not_host)
+ return NULL;
+ }
- /* now check to see if there is a / in the string before the : - if there is then
- discard the colon on the assumption that the : is part of a filename */
- p2 = strchr(s,'/');
- if (p2 && p2 < p)
- return NULL;
+ *host_ptr = new_array(char, p - s + 1);
+ strlcpy(*host_ptr, s, p - s + 1);
+
+ if (p[1] == ':') {
+ if (port_ptr && !*port_ptr)
+ *port_ptr = RSYNC_PORT;
+ return p + 2;
+ }
+ if (port_ptr)
+ *port_ptr = 0;
- return p;
+ return p + 1;
}