Fix the case where a partial-dir file exists but the destination

file does not.

diff --git a/generator.c b/generator.c
index b999ac8..1adb7a7 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -252,9 +252,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                           int f_out)
 {
        int fd;
-       STRUCT_STAT st;
+       STRUCT_STAT st, partial_st;
        int statret, stat_errno;
-       char *fnamecmp;
+       char *fnamecmp, *partialptr = NULL;
        char fnamecmpbuf[MAXPATHLEN];
 
        if (list_only)
@@ -448,6 +448,16 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                stat_errno = ENOENT;
        }
 
+       if (partial_dir) {
+               if ((partialptr = partial_dir_fname(fname))
+                   && link_stat(partialptr, &partial_st, 0) == 0
+                   && S_ISREG(partial_st.st_mode)) {
+                       if (statret == -1)
+                               goto prepare_to_open;
+               } else
+                       partialptr = NULL;
+       }
+
        if (statret == -1) {
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
@@ -482,6 +492,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                return;
        }
 
+prepare_to_open:
        if (dry_run || read_batch) {
                write_int(f_out,i);
                return;
@@ -493,14 +504,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                return;
        }
 
-       if (partial_dir) {
-               STRUCT_STAT st2;
-               char *partialptr = partial_dir_fname(fname);
-               if (partialptr && link_stat(partialptr, &st2, 0) == 0
-                   && S_ISREG(st2.st_mode)) {
-                       st = st2;
-                       fnamecmp = partialptr;
-               }
+       if (partialptr) {
+               st = partial_st;
+               fnamecmp = partialptr;
        }
 
        /* open the file */