Changed the -x code to allow -L to copy a file on another filesystem

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index a14320d..ff9d774 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -297,10 +297,9 @@ static void flist_expand(struct file_list *flist)
 
                if (verbose >= 2) {
                        rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
-                               who_am_i(),
-                               (double)sizeof(flist->files[0])
-                               * flist->malloced,
-                               (new_ptr == flist->files) ? " not" : "");
+                           who_am_i(),
+                           (double) sizeof flist->files[0] * flist->malloced,
+                           (new_ptr == flist->files) ? " not" : "");
                }
 
                flist->files = (struct file_struct **) new_ptr;
@@ -767,13 +766,12 @@ struct file_struct *make_file(char *fname, int exclude_level)
                return NULL;
        }
 
-       if (one_file_system && st.st_dev != filesystem_dev) {
-               /* We allow a directory though to preserve the mount point.
-                * However, flag it so that we don't recurse. */
-               if (!S_ISDIR(st.st_mode))
-                       return NULL;
+       /* We only care about directories because we need to avoid recursing
+        * into a mount-point directory, not to avoid copying a symlinked
+        * file if -L (or similar) was specified. */
+       if (one_file_system && st.st_dev != filesystem_dev
+           && S_ISDIR(st.st_mode))
                flags |= FLAG_MOUNT_POINT;
-       }
 
        if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
                return NULL;
@@ -811,9 +809,17 @@ struct file_struct *make_file(char *fname, int exclude_level)
 
 #if SUPPORT_HARD_LINKS
        if (preserve_hard_links) {
-               idev_len = (protocol_version < 28 ? S_ISREG(st.st_mode)
-                         : !S_ISDIR(st.st_mode) && st.st_nlink > 1)
-                        ? sizeof (struct idev) : 0;
+               if (protocol_version < 28) {
+                       if (S_ISREG(st.st_mode))
+                               idev_len = sizeof (struct idev);
+                       else
+                               idev_len = 0;
+               } else {
+                       if (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
+                               idev_len = sizeof (struct idev);
+                       else
+                               idev_len = 0;
+               }
        } else
 #endif
                idev_len = 0;
@@ -1330,7 +1336,7 @@ void free_file(struct file_struct *file, int free_the_struct)
        if (free_the_struct)
                free(file);
        else
-               memset(file, 0, sizeof file[0]);
+               memset(file, 0, min_file_struct_len);
 }
 
 
@@ -1377,7 +1383,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                return;
 
        qsort(flist->files, flist->count,
-             sizeof(flist->files[0]), (int (*)()) file_compare);
+             sizeof flist->files[0], (int (*)()) file_compare);
 
        for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
                if (flist->files[i]->basename) {