Changed a couple log_recv() calls back to log_send().

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 9b260d4..280df0e 100644 (file)
--- a/options.c
+++ b/options.c
@@ -143,6 +143,8 @@ int verbose = 0;
 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;
 
@@ -152,7 +154,7 @@ char *batch_name = NULL;
 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;
@@ -539,8 +541,7 @@ static void set_refuse_options(char *bp)
                        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;
@@ -548,9 +549,6 @@ static void set_refuse_options(char *bp)
                                /* 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;
@@ -579,6 +577,17 @@ static void set_refuse_options(char *bp)
                *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;
+               }
+       }
 }
 
 
@@ -1060,21 +1069,27 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
        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;
@@ -1225,8 +1240,6 @@ void server_options(char **args,int *argc)
         * 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)
@@ -1272,6 +1285,17 @@ void server_options(char **args,int *argc)
        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;