Preserve the right errno value when trying adjunct functions during

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index fc9c47c..f772877 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-2007 Wayne Davison
+ * Copyright (C) 2003-2008 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
@@ -135,7 +135,7 @@ void successful_send(int ndx)
        }
 
        file = flist->files[ndx - flist->ndx_start];
-       if (!push_pathname(F_PATHNAME(file), -1))
+       if (!change_pathname(file, NULL, 0))
                return;
        f_name(file, fname);
 
@@ -221,7 +221,7 @@ void send_files(int f_in, int f_out)
                } else {
                        path = slash = "";
                }
-               if (!push_pathname(F_PATHNAME(file), -1))
+               if (!change_pathname(file, NULL, 0))
                        continue;
                f_name(file, fname);
 
@@ -229,7 +229,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)
+               if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
                        recv_xattr_request(file, f_in);
 #endif