Use upper-case HLINK in a --debug setting to avoid a really weird bug

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 3937a10..cc2c9e9 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
@@ -22,7 +22,6 @@
 #include "rsync.h"
 #include "inums.h"
 
-extern int dry_run;
 extern int do_xfers;
 extern int am_server;
 extern int am_daemon;
@@ -152,7 +151,7 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
        if (iflags & ITEM_XNAME_FOLLOWS)
                write_vstring(f_out, buf, len);
 #ifdef SUPPORT_XATTRS
-       if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+       if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
                send_xattr_request(fname, file, f_out);
 #endif
 }
@@ -226,7 +225,7 @@ void send_files(int f_in, int f_out)
                        rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
 
 #ifdef SUPPORT_XATTRS
-               if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+               if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
                        recv_xattr_request(file, f_in);
 #endif
 
@@ -234,6 +233,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) {
@@ -257,6 +271,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
@@ -264,7 +280,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 */