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;
int delay_updates = 0;
long block_size = 0; /* "long" because popt can't set an int32. */
char *skip_compress = NULL;
+item_list dparam_list = EMPTY_ITEM_LIST;
/** Network address family. **/
int default_af_hint
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",
- /*3*/ "acl,backup,chksum2,del2,exit,filter2,flist2,fuzzy,genr,own,recv,send,time",
- /*4*/ "cmd2,chksum3,del3,exit2,flist3,iconv,own2,proto,time2",
- /*5*/ "chdir,chksum4,flist4,fuzzy2,hlink",
+ /*2*/ "bind,cmd,deltasum,connect,del,dup,filter,flist",
+ /*3*/ "acl,backup,deltasum2,del2,exit,filter2,flist2,fuzzy,genr,own,recv,send,time",
+ /*4*/ "cmd2,deltasum3,del3,exit2,flist3,iconv,own2,proto,time2",
+ /*5*/ "chdir,deltasum4,flist4,fuzzy2,hlink",
};
#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",
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"),
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"),
DEBUG_WORD(CHDIR, W_CLI|W_SRV, "Debug when the current directory changes"),
DEBUG_WORD(CONNECT, W_CLI, "Debug connection events"),
- DEBUG_WORD(CHKSUM, W_SND|W_REC, "Debug delta-transfer checksumming (levels 1-4)"),
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(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;
* 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;
}
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;
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;
}
}
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)
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, "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;
{"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 },
/* 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}
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");
{"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 },
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;
}
}
+ 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");
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";
{
static char argstr[64];
int ac = *argc_p;
- short where;
+ uchar where;
char *arg;
int i, x;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff