New -x code had some problems, so restore the old code for now.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 82040c1..1a22794 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -83,9 +83,7 @@ extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
 extern int max_delete;
 extern int force_delete;
-extern int one_file_system;
 extern struct stats stats;
-extern dev_t filesystem_dev;
 extern char *backup_dir;
 extern char *backup_suffix;
 extern int backup_suffix_len;
@@ -224,7 +222,6 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
        static int already_warned = 0;
        struct file_list *dirlist;
        char delbuf[MAXPATHLEN];
-       STRUCT_STAT st;
        int dlen, i;
 
        if (!flist) {
@@ -261,27 +258,26 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
        dlen = strlen(fbuf);
        filt_array[cur_depth] = push_local_filters(fbuf, dlen);
 
-       if (link_stat(fbuf, &st, keep_dirlinks) < 0)
+       if (file->flags & FLAG_MOUNT_POINT)
                return;
 
-       if (one_file_system) {
-               if (file->flags & FLAG_TOP_DIR)
-                       filesystem_dev = st.st_dev;
-               else if (filesystem_dev != st.st_dev)
-                       return;
-       }
-
        dirlist = get_dirlist(fbuf, dlen, 0);
 
        /* If an item in dirlist is not found in flist, delete it
         * from the filesystem. */
        for (i = dirlist->count; i--; ) {
                struct file_struct *fp = dirlist->files[i];
-               if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
+               if (!fp->basename)
                        continue;
+               if (fp->flags & FLAG_MOUNT_POINT) {
+                       int j = flist_find(flist, fp);
+                       if (j >= 0)
+                               flist->files[j]->flags |= FLAG_MOUNT_POINT;
+                       continue;
+               }
                if (flist_find(flist, fp) < 0) {
                        int mode = fp->mode;
-                       f_name_to(fp, delbuf);
+                       f_name(fp, delbuf);
                        delete_item(delbuf, mode, DEL_FORCE_RECURSE);
                }
        }
@@ -294,6 +290,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 static void do_delete_pass(struct file_list *flist)
 {
        char fbuf[MAXPATHLEN];
+       STRUCT_STAT st;
        int j;
 
        if (dry_run > 1 /* destination doesn't exist yet */
@@ -306,10 +303,14 @@ static void do_delete_pass(struct file_list *flist)
                if (!(file->flags & FLAG_DEL_HERE))
                        continue;
 
-               f_name_to(file, fbuf);
+               f_name(file, fbuf);
                if (verbose > 1 && file->flags & FLAG_TOP_DIR)
                        rprintf(FINFO, "deleting in %s\n", fbuf);
 
+               if (link_stat(fbuf, &st, keep_dirlinks) < 0
+                || !S_ISDIR(st.st_mode))
+                       continue;
+
                delete_in_dir(flist, fbuf, file);
        }
        delete_in_dir(NULL, NULL, NULL);
@@ -360,7 +361,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 
        iflags &= 0xffff;
        if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
-         || (xname && *xname)) && !read_batch) {
+         || log_format_has_i > 1 || (xname && *xname)) && !read_batch) {
                if (protocol_version >= 29) {
                        if (ndx >= 0)
                                write_int(sock_f_out, ndx);
@@ -715,10 +716,12 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                 || !unchanged_attrs(file, &st))
                        continue;
                if (S_ISLNK(file->mode)) {
+#ifdef SUPPORT_LINKS
                        if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
                                continue;
                        lnk[len] = '\0';
                        if (strcmp(lnk, file->u.link) != 0)
+#endif
                                continue;
                } else {
                        if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
@@ -906,7 +909,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
                        if (verbose) {
                                if (the_file_list->count == 1)
-                                       fname = f_name(file);
+                                       fname = f_name(file, NULL);
                                rprintf(FINFO,
                                        "ignoring unsafe symlink %s -> \"%s\"\n",
                                        full_fname(fname), file->u.link);
@@ -1039,7 +1042,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
        if (!S_ISREG(file->mode)) {
                if (the_file_list->count == 1)
-                       fname = f_name(file);
+                       fname = f_name(file, NULL);
                rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
                return;
        }
@@ -1047,7 +1050,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        if (max_size && file->length > max_size) {
                if (verbose > 1) {
                        if (the_file_list->count == 1)
-                               fname = f_name(file);
+                               fname = f_name(file, NULL);
                        rprintf(FINFO, "%s is over max-size\n", fname);
                }
                return;
@@ -1055,7 +1058,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        if (min_size && file->length < min_size) {
                if (verbose > 1) {
                        if (the_file_list->count == 1)
-                               fname = f_name(file);
+                               fname = f_name(file, NULL);
                        rprintf(FINFO, "%s is under min-size\n", fname);
                }
                return;
@@ -1111,7 +1114,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                int j = find_fuzzy(file, fuzzy_dirlist);
                if (j >= 0) {
                        fuzzy_file = fuzzy_dirlist->files[j];
-                       f_name_to(fuzzy_file, fnamecmpbuf);
+                       f_name(fuzzy_file, fnamecmpbuf);
                        if (verbose > 2) {
                                rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
                                        fname, fnamecmpbuf);
@@ -1195,7 +1198,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        close(fd);
                        return;
                }
-               if (!(back_file = make_file(fname, NULL, NO_FILTERS))) {
+               if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
                        close(fd);
                        goto pretend_missing;
                }
@@ -1267,7 +1270,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        close(fd);
 }
 
-
 void generate_files(int f_out, struct file_list *flist, char *local_name)
 {
        int i;
@@ -1333,7 +1335,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                if (local_name)
                        strlcpy(fbuf, local_name, sizeof fbuf);
                else
-                       f_name_to(file, fbuf);
+                       f_name(file, fbuf);
                recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
                               code, f_out);
 
@@ -1387,7 +1389,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                if (local_name)
                        strlcpy(fbuf, local_name, sizeof fbuf);
                else
-                       f_name_to(file, fbuf);
+                       f_name(file, fbuf);
                recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
                               code, f_out);
        }
@@ -1430,11 +1432,12 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                 * modified-time values. */
                for (i = 0; i < flist->count; i++) {
                        struct file_struct *file = flist->files[i];
+
                        if (!file->basename || !S_ISDIR(file->mode))
                                continue;
                        if (!need_retouch_dir_times && file->mode & S_IWUSR)
                                continue;
-                       recv_generator(f_name(file), file, i, itemizing,
+                       recv_generator(f_name(file, NULL), file, i, itemizing,
                                       maybe_PERMS_REPORT, code, -1);
                        if (allowed_lull && !(++j % lull_mod))
                                maybe_send_keepalive();