X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ba22c9e219ccd45fea318e7759a7fe4a7c3703dc..9411292489496984c8d5d9a446bf071afac3866d:/options.c diff --git a/options.c b/options.c index a3ea1c6a..c561f47e 100644 --- a/options.c +++ b/options.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998-2001 Andrew Tridgell * Copyright (C) 2000, 2001, 2002 Martin Pool - * Copyright (C) 2002-2007 Wayne Davison + * Copyright (C) 2002-2008 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 @@ -20,15 +20,17 @@ */ #include "rsync.h" -#include "ifuncs.h" +#include "itypes.h" #include #include "zlib/zlib.h" extern int module_id; +extern int local_server; extern int sanitize_paths; extern int daemon_over_rsh; +extern unsigned int module_dirlen; extern struct filter_list_struct filter_list; -extern struct filter_list_struct server_filter_list; +extern struct filter_list_struct daemon_filter_list; int make_backups = 0; @@ -76,15 +78,14 @@ int def_compress_level = Z_DEFAULT_COMPRESSION; int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */ int am_server = 0; int am_sender = 0; -int am_generator = 0; int am_starting_up = 1; int relative_paths = -1; int implied_dirs = 1; int numeric_ids = 0; +int msgs2stderr = 0; int allow_8bit_chars = 0; int force_delete = 0; int io_timeout = 0; -int allowed_lull = 0; int prune_empty_dirs = 0; int use_qsort = 0; char *files_from = NULL; @@ -92,17 +93,16 @@ int filesfrom_fd = -1; char *filesfrom_host = NULL; int eol_nulls = 0; int protect_args = 0; -int human_readable = 0; +int human_readable = 1; int recurse = 0; int allow_inc_recurse = 1; int xfer_dirs = -1; int am_daemon = 0; -int do_stats = 0; -int do_progress = 0; int connect_timeout = 0; int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; +int munge_symlinks = 0; int size_only = 0; int daemon_bwlimit = 0; int bwlimit = 0; @@ -121,7 +121,9 @@ int checksum_seed = 0; int inplace = 0; int delay_updates = 0; long block_size = 0; /* "long" because popt can't set an int32. */ +char number_separator; char *skip_compress = NULL; +item_list dparam_list = EMPTY_ITEM_LIST; /** Network address family. **/ int default_af_hint @@ -172,7 +174,10 @@ int link_dest = 0; int basis_dir_cnt = 0; char *dest_option = NULL; -int verbose = 0; +static int remote_option_alloc = 0; +int remote_option_cnt = 0; +const char **remote_options = NULL; + int quiet = 0; int output_motd = 1; int log_before_transfer = 0; @@ -193,6 +198,95 @@ char *iconv_opt = ICONV_OPTION; struct chmod_mode_struct *chmod_modes = NULL; +static const char *debug_verbosity[] = { + /*0*/ NULL, + /*1*/ NULL, + /*2*/ "bind,cmd,connect,del,deltasum,dup,filter,flist,iconv", + /*3*/ "acl,backup,deltasum2,del2,exit,filter2,flist2,fuzzy,genr,own,recv,send,time", + /*4*/ "cmd2,deltasum3,del3,exit2,flist3,iconv2,own2,proto,time2", + /*5*/ "chdir,deltasum4,flist4,fuzzy2,hash,hlink", +}; + +#define MAX_VERBOSITY ((int)(sizeof debug_verbosity / sizeof debug_verbosity[0]) - 1) + +static const char *info_verbosity[1+MAX_VERBOSITY] = { + /*0*/ NULL, + /*1*/ "copy,del,flist,misc,name,stats,symsafe", + /*2*/ "backup,mount,name2,remove,skip", +}; + +#define MAX_OUT_LEVEL 4 /* The largest N allowed for any flagN word. */ + +short info_levels[COUNT_INFO], debug_levels[COUNT_DEBUG]; + +#define DEFAULT_PRIORITY 0 /* Default/implied/--verbose set values. */ +#define HELP_PRIORITY 1 /* The help output uses this level. */ +#define USER_PRIORITY 2 /* User-specified via --info or --debug */ +#define LIMIT_PRIORITY 3 /* Overriding priority when limiting values. */ + +#define W_CLI (1<<0) /* client side */ +#define W_SRV (1<<1) /* server side */ +#define W_SND (1<<2) /* sending side */ +#define W_REC (1<<3) /* receiving side */ + +struct output_struct { + char *name; /* The name of the info/debug flag. */ + char *help; /* The description of the info/debug flag. */ + uchar namelen; /* The length of the name string. */ + uchar flag; /* The flag's value, for consistency check. */ + uchar where; /* Bits indicating where the flag is used. */ + uchar priority; /* See *_PRIORITY defines. */ +}; + +#define INFO_WORD(flag, where, help) { #flag, help, sizeof #flag - 1, INFO_##flag, where, 0 } + +static struct output_struct info_words[COUNT_INFO+1] = { + INFO_WORD(BACKUP, W_REC, "Mention files backed up"), + INFO_WORD(COPY, W_REC, "Mention files copied locally on the receiving side"), + INFO_WORD(DEL, W_REC, "Mention deletions on the receiving side"), + INFO_WORD(FLIST, W_CLI, "Mention file-list receiving/sending (levels 1-2)"), + INFO_WORD(MISC, W_SND|W_REC, "Mention miscellaneous information"), + INFO_WORD(MOUNT, W_SND|W_REC, "Mention mounts that were found or skipped"), + INFO_WORD(NAME, W_SND|W_REC, "Mention 1) updated file/dir names, 2) unchanged names"), + INFO_WORD(PROGRESS, W_CLI, "Mention 1) per-file progress or 2) total transfer progress"), + INFO_WORD(REMOVE, W_SND, "Mention files removed on the sending side"), + INFO_WORD(SKIP, W_REC, "Mention files that are skipped due to options used"), + INFO_WORD(STATS, W_CLI|W_SRV, "Mention statistics at end of run (levels 1-3)"), + INFO_WORD(SYMSAFE, W_SND|W_REC, "Mention symlinks that are unsafe"), + { NULL, "--info", 0, 0, 0, 0 } +}; + +#define DEBUG_WORD(flag, where, help) { #flag, help, sizeof #flag - 1, DEBUG_##flag, where, 0 } + +static struct output_struct debug_words[COUNT_DEBUG+1] = { + DEBUG_WORD(ACL, W_SND|W_REC, "Debug extra ACL info"), + DEBUG_WORD(BACKUP, W_REC, "Debug backup actions (levels 1-2)"), + DEBUG_WORD(BIND, W_CLI, "Debug socket bind actions"), + DEBUG_WORD(CHDIR, W_CLI|W_SRV, "Debug when the current directory changes"), + DEBUG_WORD(CONNECT, W_CLI, "Debug connection events"), + DEBUG_WORD(CMD, W_CLI, "Debug commands+options that are issued (levels 1-2)"), + DEBUG_WORD(DEL, W_REC, "Debug delete actions (levels 1-3)"), + DEBUG_WORD(DELTASUM, W_SND|W_REC, "Debug delta-transfer checksumming (levels 1-4)"), + DEBUG_WORD(DUP, W_REC, "Debug weeding of duplicate names"), + DEBUG_WORD(EXIT, W_CLI|W_SRV, "Debug exit events (levels 1-2)"), + DEBUG_WORD(FILTER, W_SND|W_REC, "Debug filter actions (levels 1-2)"), + DEBUG_WORD(FLIST, W_SND|W_REC, "Debug file-list operations (levels 1-4)"), + DEBUG_WORD(FUZZY, W_REC, "Debug fuzzy scoring (levels 1-2)"), + DEBUG_WORD(GENR, W_REC, "Debug generator functions"), + DEBUG_WORD(HASH, W_SND|W_REC, "Debug hashtable code"), + DEBUG_WORD(HLINK, W_SND|W_REC, "Debug hard-link actions"), + DEBUG_WORD(ICONV, W_CLI|W_SRV, "Debug iconv character conversions (levels 1-2)"), + DEBUG_WORD(OWN, W_REC, "Debug ownership changes in users & groups (levels 1-2)"), + DEBUG_WORD(PROTO, W_CLI|W_SRV, "Debug protocol information"), + DEBUG_WORD(RECV, W_REC, "Debug receiver functions"), + DEBUG_WORD(SEND, W_SND, "Debug sender functions"), + DEBUG_WORD(TIME, W_REC, "Debug setting of modified times (levels 1-2)"), + { NULL, "--debug", 0, 0, 0, 0 } +}; + +static int verbose = 0; +static int do_stats = 0; +static int do_progress = 0; static int daemon_opt; /* sets am_daemon after option error-reporting */ static int omit_dir_times = 0; static int F_option_cnt = 0; @@ -201,7 +295,7 @@ static int itemize_changes = 0; static int refused_delete, refused_archive_part, refused_compress; static int refused_partial, refused_progress, refused_delete_before; static int refused_delete_during; -static int refused_inplace; +static int refused_inplace, refused_no_iconv; static char *max_size_arg, *min_size_arg; static char tmp_partialdir[] = ".~tmp~"; @@ -210,6 +304,251 @@ static char tmp_partialdir[] = ".~tmp~"; * address, or a hostname. **/ char *bind_address; +static void output_item_help(struct output_struct *words); + +/* This constructs a string that represents all the options set for either + * the --info or --debug setting, skipping any implied options (by -v, etc.). + * This is used both when conveying the user's options to the server, and + * when the help output wants to tell the user what options are implied. */ +static char *make_output_option(struct output_struct *words, short *levels, uchar where) +{ + char *str = words == info_words ? "--info=" : "--debug="; + int j, counts[MAX_OUT_LEVEL+1], pos, skipped = 0, len = 0, max = 0, lev = 0; + int word_count = words == info_words ? COUNT_INFO : COUNT_DEBUG; + char *buf; + + memset(counts, 0, sizeof counts); + + for (j = 0; words[j].name; j++) { + if (words[j].flag != j) { + rprintf(FERROR, "rsync: internal error on %s%s: %d != %d\n", + words == info_words ? "INFO_" : "DEBUG_", + words[j].name, words[j].flag, j); + exit_cleanup(RERR_UNSUPPORTED); + } + if (!(words[j].where & where)) + continue; + if (words[j].priority == DEFAULT_PRIORITY) { + /* Implied items don't need to be mentioned. */ + skipped++; + continue; + } + len += len ? 1 : strlen(str); + len += strlen(words[j].name); + len += levels[j] == 1 ? 0 : 1; + + if (words[j].priority == HELP_PRIORITY) + continue; /* no abbreviating for help */ + + assert(levels[j] <= MAX_OUT_LEVEL); + if (++counts[levels[j]] > max) { + /* Determine which level has the most items. */ + lev = levels[j]; + max = counts[lev]; + } + } + + /* Sanity check the COUNT_* define against the length of the table. */ + if (j != word_count) { + rprintf(FERROR, "rsync: internal error: %s is wrong! (%d != %d)\n", + words == info_words ? "COUNT_INFO" : "COUNT_DEBUG", + j, word_count); + exit_cleanup(RERR_UNSUPPORTED); + } + + if (!len) + return NULL; + + len++; + if (!(buf = new_array(char, len))) + out_of_memory("make_output_option"); + pos = 0; + + if (skipped || max < 5) + lev = -1; + else { + if (lev == 0) + pos += snprintf(buf, len, "%sNONE", str); + else if (lev == 1) + pos += snprintf(buf, len, "%sALL", str); + else + pos += snprintf(buf, len, "%sALL%d", str, lev); + } + + for (j = 0; words[j].name && pos < len; j++) { + if (words[j].priority == DEFAULT_PRIORITY || levels[j] == lev || !(words[j].where & where)) + continue; + if (pos) + buf[pos++] = ','; + else + pos += strlcpy(buf+pos, str, len-pos); + if (pos < len) + pos += strlcpy(buf+pos, words[j].name, len-pos); + /* Level 1 is implied by the name alone. */ + if (levels[j] != 1 && pos < len) + buf[pos++] = '0' + levels[j]; + } + + buf[pos] = '\0'; + + return buf; +} + +static void parse_output_words(struct output_struct *words, short *levels, + const char *str, uchar priority) +{ + const char *s; + int j, len, lev; + + if (!str) + return; + + while (*str) { + if ((s = strchr(str, ',')) != NULL) + len = s++ - str; + else + len = strlen(str); + while (len && isDigit(str+len-1)) + len--; + lev = isDigit(str+len) ? atoi(str+len) : 1; + if (lev > MAX_OUT_LEVEL) + lev = MAX_OUT_LEVEL; + if (len == 4 && strncasecmp(str, "help", 4) == 0) { + output_item_help(words); + exit_cleanup(0); + } + if (len == 4 && strncasecmp(str, "none", 4) == 0) + len = lev = 0; + else if (len == 3 && strncasecmp(str, "all", 3) == 0) + len = 0; + for (j = 0; words[j].name; j++) { + if (!len + || (len == words[j].namelen && strncasecmp(str, words[j].name, len) == 0)) { + if (priority >= words[j].priority) { + words[j].priority = priority; + levels[j] = lev; + } + if (len) + break; + } + } + if (len && !words[j].name) { + rprintf(FERROR, "Unknown %s item: \"%.*s\"\n", + words[j].help, len, str); + exit_cleanup(RERR_SYNTAX); + } + if (!s) + break; + str = s; + } +} + +/* Tell the user what all the info or debug flags mean. */ +static void output_item_help(struct output_struct *words) +{ + short *levels = words == info_words ? info_levels : debug_levels; + const char **verbosity = words == info_words ? info_verbosity : debug_verbosity; + char buf[128], *opt, *fmt = "%-10s %s\n"; + int j; + + reset_output_levels(); + + rprintf(FINFO, "Use OPT or OPT1 for level 1 output, OPT2 for level 2, etc.; OPT0 silences.\n"); + rprintf(FINFO, "\n"); + for (j = 0; words[j].name; j++) + rprintf(FINFO, fmt, words[j].name, words[j].help); + rprintf(FINFO, "\n"); + + snprintf(buf, sizeof buf, "Set all %s options (e.g. all%d)", + words[j].help, MAX_OUT_LEVEL); + rprintf(FINFO, fmt, "ALL", buf); + + snprintf(buf, sizeof buf, "Silence all %s options (same as all0)", + words[j].help); + rprintf(FINFO, fmt, "NONE", buf); + + rprintf(FINFO, fmt, "HELP", "Output this help message"); + rprintf(FINFO, "\n"); + rprintf(FINFO, "Options added for each increase in verbose level:\n"); + + for (j = 1; j <= MAX_VERBOSITY; j++) { + parse_output_words(words, levels, verbosity[j], HELP_PRIORITY); + opt = make_output_option(words, levels, W_CLI|W_SRV|W_SND|W_REC); + if (opt) { + rprintf(FINFO, "%d) %s\n", j, strchr(opt, '=')+1); + free(opt); + } + reset_output_levels(); + } +} + +/* The --verbose option now sets info+debug flags. */ +static void set_output_verbosity(int level, uchar priority) +{ + int j; + + if (level > MAX_VERBOSITY) + level = MAX_VERBOSITY; + + for (j = 1; j <= level; j++) { + parse_output_words(info_words, info_levels, info_verbosity[j], priority); + parse_output_words(debug_words, debug_levels, debug_verbosity[j], priority); + } +} + +/* Limit the info+debug flag levels given a verbose-option level limit. */ +void limit_output_verbosity(int level) +{ + short info_limits[COUNT_INFO], debug_limits[COUNT_DEBUG]; + int j; + + if (level > MAX_VERBOSITY) + return; + + memset(info_limits, 0, sizeof info_limits); + memset(debug_limits, 0, sizeof debug_limits); + + /* Compute the level limits in the above arrays. */ + for (j = 1; j <= level; j++) { + parse_output_words(info_words, info_limits, info_verbosity[j], LIMIT_PRIORITY); + parse_output_words(debug_words, debug_limits, debug_verbosity[j], LIMIT_PRIORITY); + } + + for (j = 0; j < COUNT_INFO; j++) { + if (info_levels[j] > info_limits[j]) + info_levels[j] = info_limits[j]; + } + + for (j = 0; j < COUNT_DEBUG; j++) { + if (debug_levels[j] > debug_limits[j]) + debug_levels[j] = debug_limits[j]; + } +} + +void reset_output_levels(void) +{ + int j; + + memset(info_levels, 0, sizeof info_levels); + memset(debug_levels, 0, sizeof debug_levels); + + for (j = 0; j < COUNT_INFO; j++) + info_words[j].priority = DEFAULT_PRIORITY; + + for (j = 0; j < COUNT_DEBUG; j++) + debug_words[j].priority = DEFAULT_PRIORITY; +} + +void negate_output_levels(void) +{ + int j; + + for (j = 0; j < COUNT_INFO; j++) + info_levels[j] *= -1; + + for (j = 0; j < COUNT_DEBUG; j++) + debug_levels[j] *= -1; +} static void print_rsync_version(enum logcode f) { @@ -217,6 +556,7 @@ static void print_rsync_version(enum logcode f) char const *got_socketpair = "no "; char const *have_inplace = "no "; char const *hardlinks = "no "; + char const *symtimes = "no "; char const *acls = "no "; char const *xattrs = "no "; char const *links = "no "; @@ -225,7 +565,8 @@ static void print_rsync_version(enum logcode f) STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 - asprintf(&subprotocol, ".PR%d", SUBPROTOCOL_VERSION); + if (asprintf(&subprotocol, ".PR%d", SUBPROTOCOL_VERSION) < 0) + out_of_memory("print_rsync_version"); #endif #ifdef HAVE_SOCKETPAIR got_socketpair = ""; @@ -251,10 +592,13 @@ static void print_rsync_version(enum logcode f) #ifdef ICONV_OPTION iconv = ""; #endif +#if defined HAVE_LUTIMES && defined HAVE_UTIMES + symtimes = ""; +#endif rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); - rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n"); + rprintf(f, "Copyright (C) 1996-2008 by Andrew Tridgell, Wayne Davison, and others.\n"); rprintf(f, "Web site: http://rsync.samba.org/\n"); rprintf(f, "Capabilities:\n"); rprintf(f, " %d-bit files, %d-bit inums, %d-bit timestamps, %d-bit long ints,\n", @@ -264,8 +608,8 @@ static void print_rsync_version(enum logcode f) (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); - rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv\n", - have_inplace, acls, xattrs, iconv); + rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes\n", + have_inplace, acls, xattrs, iconv, symtimes); #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); @@ -308,6 +652,8 @@ void usage(enum logcode F) rprintf(F,"\n"); rprintf(F,"Options\n"); rprintf(F," -v, --verbose increase verbosity\n"); + rprintf(F," --info=FLAGS fine-grained informational verbosity\n"); + rprintf(F," --debug=FLAGS fine-grained debug verbosity\n"); rprintf(F," -q, --quiet suppress non-error messages\n"); rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n"); rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n"); @@ -328,6 +674,7 @@ 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," --munge-links munge symlinks to make them safer (but unusable)\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"); @@ -353,7 +700,7 @@ void usage(enum logcode F) #endif rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run perform a trial run with no changes made\n"); - rprintf(F," -W, --whole-file copy files whole (without rsync algorithm)\n"); + rprintf(F," -W, --whole-file copy files whole (without delta-xfer algorithm)\n"); 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"); @@ -381,6 +728,7 @@ void usage(enum logcode F) rprintf(F," --timeout=SECONDS set I/O timeout in seconds\n"); rprintf(F," --contimeout=SECONDS set daemon connection timeout in seconds\n"); rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); + rprintf(F," -M, --remote-option=OPTION send OPTION to the remote side only\n"); rprintf(F," --size-only skip files that match in size\n"); rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n"); rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); @@ -440,7 +788,7 @@ 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_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_NO_D, OPT_APPEND, + OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { @@ -450,6 +798,9 @@ static struct poptOption long_options[] = { {"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 }, + {"info", 0, POPT_ARG_STRING, 0, OPT_INFO, 0, 0 }, + {"debug", 0, POPT_ARG_STRING, 0, OPT_DEBUG, 0, 0 }, + {"msgs2stderr", 0, POPT_ARG_NONE, &msgs2stderr, 0, 0, 0 }, {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 }, {"motd", 0, POPT_ARG_VAL, &output_motd, 1, 0, 0 }, {"no-motd", 0, POPT_ARG_VAL, &output_motd, 0, 0, 0 }, @@ -469,6 +820,8 @@ static struct poptOption long_options[] = { {"dirs", 'd', POPT_ARG_VAL, &xfer_dirs, 2, 0, 0 }, {"no-dirs", 0, POPT_ARG_VAL, &xfer_dirs, 0, 0, 0 }, {"no-d", 0, POPT_ARG_VAL, &xfer_dirs, 0, 0, 0 }, + {"old-dirs", 0, POPT_ARG_VAL, &xfer_dirs, 4, 0, 0 }, + {"old-d", 0, POPT_ARG_VAL, &xfer_dirs, 4, 0, 0 }, {"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 }, @@ -507,6 +860,8 @@ static struct poptOption long_options[] = { {"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 }, + {"munge-links", 0, POPT_ARG_VAL, &munge_symlinks, 1, 0, 0 }, + {"no-munge-links", 0, POPT_ARG_VAL, &munge_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, 0, 'H', 0, 0 }, @@ -523,14 +878,19 @@ static struct poptOption long_options[] = { {"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, 0, 'x', 0, 0 }, + {"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, + {"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, {"existing", 0, POPT_ARG_NONE, &ignore_non_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 }, - {"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 }, + {"sparse", 'S', POPT_ARG_VAL, &sparse_files, 1, 0, 0 }, + {"no-sparse", 0, POPT_ARG_VAL, &sparse_files, 0, 0, 0 }, + {"no-S", 0, POPT_ARG_VAL, &sparse_files, 0, 0, 0 }, + {"inplace", 0, POPT_ARG_VAL, &inplace, 1, 0, 0 }, + {"no-inplace", 0, POPT_ARG_VAL, &inplace, 0, 0, 0 }, {"append", 0, POPT_ARG_NONE, 0, OPT_APPEND, 0, 0 }, {"append-verify", 0, POPT_ARG_VAL, &append_mode, 2, 0, 0 }, {"no-append", 0, POPT_ARG_VAL, &append_mode, 0, 0, 0 }, @@ -543,8 +903,10 @@ static struct poptOption long_options[] = { {"delete-excluded", 0, POPT_ARG_NONE, &delete_excluded, 0, 0, 0 }, {"remove-sent-files",0, POPT_ARG_VAL, &remove_source_files, 2, 0, 0 }, /* deprecated */ {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 }, - {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, - {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 }, + {"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 }, + {"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 }, + {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 }, + {"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 }, {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 }, {0, 'F', POPT_ARG_NONE, 0, 'F', 0, 0 }, {"filter", 'f', POPT_ARG_STRING, 0, OPT_FILTER, 0, 0 }, @@ -563,11 +925,13 @@ static struct poptOption long_options[] = { {"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 }, + {"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 }, + {"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, + {"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 }, {"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 }, - {"skip-compress", 0, POPT_ARG_STRING, &skip_compress, 0, 0, 0 }, {"no-z", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 }, + {"skip-compress", 0, POPT_ARG_STRING, &skip_compress, 0, 0, 0 }, {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 }, {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 }, {"progress", 0, POPT_ARG_VAL, &do_progress, 1, 0, 0 }, @@ -577,7 +941,9 @@ static struct poptOption long_options[] = { {"partial-dir", 0, POPT_ARG_STRING, &partial_dir, 0, 0, 0 }, {"delay-updates", 0, POPT_ARG_VAL, &delay_updates, 1, 0, 0 }, {"no-delay-updates", 0, POPT_ARG_VAL, &delay_updates, 0, 0, 0 }, - {"prune-empty-dirs",'m', POPT_ARG_NONE, &prune_empty_dirs, 0, 0, 0 }, + {"prune-empty-dirs",'m', POPT_ARG_VAL, &prune_empty_dirs, 1, 0, 0 }, + {"no-prune-empty-dirs",0,POPT_ARG_VAL, &prune_empty_dirs, 0, 0, 0 }, + {"no-m", 0, POPT_ARG_VAL, &prune_empty_dirs, 0, 0, 0 }, {"log-file", 0, POPT_ARG_STRING, &logfile_name, 0, 0, 0 }, {"log-file-format", 0, POPT_ARG_STRING, &logfile_format, 0, 0, 0 }, {"out-format", 0, POPT_ARG_STRING, &stdout_format, 0, 0, 0 }, @@ -606,15 +972,19 @@ static struct poptOption long_options[] = { {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 }, {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 }, {"contimeout", 0, POPT_ARG_INT, &connect_timeout, 0, 0, 0 }, + {"no-contimeout", 0, POPT_ARG_VAL, &connect_timeout, 0, 0, 0 }, {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, #ifdef ICONV_OPTION {"iconv", 0, POPT_ARG_STRING, &iconv_opt, 0, 0, 0 }, + {"no-iconv", 0, POPT_ARG_NONE, 0, OPT_NO_ICONV, 0, 0 }, #endif {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, {"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, - {"8-bit-output", '8', POPT_ARG_NONE, &allow_8bit_chars, 0, 0, 0 }, + {"8-bit-output", '8', POPT_ARG_VAL, &allow_8bit_chars, 1, 0, 0 }, + {"no-8-bit-output", 0, POPT_ARG_VAL, &allow_8bit_chars, 0, 0, 0 }, + {"no-8", 0, POPT_ARG_VAL, &allow_8bit_chars, 0, 0, 0 }, {"qsort", 0, POPT_ARG_NONE, &use_qsort, 0, 0, 0 }, {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 }, {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 }, @@ -622,6 +992,7 @@ static struct poptOption long_options[] = { {"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 }, + {"remote-option", 'M', POPT_ARG_STRING, 0, 'M', 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, 0, OPT_SERVER, 0, 0 }, @@ -629,6 +1000,7 @@ static struct poptOption long_options[] = { /* All the following options switch us into daemon-mode option-parsing. */ {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, {"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 }, + {"dparam", 0, POPT_ARG_STRING, 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} @@ -643,6 +1015,7 @@ static void daemon_usage(enum logcode F) rprintf(F," --address=ADDRESS bind to the specified address\n"); rprintf(F," --bwlimit=KBPS limit I/O bandwidth; KBytes per second\n"); rprintf(F," --config=FILE specify alternate rsyncd.conf file\n"); + rprintf(F," -M, --dparam=OVERRIDE override global daemon config parameter\n"); rprintf(F," --no-detach do not detach from the parent\n"); rprintf(F," --port=PORT listen on alternate port number\n"); rprintf(F," --log-file=FILE override the \"log file\" setting\n"); @@ -664,6 +1037,7 @@ static struct poptOption long_daemon_options[] = { {"bwlimit", 0, POPT_ARG_INT, &daemon_bwlimit, 0, 0, 0 }, {"config", 0, POPT_ARG_STRING, &config_file, 0, 0, 0 }, {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 }, + {"dparam", 'M', POPT_ARG_STRING, 0, 'M', 0, 0 }, {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, {"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, {"detach", 0, POPT_ARG_VAL, &no_detach, 0, 0, 0 }, @@ -757,6 +1131,8 @@ static void set_refuse_options(char *bp) refused_progress = op->val; else if (wildmatch("inplace", op->longName)) refused_inplace = op->val; + else if (wildmatch("no-iconv", op->longName)) + refused_no_iconv = op->val; break; } if (!is_wild) @@ -867,7 +1243,7 @@ static void create_refuse_error(int which) * * @retval 0 on error, with err_buf containing an explanation **/ -int parse_arguments(int *argc_p, const char ***argv_p, int frommain) +int parse_arguments(int *argc_p, const char ***argv_p) { static poptContext pc; char *ref = lp_refuse_options(module_id); @@ -877,8 +1253,13 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) if (ref && *ref) set_refuse_options(ref); - if (am_daemon) + if (am_daemon) { set_refuse_options("log-file*"); +#ifdef ICONV_OPTION + if (!*lp_charset(module_id)) + set_refuse_options("iconv"); +#endif + } #ifdef ICONV_OPTION if (!am_daemon && !protect_args && (arg = getenv("RSYNC_ICONV")) != NULL && *arg) @@ -940,11 +1321,24 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) pc = poptGetContext(RSYNC_NAME, argc, argv, long_daemon_options, 0); while ((opt = poptGetNextOpt(pc)) != -1) { + char **cpp; switch (opt) { case 'h': daemon_usage(FINFO); exit_cleanup(0); + case 'M': + arg = poptGetOptArg(pc); + if (!strchr(arg, '=')) { + rprintf(FERROR, + "--dparam value is missing an '=': %s\n", + arg); + goto daemon_error; + } + cpp = EXPAND_ITEM_LIST(&dparam_list, char *, 4); + *cpp = strdup(arg); + break; + case 'v': verbose++; break; @@ -958,6 +1352,9 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) } } + if (dparam_list.count && !set_dparams(1)) + exit_cleanup(RERR_SYNTAX); + if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) { snprintf(err_buf, sizeof err_buf, "the --temp-dir path is WAY too long.\n"); @@ -1004,16 +1401,17 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) case OPT_INCLUDE_FROM: arg = poptGetOptArg(pc); if (sanitize_paths) - arg = sanitize_path(NULL, arg, NULL, 0); - if (server_filter_list.head) { + arg = sanitize_path(NULL, arg, NULL, 0, SP_DEFAULT); + if (daemon_filter_list.head) { int rej; - char *cp = strdup(arg); + char *dir, *cp = strdup(arg); if (!cp) out_of_memory("parse_arguments"); if (!*cp) goto options_rejected; - clean_fname(cp, CFN_COLLAPSE_DOT_DOT_DIRS); - rej = check_filter(&server_filter_list, cp, 0) < 0; + dir = cp + (*cp == '/' ? module_dirlen : 0); + clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS); + rej = check_filter(&daemon_filter_list, FLOG, dir, 0) < 0; free(cp); if (rej) goto options_rejected; @@ -1066,8 +1464,7 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) break; case 'q': - if (frommain) - quiet++; + quiet++; break; case 'x': @@ -1110,6 +1507,26 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) } break; + case 'M': + arg = poptGetOptArg(pc); + if (*arg != '-') { + snprintf(err_buf, sizeof err_buf, + "Remote option must start with a dash: %s\n", arg); + return 0; + } + if (remote_option_cnt+2 >= remote_option_alloc) { + remote_option_alloc += 16; + remote_options = realloc_array(remote_options, + const char *, remote_option_alloc); + if (!remote_options) + out_of_memory("parse_arguments"); + if (!remote_option_cnt) + remote_options[0] = "ARG0"; + } + remote_options[++remote_option_cnt] = arg; + remote_options[remote_option_cnt+1] = NULL; + break; + case OPT_WRITE_BATCH: /* batch_name is already set */ write_batch = 1; @@ -1125,6 +1542,12 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) read_batch = 1; break; + case OPT_NO_ICONV: +#ifdef ICONV_OPTION + iconv_opt = NULL; +#endif + break; + case OPT_MAX_SIZE: if ((max_size = parse_size_arg(&max_size_arg, 'b')) <= 0) { snprintf(err_buf, sizeof err_buf, @@ -1192,6 +1615,16 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) } break; + case OPT_INFO: + arg = poptGetOptArg(pc); + parse_output_words(info_words, info_levels, arg, USER_PRIORITY); + break; + + case OPT_DEBUG: + arg = poptGetOptArg(pc); + parse_output_words(debug_words, debug_levels, arg, USER_PRIORITY); + break; + case OPT_HELP: usage(FINFO); exit_cleanup(0); @@ -1239,12 +1672,28 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) } } - if (human_readable && argc == 2) { + if (human_readable > 1 && argc == 2 && !am_server) { /* Allow the old meaning of 'h' (--help) on its own. */ usage(FINFO); exit_cleanup(0); } + set_output_verbosity(verbose, DEFAULT_PRIORITY); + + if (do_stats && !am_server) { + parse_output_words(info_words, info_levels, + verbose > 1 ? "stats3" : "stats2", DEFAULT_PRIORITY); + } + + if (human_readable) { + char buf[32]; + snprintf(buf, sizeof buf, "%f", 3.14); + if (strchr(buf, '.') != NULL) + number_separator = ','; + else + number_separator = '.'; + } + #ifdef ICONV_OPTION if (iconv_opt && protect_args != 2) { if (!am_server && strcmp(iconv_opt, "-") == 0) @@ -1252,14 +1701,17 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) else need_unsorted_flist = 1; } + if (refused_no_iconv && !iconv_opt) { + create_refuse_error(refused_no_iconv); + return 0; + } #endif - if (protect_args == 1) { - if (!frommain) - protect_args = 0; - else if (am_server) - return 1; - } + if (protect_args == 1 && am_server) + return 1; + + *argv_p = argv = poptGetArgs(pc); + *argc_p = argc = count_args(argv); #ifndef SUPPORT_LINKS if (preserve_links && !am_sender) { @@ -1279,7 +1731,13 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) } #endif -#ifndef SUPPORT_XATTRS +#ifdef SUPPORT_XATTRS + if (am_root < 0 && preserve_xattrs > 1) { + snprintf(err_buf, sizeof err_buf, + "--fake-super conflicts with -XX\n"); + return 0; + } +#else if (am_root < 0) { snprintf(err_buf, sizeof err_buf, "--fake-super requires an rsync with extended attributes enabled\n"); @@ -1304,7 +1762,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) batch_name = NULL; } else if (dry_run) write_batch = 0; - } + } else if (write_batch < 0 && dry_run) + write_batch = 0; if (read_batch && files_from) { snprintf(err_buf, sizeof err_buf, "--read-batch cannot be used with --files-from\n"); @@ -1341,8 +1800,16 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) xfer_dirs = 1; } - if (xfer_dirs < 1) - xfer_dirs = recurse || list_only; + if (argc < 2 && !read_batch && !am_server) + list_only |= 1; + + if (xfer_dirs >= 4) { + parse_rule(&filter_list, "- /*/*", 0, 0); + recurse = xfer_dirs = 1; + } else if (recurse) + xfer_dirs = 1; + else if (xfer_dirs < 0) + xfer_dirs = list_only ? 1 : 0; if (relative_paths < 0) relative_paths = files_from? 1 : 0; @@ -1391,32 +1858,44 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) need_messages_from_generator = 1; } - *argv_p = argv = poptGetArgs(pc); - *argc_p = argc = count_args(argv); + if (munge_symlinks && !am_daemon) { + STRUCT_STAT st; + char prefix[SYMLINK_PREFIX_LEN]; /* NOT +1 ! */ + strlcpy(prefix, SYMLINK_PREFIX, sizeof prefix); /* trim the trailing slash */ + if (do_stat(prefix, &st) == 0 && S_ISDIR(st.st_mode)) { + rprintf(FERROR, "Symlink munging is unsafe when a %s directory exists.\n", + prefix); + exit_cleanup(RERR_UNSUPPORTED); + } + } if (sanitize_paths) { int i; for (i = argc; i-- > 0; ) - argv[i] = sanitize_path(NULL, argv[i], "", 0); + argv[i] = sanitize_path(NULL, argv[i], "", 0, SP_KEEP_DOT_DIRS); if (tmpdir) - tmpdir = sanitize_path(NULL, tmpdir, NULL, 0); + tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT); if (backup_dir) - backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); + backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT); } - if (server_filter_list.head && !am_sender) { - struct filter_list_struct *elp = &server_filter_list; + if (daemon_filter_list.head && !am_sender) { + struct filter_list_struct *elp = &daemon_filter_list; if (tmpdir) { + char *dir; if (!*tmpdir) goto options_rejected; - clean_fname(tmpdir, CFN_COLLAPSE_DOT_DOT_DIRS); - if (check_filter(elp, tmpdir, 1) < 0) + dir = tmpdir + (*tmpdir == '/' ? module_dirlen : 0); + clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS); + if (check_filter(elp, FLOG, dir, 1) < 0) goto options_rejected; } if (backup_dir) { + char *dir; if (!*backup_dir) goto options_rejected; - clean_fname(backup_dir, CFN_COLLAPSE_DOT_DOT_DIRS); - if (check_filter(elp, backup_dir, 1) < 0) + dir = backup_dir + (*backup_dir == '/' ? module_dirlen : 0); + clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS); + if (check_filter(elp, FLOG, dir, 1) < 0) goto options_rejected; } } @@ -1442,7 +1921,7 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) backup_dir_buf[backup_dir_len++] = '/'; backup_dir_buf[backup_dir_len] = '\0'; } - if (verbose > 1 && !am_sender) + if (INFO_GTE(BACKUP, 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, @@ -1469,7 +1948,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) else if (log_format_has(stdout_format, 'i')) stdout_format_has_i = itemize_changes | 1; if (!log_format_has(stdout_format, 'b') - && !log_format_has(stdout_format, 'c')) + && !log_format_has(stdout_format, 'c') + && !log_format_has(stdout_format, 'C')) log_before_transfer = !am_server; } else if (itemize_changes) { stdout_format = "%i %n%L"; @@ -1477,15 +1957,18 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) log_before_transfer = !am_server; } - if (do_progress && !verbose && !log_before_transfer && !am_server) - verbose = 1; + if (do_progress && !am_server) { + if (!log_before_transfer && INFO_EQ(NAME, 0)) + parse_output_words(info_words, info_levels, "name", DEFAULT_PRIORITY); + parse_output_words(info_words, info_levels, "flist2,progress", DEFAULT_PRIORITY); + } if (dry_run) do_xfers = 0; set_io_timeout(io_timeout); - if (verbose && !stdout_format) { + if (INFO_GTE(NAME, 1) && !stdout_format) { stdout_format = "%n%L"; log_before_transfer = !am_server; } @@ -1605,12 +2088,14 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) } } else { if (sanitize_paths) - files_from = sanitize_path(NULL, files_from, NULL, 0); - if (server_filter_list.head) { + files_from = sanitize_path(NULL, files_from, NULL, 0, SP_DEFAULT); + if (daemon_filter_list.head) { + char *dir; if (!*files_from) goto options_rejected; - clean_fname(files_from, CFN_COLLAPSE_DOT_DOT_DIRS); - if (check_filter(&server_filter_list, files_from, 0) < 0) + dir = files_from + (*files_from == '/' ? module_dirlen : 0); + clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS); + if (check_filter(&daemon_filter_list, FLOG, dir, 0) < 0) goto options_rejected; } filesfrom_fd = open(files_from, O_RDONLY|O_BINARY); @@ -1646,6 +2131,7 @@ void server_options(char **args, int *argc_p) { static char argstr[64]; int ac = *argc_p; + uchar where; char *arg; int i, x; @@ -1680,8 +2166,8 @@ void server_options(char **args, int *argc_p) argstr[x++] = 'n'; if (preserve_links) argstr[x++] = 'l'; - if ((list_only && !recurse) || xfer_dirs > 1 - || (xfer_dirs && !recurse && delete_mode && am_sender)) + if ((xfer_dirs >= 2 && xfer_dirs < 4) + || (xfer_dirs && !recurse && (list_only || (delete_mode && am_sender)))) argstr[x++] = 'd'; if (am_sender) { if (keep_dirlinks) @@ -1751,24 +2237,39 @@ void server_options(char **args, int *argc_p) if (do_compression) argstr[x++] = 'z'; - /* We make use of the -e option to let the server know about any - * pre-release protocol version && our allow_inc_recurse status. */ set_allow_inc_recurse(); + + /* Checking the pre-negotiated value allows --protocol=29 override. */ + if (protocol_version >= 30) { + /* We make use of the -e option to let the server know about + * any pre-release protocol version && some behavior flags. */ + argstr[x++] = 'e'; #if SUBPROTOCOL_VERSION != 0 - if (protocol_version == PROTOCOL_VERSION) { - x += snprintf(argstr+x, sizeof argstr - x, - "e%d.%d%s", PROTOCOL_VERSION, SUBPROTOCOL_VERSION, - allow_inc_recurse ? "i" : ""); - } else + if (protocol_version == PROTOCOL_VERSION) { + x += snprintf(argstr+x, sizeof argstr - x, + "%d.%d", + PROTOCOL_VERSION, SUBPROTOCOL_VERSION); + } else +#endif + argstr[x++] = '.'; + if (allow_inc_recurse) + argstr[x++] = 'i'; +#if defined HAVE_LUTIMES && defined HAVE_UTIMES + argstr[x++] = 'L'; +#endif +#ifdef ICONV_OPTION + argstr[x++] = 's'; #endif - if (allow_inc_recurse) { - argstr[x++] = 'e'; - argstr[x++] = 'i'; + } + + if (x >= (int)sizeof argstr) { /* Not possible... */ + rprintf(FERROR, "argstr overflow in server_options().\n"); + exit_cleanup(RERR_MALLOC); } argstr[x] = '\0'; - if (x != 1) + if (x > 1) args[ac++] = argstr; #ifdef ICONV_OPTION @@ -1784,7 +2285,7 @@ void server_options(char **args, int *argc_p) } #endif - if (protect_args) /* initial args break here */ + if (protect_args && !local_server) /* unprotected args stop here */ args[ac++] = NULL; if (list_only > 1) @@ -1951,7 +2452,6 @@ void server_options(char **args, int *argc_p) * and it may be an older version that doesn't know this * option, so don't send it if client is the sender. */ - int i; for (i = 0; i < basis_dir_cnt; i++) { args[ac++] = dest_option; args[ac++] = basis_dir[i]; @@ -1959,6 +2459,16 @@ void server_options(char **args, int *argc_p) } } + /* What flags do we need to send to the other side? */ + where = (am_server ? W_CLI : W_SRV) | (am_sender ? W_REC : W_SND); + arg = make_output_option(info_words, info_levels, where); + if (arg) + args[ac++] = arg; + + arg = make_output_option(debug_words, debug_levels, where); + if (arg) + args[ac++] = arg; + if (append_mode) { if (append_mode > 1) args[ac++] = "--append"; @@ -1991,6 +2501,21 @@ void server_options(char **args, int *argc_p) else if (remove_source_files) args[ac++] = "--remove-sent-files"; + if (ac > MAX_SERVER_ARGS) { /* Not possible... */ + rprintf(FERROR, "argc overflow in server_options().\n"); + exit_cleanup(RERR_MALLOC); + } + + if (remote_option_cnt) { + int j; + if (ac + remote_option_cnt > MAX_SERVER_ARGS) { + rprintf(FERROR, "too many remote options specified.\n"); + exit_cleanup(RERR_SYNTAX); + } + for (j = 1; j <= remote_option_cnt; j++) + args[ac++] = (char*)remote_options[j]; + } + *argc_p = ac; return;