X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/dfa32483808be6b760243f8e7cbdf64f1bb3f13d..da9d12f5d93724cb07a4107aa7aff92be9fb2ddb:/options.c diff --git a/options.c b/options.c index 066dd4b9..1fe70b80 100644 --- a/options.c +++ b/options.c @@ -21,6 +21,8 @@ #include "rsync.h" #include "popt.h" +extern struct exclude_struct **exclude_list; + int make_backups = 0; /** @@ -50,20 +52,24 @@ int ignore_times=0; int delete_mode=0; int delete_excluded=0; int one_file_system=0; -int remote_version=0; +int protocol_version = PROTOCOL_VERSION; int sparse_files=0; int do_compression=0; int am_root=0; int orig_umask=0; -int relative_paths=0; +int relative_paths = -1; +int implied_dirs = 1; int numeric_ids = 0; int force_delete = 0; int io_timeout = 0; -int io_error = 0; int read_only = 0; int module_id = -1; int am_server = 0; int am_sender = 0; +char *files_from = NULL; +int filesfrom_fd = -1; +char *remote_filesfrom_file = NULL; +int eol_nulls = 0; int recurse = 0; int am_daemon = 0; int daemon_over_rsh = 0; @@ -72,7 +78,6 @@ int do_progress=0; int keep_partial=0; int safe_symlinks=0; int copy_unsafe_links=0; -int block_size=BLOCK_SIZE; int size_only=0; int bwlimit=0; int delete_after=0; @@ -82,6 +87,7 @@ int max_delete=0; int ignore_errors=0; int modify_window=0; int blocking_io=-1; +unsigned int block_size = 0; /** Network address family. **/ @@ -98,9 +104,10 @@ int no_detach = 0; int write_batch = 0; int read_batch = 0; -int suffix_specified = 0; +int backup_dir_len = 0; +int backup_suffix_len; -char *backup_suffix = BACKUP_SUFFIX; +char *backup_suffix = NULL; char *tmpdir = NULL; char *compare_dest = NULL; char *config_file = NULL; @@ -154,7 +161,7 @@ static void print_rsync_version(enum logcode f) rprintf(f, "%s version %s protocol version %d\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); rprintf(f, - "Copyright (C) 1996-2002 by Andrew Tridgell and others\n"); + "Copyright (C) 1996-2004 by Andrew Tridgell and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " "%shard links, %ssymlinks, batchfiles, \n", @@ -209,9 +216,11 @@ void usage(enum logcode F) rprintf(F," -a, --archive archive mode, equivalent to -rlptgoD\n"); rprintf(F," -r, --recursive recurse into directories\n"); rprintf(F," -R, --relative use relative path names\n"); - rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX); + 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 override backup suffix\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," -l, --links copy symlinks as symlinks\n"); rprintf(F," -L, --copy-links copy the referent of symlinks\n"); @@ -231,9 +240,8 @@ void usage(enum logcode F) rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE); rprintf(F," -e, --rsh=COMMAND specify the remote shell\n"); rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n"); - rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); rprintf(F," --existing only update files that already exist\n"); - rprintf(F," --ignore-existing ignore files that already exist on the receiving side\n"); + rprintf(F," --ignore-existing ignore files that already exist on receiving side\n"); rprintf(F," --delete delete files that don't exist on the sending side\n"); rprintf(F," --delete-excluded also delete excluded files on the receiving side\n"); rprintf(F," --delete-after delete after transferring, not before\n"); @@ -243,17 +251,21 @@ void usage(enum logcode F) rprintf(F," --force force deletion of directories even if not empty\n"); rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n"); rprintf(F," --timeout=TIME set IO timeout in seconds\n"); - rprintf(F," -I, --ignore-times don't exclude files that match length and time\n"); - rprintf(F," --size-only only use file size when determining if a file should be transferred\n"); - rprintf(F," --modify-window=NUM Timestamp window (seconds) for file match (default=%d)\n",modify_window); + 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," -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," --link-dest=DIR create hardlinks to DIR for unchanged files\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," --exclude=PATTERN exclude files matching PATTERN\n"); rprintf(F," --exclude-from=FILE exclude patterns listed in 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," -0 --from0 all *-from file lists are delimited by nulls\n"); rprintf(F," --version print version number\n"); rprintf(F," --daemon run as a rsync daemon\n"); rprintf(F," --no-detach do not detach from the parent\n"); @@ -281,92 +293,92 @@ void usage(enum logcode F) rprintf(F,"See http://rsync.samba.org/ for updates, bug reports, and answers\n"); } -enum {OPT_VERSION = 1000, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE, - OPT_EXCLUDE_FROM, OPT_DELETE, OPT_DELETE_EXCLUDED, OPT_NUMERIC_IDS, - OPT_RSYNC_PATH, OPT_FORCE, OPT_TIMEOUT, OPT_DAEMON, OPT_CONFIG, OPT_PORT, - OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_STATS, OPT_PARTIAL, OPT_PROGRESS, - OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, OPT_LINK_DEST, - OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, - OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, - OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_NO_BLOCKING_IO, OPT_NO_WHOLE_FILE, - OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_IGNORE_EXISTING}; +enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, + OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, + OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, + OPT_READ_BATCH, OPT_WRITE_BATCH}; static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0}, - {"suffix", 0, POPT_ARG_STRING, &backup_suffix, OPT_SUFFIX, 0, 0 }, + {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 }, {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, - {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times , 0, 0, 0 }, - {"size-only", 0, POPT_ARG_NONE, &size_only , 0, 0, 0 }, + {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, + {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system , 0, 0, 0 }, - {"delete", 0, POPT_ARG_NONE, &delete_mode , 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 }, + {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, + {"delete", 0, POPT_ARG_NONE, &delete_mode, 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 }, {"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 }, {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 }, - {"force", 0, POPT_ARG_NONE, &force_delete , 0, 0, 0 }, - {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids , 0, 0, 0 }, + {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, + {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 }, {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 }, {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 }, {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 }, {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 }, - {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks , 0, 0, 0 }, + {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, - {"backup", 'b', POPT_ARG_NONE, &make_backups , 0, 0, 0 }, - {"dry-run", 'n', POPT_ARG_NONE, &dry_run , 0, 0, 0 }, - {"sparse", 'S', POPT_ARG_NONE, &sparse_files , 0, 0, 0 }, - {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude , 0, 0, 0 }, - {"update", 'u', POPT_ARG_NONE, &update_only , 0, 0, 0 }, - {"links", 'l', POPT_ARG_NONE, &preserve_links , 0, 0, 0 }, - {"copy-links", 'L', POPT_ARG_NONE, ©_links , 0, 0, 0 }, - {"whole-file", 'W', POPT_ARG_NONE, &whole_file, 0, 0, 0 }, - {"no-whole-file", 0, POPT_ARG_NONE, 0, OPT_NO_WHOLE_FILE, 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 }, - {"checksum", 'c', POPT_ARG_NONE, &always_checksum , 0, 0, 0 }, + {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, + {"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 }, + {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 }, + {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 }, + {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, + {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 }, + {"copy-links", 'L', POPT_ARG_NONE, ©_links, 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 }, + {"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 }, + {"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 }, + {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, - {"recursive", 'r', POPT_ARG_NONE, &recurse , 0, 0, 0 }, - {"relative", 'R', POPT_ARG_NONE, &relative_paths , 0, 0, 0 }, - {"rsh", 'e', POPT_ARG_STRING, &shell_cmd , 0, 0, 0 }, - {"block-size", 'B', POPT_ARG_INT, &block_size , 0, 0, 0 }, - {"max-delete", 0, POPT_ARG_INT, &max_delete , 0, 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, &compare_dest , 0, 0, 0 }, + {"recursive", 'r', POPT_ARG_NONE, &recurse, 0, 0, 0 }, + {"relative", 'R', POPT_ARG_VAL, &relative_paths, 1, 0, 0 }, + {"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 }, + {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, + {"block-size", 'B', POPT_ARG_INT, &block_size, 0, 0, 0 }, + {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 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, &compare_dest, 0, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, /* TODO: Should this take an optional int giving the compression level? */ - {"compress", 'z', POPT_ARG_NONE, &do_compression , 0, 0, 0 }, - {"daemon", 0, POPT_ARG_NONE, &am_daemon , 0, 0, 0 }, - {"no-detach", 0, POPT_ARG_NONE, &no_detach , 0, 0, 0 }, - {"stats", 0, POPT_ARG_NONE, &do_stats , 0, 0, 0 }, - {"progress", 0, POPT_ARG_NONE, &do_progress , 0, 0, 0 }, - {"partial", 0, POPT_ARG_NONE, &keep_partial , 0, 0, 0 }, - {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors , 0, 0, 0 }, - {"blocking-io", 0, POPT_ARG_NONE, &blocking_io , 0, 0, 0 }, - {"no-blocking-io", 0, POPT_ARG_NONE, 0, OPT_NO_BLOCKING_IO, 0, 0 }, + {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, + {"daemon", 0, POPT_ARG_NONE, &am_daemon, 0, 0, 0 }, + {"no-detach", 0, POPT_ARG_NONE, &no_detach, 0, 0, 0 }, + {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, + {"progress", 0, POPT_ARG_NONE, &do_progress, 0, 0, 0 }, + {"partial", 0, POPT_ARG_NONE, &keep_partial, 0, 0, 0 }, + {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 }, + {"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 }, + {"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 }, {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 }, - {"config", 0, POPT_ARG_STRING, &config_file , 0, 0, 0 }, - {"port", 0, POPT_ARG_INT, &rsync_port , 0, 0, 0 }, - {"log-format", 0, POPT_ARG_STRING, &log_format , 0, 0, 0 }, - {"bwlimit", 0, POPT_ARG_INT, &bwlimit , 0, 0, 0 }, + {"config", 0, POPT_ARG_STRING, &config_file, 0, 0, 0 }, + {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 }, + {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 }, + {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, {"address", 0, POPT_ARG_STRING, &bind_address, 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 }, + {"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_prefix, OPT_READ_BATCH, 0, 0 }, {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_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 }, + {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, #ifdef INET6 - {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET , 0, 0 }, - {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6 , 0, 0 }, + {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, + {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, #endif {0,0,0,0, 0, 0, 0} }; @@ -384,7 +396,7 @@ void option_error(void) { if (err_buf[0]) { rprintf(FLOG, "%s", err_buf); - rprintf(FERROR, "%s: %s", RSYNC_NAME, err_buf); + rprintf(FERROR, RSYNC_NAME ": %s", err_buf); } else { rprintf (FERROR, "Error parsing options: " "option may be supported on client but not on server?\n"); @@ -469,13 +481,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) print_rsync_version(FINFO); exit_cleanup(0); - case OPT_SUFFIX: - /* The value has already been set by popt, but - * we need to remember that a suffix was specified - * in case a backup-directory is used. */ - suffix_specified = 1; - break; - case OPT_MODIFY_WINDOW: /* The value has already been set by popt, but * we need to remember that we're using a @@ -494,27 +499,23 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_EXCLUDE: - add_exclude(poptGetOptArg(pc), 0); + add_exclude(&exclude_list, poptGetOptArg(pc), + ADD_EXCLUDE); break; case OPT_INCLUDE: - add_exclude(poptGetOptArg(pc), 1); + add_exclude(&exclude_list, poptGetOptArg(pc), + ADD_INCLUDE); break; case OPT_EXCLUDE_FROM: - add_exclude_file(poptGetOptArg(pc), 1, 0); + add_exclude_file(&exclude_list, poptGetOptArg(pc), + MISSING_FATAL, ADD_EXCLUDE); break; case OPT_INCLUDE_FROM: - add_exclude_file(poptGetOptArg(pc), 1, 1); - break; - - case OPT_NO_WHOLE_FILE: - whole_file = 0; - break; - - case OPT_NO_BLOCKING_IO: - blocking_io = 0; + add_exclude_file(&exclude_list, poptGetOptArg(pc), + MISSING_FATAL, ADD_INCLUDE); break; case 'h': @@ -531,10 +532,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain) * rprintf? Everybody who gets this message * ought to send it to the client and also to * the logs. */ - snprintf(err_buf,sizeof(err_buf), + snprintf(err_buf, sizeof err_buf, "hard links are not supported on this %s\n", am_server ? "server" : "client"); - rprintf(FERROR,"ERROR: hard links not supported on this platform\n"); + rprintf(FERROR, "ERROR: %s", err_buf); return 0; #endif /* SUPPORT_HARD_LINKS */ break; @@ -569,16 +570,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain) /* popt stores the filename in batch_prefix for us */ read_batch = 1; break; + case OPT_LINK_DEST: #if HAVE_LINK compare_dest = (char *)poptGetOptArg(pc); link_dest = 1; break; #else - snprintf(err_buf,sizeof(err_buf), + snprintf(err_buf, sizeof err_buf, "hard links are not supported on this %s\n", am_server ? "server" : "client"); - rprintf(FERROR,"ERROR: hard links not supported on this platform\n"); + rprintf(FERROR, "ERROR: %s", err_buf); return 0; #endif @@ -596,23 +598,20 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } if (write_batch && read_batch) { - snprintf(err_buf,sizeof(err_buf), - "write-batch and read-batch can not be used together\n"); - rprintf(FERROR,"ERROR: write-batch and read-batch" - " can not be used together\n"); - return 0; + rprintf(FERROR, + "write-batch and read-batch can not be used together\n"); + exit_cleanup(RERR_SYNTAX); } if (do_compression && (write_batch || read_batch)) { - snprintf(err_buf,sizeof(err_buf), - "compress can not be used with write-batch or read-batch\n"); - rprintf(FERROR,"ERROR: compress can not be used with" - " write-batch or read-batch\n"); - return 0; + rprintf(FERROR, + "compress can not be used with write-batch or read-batch\n"); + exit_cleanup(RERR_SYNTAX); } if (archive_mode) { - recurse = 1; + if (!files_from) + recurse = 1; #if SUPPORT_LINKS preserve_links = 1; #endif @@ -623,12 +622,69 @@ int parse_arguments(int *argc, const char ***argv, int frommain) preserve_devices = 1; } + if (relative_paths < 0) + relative_paths = files_from? 1 : 0; + + if (!backup_suffix) + backup_suffix = backup_dir? "" : BACKUP_SUFFIX; + backup_suffix_len = strlen(backup_suffix); + if (strchr(backup_suffix, '/') != NULL) { + rprintf(FERROR, "--suffix cannot contain slashes: %s\n", + backup_suffix); + exit_cleanup(RERR_SYNTAX); + } + if (backup_dir) + backup_dir_len = strlen(backup_dir); + else if (!backup_suffix_len) { + rprintf(FERROR, + "--suffix cannot be a null string without --backup-dir\n"); + exit_cleanup(RERR_SYNTAX); + } + + if (do_progress && !verbose) + verbose = 1; + *argv = poptGetArgs(pc); if (*argv) *argc = count_args(*argv); else *argc = 0; + if (files_from) { + char *colon; + if (*argc != 2) { + 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) { + if (am_server) { + usage(FERROR); + exit_cleanup(RERR_SYNTAX); + } + remote_filesfrom_file = colon+1 + (colon[1] == ':'); + if (strcmp(remote_filesfrom_file, "-") == 0) { + rprintf(FERROR, "Invalid --files-from remote filename\n"); + exit_cleanup(RERR_SYNTAX); + } + } else { + extern int sanitize_paths; + if (sanitize_paths) + sanitize_path(strdup(files_from), NULL); + filesfrom_fd = open(files_from, O_RDONLY|O_BINARY); + if (filesfrom_fd < 0) { + rsyserr(FERROR, errno, + "failed to open files-from file %s", + files_from); + exit_cleanup(RERR_FILEIO); + } + } + } + return 1; } @@ -733,8 +789,8 @@ void server_options(char **args,int *argc) if (x != 1) args[ac++] = argstr; - if (block_size != BLOCK_SIZE) { - snprintf(bsize,sizeof(bsize),"-B%d",block_size); + if (block_size) { + snprintf(bsize, sizeof bsize, "-B%u", block_size); args[ac++] = bsize; } @@ -764,9 +820,19 @@ void server_options(char **args,int *argc) args[ac++] = bw; } - if (strcmp(backup_suffix, BACKUP_SUFFIX)) { - args[ac++] = "--suffix"; - args[ac++] = backup_suffix; + if (backup_dir) { + args[ac++] = "--backup-dir"; + args[ac++] = backup_dir; + } + + /* Only send --suffix if it specifies a non-default value. */ + if (strcmp(backup_suffix, backup_dir? "" : BACKUP_SUFFIX) != 0) { + char *s = new_array(char, 9+backup_suffix_len+1); + if (!s) + out_of_memory("server_options"); + /* We use the following syntax to avoid weirdness with '~'. */ + sprintf(s, "--suffix=%s", backup_suffix); + args[ac++] = s; } if (delete_mode && !delete_excluded) @@ -816,14 +882,6 @@ void server_options(char **args,int *argc) args[ac++] = tmpdir; } - if (backup_dir && am_sender) { - /* only the receiver needs this option, if we are the sender - * then we need to send it to the receiver. - */ - args[ac++] = "--backup-dir"; - args[ac++] = backup_dir; - } - if (compare_dest && am_sender) { /* the server only needs this option if it is not the sender, * and it may be an older version that doesn't know this @@ -833,6 +891,36 @@ void server_options(char **args,int *argc) args[ac++] = compare_dest; } + if (files_from && (!am_sender || remote_filesfrom_file)) { + if (remote_filesfrom_file) { + args[ac++] = "--files-from"; + args[ac++] = remote_filesfrom_file; + if (eol_nulls) + args[ac++] = "--from0"; + } else { + args[ac++] = "--files-from=-"; + args[ac++] = "--from0"; + } + } + *argc = ac; } +/** + * 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) +{ + char *p, *p2; + + p = strchr(s,':'); + if (!p) 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; + + return p; +}