Matt McCutchen's Web Site / rsync / rsync.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed some backward-compatibility issues with --files-from.
[rsync/rsync.git] / flist.c
diff --git a/flist.c b/flist.c
index 7a28b73..622fb4e 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -52,6 +52,7 @@ extern int preserve_hard_links;
 extern int preserve_devices;
 extern int preserve_specials;
 extern int missing_args;
+extern int sock_f_in;
 extern int uid_ndx;
 extern int gid_ndx;
 extern int eol_nulls;
@@ -674,8 +675,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
                stats.total_size += F_LENGTH(file);
 }
 
-static struct file_struct *recv_file_entry(struct file_list *flist,
-                                          int xflags, int f)
+static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
 {
        static int64 modtime;
        static mode_t mode;
@@ -732,7 +732,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
                INIT_CONST_XBUF(outbuf, thisname);
                INIT_XBUF(inbuf, lastname, basename_len, (size_t)-1);
 
-               if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) {
+               if (iconvbufs(ic_recv, &inbuf, &outbuf, ICB_INIT) < 0) {
                        io_error |= IOERR_GENERAL;
                        rprintf(FERROR_UTF8,
                            "[%s] cannot convert filename: %s (%s)\n",
@@ -1050,7 +1050,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
                                read_sbuf(f, inbuf.buf, inbuf.len);
                                INIT_XBUF(outbuf, bp, 0, alloc_len);
 
-                               if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) {
+                               if (iconvbufs(ic_recv, &inbuf, &outbuf, ICB_INIT) < 0) {
                                        io_error |= IOERR_GENERAL;
                                        rprintf(FERROR_XFER,
                                            "[%s] cannot convert symlink data for: %s (%s)\n",
@@ -1116,11 +1116,11 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 
 #ifdef SUPPORT_ACLS
        if (preserve_acls && !S_ISLNK(mode))
-               receive_acl(file, f);
+               receive_acl(f, file);
 #endif
 #ifdef SUPPORT_XATTRS
        if (preserve_xattrs)
-               receive_xattr(file, f );
+               receive_xattr(f, file);
 #endif
 
        if (S_ISREG(mode) || S_ISLNK(mode))
@@ -1465,14 +1465,14 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
                        if (file->dirname) {
                                INIT_XBUF_STRLEN(inbuf, (char*)file->dirname);
                                outbuf.size -= 2; /* Reserve room for '/' & 1 more char. */
-                               if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0)
+                               if (iconvbufs(ic_send, &inbuf, &outbuf, ICB_INIT) < 0)
                                        goto convert_error;
                                outbuf.size += 2;
                                fbuf[outbuf.len++] = '/';
                        }
 
                        INIT_XBUF_STRLEN(inbuf, (char*)file->basename);
-                       if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) {
+                       if (iconvbufs(ic_send, &inbuf, &outbuf, ICB_INIT) < 0) {
                          convert_error:
                                io_error |= IOERR_GENERAL;
                                rprintf(FERROR_XFER,
@@ -1486,7 +1486,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
                        if (symlink_len && sender_symlink_iconv) {
                                INIT_XBUF(inbuf, (char*)symlink_name, symlink_len, (size_t)-1);
                                INIT_CONST_XBUF(outbuf, symlink_buf);
-                               if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) {
+                               if (iconvbufs(ic_send, &inbuf, &outbuf, ICB_INIT) < 0) {
                                        io_error |= IOERR_GENERAL;
                                        f_name(file, fbuf);
                                        rprintf(FERROR_XFER,
@@ -1531,13 +1531,13 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 
 #ifdef SUPPORT_ACLS
                if (preserve_acls && !S_ISLNK(file->mode)) {
-                       send_acl(&sx, f);
+                       send_acl(f, &sx);
                        free_acl(&sx);
                }
 #endif
 #ifdef SUPPORT_XATTRS
                if (preserve_xattrs) {
-                       F_XATTR(file) = send_xattr(&sx, f);
+                       F_XATTR(file) = send_xattr(f, &sx);
                        free_xattr(&sx);
                }
 #endif
@@ -2023,6 +2023,8 @@ void send_extra_file_list(int f, int at_least)
                                if ((send_dir_ndx = DIR_PARENT(dp)) < 0) {
                                        write_ndx(f, NDX_FLIST_EOF);
                                        flist_eof = 1;
+                                       if (DEBUG_GTE(FLIST, 3))
+                                               rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
                                        change_local_filter_dir(NULL, 0, 0);
                                        goto finish;
                                }
@@ -2091,6 +2093,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                                full_fname(argv[0]));
                        exit_cleanup(RERR_FILESELECT);
                }
+               if (protocol_version == 30) {
+                       /* Older protocols send the files-from data w/o packaging it in
+                        * multiplexed I/O packets, but protocol 30 messed up and did
+                        * this after starting multiplexing.  We'll temporarily switch
+                        * to buffered I/O to match this behavior. */
+                       io_end_multiplex_in(MPLX_TO_BUFFERED);
+               }
                use_ff_fd = 1;
        }
 
@@ -2296,6 +2305,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        send_file_name(f, flist, fbuf, &st, flags, NO_FILTERS);
        }
 
+       if (use_ff_fd && protocol_version == 30)
+               io_start_multiplex_in(sock_f_in);
+
        gettimeofday(&end_tv, NULL);
        stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
                              + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
@@ -2344,8 +2356,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
        if (numeric_ids <= 0 && !inc_recurse)
                send_id_list(f);
 
-       set_msg_fd_in(-1);
-
        /* send the io_error flag */
        if (protocol_version < 30)
                write_int(f, ignore_errors ? 0 : io_error);
@@ -2353,7 +2363,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                send_msg_int(MSG_IO_ERROR, io_error);
 
        if (disable_buffering)
-               io_end_buffering_out();
+               io_end_buffering_out(IOBUF_FREE_BUFS);
 
        stats.flist_size = stats.total_written - start_write;
        stats.num_files = flist->used;
@@ -2373,6 +2383,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                if (send_dir_ndx < 0) {
                        write_ndx(f, NDX_FLIST_EOF);
                        flist_eof = 1;
+                       if (DEBUG_GTE(FLIST, 3))
+                               rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
                }
                else if (file_total == 1) {
                        /* If we're creating incremental file-lists and there
@@ -2380,8 +2392,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                         * file-list to check if this is a 1-file xfer. */
                        send_extra_file_list(f, 1);
                }
-       } else
+       } else {
                flist_eof = 1;
+               if (DEBUG_GTE(FLIST, 3))
+                       rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
+       }
 
        return flist;
 }
@@ -2441,7 +2456,7 @@ struct file_list *recv_file_list(int f)
                }
 
                flist_expand(flist, 1);
-               file = recv_file_entry(flist, flags, f);
+               file = recv_file_entry(f, flist, flags);
 
                if (S_ISREG(file->mode)) {
                        /* Already counted */
@@ -2510,6 +2525,8 @@ struct file_list *recv_file_list(int f)
        else if (f >= 0) {
                recv_id_list(f, flist);
                flist_eof = 1;
+               if (DEBUG_GTE(FLIST, 3))
+                       rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
        }
 
        flist_sort_and_clean(flist, relative_paths);
@@ -2544,6 +2561,8 @@ void recv_additional_file_list(int f)
        int ndx = read_ndx(f);
        if (ndx == NDX_FLIST_EOF) {
                flist_eof = 1;
+               if (DEBUG_GTE(FLIST, 3))
+                       rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
                change_local_filter_dir(NULL, 0, 0);
        } else {
                ndx = NDX_FLIST_OFFSET - ndx;
Matt McCutchen's repository for rsync, the fast and versatile remote file copier