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
Added RERR_SIGNAL1 to separate SIGUSR1 from the rest of the
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
3e7481f
..
8f26f03
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-820,7
+820,7
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
return NULL;
}
return NULL;
}
-skip_filters:
+
skip_filters:
if (verbose > 2) {
rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
if (verbose > 2) {
rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
@@
-848,7
+848,8
@@
skip_filters:
linkname_len = 0;
#endif
linkname_len = 0;
#endif
- sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 0;
+ sum_len = always_checksum && am_sender && S_ISREG(st.st_mode)
+ ? MD4_SUM_LENGTH : 0;
alloc_len = file_struct_len + dirname_len + basename_len
+ linkname_len + sum_len;
alloc_len = file_struct_len + dirname_len + basename_len
+ linkname_len + sum_len;
@@
-1313,7
+1314,6
@@
struct file_list *recv_file_list(int f)
if (!flist->files)
goto oom;
if (!flist->files)
goto oom;
-
while ((flags = read_byte(f)) != 0) {
struct file_struct *file;
while ((flags = read_byte(f)) != 0) {
struct file_struct *file;
@@
-1374,7
+1374,7
@@
struct file_list *recv_file_list(int f)
return flist;
return flist;
-oom:
+
oom:
out_of_memory("recv_file_list");
return NULL; /* not reached */
}
out_of_memory("recv_file_list");
return NULL; /* not reached */
}