Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the use of --xattrs with --only-write-batch.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
74d0634
..
e0b440d
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-200
8
Wayne Davison
+ * Copyright (C) 2003-200
9
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
*
* 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"
extern int verbose;
#include "rsync.h"
extern int verbose;
-extern int dry_run;
extern int do_xfers;
extern int am_server;
extern int am_daemon;
extern int do_xfers;
extern int am_server;
extern int am_daemon;
@@
-127,13
+126,7
@@
void successful_send(int ndx)
if (!remove_source_files)
return;
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;
file = flist->files[ndx - flist->ndx_start];
if (!change_pathname(file, NULL, 0))
return;
@@
-159,7
+152,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 (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
}
send_xattr_request(fname, file, f_out);
#endif
}
@@
-229,7
+222,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
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
recv_xattr_request(file, f_in);
#endif