X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7752df41b7447e0e9aeb4c6b339997499bde58bd..97b7bff4d654d9fc679b823d5550ccd9b8a312ad:/flist.c diff --git a/flist.c b/flist.c index 3e7481f3..8f26f03c 100644 --- a/flist.c +++ b/flist.c @@ -820,7 +820,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist, return NULL; } -skip_filters: + skip_filters: if (verbose > 2) { rprintf(FINFO, "[%s] make_file(%s,*,%d)\n", @@ -848,7 +848,8 @@ skip_filters: 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; @@ -1313,7 +1314,6 @@ struct file_list *recv_file_list(int f) if (!flist->files) goto oom; - while ((flags = read_byte(f)) != 0) { struct file_struct *file; @@ -1374,7 +1374,7 @@ struct file_list *recv_file_list(int f) return flist; -oom: + oom: out_of_memory("recv_file_list"); return NULL; /* not reached */ }