Moved the call to do_hard_links() and the final directory-permissions

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index da53223..a85567d 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -72,8 +72,8 @@ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
 
                if (compare_dest != NULL) {
                        if (access(fname, 0) != 0) {
-                               snprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
-                                        compare_dest,fname);
+                               pathjoin(fnamecmpdest, sizeof fnamecmpdest,
+                                        compare_dest, fname);
                                fname = fnamecmpdest;
                        }
                }
@@ -397,7 +397,7 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
        }
 #endif
 
-       if (preserve_hard_links && check_hard_link(file)) {
+       if (preserve_hard_links && file->link_u.links && file->F_HEAD != file) {
                if (verbose > 1) {
                        rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",
                                f_name(file));
@@ -415,7 +415,7 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
        if ((statret == -1) && (compare_dest != NULL)) {
                /* try the file at compare_dest instead */
                int saveerrno = errno;
-               snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname);
+               pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
                statret = link_stat(fnamecmpbuf,&st);
                if (!S_ISREG(st.st_mode))
                        statret = -1;
@@ -522,7 +522,7 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
 }
 
 
-void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
+void generate_files(int f, struct file_list *flist, char *local_name)
 {
        int i;
        int phase=0;
@@ -561,8 +561,8 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
                        file = ©
                }
 
-               recv_generator(local_name? local_name
-                            : f_name_to(file,fbuf,sizeof fbuf), file, i, f);
+               recv_generator(local_name ? local_name : f_name_to(file, fbuf),
+                              file, i, f);
        }
 
        phase++;
@@ -576,10 +576,10 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
 
        /* files can cycle through the system more than once
         * to catch initial checksum errors */
-       while ((i = read_int(f_recv)) != -1) {
+       while ((i = get_redo_num()) != -1) {
                struct file_struct *file = flist->files[i];
-               recv_generator(local_name? local_name
-                            : f_name_to(file,fbuf,sizeof fbuf), file, i, f);
+               recv_generator(local_name ? local_name : f_name_to(file, fbuf),
+                              file, i, f);
        }
 
        phase++;