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
- Moved the second send_extr_file_list() call to a better spot.
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
8e8e67e
..
789aa61
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-3,12
+3,11
@@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003
, 2004, 2005, 2006
Wayne Davison
+ * Copyright (C) 2003
-2007
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-45,7
+44,7
@@
extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_uid;
extern int preserve_gid;
extern int protocol_version;
extern int preserve_uid;
extern int preserve_gid;
-extern int inc
remental
;
+extern int inc
_recurse
;
extern int inplace;
extern int flist_eof;
extern int keep_dirlinks;
extern int inplace;
extern int flist_eof;
extern int keep_dirlinks;
@@
-110,7
+109,7
@@
int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr,
break;
if (ndx == NDX_DONE)
return ndx;
break;
if (ndx == NDX_DONE)
return ndx;
- if (!inc
remental
|| am_sender)
+ if (!inc
_recurse
|| am_sender)
goto invalid_ndx;
if (ndx == NDX_FLIST_EOF) {
flist_eof = 1;
goto invalid_ndx;
if (ndx == NDX_FLIST_EOF) {
flist_eof = 1;
@@
-183,6
+182,8
@@
int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr,
exit_cleanup(RERR_PROTOCOL);
}
} else if (f_out >= 0) {
exit_cleanup(RERR_PROTOCOL);
}
} else if (f_out >= 0) {
+ if (inc_recurse)
+ send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
write_ndx_and_attrs(f_out, ndx, iflags,
fnamecmp_type, buf, len);
}
write_ndx_and_attrs(f_out, ndx, iflags,
fnamecmp_type, buf, len);
}
@@
-407,7
+408,7
@@
struct file_list *flist_for_ndx(int ndx)
{
struct file_list *flist = cur_flist;
{
struct file_list *flist = cur_flist;
- if (!flist)
+ if (!flist
&& !(flist = first_flist)
)
return NULL;
while (ndx < flist->ndx_start) {
return NULL;
while (ndx < flist->ndx_start) {