Update the copyright year.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index c8ef7cc..8506ac6 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
  */
 
 #include "rsync.h"
+#include "inums.h"
 
 extern int dry_run;
 extern int do_xfers;
@@ -71,7 +72,7 @@ static struct sum_struct *receive_sums(int f)
 
        if (DEBUG_GTE(DELTASUM, 3)) {
                rprintf(FINFO, "count=%s n=%ld rem=%ld\n",
-                       big_num(s->count, 0), (long)s->blength, (long)s->remainder);
+                       big_num(s->count), (long)s->blength, (long)s->remainder);
        }
 
        if (append_mode > 0) {
@@ -106,7 +107,7 @@ static struct sum_struct *receive_sums(int f)
                if (DEBUG_GTE(DELTASUM, 3)) {
                        rprintf(FINFO,
                                "chunk[%d] len=%d offset=%s sum1=%08x\n",
-                               i, s->sums[i].len, big_num(s->sums[i].offset, 0),
+                               i, s->sums[i].len, big_num(s->sums[i].offset),
                                s->sums[i].sum1);
                }
        }
@@ -125,13 +126,7 @@ void successful_send(int ndx)
        if (!remove_source_files)
                return;
 
-       if (!(flist = flist_for_ndx(ndx))) {
-               rprintf(FERROR,
-                       "INTERNAL ERROR: unable to find flist for item %d\n",
-                       ndx);
-               return;
-       }
-
+       flist = flist_for_ndx(ndx, "successful_send");
        file = flist->files[ndx - flist->ndx_start];
        if (!change_pathname(file, NULL, 0))
                return;
@@ -206,6 +201,8 @@ void send_files(int f_in, int f_out)
                                break;
                        if (DEBUG_GTE(SEND, 1))
                                rprintf(FINFO, "send_files phase=%d\n", phase);
+                       if (phase == 2)
+                               read_del_stats(f_in);
                        write_ndx(f_out, NDX_DONE);
                        continue;
                }
@@ -239,6 +236,21 @@ void send_files(int f_in, int f_out)
                        maybe_log_item(file, iflags, itemizing, xname);
                        write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
                                            fnamecmp_type, xname, xlen);
+                       if (iflags & ITEM_IS_NEW) {
+                               stats.created_files++;
+                               if (S_ISREG(file->mode)) {
+                                       /* Nothing further to count. */
+                               } else if (S_ISDIR(file->mode))
+                                       stats.created_dirs++;
+#ifdef SUPPORT_LINKS
+                               else if (S_ISLNK(file->mode))
+                                       stats.created_symlinks++;
+#endif
+                               else if (IS_DEVICE(file->mode))
+                                       stats.created_devices++;
+                               else
+                                       stats.created_specials++;
+                       }
                        continue;
                }
                if (phase == 2) {
@@ -262,6 +274,8 @@ void send_files(int f_in, int f_out)
                                append_mode = -append_mode;
                                csum_length = SHORT_SUM_LENGTH;
                        }
+                       if (iflags & ITEM_IS_NEW)
+                               stats.created_files++;
                }
 
                updating_basis_file = inplace && (protocol_version >= 29
@@ -269,7 +283,7 @@ void send_files(int f_in, int f_out)
 
                if (!am_server && INFO_GTE(PROGRESS, 1))
                        set_current_file_index(file, ndx);
-               stats.num_transferred_files++;
+               stats.xferred_files++;
                stats.total_transferred_size += F_LENGTH(file);
 
                if (!do_xfers) { /* log the transfer */
@@ -325,7 +339,7 @@ void send_files(int f_in, int f_out)
 
                if (DEBUG_GTE(DELTASUM, 2)) {
                        rprintf(FINFO, "send_files mapped %s%s%s of size %s\n",
-                               path,slash,fname, big_num(st.st_size, 0));
+                               path,slash,fname, big_num(st.st_size));
                }
 
                write_ndx_and_attrs(f_out, ndx, iflags, fname, file,