X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4337c8f856340f398695811ddaa5c6f8d005379f..a5c11139717c41030c9d33617f3b255481afd3fa:/options.c diff --git a/options.c b/options.c index 082d4f7d..2e27d106 100644 --- a/options.c +++ b/options.c @@ -46,17 +46,17 @@ int preserve_gid = 0; int preserve_times = 0; int update_only = 0; int cvs_exclude = 0; -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 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 protocol_version = PROTOCOL_VERSION; -int sparse_files=0; -int do_compression=0; -int am_root=0; -int orig_umask=0; +int sparse_files = 0; +int do_compression = 0; +int am_root = 0; +int orig_umask = 0; int relative_paths = -1; int implied_dirs = 1; int numeric_ids = 0; @@ -74,20 +74,20 @@ int eol_nulls = 0; int recurse = 0; int am_daemon = 0; int daemon_over_rsh = 0; -int do_stats=0; -int do_progress=0; -int keep_partial=0; -int safe_symlinks=0; -int copy_unsafe_links=0; -int size_only=0; -int bwlimit=0; -int delete_after=0; -int only_existing=0; -int opt_ignore_existing=0; -int max_delete=0; -int ignore_errors=0; -int modify_window=0; -int blocking_io=-1; +int do_stats = 0; +int do_progress = 0; +int keep_partial = 0; +int safe_symlinks = 0; +int copy_unsafe_links = 0; +int size_only = 0; +int bwlimit = 0; +int delete_after = 0; +int only_existing = 0; +int opt_ignore_existing = 0; +int max_delete = 0; +int ignore_errors = 0; +int modify_window = 0; +int blocking_io = -1; unsigned int block_size = 0; @@ -128,6 +128,7 @@ int list_only = 0; #define MAX_BATCH_PREFIX_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_prefix = NULL; +static int daemon_opt; /* sets am_daemon after option error-reporting */ static int modify_window_set; /** Local address to bind. As a character string because it's @@ -167,7 +168,7 @@ static void print_rsync_version(enum logcode f) rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " "%shard links, %ssymlinks, batchfiles, \n", - (int) (sizeof(OFF_T) * 8), + (int) (sizeof (OFF_T) * 8), got_socketpair, hardlinks, links); /* Note that this field may not have type ino_t. It depends @@ -175,8 +176,8 @@ static void print_rsync_version(enum logcode f) * macros. */ rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums\n", ipv6, - (int) (sizeof(dumstat->st_ino) * 8), - (int) (sizeof(INO64_T) * 8)); + (int) (sizeof dumstat->st_ino * 8), + (int) (sizeof (INO64_T) * 8)); #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); @@ -225,9 +226,9 @@ void usage(enum logcode F) 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"); - 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," -L, --copy-links copy the referent of all symlinks\n"); + rprintf(F," --copy-unsafe-links copy the referent of \"unsafe\" symlinks\n"); + rprintf(F," --safe-links ignore \"unsafe\" symlinks\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"); @@ -356,7 +357,7 @@ static struct poptOption long_options[] = { {"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 }, + {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 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 }, @@ -429,7 +430,7 @@ static int check_refuse_options(char *ref, int opt) while ((p = strstr(ref,name))) { if ((p==ref || p[-1]==' ') && (p[len] == ' ' || p[len] == 0)) { - snprintf(err_buf,sizeof(err_buf), + snprintf(err_buf, sizeof err_buf, "The '%s' option is not supported by this server\n", name); return 1; } @@ -524,24 +525,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) usage(FINFO); exit_cleanup(0); - case 'H': -#if SUPPORT_HARD_LINKS - preserve_hard_links=1; -#else - /* FIXME: Don't say "server" if this is - * happening on the client. */ - /* FIXME: Why do we have the duplicated - * rprintf? Everybody who gets this message - * ought to send it to the client and also to - * the logs. */ - snprintf(err_buf, sizeof err_buf, - "hard links are not supported on this %s\n", - am_server ? "server" : "client"); - rprintf(FERROR, "ERROR: %s", err_buf); - return 0; -#endif /* SUPPORT_HARD_LINKS */ - break; - case 'v': verbose++; break; @@ -588,9 +571,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) default: - /* FIXME: If --daemon is specified, then errors for later - * parameters seem to disappear. */ - snprintf(err_buf, sizeof(err_buf), + snprintf(err_buf, sizeof err_buf, "%s%s: %s\n", am_server ? "on remote machine: " : "", poptBadOption(pc, POPT_BADOPTION_NOALIAS), @@ -599,6 +580,26 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } +#if !SUPPORT_LINKS + if (preserve_links && !am_sender) { + snprintf(err_buf, sizeof err_buf, + "symlinks are not supported on this %s\n", + am_server ? "server" : "client"); + rprintf(FERROR, "ERROR: %s", err_buf); + return 0; + } +#endif + +#if !SUPPORT_HARD_LINKS + if (preserve_hard_links) { + snprintf(err_buf, sizeof err_buf, + "hard links are not supported on this %s\n", + am_server ? "server" : "client"); + rprintf(FERROR, "ERROR: %s", err_buf); + return 0; + } +#endif + if (write_batch && read_batch) { rprintf(FERROR, "write-batch and read-batch can not be used together\n"); @@ -686,8 +687,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } else { extern int sanitize_paths; - if (sanitize_paths) - sanitize_path(strdup(files_from), NULL); + if (sanitize_paths) { + files_from = strdup(files_from); + sanitize_path(files_from, NULL); + } filesfrom_fd = open(files_from, O_RDONLY|O_BINARY); if (filesfrom_fd < 0) { rsyserr(FERROR, errno, @@ -698,6 +701,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } + if (daemon_opt) + am_daemon = 1; + return 1; } @@ -808,7 +814,8 @@ void server_options(char **args,int *argc) } if (max_delete && am_sender) { - snprintf(mdelete,sizeof(mdelete),"--max-delete=%d",max_delete); + snprintf(mdelete, sizeof mdelete, "--max-delete=%d", + max_delete); args[ac++] = mdelete; } @@ -819,17 +826,17 @@ void server_options(char **args,int *argc) else if (read_batch) fmt = "--read-batch=%s"; - snprintf(fext,sizeof(fext),fmt,batch_prefix); + snprintf(fext, sizeof fext, fmt, batch_prefix); args[ac++] = fext; } if (io_timeout) { - snprintf(iotime,sizeof(iotime),"--timeout=%d",io_timeout); + snprintf(iotime, sizeof iotime, "--timeout=%d", io_timeout); args[ac++] = iotime; } if (bwlimit) { - snprintf(bw,sizeof(bw),"--bwlimit=%d",bwlimit); + snprintf(bw, sizeof bw, "--bwlimit=%d", bwlimit); args[ac++] = bw; } @@ -858,7 +865,7 @@ void server_options(char **args,int *argc) args[ac++] = "--size-only"; if (modify_window_set) { - snprintf(mwindow,sizeof(mwindow),"--modify-window=%d", + snprintf(mwindow, sizeof mwindow, "--modify-window=%d", modify_window); args[ac++] = mwindow; }