OK, "find ... -print0 | xargs -0 ..." wasn't portable. This is.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 100ae9f..ee18d4d 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -342,7 +342,8 @@ static void flist_expand(struct file_list *flist)
                }
 
                if (verbose >= 2) {
-                       rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
+                       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" : "");
@@ -697,32 +698,6 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 }
 
 
-/* determine if a file in a different filesystem should be skipped
-   when one_file_system is set. We bascally only want to include
-   the mount points - but they can be hard to find! */
-static int skip_filesystem(char *fname, STRUCT_STAT * st)
-{
-       STRUCT_STAT st2;
-       char *p = strrchr(fname, '/');
-
-       /* skip all but directories */
-       if (!S_ISDIR(st->st_mode))
-               return 1;
-
-       /* if its not a subdirectory then allow */
-       if (!p)
-               return 0;
-
-       *p = 0;
-       if (link_stat(fname, &st2)) {
-               *p = '/';
-               return 0;
-       }
-       *p = '/';
-
-       return (st2.st_dev != filesystem_dev);
-}
-
 #define STRDUP(ap, p)  (ap ? string_area_strdup(ap, p) : strdup(p))
 /* IRIX cc cares that the operands to the ternary have the same type. */
 #define MALLOC(ap, i)  (ap ? (void*) string_area_malloc(ap, i) : malloc(i))
@@ -751,6 +726,7 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
        char *p;
        char cleaned_name[MAXPATHLEN];
        char linkbuf[MAXPATHLEN];
+       unsigned short flags = 0;
 
        if (strlcpy(cleaned_name, fname, sizeof cleaned_name)
            >= sizeof cleaned_name - flist_dir_len) {
@@ -791,8 +767,11 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
        }
 
        if (one_file_system && st.st_dev != filesystem_dev) {
-               if (skip_filesystem(fname, &st))
+               /* 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;
+               flags |= FLAG_MOUNT_POINT;
        }
 
        if (check_exclude_file(fname, S_ISDIR(st.st_mode) != 0, exclude_level))
@@ -803,13 +782,16 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 
       skip_excludes:
 
-       if (verbose > 2)
-               rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level);
+       if (verbose > 2) {
+               rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
+                       who_am_i(), fname, exclude_level);
+       }
 
        file = new(struct file_struct);
        if (!file)
                out_of_memory("make_file");
        memset((char *) file, 0, sizeof(*file));
+       file->flags = flags;
 
        if ((p = strrchr(fname, '/'))) {
                static char *lastdir;
@@ -893,7 +875,8 @@ void send_file_name(int f, struct file_list *flist, char *fname,
                send_file_entry(file, f, base_flags);
        }
 
-       if (S_ISDIR(file->mode) && recursive) {
+       if (recursive && S_ISDIR(file->mode)
+           && !(file->flags & FLAG_MOUNT_POINT)) {
                struct exclude_struct **last_exclude_list = local_exclude_list;
                send_directory(f, flist, f_name_to(file, fbuf));
                local_exclude_list = last_exclude_list;
@@ -1117,8 +1100,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                                flist_dir = lastdir;
                                flist_dir_len = lastdir_len;
                        } else {
-                               if (lastdir)
-                                       free(lastdir);
                                flist_dir = lastdir = strdup(dir);
                                flist_dir_len = lastdir_len = strlen(dir);
                        }
@@ -1436,8 +1417,9 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                return;
 
        for (i = 0; i < flist->count; i++) {
-               rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n",
-                       (long) getpid(), i,
+               rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n",
+                       who_am_i(), i,
+                       NS(flist->files[i]->basedir),
                        NS(flist->files[i]->dirname),
                        NS(flist->files[i]->basename),
                        (int) flist->files[i]->mode,