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
Mention the latest bug-fix.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
4c11759
..
b0a9ebd
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-396,17
+396,11
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
- if (!(iflags & ITEM_
UPDATING) || !S_ISREG(file->mode
)) {
+ if (!(iflags & ITEM_
TRANSFER
)) {
maybe_log_item(file, iflags, itemizing, fnametmp);
continue;
}
maybe_log_item(file, iflags, itemizing, fnametmp);
continue;
}
- if (!S_ISREG(file->mode)) {
- rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
- who_am_i(), i);
- exit_cleanup(RERR_PROTOCOL);
- }
-
stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
@@
-604,14
+598,14
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
cleanup_disable();
cleanup_disable();
- if (recv_ok) {
- if (remove_sent_files && recv_ok > 0) {
+ if (recv_ok > 0) {
+ if (remove_sent_files
+ || (preserve_hard_links && file->link_u.links)) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4);
}
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4);
}
- } else {
- int msgtype = csum_length == SUM_LENGTH || read_batch ?
- FERROR : FINFO;
+ } else if (!recv_ok) {
+ int msgtype = phase || read_batch ? FERROR : FINFO;
if (msgtype == FERROR || verbose) {
char *errstr, *redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)
if (msgtype == FERROR || verbose) {
char *errstr, *redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)
@@
-632,7
+626,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
errstr, safe_fname(fname),
keptstr, redostr);
}
errstr, safe_fname(fname),
keptstr, redostr);
}
- if (
csum_length != SUM_LENGTH
) {
+ if (
!phase
) {
SIVAL(numbuf, 0, i);
send_msg(MSG_REDO, numbuf, 4);
}
SIVAL(numbuf, 0, i);
send_msg(MSG_REDO, numbuf, 4);
}
@@
-659,7
+653,9
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
full_fname(fname),
safe_fname(partialptr));
} else {
full_fname(fname),
safe_fname(partialptr));
} else {
- if (remove_sent_files) {
+ if (remove_sent_files
+ || (preserve_hard_links
+ && file->link_u.links)) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS,numbuf,4);
}
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS,numbuf,4);
}