Tweaked the rprintf() that outputs about the delta-transmission

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index f59a512..5bad8a5 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -42,6 +42,7 @@ extern int preserve_gid;
 extern int preserve_times;
 extern int omit_dir_times;
 extern int delete_during;
+extern int remove_sent_files;
 extern int update_only;
 extern int opt_ignore_existing;
 extern int inplace;
@@ -555,6 +556,11 @@ static void recv_generator(char *fname, struct file_list *flist,
                                rprintf(code, "%s -> %s\n", safe_fname(fname),
                                        safe_fname(file->u.link));
                        }
+                       if (remove_sent_files && !dry_run) {
+                               char numbuf[4];
+                               SIVAL(numbuf, 0, ndx);
+                               send_msg(MSG_SUCCESS, numbuf, 4);
+                       }
                }
 #endif
                return;
@@ -835,7 +841,7 @@ notify_others:
 #endif
                        }
                        *lb = len;
-                       write_buf(f_out_name, lenbuf, lb - lenbuf + 1);
+                       write_buf(f_out_name, (char*)lenbuf, lb - lenbuf + 1);
                        write_buf(f_out_name, fuzzy_file->basename, len);
                }
        }
@@ -879,10 +885,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
        }
 
        if (verbose >= 2) {
-               rprintf(FINFO,
+               rprintf(FINFO, "delta-transmission %s\n",
                        whole_file > 0
-                       ? "delta-transmission disabled for local transfer or --whole-file\n"
-                       : "delta transmission enabled\n");
+                       ? "disabled for local transfer or --whole-file"
+                       : "enabled");
        }
 
        /* We expect to just sit around now, so don't exit on a timeout.