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;
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int F_option_cnt = 0;
static int modify_window_set;
-static int refused_verbose, refused_delete, refused_archive_part;
+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;
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;
/* These flags are set to let us easily check
* an implied option later in the code. */
switch (*shortname) {
- case 'v':
- refused_verbose = op->val;
- break;
case 'r': case 'd': case 'l': case 'p':
case 't': case 'g': case 'o': case 'D':
refused_archive_part = op->val;
*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;
+ }
+ }
}
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;
}
- if (do_progress && !verbose && !log_before_transfer) {
- if (refused_verbose) {
- create_refuse_error(refused_verbose);
- return 0;
- }
+
+ if ((do_progress || dry_run) && !verbose && !log_before_transfer
+ && !am_server)
verbose = 1;
+
+ if (verbose && !log_format) {
+ 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;
* default for remote transfers, and in any case old versions
* of rsync will not understand it. */
- if (itemize_changes)
- argstr[x++] = 'i';
if (preserve_hard_links)
argstr[x++] = 'H';
if (preserve_uid)
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;