Including my extern-squishing script, which just found an

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 154ddde..2fc664c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -272,9 +272,10 @@ static void output_summary(void)
                        "sent %s bytes  received %s bytes  %s bytes/sec\n",
                        human_num(total_written), human_num(total_read),
                        human_dnum((total_written + total_read)/(0.5 + (endtime - starttime)), 2));
-               rprintf(FINFO, "total size is %s  speedup is %.2f\n",
+               rprintf(FINFO, "total size is %s  speedup is %.2f%s\n",
                        human_num(stats.total_size),
-                       (double)stats.total_size / (total_written+total_read));
+                       (double)stats.total_size / (total_written+total_read),
+                       dry_run ? " (DRY RUN)" : "");
        }
 
        fflush(stdout);
@@ -440,6 +441,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
 
        if (read_batch) {
                int from_gen_pipe[2];
+               set_allow_inc_recurse();
                if (fd_pair(from_gen_pipe) < 0) {
                        rsyserr(FERROR, errno, "pipe");
                        exit_cleanup(RERR_IPC);
@@ -456,6 +458,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
                 * it on, but only if we're not batch processing. */
                if (whole_file < 0 && !write_batch)
                        whole_file = 1;
+               set_allow_inc_recurse();
                ret = local_child(argc, args, f_in_p, f_out_p, child_main);
 #ifdef ICONV_CONST
                setup_iconv();
@@ -721,7 +724,7 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
        argc--;
        argv++;
 
-       if (argc == 0 && (recurse || list_only)) {
+       if (argc == 0 && (recurse || xfer_dirs || list_only)) {
                argc = 1;
                argv--;
                argv[0] = ".";