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
- Parse hard-link info as soon as we get it in inc_recurse mode.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
efcd060
..
d8d3480
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-71,7
+71,7
@@
extern char *shell_cmd;
extern char *batch_name;
extern char *password_file;
extern char curr_dir[MAXPATHLEN];
extern char *batch_name;
extern char *password_file;
extern char curr_dir[MAXPATHLEN];
-extern struct file_list *
cur
_flist;
+extern struct file_list *
first
_flist;
extern struct filter_list_struct server_filter_list;
int local_server = 0;
extern struct filter_list_struct server_filter_list;
int local_server = 0;
@@
-721,7
+721,7
@@
static int do_recv(int f_in, int f_out, char *local_name)
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && !inc_recurse)
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && !inc_recurse)
- match_hard_links(
cur
_flist);
+ match_hard_links(
first
_flist);
#endif
if (fd_pair(error_pipe) < 0) {
#endif
if (fd_pair(error_pipe) < 0) {
@@
-796,6
+796,14
@@
static int do_recv(int f_in, int f_out, char *local_name)
set_msg_fd_in(error_pipe[0]);
io_start_buffering_in(error_pipe[0]);
set_msg_fd_in(error_pipe[0]);
io_start_buffering_in(error_pipe[0]);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && inc_recurse) {
+ struct file_list *flist;
+ for (flist = first_flist; flist; flist = flist->next)
+ match_hard_links(flist);
+ }
+#endif
+
generate_files(f_out, local_name);
handle_stats(-1);
generate_files(f_out, local_name);
handle_stats(-1);