- Changed ITEM_UPDATING to ITEM_TRANSFER.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 6e5f9a3..79b7e63 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -331,7 +331,7 @@ static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st,
                                write_int(f_out, ndx);
                        write_shortint(f_out, iflags);
                } else if (ndx >= 0)
-                       log_recv(file, &stats, iflags);
+                       log_item(file, &stats, iflags, NULL);
        }
 }
 
@@ -950,7 +950,7 @@ prepare_to_open:
                statret = 0;
        }
 
-       if (dry_run || read_batch || whole_file > 0)
+       if (dry_run || read_batch || whole_file)
                goto notify_others;
 
        if (fuzzy_basis) {
@@ -1021,26 +1021,15 @@ notify_others:
        if (f_out_name >= 0) {
                write_byte(f_out_name, fnamecmp_type);
                if (fnamecmp_type == FNAMECMP_FUZZY) {
-                       uchar lenbuf[3], *lb = lenbuf;
-                       int len = strlen(fuzzy_file->basename);
-                       if (len > 0x7F) {
-#if MAXPATHLEN > 0x7FFF
-                               *lb++ = len / 0x10000 + 0x80;
-                               *lb++ = len / 0x100;
-#else
-                               *lb++ = len / 0x100 + 0x80;
-#endif
-                       }
-                       *lb = len;
-                       write_buf(f_out_name, (char*)lenbuf, lb - lenbuf + 1);
-                       write_buf(f_out_name, fuzzy_file->basename, len);
+                       write_vstring(f_out_name, fuzzy_file->basename,
+                                     strlen(fuzzy_file->basename));
                }
        }
 
        if (dry_run || read_batch)
                return;
 
-       if (statret != 0 || whole_file > 0) {
+       if (statret != 0 || whole_file) {
                write_sum_head(f_out, NULL);
                return;
        }
@@ -1102,9 +1091,11 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
        if (delete_before && !local_name && flist->count > 0)
                do_delete_pass(flist, allowed_lull);
 
+       if (whole_file < 0)
+               whole_file = 0;
        if (verbose >= 2) {
                rprintf(FINFO, "delta-transmission %s\n",
-                       whole_file > 0
+                       whole_file
                        ? "disabled for local transfer or --whole-file"
                        : "enabled");
        }