X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/951e826b75c4a4e6bc066e248d7489fb6eba6fde..886df221c1ce1660a2b6cd274b13952b482fe5bf:/options.c diff --git a/options.c b/options.c index 1bdea189..4f6b5e14 100644 --- a/options.c +++ b/options.c @@ -196,7 +196,7 @@ char *iconv_opt = ICONV_OPTION; struct chmod_mode_struct *chmod_modes = NULL; -static char *debug_verbosity[] = { +static const char *debug_verbosity[] = { /*0*/ NULL, /*1*/ NULL, /*2*/ "bind,cmd,chksum,connect,del,dup,filter,flist", @@ -207,7 +207,7 @@ static char *debug_verbosity[] = { #define MAX_VERBOSITY ((int)(sizeof debug_verbosity / sizeof debug_verbosity[0]) - 1) -static char *info_verbosity[MAX_VERBOSITY] = { +static const char *info_verbosity[1+MAX_VERBOSITY] = { /*0*/ NULL, /*1*/ "copy,del,flist,misc,name,stats,symsafe", /*2*/ "backup,misc2,mount,name2,remove,skip", @@ -230,14 +230,15 @@ short info_levels[COUNT_INFO], debug_levels[COUNT_DEBUG]; struct output_struct { char *name; /* The name of the info/debug flag. */ char *help; /* The description of the info/debug flag. */ - short flag; /* The flag's value, for consistency check. */ - short where; /* Bits indicating where the flag is used. */ - short priority; /* See *_PRIORITY defines. */ + 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, INFO_##flag, where, 0 } +#define INFO_WORD(flag, where, help) { #flag, help, sizeof #flag - 1, INFO_##flag, where, 0 } -static struct output_struct info_words[] = { +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"), @@ -250,12 +251,12 @@ static struct output_struct info_words[] = { 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 } + { NULL, "--info", 0, 0, 0, 0 } }; -#define DEBUG_WORD(flag, where, help) { #flag, help, DEBUG_##flag, where, 0 } +#define DEBUG_WORD(flag, where, help) { #flag, help, sizeof #flag - 1, DEBUG_##flag, where, 0 } -static struct output_struct debug_words[] = { +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"), @@ -277,7 +278,7 @@ static struct output_struct debug_words[] = { 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 } + { NULL, "--debug", 0, 0, 0, 0 } }; static int verbose = 0; @@ -306,7 +307,7 @@ static void output_item_help(struct output_struct *words); * 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, short where) +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; @@ -391,7 +392,7 @@ static char *make_output_option(struct output_struct *words, short *levels, shor } static void parse_output_words(struct output_struct *words, short *levels, - const char *str, int priority) + const char *str, uchar priority) { const char *s; int j, len, lev; @@ -419,7 +420,7 @@ static void parse_output_words(struct output_struct *words, short *levels, len = 0; for (j = 0; words[j].name; j++) { if (!len - || (strncasecmp(str, words[j].name, len) == 0 && !words[j].name[len])) { + || (len == words[j].namelen && strncasecmp(str, words[j].name, len) == 0)) { if (priority >= words[j].priority) { words[j].priority = priority; levels[j] = lev; @@ -429,7 +430,8 @@ static void parse_output_words(struct output_struct *words, short *levels, } } if (len && !words[j].name) { - rprintf(FERROR, "Unknown %s item: %.*s\n", words[j].help, len, str); + rprintf(FERROR, "Unknown %s item: \"%.*s\"\n", + words[j].help, len, str); exit_cleanup(RERR_SYNTAX); } if (!s) @@ -442,9 +444,12 @@ static void parse_output_words(struct output_struct *words, short *levels, 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++) @@ -464,23 +469,18 @@ static void output_item_help(struct output_struct *words) rprintf(FINFO, "Options added for each increase in verbose level:\n"); for (j = 1; j <= MAX_VERBOSITY; j++) { - reset_output_levels(); - if (words == info_words) - parse_output_words(info_words, levels, info_verbosity[j], HELP_PRIORITY); - else - parse_output_words(debug_words, levels, debug_verbosity[j], HELP_PRIORITY); + 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(); } - - reset_output_levels(); } /* The --verbose option now sets info+debug flags. */ -static void set_output_verbosity(int level, int priority) +static void set_output_verbosity(int level, uchar priority) { int j; @@ -1901,7 +1901,8 @@ int parse_arguments(int *argc_p, const char ***argv_p) 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"; @@ -2083,7 +2084,7 @@ void server_options(char **args, int *argc_p) { static char argstr[64]; int ac = *argc_p; - short where; + uchar where; char *arg; int i, x;