- Changed the calling args to delete_file() to take an st_mode instead

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 9b260d4..e04ee61 100644 (file)
--- a/options.c
+++ b/options.c
@@ -152,7 +152,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;
@@ -548,9 +548,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;
@@ -1068,12 +1065,14 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                log_format = "%i %n%L";
                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 (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
@@ -1225,8 +1224,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)