The improved --xattrs option is landing on the trunk.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index a2bbc91..23def37 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -43,6 +43,7 @@ extern int one_file_system;
 extern int copy_dirlinks;
 extern int keep_dirlinks;
 extern int preserve_acls;
+extern int preserve_xattrs;
 extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_devices;
@@ -85,9 +86,9 @@ static dev_t tmp_rdev;
 #ifdef SUPPORT_HARD_LINKS
 static int64 tmp_dev, tmp_ino;
 #endif
-static char tmp_sum[MD4_SUM_LENGTH];
+static char tmp_sum[MAX_DIGEST_LEN];
 
-static char empty_sum[MD4_SUM_LENGTH];
+static char empty_sum[MAX_DIGEST_LEN];
 static int flist_count_offset; /* for --delete --progress */
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
@@ -99,7 +100,9 @@ void init_flist(void)
                rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n",
                        (int)FILE_STRUCT_LEN, (int)EXTRA_LEN);
        }
-       checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
+       checksum_len = protocol_version < 21 ? 2
+                    : protocol_version < 30 ? MD4_DIGEST_LEN
+                    : MD5_DIGEST_LEN;
 }
 
 static int show_filelist_p(void)
@@ -335,8 +338,8 @@ int push_flist_dir(const char *dir, int len)
 
        if (dir && !push_dir(dir, 0)) {
                io_error |= IOERR_GENERAL;
-               rsyserr(FERROR, errno, "push_dir %s failed",
-                       full_fname(dir));
+               rsyserr(FERROR, errno, "push_dir %s failed in %s",
+                       full_fname(dir), curr_dir);
                return 0;
        }
 
@@ -886,6 +889,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
        if (preserve_acls && !S_ISLNK(mode))
                receive_acl(file, f);
 #endif
+#ifdef SUPPORT_XATTRS
+       if (preserve_xattrs)
+               receive_xattr(file, f );
+#endif
 
        if (S_ISREG(mode) || S_ISLNK(mode))
                stats.total_size += file_length;
@@ -1158,7 +1165,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
                                          int flags, int filter_flags)
 {
        struct file_struct *file;
-#ifdef SUPPORT_ACLS
+#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
        statx sx;
 #endif
 
@@ -1177,6 +1184,13 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
                        return NULL;
        }
 #endif
+#ifdef SUPPORT_XATTRS
+       if (preserve_xattrs && f >= 0) {
+               sx.xattr = NULL;
+               if (get_xattr(fname, &sx) < 0)
+                       return NULL;
+       }
+#endif
 
        maybe_emit_filelist_progress(flist->count + flist_count_offset);
 
@@ -1189,6 +1203,12 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
                        send_acl(&sx, f);
                        free_acl(&sx);
                }
+#endif
+#ifdef SUPPORT_XATTRS
+               if (preserve_xattrs) {
+                       F_XATTR(file) = send_xattr(&sx, f);
+                       free_xattr(&sx);
+               }
 #endif
        }
        return file;
@@ -1334,7 +1354,7 @@ void send_extra_file_list(int f, int at_least)
        int64 start_write;
        int future_cnt, save_io_error = io_error;
 
-       if (send_dir_ndx < 0)
+       if (flist_eof)
                return;
 
        /* Keep sending data until we have the requested number of
@@ -1437,8 +1457,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
        disable_buffering = io_start_buffering_out(f);
        if (filesfrom_fd >= 0) {
                if (argv[0] && !push_dir(argv[0], 0)) {
-                       rsyserr(FERROR, errno, "push_dir %s failed",
-                               full_fname(argv[0]));
+                       rsyserr(FERROR, errno, "push_dir %s failed in %s",
+                               full_fname(argv[0]), curr_dir);
                        exit_cleanup(RERR_FILESELECT);
                }
                use_ff_fd = 1;
@@ -1489,18 +1509,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                                   && (len == 1 || fbuf[len-2] == '/');
                }
 
-               if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
-                       io_error |= IOERR_GENERAL;
-                       rsyserr(FERROR, errno, "link_stat %s failed",
-                               full_fname(fbuf));
-                       continue;
-               }
-
-               if (S_ISDIR(st.st_mode) && !xfer_dirs) {
-                       rprintf(FINFO, "skipping directory %s\n", fbuf);
-                       continue;
-               }
-
                dir = NULL;
 
                if (!relative_paths) {
@@ -1578,8 +1586,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        } else if (!push_flist_dir(lastdir, lastdir_len)) {
                          push_error:
                                io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR, errno, "push_dir %s failed",
-                                       full_fname(dir));
+                               rsyserr(FERROR, errno, "push_dir %s failed in %s",
+                                       full_fname(dir), curr_dir);
                                continue;
                        }
                }
@@ -1587,6 +1595,18 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                if (fn != fbuf)
                        memmove(fbuf, fn, len + 1);
 
+               if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+                       io_error |= IOERR_GENERAL;
+                       rsyserr(FERROR, errno, "link_stat %s failed",
+                               full_fname(fbuf));
+                       continue;
+               }
+
+               if (S_ISDIR(st.st_mode) && !xfer_dirs) {
+                       rprintf(FINFO, "skipping directory %s\n", fbuf);
+                       continue;
+               }
+
                if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
                        /* Send the implied directories at the start of the
                         * source spec, so we get their permissions right. */
@@ -1687,14 +1707,15 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
        if (inc_recurse) {
                add_dirs_to_tree(-1, 0, dir_flist->count - 1);
-               if (file_total == 1) {
+               if (send_dir_ndx < 0) {
+                       write_ndx(f, NDX_FLIST_EOF);
+                       flist_eof = 1;
+               }
+               else if (file_total == 1) {
                        /* If we're creating incremental file-lists and there
                         * was just 1 item in the first file-list, send 1 more
                         * file-list to check if this is a 1-file xfer. */
-                       if (send_dir_ndx < 0)
-                               write_ndx(f, NDX_DONE);
-                       else
-                               send_extra_file_list(f, 1);
+                       send_extra_file_list(f, 1);
                }
        }
 
@@ -1803,7 +1824,7 @@ void recv_additional_file_list(int f)
 {
        struct file_list *flist;
        int ndx = read_ndx(f);
-       if (ndx == NDX_DONE) {
+       if (ndx == NDX_FLIST_EOF) {
                flist_eof = 1;
                change_local_filter_dir(NULL, 0, 0);
        } else {