Changed the rdev code to have both an "rdev" variable (which always

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 82f2b0a..71897a9 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -91,8 +91,9 @@ void delete_files(struct file_list *flist)
        }
 
        for (j = 0;j < flist->count; j++) {
-               if (!S_ISDIR(flist->files[j]->mode) ||
-                   !(flist->files[j]->flags & FLAG_DELETE)) continue;
+               if (!(flist->files[j]->flags & FLAG_TOP_DIR)
+                   || !S_ISDIR(flist->files[j]->mode))
+                       continue;
 
                argv[0] = f_name_to(flist->files[j], fbuf);
 
@@ -357,8 +358,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 
                if ((fd1 == -1) && (compare_dest != NULL)) {
                        /* try the file at compare_dest instead */
-                       snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
-                                               compare_dest,fname);
+                       pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+                                compare_dest, fname);
                        fnamecmp = fnamecmpbuf;
                        fd1 = do_open(fnamecmp, O_RDONLY, 0);
                }
@@ -479,18 +480,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
            && flist->count > 0)
                delete_files(flist);
 
-       if (preserve_hard_links)
-               do_hard_links();
-
-       /* now we need to fix any directory permissions that were
-        * modified during the transfer */
-       for (i = 0; i < flist->count; i++) {
-               file = flist->files[i];
-               if (!file->basename || !S_ISDIR(file->mode)) continue;
-               recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-                              file, i, -1);
-       }
-
        if (verbose > 2)
                rprintf(FINFO,"recv_files finished\n");