X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bee9df73c1cb5ed866889fca4f3b7353877c317e..0f78b81511be65d8fe21af1e6ac674f9e80ac29d:/options.c diff --git a/options.c b/options.c index 984fc72b..5f4c6338 100644 --- a/options.c +++ b/options.c @@ -1,7 +1,9 @@ -/* -*- c-file-style: "linux" -*- +/* + * Command-line (and received via daemon-socket) option parsing. * - * Copyright (C) 1998-2001 by Andrew Tridgell - * Copyright (C) 2000, 2001, 2002 by Martin Pool + * Copyright (C) 1998-2001 Andrew Tridgell + * Copyright (C) 2000, 2001, 2002 Martin Pool + * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,11 +17,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "rsync.h" -#include "popt.h" +#include #include "zlib/zlib.h" extern int module_id; @@ -41,11 +43,14 @@ int whole_file = -1; int append_mode = 0; int keep_dirlinks = 0; +int copy_dirlinks = 0; int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; int preserve_perms = 0; +int preserve_executability = 0; int preserve_devices = 0; +int preserve_specials = 0; int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; @@ -71,13 +76,14 @@ 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 allow_8bit_chars = 0; int force_delete = 0; int io_timeout = 0; int allowed_lull = 0; +int prune_empty_dirs = 0; char *files_from = NULL; int filesfrom_fd = -1; char *filesfrom_host = NULL; @@ -145,8 +151,8 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; -char *chmod_mode = NULL; char backup_dir_buf[MAXPATHLEN]; +char *sockopts = NULL; int rsync_port = 0; int compare_dest = 0; int copy_dest = 0; @@ -175,7 +181,7 @@ static int refused_delete, refused_archive_part, refused_compress; static int refused_partial, refused_progress, refused_delete_before; static int refused_inplace; static char *max_size_arg, *min_size_arg; -static char partialdir_for_delayupdate[] = ".~tmp~"; +static char tmp_partialdir[] = ".~tmp~"; /** Local address to bind. As a character string because it's * interpreted by the IPv6 layer: should be a numeric IP4 or IP6 @@ -214,24 +220,23 @@ 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-2005 by Andrew Tridgell and others\n"); + rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " - "%shard links, %ssymlinks, batchfiles, \n", + "%shard links, %ssymlinks, batchfiles,\n", (int) (sizeof (OFF_T) * 8), got_socketpair, hardlinks, links); /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature * macros. */ - rprintf(f, " %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n", + rprintf(f, " %sinplace, %sIPv6, " + "%d-bit system inums, %d-bit internal inums\n", have_inplace, ipv6, (int) (sizeof dumstat->st_ino * 8), (int) (sizeof (int64) * 8)); #ifdef MAINTAINER_MODE - rprintf(f, " panic action: \"%s\"\n", - get_panic_action()); + rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); #endif #if SIZEOF_INT64 < 8 @@ -243,12 +248,9 @@ static void print_rsync_version(enum logcode f) (int) SIZEOF_INT64, (int) sizeof (int64)); } - rprintf(f, -"\n" -"rsync comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" -"are welcome to redistribute it under certain conditions. See the GNU\n" -"General Public Licence for details.\n" - ); + rprintf(f,"\nrsync comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"); + rprintf(f,"are welcome to redistribute it under certain conditions. See the GNU\n"); + rprintf(f,"General Public Licence for details.\n"); } @@ -256,9 +258,10 @@ void usage(enum logcode F) { print_rsync_version(F); - rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n"); + rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\n"); + rprintf(F,"via a fast differencing algorithm.\n"); - rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... DEST\n"); + rprintf(F,"\nUsage: rsync [OPTION]... SRC [SRC]... DEST\n"); rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n"); rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n"); rprintf(F," or rsync [OPTION]... SRC [SRC]... rsync://[USER@]HOST[:PORT]/DEST\n"); @@ -272,7 +275,7 @@ void usage(enum logcode F) 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," --no-OPTION turn of an implied OPTION (e.g. --no-D)\n"); + rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n"); rprintf(F," -r, --recursive recurse into directories\n"); rprintf(F," -R, --relative use relative path names\n"); rprintf(F," --no-implied-dirs don't send implied dirs with --relative\n"); @@ -287,15 +290,20 @@ void usage(enum logcode F) 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, --copy-dirlinks transform symlink to a dir into referent dir\n"); rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); + rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -p, --perms preserve permissions\n"); - rprintf(F," -o, --owner preserve owner (root only)\n"); + rprintf(F," -E, --executability preserve the file's executability\n"); + rprintf(F," --chmod=CHMOD change destination permissions\n"); + rprintf(F," -o, --owner preserve owner (super-user only)\n"); rprintf(F," -g, --group preserve group\n"); - rprintf(F," -D, --devices preserve devices (root only)\n"); + rprintf(F," --devices preserve device files (super-user only)\n"); + rprintf(F," --specials preserve special files\n"); + rprintf(F," -D same as --devices --specials\n"); rprintf(F," -t, --times preserve times\n"); rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); - rprintf(F," --chmod=CHMOD change destination permissions\n"); + rprintf(F," --super receiver attempts super-user activities\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 (without rsync algorithm)\n"); @@ -303,8 +311,8 @@ void usage(enum logcode F) 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=PROGRAM specify the rsync to run on the remote machine\n"); + rprintf(F," --existing ignore non-existing files on receiving side\n"); rprintf(F," --ignore-existing ignore files that already exist on receiving side\n"); - rprintf(F," --ignore-non-existing ignore files that don't 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"); @@ -320,6 +328,7 @@ void usage(enum logcode F) 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 put all updated files into place at transfer's end\n"); + rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\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 don't skip files that match in size and mod-time\n"); @@ -344,10 +353,11 @@ void usage(enum logcode F) 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," --sockopts=OPTIONS specify custom TCP options\n"); rprintf(F," --blocking-io use blocking I/O for the remote shell\n"); rprintf(F," --stats give some file-transfer stats\n"); - rprintf(F," -m, --human-readable output numbers in a human-readable format\n"); - rprintf(F," --si like human-readable, but use powers of 1000\n"); + rprintf(F," -8, --8-bit-output leave high-bit chars unescaped in output\n"); + rprintf(F," -h, --human-readable output numbers in a human-readable format\n"); rprintf(F," --progress show progress during transfer\n"); rprintf(F," -P same as --partial --progress\n"); rprintf(F," -i, --itemize-changes output a change-summary for all updates\n"); @@ -364,7 +374,7 @@ void usage(enum logcode F) 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,"(-h) --help show this help (-h works with no other options)\n"); rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n"); rprintf(F,"Please see the rsync(1) and rsyncd.conf(5) man pages for full documentation.\n"); @@ -372,22 +382,22 @@ void usage(enum logcode F) } 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_MIN_SIZE, + 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_REFUSED_BASE = 9000}; + OPT_NO_D, + OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ - {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, + {"help", 0, POPT_ARG_NONE, 0, OPT_HELP, 0, 0 }, {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0}, {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, {"no-verbose", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, {"no-v", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 }, {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, - {"human-readable", 'm', POPT_ARG_VAL, &human_readable, 1, 0, 0}, - {"si", 0, POPT_ARG_VAL, &human_readable, 2, 0, 0}, + {"human-readable", 'h', POPT_ARG_NONE, 0, 'h', 0, 0}, {"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 }, {"archive", 'a', POPT_ARG_NONE, 0, 'a', 0, 0 }, {"recursive", 'r', POPT_ARG_VAL, &recurse, 2, 0, 0 }, @@ -399,40 +409,50 @@ static struct poptOption long_options[] = { {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 }, {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, + {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 }, {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 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 }, {"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 }, {"owner", 'o', POPT_ARG_VAL, &preserve_uid, 1, 0, 0 }, {"no-owner", 0, POPT_ARG_VAL, &preserve_uid, 0, 0, 0 }, {"no-o", 0, POPT_ARG_VAL, &preserve_uid, 0, 0, 0 }, {"group", 'g', POPT_ARG_VAL, &preserve_gid, 1, 0, 0 }, {"no-group", 0, POPT_ARG_VAL, &preserve_gid, 0, 0, 0 }, {"no-g", 0, POPT_ARG_VAL, &preserve_gid, 0, 0, 0 }, - {"devices", 'D', POPT_ARG_VAL, &preserve_devices, 1, 0, 0 }, + {0, 'D', POPT_ARG_NONE, 0, 'D', 0, 0 }, + {"no-D", 0, POPT_ARG_NONE, 0, OPT_NO_D, 0, 0 }, + {"devices", 0, POPT_ARG_VAL, &preserve_devices, 1, 0, 0 }, {"no-devices", 0, POPT_ARG_VAL, &preserve_devices, 0, 0, 0 }, - {"no-D", 0, POPT_ARG_VAL, &preserve_devices, 0, 0, 0 }, + {"specials", 0, POPT_ARG_VAL, &preserve_specials, 1, 0, 0 }, + {"no-specials", 0, POPT_ARG_VAL, &preserve_specials, 0, 0, 0 }, {"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 }, {"no-links", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 }, {"no-l", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 }, {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 }, {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 }, {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, + {"copy-dirlinks", 'k', POPT_ARG_NONE, ©_dirlinks, 0, 0, 0 }, {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 }, - {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 }, + {"hard-links", 'H', POPT_ARG_VAL, &preserve_hard_links, 1, 0, 0 }, + {"no-hard-links", 0, POPT_ARG_VAL, &preserve_hard_links, 0, 0, 0 }, + {"no-H", 0, POPT_ARG_VAL, &preserve_hard_links, 0, 0, 0 }, {"relative", 'R', POPT_ARG_VAL, &relative_paths, 1, 0, 0 }, {"no-relative", 0, POPT_ARG_VAL, &relative_paths, 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 }, - {"chmod", 0, POPT_ARG_STRING, &chmod_mode, 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 }, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, + {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, - {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 }, {"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, + {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 }, {"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 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 }, @@ -473,8 +493,9 @@ static struct poptOption long_options[] = { {"no-partial", 0, POPT_ARG_VAL, &keep_partial, 0, 0, 0 }, {"partial-dir", 0, POPT_ARG_STRING, &partial_dir, 0, 0, 0 }, {"delay-updates", 0, POPT_ARG_NONE, &delay_updates, 0, 0, 0 }, + {"prune-empty-dirs",'m', POPT_ARG_NONE, &prune_empty_dirs, 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 }, + {"itemize-changes", 'i', POPT_ARG_NONE, 0, 'i', 0, 0 }, {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, @@ -494,14 +515,16 @@ static struct poptOption long_options[] = { {"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 }, {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 }, {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 }, + {"sockopts", 0, POPT_ARG_STRING, &sockopts, 0, 0, 0 }, {"password-file", 0, POPT_ARG_STRING, &password_file, 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 }, {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, - {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, + {"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 }, {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, /* All the following options switch us into daemon-mode option-parsing. */ {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, @@ -521,12 +544,13 @@ static void daemon_usage(enum logcode F) 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 listen on alternate port number\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," -h, --help show this help screen\n"); + rprintf(F," --help show this help screen\n"); rprintf(F,"\nIf you were not trying to invoke rsync as a daemon, avoid using any of the\n"); rprintf(F,"daemon-specific rsync options. See also the rsyncd.conf(5) man page.\n"); @@ -545,6 +569,7 @@ static struct poptOption long_daemon_options[] = { {"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 }, + {"sockopts", 0, POPT_ARG_STRING, &sockopts, 0, 0, 0 }, {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, @@ -572,6 +597,7 @@ void option_error(void) } rprintf(FERROR, RSYNC_NAME ": %s", err_buf); + msleep(20); } @@ -670,41 +696,44 @@ static int count_args(const char **argv) static OFF_T parse_size_arg(char **size_arg, char def_suf) { - int mult, make_compatible = 0; - const char *arg, *p; - OFF_T size = 0; + int reps, mult, make_compatible = 0; + const char *arg; + OFF_T size = 1; for (arg = *size_arg; isdigit(*(uchar*)arg); arg++) {} if (*arg == '.') for (arg++; isdigit(*(uchar*)arg); arg++) {} - if (*arg && (arg[1] == 'b' || arg[1] == 'B')) - mult = 1000, make_compatible = 1; - else - mult = 1024; - if ((p = strstr(arg, "+1")) != NULL - || (p = strstr(arg, "-1")) != NULL) { - if (p[2] != '\0') - return -1; - size = atoi(p); - make_compatible = 1; - } - switch (*arg && arg != p ? *arg : def_suf) { + switch (*arg && *arg != '+' && *arg != '-' ? *arg++ : def_suf) { case 'b': case 'B': - size += atof(*size_arg); + reps = 0; break; case 'k': case 'K': - size += atof(*size_arg) * mult; + reps = 1; break; case 'm': case 'M': - size += atof(*size_arg) * mult*mult; + reps = 2; break; case 'g': case 'G': - size += atof(*size_arg) * mult*mult*mult; + reps = 3; break; default: - size = -1; - break; + return -1; } + if (*arg == 'b' || *arg == 'B') + mult = 1000, make_compatible = 1, arg++; + else if (!*arg || *arg == '+' || *arg == '-') + mult = 1024; + else if (strncasecmp(arg, "ib", 2) == 0) + mult = 1024, arg += 2; + else + return -1; + while (reps--) + size *= mult; + size *= atof(*size_arg); + if ((*arg == '+' || *arg == '-') && arg[1] == '1') + size += atoi(arg), make_compatible = 1, arg += 2; + if (*arg) + return -1; if (size > 0 && make_compatible) { /* We convert this manually because we may need %lld precision, * and that's not a portable sprintf() escape. */ @@ -770,6 +799,25 @@ int parse_arguments(int *argc, const char ***argv, int frommain) print_rsync_version(FINFO); exit_cleanup(0); + case OPT_SERVER: + if (!am_server) { + /* Disable popt aliases on the server side and + * then start parsing the options again. */ + poptFreeContext(pc); + pc = poptGetContext(RSYNC_NAME, *argc, *argv, + long_options, 0); + am_server = 1; + } + break; + + case OPT_SENDER: + if (!am_server) { + usage(FERROR); + exit_cleanup(RERR_SYNTAX); + } + am_sender = 1; + break; + case OPT_DAEMON: if (am_daemon) { strcpy(err_buf, "Attempt to hack rsync thwarted!\n"); @@ -872,11 +920,24 @@ int parse_arguments(int *argc, const char ***argv, int frommain) preserve_gid = 1; preserve_uid = 1; preserve_devices = 1; + preserve_specials = 1; + break; + + case 'D': + preserve_devices = preserve_specials = 1; + break; + + case OPT_NO_D: + preserve_devices = preserve_specials = 0; break; case 'h': - usage(FINFO); - exit_cleanup(0); + human_readable++; + break; + + case 'i': + itemize_changes++; + break; case 'v': verbose++; @@ -887,12 +948,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain) quiet++; break; - case OPT_SENDER: - if (!am_server) { - usage(FERROR); - exit_cleanup(RERR_SYNTAX); - } - am_sender = 1; + case 'x': + one_file_system++; break; case 'F': @@ -997,6 +1054,20 @@ int parse_arguments(int *argc, const char ***argv, int frommain) basis_dir[basis_dir_cnt++] = (char *)arg; break; + case OPT_CHMOD: + arg = poptGetOptArg(pc); + if (!parse_chmod(arg, &chmod_modes)) { + snprintf(err_buf, sizeof err_buf, + "Invalid argument passed to --chmod (%s)\n", + arg); + return 0; + } + break; + + case OPT_HELP: + usage(FINFO); + exit_cleanup(0); + default: /* A large opt value means that set_refuse_options() * turned this option off. */ @@ -1012,6 +1083,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } + if (human_readable && *argc == 2) { + /* Allow the old meaning of 'h' (--help) on its own. */ + usage(FINFO); + exit_cleanup(0); + } + #ifndef SUPPORT_LINKS if (preserve_links && !am_sender) { snprintf(err_buf, sizeof err_buf, @@ -1092,10 +1169,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) "You may not combine multiple --delete-WHEN options.\n"); return 0; } - if (!xfer_dirs) { - delete_before = delete_during = delete_after = 0; - delete_mode = delete_excluded = 0; - } else if (delete_before || delete_during || delete_after) + if (delete_before || delete_during || delete_after) delete_mode = 1; else if (delete_mode || delete_excluded) { if (refused_delete_before) { @@ -1104,6 +1178,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } delete_mode = delete_before = 1; } + if (!xfer_dirs && delete_mode) { + snprintf(err_buf, sizeof err_buf, + "--delete does not work without -r or -d.\n"); + return 0; + } if (delete_mode && refused_delete) { create_refuse_error(refused_delete); @@ -1191,38 +1270,35 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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", - safe_fname(backup_dir_buf)); - } + if (verbose > 1 && !am_sender) + rprintf(FINFO, "backup_dir is %s\n", 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; + } else if (make_backups && delete_mode && !delete_excluded) { + snprintf(backup_dir_buf, sizeof backup_dir_buf, + "P *%s", backup_suffix); + parse_rule(&filter_list, backup_dir_buf, 0, 0); } if (make_backups && !backup_dir) omit_dir_times = 1; - if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) { - snprintf(err_buf, sizeof err_buf, - "Invalid argument passed to chmod\n"); - return 0; - } - if (log_format) { - if (log_format_has(log_format, 'i')) - log_format_has_i = 1; + if (am_server && log_format_has(log_format, 'I')) + log_format_has_i = 2; + else if (log_format_has(log_format, 'i')) + log_format_has_i = itemize_changes | 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_format_has_i = itemize_changes; log_before_transfer = !am_server; } - if ((do_progress || dry_run) && !verbose && !log_before_transfer - && !am_server) + if (do_progress && !verbose && !log_before_transfer && !am_server) verbose = 1; if (dry_run) @@ -1267,7 +1343,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } if (delay_updates && !partial_dir) - partial_dir = partialdir_for_delayupdate; + partial_dir = tmp_partialdir; if (inplace) { #ifdef HAVE_FTRUNCATE @@ -1293,7 +1369,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) return 0; #endif } else { - if (keep_partial && !partial_dir) { + if (keep_partial && !partial_dir && !am_server) { if ((arg = getenv("RSYNC_PARTIAL_DIR")) != NULL && *arg) partial_dir = strdup(arg); } @@ -1383,6 +1459,7 @@ void server_options(char **args,int *argc) if (blocking_io == -1) blocking_io = 0; + /* This should always remain first on the server's command-line. */ args[ac++] = "--server"; if (daemon_over_rsh) { @@ -1405,16 +1482,25 @@ void server_options(char **args,int *argc) argstr[x++] = 'b'; if (update_only) argstr[x++] = 'u'; - if (!do_xfers) /* NOT "dry_run"! */ + if (!do_xfers) /* Note: NOT "dry_run"! */ argstr[x++] = 'n'; if (preserve_links) argstr[x++] = 'l'; - if (copy_links) - argstr[x++] = 'L'; - if (xfer_dirs > 1) + if (xfer_dirs > (recurse || !delete_mode || !am_sender)) argstr[x++] = 'd'; - if (keep_dirlinks && am_sender) - argstr[x++] = 'K'; + if (am_sender) { + if (keep_dirlinks) + argstr[x++] = 'K'; + if (prune_empty_dirs) + argstr[x++] = 'm'; + if (omit_dir_times == 2) + argstr[x++] = 'O'; + } else { + if (copy_links) + argstr[x++] = 'L'; + if (copy_dirlinks) + argstr[x++] = 'k'; + } if (whole_file > 0) argstr[x++] = 'W'; @@ -1428,14 +1514,14 @@ void server_options(char **args,int *argc) argstr[x++] = 'o'; if (preserve_gid) argstr[x++] = 'g'; - if (preserve_devices) + if (preserve_devices) /* ignore preserve_specials here */ argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; - if (omit_dir_times == 2 && am_sender) - argstr[x++] = 'O'; if (preserve_perms) argstr[x++] = 'p'; + else if (preserve_executability && am_sender) + argstr[x++] = 'E'; if (recurse) argstr[x++] = 'r'; if (always_checksum) @@ -1446,8 +1532,11 @@ void server_options(char **args,int *argc) argstr[x++] = 'I'; if (relative_paths) argstr[x++] = 'R'; - if (one_file_system) + if (one_file_system) { argstr[x++] = 'x'; + if (one_file_system > 1) + argstr[x++] = 'x'; + } if (sparse_files) argstr[x++] = 'S'; if (do_compression) @@ -1459,7 +1548,7 @@ void server_options(char **args,int *argc) if (list_only == 1 && !recurse) argstr[x++] = 'r'; - argstr[x] = 0; + argstr[x] = '\0'; if (x != 1) args[ac++] = argstr; @@ -1467,16 +1556,30 @@ void server_options(char **args,int *argc) if (list_only > 1) args[ac++] = "--list-only"; + /* This makes sure that the remote rsync can handle deleting with -d + * sans -r because the --no-r option was added at the same time. */ + if (xfer_dirs && !recurse && delete_mode && am_sender) + args[ac++] = "--no-r"; + if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) goto oom; args[ac++] = arg; } + if (preserve_devices) { + /* Note: sending "--devices" would not be backward-compatible. */ + if (!preserve_specials) + args[ac++] = "--no-specials"; /* -D is already set. */ + } else if (preserve_specials) + args[ac++] = "--specials"; + /* 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) + if (log_format_has_i > 1) + args[ac++] = "--log-format=%i%I"; + else if (log_format_has_i) args[ac++] = "--log-format=%i"; else if (log_format_has_o_or_i) args[ac++] = "--log-format=%o"; @@ -1546,11 +1649,12 @@ void server_options(char **args,int *argc) args[ac++] = "--force"; if (write_batch < 0) args[ac++] = "--only-write-batch=X"; + if (am_root > 1) + args[ac++] = "--super"; + if (size_only) + args[ac++] = "--size-only"; } - if (size_only) - args[ac++] = "--size-only"; - if (modify_window_set) { if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) goto oom; @@ -1564,13 +1668,13 @@ void server_options(char **args,int *argc) } if (partial_dir && am_sender) { - if (partial_dir != partialdir_for_delayupdate) { + if (partial_dir != tmp_partialdir) { args[ac++] = "--partial-dir"; args[ac++] = partial_dir; } if (delay_updates) args[ac++] = "--delay-updates"; - } else if (keep_partial) + } else if (keep_partial && am_sender) args[ac++] = "--partial"; if (ignore_errors) @@ -1597,7 +1701,7 @@ void server_options(char **args,int *argc) else if (inplace) args[ac++] = "--inplace"; - if (tmpdir) { + if (tmpdir && am_sender) { args[ac++] = "--temp-dir"; args[ac++] = tmpdir; } @@ -1614,11 +1718,6 @@ void server_options(char **args,int *argc) } } - if (chmod_mode && !am_sender) { - args[ac++] = "--chmod"; - args[ac++] = chmod_mode; - } - if (files_from && (!am_sender || filesfrom_host)) { if (filesfrom_host) { args[ac++] = "--files-from";