X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/702cd15cb010adabab7e2670ab5e745939c276a7..ef20efcbb69274e423321d7ac27bfe868bca65aa:/options.c diff --git a/options.c b/options.c index e04ee616..be7ed1fd 100644 --- a/options.c +++ b/options.c @@ -59,23 +59,25 @@ 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; 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; @@ -93,6 +95,7 @@ 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; @@ -114,7 +117,12 @@ int default_af_hint = AF_INET; /* Must use IPv4 */ /** 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; @@ -135,14 +143,16 @@ char *backup_dir = NULL; char backup_dir_buf[MAXPATHLEN]; int rsync_port = 0; int compare_dest = 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 itemize_changes = 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; @@ -154,7 +164,6 @@ static int F_option_cnt = 0; static int modify_window_set; static int refused_delete, refused_archive_part; static int refused_partial, refused_progress, refused_delete_before; -static char *dest_option = NULL; static char *max_size_arg; static char partialdir_for_delayupdate[] = ".~tmp~"; @@ -283,9 +292,10 @@ void usage(enum logcode F) 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"); @@ -307,7 +317,6 @@ void usage(enum logcode F) 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," -z, --compress compress file data during the transfer\n"); rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); @@ -346,7 +355,7 @@ 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_FILTER, OPT_COMPARE_DEST, OPT_LINK_DEST, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, OPT_REFUSED_BASE = 9000}; @@ -369,6 +378,7 @@ 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 }, @@ -396,7 +406,7 @@ static struct poptOption long_options[] = { {"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 }, @@ -414,7 +424,6 @@ static struct poptOption long_options[] = { {"timeout", 0, POPT_ARG_INT, &io_timeout, OPT_TIMEOUT, 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? */ @@ -450,6 +459,7 @@ static struct poptOption long_options[] = { {"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} }; @@ -485,7 +495,8 @@ static struct poptOption long_daemon_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 - {"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 }, @@ -539,8 +550,7 @@ static void set_refuse_options(char *bp) 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; @@ -576,6 +586,17 @@ static void set_refuse_options(char *bp) *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; + } + } } @@ -675,6 +696,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } *argv = poptGetArgs(pc); *argc = count_args(*argv); + am_starting_up = 0; daemon_opt = 0; am_daemon = 1; return 1; @@ -816,11 +838,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) return 0; #endif - case OPT_COPY_DEST: - copy_dest = 1; - dest_option = "--copy-dest"; - goto set_dest_dir; - case OPT_COMPARE_DEST: compare_dest = 1; dest_option = "--compare-dest"; @@ -852,9 +869,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } - if (am_sender < 0) - am_sender = 0; - #ifndef SUPPORT_LINKS if (preserve_links && !am_sender) { snprintf(err_buf, sizeof err_buf, @@ -914,9 +928,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain) return 0; } - if (compare_dest + copy_dest + link_dest > 1) { + if (compare_dest + link_dest > 1) { snprintf(err_buf, sizeof err_buf, - "You may not mix --compare-dest, --copy-dest, and --link-dest.\n"); + "You may not mix --compare-dest and --link-dest.\n"); return 0; } @@ -966,6 +980,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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); @@ -979,8 +1004,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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; @@ -1008,19 +1031,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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; + } } } @@ -1054,15 +1070,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain) "--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 (strstr(log_format, "%i") != NULL) - itemize_changes = 1; + log_format_has_i = 1; if (strstr(log_format, "%b") == NULL && strstr(log_format, "%c") == NULL) log_before_transfer = !am_server; } else if (itemize_changes) { log_format = "%i %n%L"; + log_format_has_i = 1; log_before_transfer = !am_server; } @@ -1074,6 +1093,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain) log_format = "%n%L"; log_before_transfer = !am_server; } + if (log_format_has_i + || (log_format && strstr(log_format, "%o") != NULL)) + log_format_has_o_or_i = 1; if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit)) bwlimit = daemon_bwlimit; @@ -1130,7 +1152,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } if (files_from) { - char *colon; + char *h, *p; + int q; if (*argc > 2 || (!am_daemon && *argc == 1)) { usage(FERROR); exit_cleanup(RERR_SYNTAX); @@ -1138,20 +1161,30 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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, @@ -1162,6 +1195,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } + am_starting_up = 0; + return 1; } @@ -1234,7 +1269,7 @@ void server_options(char **args,int *argc) 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'; @@ -1269,6 +1304,17 @@ void server_options(char **args,int *argc) 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; @@ -1389,10 +1435,10 @@ void server_options(char **args,int *argc) } } - 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 { @@ -1408,6 +1454,9 @@ void server_options(char **args,int *argc) if (fuzzy_basis && am_sender) args[ac++] = "--fuzzy"; + if (remove_sent_files) + args[ac++] = "--remove-sent-files"; + *argc = ac; return; @@ -1415,23 +1464,75 @@ void server_options(char **args,int *argc) 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; + } + + 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; + } - p = strchr(s,':'); - if (!p) - return NULL; + *host_ptr = new_array(char, p - s + 1); + strlcpy(*host_ptr, s, p - s + 1); - /* 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; + 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; }