Adding 3.0.4 release line to OLDNEWS.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index a0a95d9..8557740 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -21,6 +21,7 @@
  */
 
 #include "rsync.h"
+#include "inums.h"
 
 extern int dry_run;
 extern int do_xfers;
@@ -53,6 +54,7 @@ extern int ignore_errors;
 extern int remove_source_files;
 extern int delay_updates;
 extern int update_only;
+extern int human_readable;
 extern int ignore_existing;
 extern int ignore_non_existing;
 extern int inplace;
@@ -74,7 +76,6 @@ extern int fuzzy_basis;
 extern int always_checksum;
 extern int checksum_len;
 extern char *partial_dir;
-extern char *basis_dir[];
 extern int compare_dest;
 extern int copy_dest;
 extern int link_dest;
@@ -94,6 +95,7 @@ extern uid_t our_uid;
 extern char *backup_dir;
 extern char *backup_suffix;
 extern int backup_suffix_len;
+extern char *basis_dir[MAX_BASIS_DIRS+1];
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
 extern struct filter_list_struct daemon_filter_list;
 
@@ -803,11 +805,11 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
        if ((int64)sum->count != l)
                sum->count = -1;
 
-       if (sum->count && DEBUG_GTE(CHKSUM, 2)) {
+       if (sum->count && DEBUG_GTE(DELTASUM, 2)) {
                rprintf(FINFO,
                        "count=%s rem=%ld blength=%ld s2length=%d flength=%s\n",
-                       big_num(sum->count, 0), (long)sum->remainder, (long)sum->blength,
-                       sum->s2length, big_num(sum->flength, 0));
+                       big_num(sum->count), (long)sum->remainder, (long)sum->blength,
+                       sum->s2length, big_num(sum->flength));
        }
 }
 
@@ -855,10 +857,10 @@ static int generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
                sum1 = get_checksum1(map, n1);
                get_checksum2(map, n1, sum2);
 
-               if (DEBUG_GTE(CHKSUM, 3)) {
+               if (DEBUG_GTE(DELTASUM, 3)) {
                        rprintf(FINFO,
                                "chunk[%s] offset=%s len=%ld sum1=%08lx\n",
-                               big_num(i, 0), big_num(offset - n1, 0), (long)n1,
+                               big_num(i), big_num(offset - n1), (long)n1,
                                (unsigned long)sum1);
                }
                write_int(f_out, sum1);
@@ -1199,6 +1201,7 @@ static void list_file_entry(struct file_struct *f)
 {
        char permbuf[PERMSTRING_SIZE];
        int64 len;
+       int colwidth = human_readable ? 14 : 11;
 
        if (!F_IS_ACTIVE(f)) {
                /* this can happen if duplicate names were removed */
@@ -1212,15 +1215,16 @@ static void list_file_entry(struct file_struct *f)
 
 #ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(f->mode)) {
-               rprintf(FINFO, "%s %11s %s %s -> %s\n",
-                       permbuf, big_num(len, 0), timestring(f->modtime),
-                       f_name(f, NULL), F_SYMLINK(f));
+               rprintf(FINFO, "%s %*s %s %s -> %s\n",
+                       permbuf, colwidth, comma_num(len),
+                       timestring(f->modtime), f_name(f, NULL),
+                       F_SYMLINK(f));
        } else
 #endif
        {
-               rprintf(FINFO, "%s %11s %s %s\n",
-                       permbuf, big_num(len, 0), timestring(f->modtime),
-                       f_name(f, NULL));
+               rprintf(FINFO, "%s %*s %s %s\n",
+                       permbuf, colwidth, comma_num(len),
+                       timestring(f->modtime), f_name(f, NULL));
        }
 }
 
@@ -1903,12 +1907,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                fnamecmp_type = FNAMECMP_BACKUP;
        }
 
-       if (DEBUG_GTE(CHKSUM, 3)) {
+       if (DEBUG_GTE(DELTASUM, 3)) {
                rprintf(FINFO, "gen mapped %s of size %s\n",
-                       fnamecmp, big_num(sx.st.st_size, 0));
+                       fnamecmp, big_num(sx.st.st_size));
        }
 
-       if (DEBUG_GTE(CHKSUM, 2))
+       if (DEBUG_GTE(DELTASUM, 2))
                rprintf(FINFO, "generating and sending sums for %d\n", ndx);
 
   notify_others:
@@ -2076,8 +2080,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
        while (1) {
 #ifdef SUPPORT_HARD_LINKS
                if (preserve_hard_links && (ndx = get_hlink_num()) != -1) {
-                       flist = flist_for_ndx(ndx);
-                       assert(flist != NULL);
+                       flist = flist_for_ndx(ndx, "check_for_finished_files.1");
                        file = flist->files[ndx - flist->ndx_start];
                        assert(file->flags & FLAG_HLINKED);
                        finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1);
@@ -2100,7 +2103,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                        ignore_times++;
 
                        flist = cur_flist;
-                       cur_flist = flist_for_ndx(ndx);
+                       cur_flist = flist_for_ndx(ndx, "check_for_finished_files.2");
 
                        file = cur_flist->files[ndx - cur_flist->ndx_start];
                        if (solo_file)
@@ -2336,7 +2339,7 @@ void generate_files(int f_out, const char *local_name)
                touch_up_dirs(dir_flist, -1);
 
        if (max_delete >= 0 && deletion_count > max_delete) {
-               rprintf(FINFO,
+               rprintf(FWARNING,
                        "Deletions stopped due to --max-delete limit (%d skipped)\n",
                        deletion_count - max_delete);
                io_error |= IOERR_DEL_LIMIT;