X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/57df171bc00cd813b5d661960b567a041107af13..64c2cf8fea3287b7f1b4ce2a359dfaf0e2da0ad8:/options.c diff --git a/options.c b/options.c index 623385ae..4176b328 100644 --- a/options.c +++ b/options.c @@ -62,7 +62,17 @@ 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; +int only_existing=0; +int max_delete=0; +int ignore_errors=0; +#ifdef _WIN32 +int modify_window=2; +#else +int modify_window=0; +#endif +int blocking_io=0; char *backup_suffix = BACKUP_SUFFIX; char *tmpdir = NULL; @@ -72,6 +82,7 @@ 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; @@ -79,9 +90,12 @@ int quiet = 0; int always_checksum = 0; int list_only = 0; +static int modify_window_set; + + struct in_addr socket_address = {INADDR_ANY}; -void usage(int F) +void usage(enum logcode F) { rprintf(F,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n", VERSION); @@ -105,6 +119,7 @@ void usage(int F) 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," --backup-dir make backups into this directory\n"); 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"); @@ -125,15 +140,19 @@ void usage(int F) 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," --ignore-errors delete even if there are IO errors\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," --modify-window=NUM Timestamp window (seconds) for file match (default=%d)\n",modify_window); 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"); @@ -147,10 +166,12 @@ void usage(int F) 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," --blocking-io use blocking IO for the remote shell\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," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); rprintf(F," -h, --help show this help screen\n"); rprintf(F,"\n"); @@ -165,7 +186,9 @@ enum {OPT_VERSION, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_STATS, OPT_PARTIAL, OPT_PROGRESS, 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_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, + OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO, + OPT_MODIFY_WINDOW}; static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP"; @@ -173,6 +196,7 @@ 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}, @@ -186,6 +210,7 @@ static struct option long_options[] = { {"one-file-system",0, 0, 'x'}, {"ignore-times",0, 0, 'I'}, {"size-only", 0, 0, OPT_SIZE_ONLY}, + {"modify-window",1, 0, OPT_MODIFY_WINDOW}, {"help", 0, 0, 'h'}, {"dry-run", 0, 0, 'n'}, {"sparse", 0, 0, 'S'}, @@ -221,10 +246,15 @@ static struct option long_options[] = { {"progress", 0, 0, OPT_PROGRESS}, {"partial", 0, 0, OPT_PARTIAL}, {"delete-after",0, 0, OPT_DELETE_AFTER}, + {"ignore-errors",0, 0, OPT_IGNORE_ERRORS}, + {"blocking-io" ,0, 0, OPT_BLOCKING_IO}, {"config", 1, 0, OPT_CONFIG}, {"port", 1, 0, OPT_PORT}, {"log-format", 1, 0, OPT_LOG_FORMAT}, + {"bwlimit", 1, 0, OPT_BWLIMIT}, {"address", 1, 0, OPT_ADDRESS}, + {"max-delete", 1, 0, OPT_MAX_DELETE}, + {"backup-dir", 1, 0, OPT_BACKUP_DIR}, {0,0,0,0}}; @@ -312,6 +342,11 @@ int parse_arguments(int argc, char *argv[], int frommain) size_only = 1; break; + case OPT_MODIFY_WINDOW: + modify_window = atoi(optarg); + modify_window_set = 1; + break; + case 'x': one_file_system=1; break; @@ -320,6 +355,10 @@ int parse_arguments(int argc, char *argv[], int frommain) delete_mode = 1; break; + case OPT_EXISTING: + only_existing = 1; + break; + case OPT_DELETE_AFTER: delete_after = 1; break; @@ -447,10 +486,8 @@ int parse_arguments(int argc, char *argv[], int frommain) preserve_perms=1; preserve_times=1; preserve_gid=1; - if (am_root) { - preserve_devices=1; - preserve_uid=1; - } + preserve_uid=1; + preserve_devices=1; break; case OPT_SERVER: @@ -481,6 +518,10 @@ int parse_arguments(int argc, char *argv[], int frommain) block_size = atoi(optarg); break; + case OPT_MAX_DELETE: + max_delete = atoi(optarg); + break; + case OPT_TIMEOUT: io_timeout = atoi(optarg); break; @@ -513,6 +554,14 @@ int parse_arguments(int argc, char *argv[], int frommain) keep_partial = 1; break; + case OPT_IGNORE_ERRORS: + ignore_errors = 1; + break; + + case OPT_BLOCKING_IO: + blocking_io = 1; + break; + case 'P': do_progress = 1; keep_partial = 1; @@ -529,6 +578,10 @@ int parse_arguments(int argc, char *argv[], int frommain) case OPT_LOG_FORMAT: log_format = optarg; break; + + case OPT_BWLIMIT: + bwlimit = atoi(optarg); + break; case OPT_ADDRESS: { @@ -539,6 +592,10 @@ int parse_arguments(int argc, char *argv[], int frommain) } break; + case OPT_BACKUP_DIR: + backup_dir = optarg; + break; + default: slprintf(err_buf,sizeof(err_buf),"unrecognised option\n"); return 0; @@ -548,12 +605,18 @@ int parse_arguments(int argc, char *argv[], int frommain) } +/* 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]; + static char mwindow[30]; + static char bw[50]; + int i, x; args[ac++] = "--server"; @@ -565,6 +628,7 @@ void server_options(char **args,int *argc) argstr[0] = '-'; for (i=0;i