X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/65575e9670fb77ececc8255d572d08d7b10bb049..66203a982b3d249bafda9b9272c4c103c19e4a9b:/options.c diff --git a/options.c b/options.c index 19ff7ef5..642a9f28 100644 --- a/options.c +++ b/options.c @@ -37,6 +37,7 @@ int dry_run=0; int local_server=0; int ignore_times=0; int delete_mode=0; +int delete_excluded=0; int one_file_system=0; int remote_version=0; int sparse_files=0; @@ -54,12 +55,16 @@ int am_server = 0; int am_sender=0; int recurse = 0; int am_daemon=0; -int am_client=0; int do_stats=0; 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 delete_after=0; +int only_existing=0; +int max_delete=0; char *backup_suffix = BACKUP_SUFFIX; char *tmpdir = NULL; @@ -69,12 +74,16 @@ char *shell_cmd = NULL; char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_NAME; +char *backup_dir = NULL; int rsync_port = RSYNC_PORT; int verbose = 0; +int quiet = 0; int always_checksum = 0; int list_only = 0; +struct in_addr socket_address = {INADDR_ANY}; + void usage(int F) { rprintf(F,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n", @@ -82,22 +91,29 @@ void usage(int F) rprintf(F,"rsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n"); - rprintf(F,"Usage: rsync [OPTION]... SRC [USER@]HOST:DEST\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]... 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 [USER@]HOST::DEST\n"); + rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n"); rprintf(F," or rsync [OPTION]... rsync://[USER@]HOST[:PORT]/SRC [DEST]\n"); + rprintf(F,"SRC on single-colon remote HOST will be expanded by remote shell\n"); + rprintf(F,"SRC on server remote HOST may contain shell wildcards or multiple\n"); + 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\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 ~ extension)\n"); + rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX); + rprintf(F," --backup-dir make backups into this directory"); + rprintf(F," --suffix=SUFFIX override backup suffix\n"); rprintf(F," -u, --update update only (don't overwrite newer files)\n"); rprintf(F," -l, --links preserve soft links\n"); rprintf(F," -L, --copy-links treat soft links like regular files\n"); + rprintf(F," --copy-unsafe-links copy links outside the source tree\n"); rprintf(F," --safe-links ignore links outside the destination tree\n"); rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -p, --perms preserve permissions\n"); @@ -109,26 +125,32 @@ void usage(int F) 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," -x, --one-file-system don't cross filesystem boundaries\n"); - rprintf(F," -B, --block-size=SIZE checksum blocking size\n"); + rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE); rprintf(F," -e, --rsh=COMMAND specify rsh replacement\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," --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"); + rprintf(F," --max-delete=NUM don't delete more than NUM files\n"); rprintf(F," --partial keep partially transferred files\n"); 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," -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," -P equivalent to --partial --progress\n"); rprintf(F," -z, --compress compress file data\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," --suffix=SUFFIX override backup suffix\n"); rprintf(F," --version print version number\n"); rprintf(F," --daemon run as a rsync daemon\n"); + rprintf(F," --address bind to the specified address\n"); rprintf(F," --config=FILE specify alternate rsyncd.conf file\n"); rprintf(F," --port=PORT specify alternate rsyncd port number\n"); rprintf(F," --stats give some file transfer stats\n"); @@ -138,26 +160,28 @@ void usage(int F) rprintf(F," -h, --help show this help screen\n"); rprintf(F,"\n"); - rprintf(F,"the backup suffix defaults to %s\n",BACKUP_SUFFIX); - rprintf(F,"the block size defaults to %d\n",BLOCK_SIZE); rprintf(F,"\nPlease see the rsync(1) and rsyncd.conf(5) man pages for full documentation\n"); rprintf(F,"See http://rsync.samba.org/ for updates and bug reports\n"); } -enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE, - OPT_EXCLUDE_FROM,OPT_DELETE,OPT_NUMERIC_IDS,OPT_RSYNC_PATH, - OPT_FORCE,OPT_TIMEOUT,OPT_DAEMON,OPT_CONFIG,OPT_PORT, +enum {OPT_VERSION, 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_SAFE_LINKS, OPT_COMPARE_DEST, OPT_LOG_FORMAT,OPT_PASSWORD_FILE}; + OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, + OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, + OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR}; -static char *short_options = "oblLWHpguDCtcahvrRIxnSe:B:T:z"; +static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP"; static struct option long_options[] = { {"version", 0, 0, OPT_VERSION}, {"server", 0, 0, OPT_SERVER}, {"sender", 0, 0, OPT_SENDER}, + {"existing", 0, 0, OPT_EXISTING}, {"delete", 0, 0, OPT_DELETE}, + {"delete-excluded", 0, 0, OPT_DELETE_EXCLUDED}, {"force", 0, 0, OPT_FORCE}, {"numeric-ids", 0, 0, OPT_NUMERIC_IDS}, {"exclude", 1, 0, OPT_EXCLUDE}, @@ -168,6 +192,7 @@ static struct option long_options[] = { {"password-file", 1, 0, OPT_PASSWORD_FILE}, {"one-file-system",0, 0, 'x'}, {"ignore-times",0, 0, 'I'}, + {"size-only", 0, 0, OPT_SIZE_ONLY}, {"help", 0, 0, 'h'}, {"dry-run", 0, 0, 'n'}, {"sparse", 0, 0, 'S'}, @@ -177,12 +202,14 @@ static struct option long_options[] = { {"backup", 0, 0, 'b'}, {"update", 0, 0, 'u'}, {"verbose", 0, 0, 'v'}, + {"quiet", 0, 0, 'q'}, {"recursive", 0, 0, 'r'}, {"relative", 0, 0, 'R'}, {"devices", 0, 0, 'D'}, {"perms", 0, 0, 'p'}, {"links", 0, 0, 'l'}, {"copy-links", 0, 0, 'L'}, + {"copy-unsafe-links", 0, 0, OPT_COPY_UNSAFE_LINKS}, {"safe-links", 0, 0, OPT_SAFE_LINKS}, {"whole-file", 0, 0, 'W'}, {"hard-links", 0, 0, 'H'}, @@ -200,9 +227,13 @@ static struct option long_options[] = { {"stats", 0, 0, OPT_STATS}, {"progress", 0, 0, OPT_PROGRESS}, {"partial", 0, 0, OPT_PARTIAL}, + {"delete-after",0, 0, OPT_DELETE_AFTER}, {"config", 1, 0, OPT_CONFIG}, {"port", 1, 0, OPT_PORT}, {"log-format", 1, 0, OPT_LOG_FORMAT}, + {"address", 1, 0, OPT_ADDRESS}, + {"max-delete", 1, 0, OPT_MAX_DELETE}, + {"backup-dir", 1, 0, OPT_BACKUP_DIR}, {0,0,0,0}}; @@ -249,7 +280,7 @@ static int check_refuse_options(char *ref, int opt) } -int parse_arguments(int argc, char *argv[]) +int parse_arguments(int argc, char *argv[], int frommain) { int opt; int option_index; @@ -281,10 +312,15 @@ int parse_arguments(int argc, char *argv[]) case OPT_PASSWORD_FILE: password_file =optarg; break; + case 'I': ignore_times = 1; break; + case OPT_SIZE_ONLY: + size_only = 1; + break; + case 'x': one_file_system=1; break; @@ -293,6 +329,19 @@ int parse_arguments(int argc, char *argv[]) delete_mode = 1; break; + case OPT_EXISTING: + only_existing = 1; + break; + + case OPT_DELETE_AFTER: + delete_after = 1; + break; + + case OPT_DELETE_EXCLUDED: + delete_excluded = 1; + delete_mode = 1; + break; + case OPT_FORCE: force_delete = 1; break; @@ -317,6 +366,10 @@ int parse_arguments(int argc, char *argv[]) add_exclude_file(optarg,1, 1); break; + case OPT_COPY_UNSAFE_LINKS: + copy_unsafe_links=1; + break; + case OPT_SAFE_LINKS: safe_symlinks=1; break; @@ -395,6 +448,10 @@ int parse_arguments(int argc, char *argv[]) verbose++; break; + case 'q': + if (frommain) quiet++; + break; + case 'a': recurse=1; #if SUPPORT_LINKS @@ -437,6 +494,10 @@ int parse_arguments(int argc, char *argv[]) block_size = atoi(optarg); break; + case OPT_MAX_DELETE: + max_delete = atoi(optarg); + break; + case OPT_TIMEOUT: io_timeout = atoi(optarg); break; @@ -469,6 +530,11 @@ int parse_arguments(int argc, char *argv[]) keep_partial = 1; break; + case 'P': + do_progress = 1; + keep_partial = 1; + break; + case OPT_CONFIG: config_file = optarg; break; @@ -481,6 +547,19 @@ int parse_arguments(int argc, char *argv[]) log_format = optarg; break; + case OPT_ADDRESS: + { + struct in_addr *ia; + if ((ia = ip_address(optarg))) { + socket_address = *ia; + } + } + break; + + case OPT_BACKUP_DIR: + backup_dir = optarg; + break; + default: slprintf(err_buf,sizeof(err_buf),"unrecognised option\n"); return 0; @@ -490,12 +569,15 @@ int parse_arguments(int argc, char *argv[]) } +/* need to pass all the valid options from the client to the server */ + void server_options(char **args,int *argc) { int ac = *argc; static char argstr[50]; static char bsize[30]; static char iotime[30]; + static char mdelete[30]; int i, x; args[ac++] = "--server"; @@ -507,6 +589,7 @@ void server_options(char **args,int *argc) argstr[0] = '-'; for (i=0;i