Changed human_num() to big_num() with an extra arg so that it can
[rsync/rsync.git] / receiver.c
index a574ea6..05ac184 100644 (file)
-/* -*- c-file-style: "linux" -*-
-   
-   Copyright (C) 1996-2000 by Andrew Tridgell
-   Copyright (C) Paul Mackerras 1996
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/*
+ * Routines only used by the receiving process.
+ *
+ * Copyright (C) 1996-2000 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2003-2008 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
+ */
 
 #include "rsync.h"
 
-extern int verbose;
-extern int recurse;
-extern int delete_mode;
-extern int remote_version;
-extern int csum_length;
-extern struct stats stats;
 extern int dry_run;
+extern int do_xfers;
 extern int am_server;
+extern int inc_recurse;
+extern int log_before_transfer;
+extern int stdout_format_has_i;
+extern int logfile_format_has_i;
+extern int csum_length;
+extern int read_batch;
+extern int write_batch;
+extern int batch_gen_fd;
+extern int protocol_version;
 extern int relative_paths;
 extern int preserve_hard_links;
-extern int cvs_exclude;
-extern int io_error;
-extern char *tmpdir;
-extern char *compare_dest;
+extern int preserve_perms;
+extern int preserve_xattrs;
+extern int basis_dir_cnt;
 extern int make_backups;
-extern char *backup_suffix;
-
-static struct delete_list {
-       DEV64_T dev;
-       INO64_T inode;
-} *delete_list;
-static int dlist_len, dlist_alloc_len;
-
-/* yuck! This function wouldn't have been necessary if I had the sorting
-   algorithm right. Unfortunately fixing the sorting algorithm would introduce
-   a backward incompatibility as file list indexes are sent over the link.
-*/
-static int delete_already_done(struct file_list *flist,int j)
+extern int cleanup_got_literal;
+extern int remove_source_files;
+extern int append_mode;
+extern int sparse_files;
+extern int keep_partial;
+extern int checksum_seed;
+extern int inplace;
+extern int delay_updates;
+extern mode_t orig_umask;
+extern struct stats stats;
+extern char *tmpdir;
+extern char *partial_dir;
+extern char *basis_dir[];
+extern struct file_list *cur_flist, *first_flist, *dir_flist;
+extern struct filter_list_struct daemon_filter_list;
+
+static struct bitbag *delayed_bits = NULL;
+static int phase = 0, redoing = 0;
+/* We're either updating the basis file or an identical copy: */
+static int updating_basis_or_equiv;
+
+/*
+ * get_tmpname() - create a tmp filename for a given filename
+ *
+ *   If a tmpdir is defined, use that as the directory to
+ *   put it in.  Otherwise, the tmp filename is in the same
+ *   directory as the given name.  Note that there may be no
+ *   directory at all in the given name!
+ *
+ *   The tmp filename is basically the given filename with a
+ *   dot prepended, and .XXXXXX appended (for mkstemp() to
+ *   put its unique gunk in).  Take care to not exceed
+ *   either the MAXPATHLEN or NAME_MAX, esp. the last, as
+ *   the basename basically becomes 8 chars longer. In that
+ *   case, the original name is shortened sufficiently to
+ *   make it all fit.
+ *
+ *   Of course, there's no real reason for the tmp name to
+ *   look like the original, except to satisfy us humans.
+ *   As long as it's unique, rsync will work.
+ */
+
+int get_tmpname(char *fnametmp, const char *fname)
 {
-       int i;
-       STRUCT_STAT st;
+       int maxname, added, length = 0;
+       const char *f;
 
-       if (link_stat(f_name(flist->files[j]), &st)) return 1;
+       if (tmpdir) {
+               /* Note: this can't overflow, so the return value is safe */
+               length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
+               fnametmp[length++] = '/';
+       }
+
+       if ((f = strrchr(fname, '/')) != NULL) {
+               ++f;
+               if (!tmpdir) {
+                       length = f - fname;
+                       /* copy up to and including the slash */
+                       strlcpy(fnametmp, fname, length + 1);
+               }
+       } else
+               f = fname;
+       fnametmp[length++] = '.';
 
-       for (i=0;i<dlist_len;i++) {
-               if (st.st_ino == delete_list[i].inode &&
-                   st.st_dev == delete_list[i].dev)
-                       return 1;
+       /* The maxname value is bufsize, and includes space for the '\0'.
+        * (Note that NAME_MAX get -8 for the leading '.' above.) */
+       maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
+
+       if (maxname < 1) {
+               rprintf(FERROR_XFER, "temporary filename too long: %s\n", fname);
+               fnametmp[0] = '\0';
+               return 0;
        }
 
-       return 0;
+       added = strlcpy(fnametmp + length, f, maxname);
+       if (added >= maxname)
+               added = maxname - 1;
+       memcpy(fnametmp + length + added, ".XXXXXX", 8);
+
+       return 1;
 }
 
-static void add_delete_entry(struct file_struct *file)
+/* Opens a temporary file for writing.
+ * Success: Writes name into fnametmp, returns fd.
+ * Failure: Clobbers fnametmp, returns -1.
+ * Calling cleanup_set() is the caller's job. */
+int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
 {
-       if (dlist_len == dlist_alloc_len) {
-               dlist_alloc_len += 1024;
-               delete_list = (struct delete_list *)Realloc(delete_list, sizeof(delete_list[0])*dlist_alloc_len);
-               if (!delete_list) out_of_memory("add_delete_entry");
+       int fd;
+
+       if (!get_tmpname(fnametmp, fname))
+               return -1;
+
+       /* We initially set the perms without the setuid/setgid bits or group
+        * access to ensure that there is no race condition.  They will be
+        * correctly updated after the right owner and group info is set.
+        * (Thanks to snabb@epipe.fi for pointing this out.) */
+       fd = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
+
+#if 0
+       /* In most cases parent directories will already exist because their
+        * information should have been previously transferred, but that may
+        * not be the case with -R */
+       if (fd == -1 && relative_paths && errno == ENOENT
+           && create_directory_path(fnametmp) == 0) {
+               /* Get back to name with XXXXXX in it. */
+               get_tmpname(fnametmp, fname);
+               fd = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
        }
+#endif
 
-       delete_list[dlist_len].dev = file->dev;
-       delete_list[dlist_len].inode = file->inode;
-       dlist_len++;
+       if (fd == -1) {
+               rsyserr(FERROR_XFER, errno, "mkstemp %s failed",
+                       full_fname(fnametmp));
+               return -1;
+       }
 
-       if (verbose > 3)
-               rprintf(FINFO,"added %s to delete list\n", f_name(file));
+       return fd;
 }
 
-static void delete_one(struct file_struct *f)
+static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+                       const char *fname, int fd, OFF_T total_size)
 {
-       if (!S_ISDIR(f->mode)) {
-               if (robust_unlink(f_name(f)) != 0) {
-                       rprintf(FERROR,"delete_one: unlink %s: %s\n",f_name(f),strerror(errno));
-               } else if (verbose) {
-                       rprintf(FINFO,"deleting %s\n",f_name(f));
+       static char file_sum1[MAX_DIGEST_LEN];
+       static char file_sum2[MAX_DIGEST_LEN];
+       struct map_struct *mapbuf;
+       struct sum_struct sum;
+       int32 len, sum_len;
+       OFF_T offset = 0;
+       OFF_T offset2;
+       char *data;
+       int32 i;
+       char *map = NULL;
+
+       read_sum_head(f_in, &sum);
+
+       if (fd_r >= 0 && size_r > 0) {
+               int32 read_size = MAX(sum.blength * 2, 16*1024);
+               mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
+               if (DEBUG_GTE(CHKSUM, 2)) {
+                       rprintf(FINFO, "recv mapped %s of size %s\n",
+                               fname_r, big_num(size_r, 0));
                }
-       } else {    
-               if (do_rmdir(f_name(f)) != 0) {
-                       if (errno != ENOTEMPTY && errno != EEXIST)
-                               rprintf(FERROR,"delete_one: rmdir %s: %s\n",
-                                        f_name(f), strerror(errno));
-               } else if (verbose) {
-                       rprintf(FINFO,"deleting directory %s\n",f_name(f));      
+       } else
+               mapbuf = NULL;
+
+       sum_init(checksum_seed);
+
+       if (append_mode > 0) {
+               OFF_T j;
+               sum.flength = (OFF_T)sum.count * sum.blength;
+               if (sum.remainder)
+                       sum.flength -= sum.blength - sum.remainder;
+               if (append_mode == 2) {
+                       for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
+                               if (INFO_GTE(PROGRESS, 1))
+                                       show_progress(offset, total_size);
+                               sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
+                                          CHUNK_SIZE);
+                               offset = j;
+                       }
+                       if (offset < sum.flength) {
+                               int32 len = (int32)(sum.flength - offset);
+                               if (INFO_GTE(PROGRESS, 1))
+                                       show_progress(offset, total_size);
+                               sum_update(map_ptr(mapbuf, offset, len), len);
+                       }
+               }
+               offset = sum.flength;
+               if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
+                       rsyserr(FERROR_XFER, errno, "lseek of %s returned %s, not %s",
+                               full_fname(fname), big_num(j, 0), big_num(offset, 0));
+                       exit_cleanup(RERR_FILEIO);
                }
        }
-}
 
+       while ((i = recv_token(f_in, &data)) != 0) {
+               if (INFO_GTE(PROGRESS, 1))
+                       show_progress(offset, total_size);
 
+               if (i > 0) {
+                       if (DEBUG_GTE(CHKSUM, 3)) {
+                               rprintf(FINFO,"data recv %d at %s\n",
+                                       i, big_num(offset, 0));
+                       }
 
+                       stats.literal_data += i;
+                       cleanup_got_literal = 1;
 
-/* this deletes any files on the receiving side that are not present
-   on the sending side. For version 1.6.4 I have changed the behaviour
-   to match more closely what most people seem to expect of this option */
-void delete_files(struct file_list *flist)
-{
-       struct file_list *local_file_list;
-       int i, j;
-       char *name;
-       extern int module_id;
-       extern int ignore_errors;
-       extern int max_delete;
-       static int deletion_count;
-
-       if (cvs_exclude)
-               add_cvs_excludes();
-
-       if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
-               rprintf(FINFO,"IO error encountered - skipping file deletion\n");
-               return;
-       }
+                       sum_update(data, i);
 
-       for (j=0;j<flist->count;j++) {
-               if (!S_ISDIR(flist->files[j]->mode) || 
-                   !(flist->files[j]->flags & FLAG_DELETE)) continue;
+                       if (fd != -1 && write_file(fd,data,i) != i)
+                               goto report_write_error;
+                       offset += i;
+                       continue;
+               }
 
-               if (remote_version < 19 &&
-                   delete_already_done(flist, j)) continue;
+               i = -(i+1);
+               offset2 = i * (OFF_T)sum.blength;
+               len = sum.blength;
+               if (i == (int)sum.count-1 && sum.remainder != 0)
+                       len = sum.remainder;
 
-               name = strdup(f_name(flist->files[j]));
+               stats.matched_data += len;
 
-               if (!(local_file_list = send_file_list(-1,1,&name))) {
-                       free(name);
-                       continue;
+               if (DEBUG_GTE(CHKSUM, 3)) {
+                       rprintf(FINFO,
+                               "chunk[%d] of size %ld at %s offset=%s\n",
+                               i, (long)len, big_num(offset2, 0), big_num(offset, 0));
                }
 
-               if (verbose > 1)
-                       rprintf(FINFO,"deleting in %s\n", name);
-
-               for (i=local_file_list->count-1;i>=0;i--) {
-                       if (max_delete && deletion_count > max_delete) break;
-                       if (!local_file_list->files[i]->basename) continue;
-                       if (remote_version < 19 &&
-                           S_ISDIR(local_file_list->files[i]->mode))
-                               add_delete_entry(local_file_list->files[i]);
-                       if (-1 == flist_find(flist,local_file_list->files[i])) {
-                               char *f = f_name(local_file_list->files[i]);
-                               int k = strlen(f) - strlen(backup_suffix);
-/* Hi Andrew, do we really need to play with backup_suffix here? */
-                               if (make_backups && ((k <= 0) ||
-                                           (strcmp(f+k,backup_suffix) != 0))) {
-                                       (void) make_backup(f);
-                               } else {
-                                       deletion_count++;
-                                       delete_one(local_file_list->files[i]);
+               if (mapbuf) {
+                       map = map_ptr(mapbuf,offset2,len);
+
+                       see_token(map, len);
+                       sum_update(map, len);
+               }
+
+               if (updating_basis_or_equiv) {
+                       if (offset == offset2 && fd != -1) {
+                               OFF_T pos;
+                               if (flush_write_file(fd) < 0)
+                                       goto report_write_error;
+                               offset += len;
+                               if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) {
+                                       rsyserr(FERROR_XFER, errno,
+                                               "lseek of %s returned %s, not %s",
+                                               full_fname(fname),
+                                               big_num(pos, 0), big_num(offset, 0));
+                                       exit_cleanup(RERR_FILEIO);
                                }
+                               continue;
                        }
                }
-               flist_free(local_file_list);
-               free(name);
+               if (fd != -1 && map && write_file(fd, map, len) != (int)len)
+                       goto report_write_error;
+               offset += len;
        }
-}
 
+       if (flush_write_file(fd) < 0)
+               goto report_write_error;
 
-static int get_tmpname(char *fnametmp, char *fname)
-{
-       char *f;
+#ifdef HAVE_FTRUNCATE
+       if (inplace && fd != -1)
+               ftruncate(fd, offset);
+#endif
 
-       /* open tmp file */
-       if (tmpdir) {
-               f = strrchr(fname,'/');
-               if (f == NULL) 
-                       f = fname;
-               else 
-                       f++;
-               if (strlen(tmpdir)+strlen(f)+10 > MAXPATHLEN) {
-                       rprintf(FERROR,"filename too long\n");
-                       return 0;
-               }
-               snprintf(fnametmp,MAXPATHLEN, "%s/.%s.XXXXXX",tmpdir,f);
-               return 1;
-       } 
+       if (INFO_GTE(PROGRESS, 1))
+               end_progress(total_size);
 
-       f = strrchr(fname,'/');
-
-       if (strlen(fname)+9 > MAXPATHLEN) {
-               rprintf(FERROR,"filename too long\n");
-               return 0;
+       if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
+           report_write_error:
+               rsyserr(FERROR_XFER, errno, "write failed on %s",
+                       full_fname(fname));
+               exit_cleanup(RERR_FILEIO);
        }
 
-       if (f) {
-               *f = 0;
-               snprintf(fnametmp,MAXPATHLEN,"%s/.%s.XXXXXX",
-                        fname,f+1);
-               *f = '/';
-       } else {
-               snprintf(fnametmp,MAXPATHLEN,".%s.XXXXXX",fname);
-       }
+       sum_len = sum_end(file_sum1);
 
+       if (mapbuf)
+               unmap_file(mapbuf);
+
+       read_buf(f_in, file_sum2, sum_len);
+       if (DEBUG_GTE(CHKSUM, 2))
+               rprintf(FINFO,"got file_sum\n");
+       if (fd != -1 && memcmp(file_sum1, file_sum2, sum_len) != 0)
+               return 0;
        return 1;
 }
 
 
-static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
-                       OFF_T total_size)
+static void discard_receive_data(int f_in, OFF_T length)
 {
-       int i,n,remainder,len,count;
-       OFF_T offset = 0;
-       OFF_T offset2;
-       char *data;
-       static char file_sum1[MD4_SUM_LENGTH];
-       static char file_sum2[MD4_SUM_LENGTH];
-       char *map=NULL;
-       
-       count = read_int(f_in);
-       n = read_int(f_in);
-       remainder = read_int(f_in);
-       
-       sum_init();
-       
-       for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) {
-
-               show_progress(offset, total_size);
-
-               if (i > 0) {
-                       extern int cleanup_got_literal;
+       receive_data(f_in, NULL, -1, 0, NULL, -1, length);
+}
 
-                       if (verbose > 3) {
-                               rprintf(FINFO,"data recv %d at %.0f\n",
-                                       i,(double)offset);
+static void handle_delayed_updates(char *local_name)
+{
+       char *fname, *partialptr;
+       int ndx;
+
+       for (ndx = -1; (ndx = bitbag_next_bit(delayed_bits, ndx)) >= 0; ) {
+               struct file_struct *file = cur_flist->files[ndx];
+               fname = local_name ? local_name : f_name(file, NULL);
+               if ((partialptr = partial_dir_fname(fname)) != NULL) {
+                       if (make_backups > 0 && !make_backup(fname))
+                               continue;
+                       if (DEBUG_GTE(RECV, 1)) {
+                               rprintf(FINFO, "renaming %s to %s\n",
+                                       partialptr, fname);
                        }
-
-                       stats.literal_data += i;
-                       cleanup_got_literal = 1;
-      
-                       sum_update(data,i);
-
-                       if (fd != -1 && write_file(fd,data,i) != i) {
-                               rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
-                               exit_cleanup(RERR_FILEIO);
+                       /* We don't use robust_rename() here because the
+                        * partial-dir must be on the same drive. */
+                       if (do_rename(partialptr, fname) < 0) {
+                               rsyserr(FERROR_XFER, errno,
+                                       "rename failed for %s (from %s)",
+                                       full_fname(fname), partialptr);
+                       } else {
+                               if (remove_source_files
+                                || (preserve_hard_links && F_IS_HLINKED(file)))
+                                       send_msg_int(MSG_SUCCESS, ndx);
+                               handle_partial_dir(partialptr, PDIR_DELETE);
                        }
-                       offset += i;
-                       continue;
-               } 
-
-               i = -(i+1);
-               offset2 = i*(OFF_T)n;
-               len = n;
-               if (i == count-1 && remainder != 0)
-                       len = remainder;
-               
-               stats.matched_data += len;
-               
-               if (verbose > 3)
-                       rprintf(FINFO,"chunk[%d] of size %d at %.0f offset=%.0f\n",
-                               i,len,(double)offset2,(double)offset);
-               
-               if (buf) {
-                       map = map_ptr(buf,offset2,len);
-               
-                       see_token(map, len);
-                       sum_update(map,len);
-               }
-               
-               if (fd != -1 && write_file(fd,map,len) != len) {
-                       rprintf(FERROR,"write failed on %s : %s\n",
-                               fname,strerror(errno));
-                       exit_cleanup(RERR_FILEIO);
                }
-               offset += len;
        }
+}
 
-       end_progress(total_size);
-
-       if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
-               rprintf(FERROR,"write failed on %s : %s\n",
-                       fname,strerror(errno));
-               exit_cleanup(RERR_FILEIO);
-       }
-
-       sum_end(file_sum1);
-
-       if (remote_version >= 14) {
-               read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
-               if (verbose > 2) {
-                       rprintf(FINFO,"got file_sum\n");
+static int get_next_gen_ndx(int fd, int next_gen_ndx, int desired_ndx)
+{
+       while (next_gen_ndx < desired_ndx) {
+               if (next_gen_ndx >= 0) {
+                       struct file_struct *file = cur_flist->files[next_gen_ndx];
+                       rprintf(FERROR_XFER,
+                               "(No batched update for%s \"%s\")\n",
+                               file->flags & FLAG_FILE_SENT ? " resend of" : "",
+                               f_name(file, NULL));
                }
-               if (fd != -1 && 
-                   memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) {
-                       return 0;
+               next_gen_ndx = read_int(fd);
+               if (next_gen_ndx == -1) {
+                       if (inc_recurse)
+                               next_gen_ndx = first_flist->prev->used + first_flist->prev->ndx_start;
+                       else
+                               next_gen_ndx = cur_flist->used;
                }
        }
-       return 1;
+       return next_gen_ndx;
 }
 
-
-/* main routine for receiver process. Receiver process runs on the
-       same host as the generator process. */
-
-int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
-{  
+/**
+ * main routine for receiver process.
+ *
+ * Receiver process runs on the same host as the generator process. */
+int recv_files(int f_in, char *local_name)
+{
+       int next_gen_ndx = -1;
        int fd1,fd2;
        STRUCT_STAT st;
-       char *fname;
-       char template[MAXPATHLEN];
+       int iflags, xlen;
+       char *fname, fbuf[MAXPATHLEN];
+       char xname[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];
-       char *fnamecmp;
+       char *fnamecmp, *partialptr;
        char fnamecmpbuf[MAXPATHLEN];
-       struct map_struct *buf;
-       int i;
+       uchar fnamecmp_type;
        struct file_struct *file;
-       int phase=0;
-       int recv_ok;
-       extern struct stats stats;              
-       extern int preserve_perms;
-       extern int delete_after;
        struct stats initial_stats;
-
-       if (verbose > 2) {
-               rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
-       }
-
-       while (1) {      
+       int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
+       enum logcode log_code = log_before_transfer ? FLOG : FINFO;
+       int max_phase = protocol_version >= 29 ? 2 : 1;
+       int dflt_perms = (ACCESSPERMS & ~orig_umask);
+#ifdef SUPPORT_ACLS
+       const char *parent_dirname = "";
+#endif
+       int ndx, recv_ok;
+
+       if (DEBUG_GTE(RECV, 1))
+               rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
+
+       if (delay_updates)
+               delayed_bits = bitbag_create(cur_flist->used + 1);
+
+       while (1) {
                cleanup_disable();
 
-               i = read_int(f_in);
-               if (i == -1) {
-                       if (phase==0 && remote_version >= 13) {
-                               phase++;
-                               csum_length = SUM_LENGTH;
-                               if (verbose > 2)
-                                       rprintf(FINFO,"recv_files phase=%d\n",phase);
-                               write_int(f_gen,-1);
-                               continue;
+               /* This call also sets cur_flist. */
+               ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+                                        xname, &xlen);
+               if (ndx == NDX_DONE) {
+                       if (!am_server && INFO_GTE(PROGRESS, 2) && cur_flist) {
+                               set_current_file_index(NULL, 0);
+                               end_progress(0);
                        }
-                       break;
+                       if (inc_recurse && first_flist) {
+                               flist_free(first_flist);
+                               if (first_flist)
+                                       continue;
+                       }
+                       if (read_batch && cur_flist) {
+                               int high = inc_recurse
+                                   ? first_flist->prev->used + first_flist->prev->ndx_start
+                                   : cur_flist->used;
+                               get_next_gen_ndx(batch_gen_fd, next_gen_ndx, high);
+                               next_gen_ndx = -1;
+                       }
+                       if (++phase > max_phase)
+                               break;
+                       if (DEBUG_GTE(RECV, 1))
+                               rprintf(FINFO, "recv_files phase=%d\n", phase);
+                       if (phase == 2 && delay_updates)
+                               handle_delayed_updates(local_name);
+                       send_msg(MSG_DONE, "", 0, 0);
+                       continue;
                }
 
-               if (i < 0 || i >= flist->count) {
-                       rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n", 
-                               i, flist->count);
+               if (ndx - cur_flist->ndx_start >= 0)
+                       file = cur_flist->files[ndx - cur_flist->ndx_start];
+               else
+                       file = dir_flist->files[cur_flist->parent_ndx];
+               fname = local_name ? local_name : f_name(file, fbuf);
+
+               if (DEBUG_GTE(RECV, 1))
+                       rprintf(FINFO, "recv_files(%s)\n", fname);
+
+#ifdef SUPPORT_XATTRS
+               if (iflags & ITEM_REPORT_XATTR && !dry_run)
+                       recv_xattr_request(file, f_in);
+#endif
+
+               if (!(iflags & ITEM_TRANSFER)) {
+                       maybe_log_item(file, iflags, itemizing, xname);
+#ifdef SUPPORT_XATTRS
+                       if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+                               set_file_attrs(fname, file, NULL, fname, 0);
+#endif
+                       continue;
+               }
+               if (phase == 2) {
+                       rprintf(FERROR,
+                               "got transfer request in phase 2 [%s]\n",
+                               who_am_i());
                        exit_cleanup(RERR_PROTOCOL);
                }
 
-               file = flist->files[i];
-               fname = f_name(file);
+               if (file->flags & FLAG_FILE_SENT) {
+                       if (csum_length == SHORT_SUM_LENGTH) {
+                               if (keep_partial && !partial_dir)
+                                       make_backups = -make_backups; /* prevents double backup */
+                               if (append_mode)
+                                       sparse_files = -sparse_files;
+                               append_mode = -append_mode;
+                               csum_length = SUM_LENGTH;
+                               redoing = 1;
+                       }
+               } else {
+                       if (csum_length != SHORT_SUM_LENGTH) {
+                               if (keep_partial && !partial_dir)
+                                       make_backups = -make_backups;
+                               if (append_mode)
+                                       sparse_files = -sparse_files;
+                               append_mode = -append_mode;
+                               csum_length = SHORT_SUM_LENGTH;
+                               redoing = 0;
+                       }
+               }
 
+               if (!am_server && INFO_GTE(PROGRESS, 1))
+                       set_current_file_index(file, ndx);
                stats.num_transferred_files++;
-               stats.total_transferred_size += file->length;
+               stats.total_transferred_size += F_LENGTH(file);
 
-               if (local_name)
-                       fname = local_name;
+               cleanup_got_literal = 0;
 
-               if (dry_run) {
-                       if (!am_server) {
-                               log_transfer(file, fname);
-                       }
+               if (daemon_filter_list.head
+                   && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
+                       rprintf(FERROR, "attempt to hack rsync failed.\n");
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+
+               if (!do_xfers) { /* log the transfer */
+                       log_item(FCLIENT, file, &stats, iflags, NULL);
+                       if (read_batch)
+                               discard_receive_data(f_in, F_LENGTH(file));
+                       continue;
+               }
+               if (write_batch < 0) {
+                       log_item(FCLIENT, file, &stats, iflags, NULL);
+                       if (!am_server)
+                               discard_receive_data(f_in, F_LENGTH(file));
                        continue;
                }
 
-               initial_stats = stats;
+               if (read_batch) {
+                       next_gen_ndx = get_next_gen_ndx(batch_gen_fd, next_gen_ndx, ndx);
+                       if (ndx < next_gen_ndx) {
+                               rprintf(FINFO,
+                                       "(Skipping batched update for \"%s\")\n",
+                                       fname);
+                               discard_receive_data(f_in, F_LENGTH(file));
+                               if (inc_recurse)
+                                       send_msg_int(MSG_NO_SEND, ndx);
+                               continue;
+                       }
+                       next_gen_ndx = -1;
+               }
 
-               if (verbose > 2)
-                       rprintf(FINFO,"recv_files(%s)\n",fname);
+               partialptr = partial_dir ? partial_dir_fname(fname) : fname;
+
+               if (protocol_version >= 29) {
+                       switch (fnamecmp_type) {
+                       case FNAMECMP_FNAME:
+                               fnamecmp = fname;
+                               break;
+                       case FNAMECMP_PARTIAL_DIR:
+                               fnamecmp = partialptr;
+                               break;
+                       case FNAMECMP_BACKUP:
+                               fnamecmp = get_backup_name(fname);
+                               break;
+                       case FNAMECMP_FUZZY:
+                               if (file->dirname) {
+                                       pathjoin(fnamecmpbuf, MAXPATHLEN,
+                                                file->dirname, xname);
+                                       fnamecmp = fnamecmpbuf;
+                               } else
+                                       fnamecmp = xname;
+                               break;
+                       default:
+                               if (fnamecmp_type >= basis_dir_cnt) {
+                                       rprintf(FERROR,
+                                               "invalid basis_dir index: %d.\n",
+                                               fnamecmp_type);
+                                       exit_cleanup(RERR_PROTOCOL);
+                               }
+                               pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+                                        basis_dir[fnamecmp_type], fname);
+                               fnamecmp = fnamecmpbuf;
+                               break;
+                       }
+                       if (!fnamecmp || (daemon_filter_list.head
+                         && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
+                               fnamecmp = fname;
+                               fnamecmp_type = FNAMECMP_FNAME;
+                       }
+               } else {
+                       /* Reminder: --inplace && --partial-dir are never
+                        * enabled at the same time. */
+                       if (inplace && make_backups > 0) {
+                               if (!(fnamecmp = get_backup_name(fname)))
+                                       fnamecmp = fname;
+                               else
+                                       fnamecmp_type = FNAMECMP_BACKUP;
+                       } else if (partial_dir && partialptr)
+                               fnamecmp = partialptr;
+                       else
+                               fnamecmp = fname;
+               }
 
-               fnamecmp = fname;
+               initial_stats = stats;
 
-               /* open the file */  
+               /* open the file */
                fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
-               if ((fd1 == -1) && (compare_dest != NULL)) {
-                       /* try the file at compare_dest instead */
-                       snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
-                                               compare_dest,fname);
-                       fnamecmp = fnamecmpbuf;
-                       fd1 = do_open(fnamecmp, O_RDONLY, 0);
+               if (fd1 == -1 && protocol_version < 29) {
+                       if (fnamecmp != fname) {
+                               fnamecmp = fname;
+                               fd1 = do_open(fnamecmp, O_RDONLY, 0);
+                       }
+
+                       if (fd1 == -1 && basis_dir[0]) {
+                               /* pre-29 allowed only one alternate basis */
+                               pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+                                        basis_dir[0], fname);
+                               fnamecmp = fnamecmpbuf;
+                               fd1 = do_open(fnamecmp, O_RDONLY, 0);
+                       }
                }
 
-               if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
-                       rprintf(FERROR,"fstat %s : %s\n",fnamecmp,strerror(errno));
-                       receive_data(f_in,NULL,-1,NULL,file->length);
+               updating_basis_or_equiv = inplace
+                   && (fnamecmp == fname || fnamecmp_type == FNAMECMP_BACKUP);
+
+               if (fd1 == -1) {
+                       st.st_mode = 0;
+                       st.st_size = 0;
+               } else if (do_fstat(fd1,&st) != 0) {
+                       rsyserr(FERROR_XFER, errno, "fstat %s failed",
+                               full_fname(fnamecmp));
+                       discard_receive_data(f_in, F_LENGTH(file));
                        close(fd1);
+                       if (inc_recurse)
+                               send_msg_int(MSG_NO_SEND, ndx);
                        continue;
                }
 
-               if (fd1 != -1 && !S_ISREG(st.st_mode)) {
-                       rprintf(FERROR,"%s : not a regular file (recv_files)\n",fnamecmp);
-                       receive_data(f_in,NULL,-1,NULL,file->length);
+               if (fd1 != -1 && S_ISDIR(st.st_mode) && fnamecmp == fname) {
+                       /* this special handling for directories
+                        * wouldn't be necessary if robust_rename()
+                        * and the underlying robust_unlink could cope
+                        * with directories
+                        */
+                       rprintf(FERROR_XFER, "recv_files: %s is a directory\n",
+                               full_fname(fnamecmp));
+                       discard_receive_data(f_in, F_LENGTH(file));
                        close(fd1);
+                       if (inc_recurse)
+                               send_msg_int(MSG_NO_SEND, ndx);
                        continue;
                }
 
-               if (fd1 != -1 && !preserve_perms) {
-                       /* if the file exists already and we aren't perserving
-                          presmissions then act as though the remote end sent
-                          us the file permissions we already have */
-                       file->mode = st.st_mode;
-               }
-
-               if (fd1 != -1 && st.st_size > 0) {
-                       buf = map_file(fd1,st.st_size);
-                       if (verbose > 2)
-                               rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
-               } else {
-                       buf = NULL;
+               if (fd1 != -1 && !S_ISREG(st.st_mode)) {
+                       close(fd1);
+                       fd1 = -1;
                }
 
-               if (!get_tmpname(fnametmp,fname)) {
-                       if (buf) unmap_file(buf);
-                       if (fd1 != -1) close(fd1);
-                       continue;
+               /* If we're not preserving permissions, change the file-list's
+                * mode based on the local permissions and some heuristics. */
+               if (!preserve_perms) {
+                       int exists = fd1 != -1;
+#ifdef SUPPORT_ACLS
+                       const char *dn = file->dirname ? file->dirname : ".";
+                       if (parent_dirname != dn
+                        && strcmp(parent_dirname, dn) != 0) {
+                               dflt_perms = default_perms_for_dir(dn);
+                               parent_dirname = dn;
+                       }
+#endif
+                       file->mode = dest_mode(file->mode, st.st_mode,
+                                              dflt_perms, exists);
                }
 
-               strlcpy(template, fnametmp, sizeof(template));
-
-               /* we initially set the perms without the
-                  setuid/setgid bits to ensure that there is no race
-                  condition. They are then correctly updated after
-                  the lchown. Thanks to snabb@epipe.fi for pointing
-                  this out.  We also set it initially without group
-                  access because of a similar race condition. */
-               fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
-               if (fd2 == -1) {
-                       rprintf(FERROR,"mkstemp %s failed\n",fnametmp);
-                       receive_data(f_in,buf,-1,NULL,file->length);
-                       if (buf) unmap_file(buf);
-                       continue;
+               /* We now check to see if we are writing the file "inplace" */
+               if (inplace)  {
+                       fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600);
+                       if (fd2 == -1) {
+                               rsyserr(FERROR_XFER, errno, "open %s failed",
+                                       full_fname(fname));
+                       }
+               } else {
+                       fd2 = open_tmpfile(fnametmp, fname, file);
+                       if (fd2 != -1)
+                               cleanup_set(fnametmp, partialptr, file, fd1, fd2);
                }
 
-               /* in most cases parent directories will already exist
-                  because their information should have been previously
-                  transferred, but that may not be the case with -R */
-               if (fd2 == -1 && relative_paths && errno == ENOENT && 
-                   create_directory_path(fnametmp) == 0) {
-                       strlcpy(fnametmp, template, sizeof(fnametmp));
-                       fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
-               }
                if (fd2 == -1) {
-                       rprintf(FERROR,"cannot create %s : %s\n",fnametmp,strerror(errno));
-                       receive_data(f_in,buf,-1,NULL,file->length);
-                       if (buf) unmap_file(buf);
-                       if (fd1 != -1) close(fd1);
+                       discard_receive_data(f_in, F_LENGTH(file));
+                       if (fd1 != -1)
+                               close(fd1);
+                       if (inc_recurse)
+                               send_msg_int(MSG_NO_SEND, ndx);
                        continue;
                }
-      
-               cleanup_set(fnametmp, fname, file, buf, fd1, fd2);
 
-               if (!am_server) {
-                       log_transfer(file, fname);
-               }
+               /* log the transfer */
+               if (log_before_transfer)
+                       log_item(FCLIENT, file, &initial_stats, iflags, NULL);
+               else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
+                       rprintf(FINFO, "%s\n", fname);
 
                /* recv file data */
-               recv_ok = receive_data(f_in,buf,fd2,fname,file->length);
+               recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
+                                      fname, fd2, F_LENGTH(file));
 
-               log_recv(file, &initial_stats);
-               
-               if (buf) unmap_file(buf);
-               if (fd1 != -1) {
+               log_item(log_code, file, &initial_stats, iflags, NULL);
+
+               if (fd1 != -1)
                        close(fd1);
+               if (close(fd2) < 0) {
+                       rsyserr(FERROR, errno, "close failed on %s",
+                               full_fname(fnametmp));
+                       exit_cleanup(RERR_FILEIO);
                }
-               close(fd2);
-               
-               if (verbose > 2)
-                       rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
 
-               finish_transfer(fname, fnametmp, file);
+               if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
+                       if (partialptr == fname)
+                               partialptr = NULL;
+                       if (!finish_transfer(fname, fnametmp, fnamecmp,
+                                            partialptr, file, recv_ok, 1))
+                               recv_ok = -1;
+                       else if (fnamecmp == partialptr) {
+                               do_unlink(partialptr);
+                               handle_partial_dir(partialptr, PDIR_DELETE);
+                       }
+               } else if (keep_partial && partialptr
+                   && handle_partial_dir(partialptr, PDIR_CREATE)) {
+                       if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL,
+                                            file, recv_ok, !partial_dir))
+                               recv_ok = -1;
+                       else if (delay_updates && recv_ok) {
+                               bitbag_set_bit(delayed_bits, ndx);
+                               recv_ok = 2;
+                       }
+               } else {
+                       partialptr = NULL;
+                       do_unlink(fnametmp);
+               }
 
                cleanup_disable();
 
-               if (!recv_ok) {
-                       if (csum_length == SUM_LENGTH) {
-                               rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
-                                       fname);
-                       } else {
-                               if (verbose > 1)
-                                       rprintf(FINFO,"redoing %s(%d)\n",fname,i);
-                               write_int(f_gen,i);
+               switch (recv_ok) {
+               case 1:
+                       if (remove_source_files || inc_recurse
+                        || (preserve_hard_links && F_IS_HLINKED(file)))
+                               send_msg_int(MSG_SUCCESS, ndx);
+                       break;
+               case 0: {
+                       enum logcode msgtype = redoing ? FERROR_XFER : FWARNING;
+                       if (msgtype == FERROR_XFER || INFO_GTE(NAME, 1)) {
+                               char *errstr, *redostr, *keptstr;
+                               if (!(keep_partial && partialptr) && !inplace)
+                                       keptstr = "discarded";
+                               else if (partial_dir)
+                                       keptstr = "put into partial-dir";
+                               else
+                                       keptstr = "retained";
+                               if (msgtype == FERROR_XFER) {
+                                       errstr = "ERROR";
+                                       redostr = "";
+                               } else {
+                                       errstr = "WARNING";
+                                       redostr = read_batch ? " (may try again)"
+                                                            : " (will try again)";
+                               }
+                               rprintf(msgtype,
+                                       "%s: %s failed verification -- update %s%s.\n",
+                                       errstr, local_name ? f_name(file, NULL) : fname,
+                                       keptstr, redostr);
                        }
+                       if (!redoing) {
+                               send_msg_int(MSG_REDO, ndx);
+                               file->flags |= FLAG_FILE_SENT;
+                       } else if (inc_recurse)
+                               send_msg_int(MSG_NO_SEND, ndx);
+                       break;
+                   }
+               case -1:
+                       if (inc_recurse)
+                               send_msg_int(MSG_NO_SEND, ndx);
+                       break;
                }
        }
+       if (make_backups < 0)
+               make_backups = -make_backups;
 
-       if (delete_after) {
-               if (recurse && delete_mode && !local_name && flist->count>0) {
-                       delete_files(flist);
-               }
-       }
-
-       if (preserve_hard_links)
-               do_hard_links(flist);
-
-       /* now we need to fix any directory permissions that were 
-          modified during the transfer */
-       for (i = 0; i < flist->count; i++) {
-               file = flist->files[i];
-               if (!file->basename || !S_ISDIR(file->mode)) continue;
-               recv_generator(local_name?local_name:f_name(file),flist,i,-1);
-       }
+       if (phase == 2 && delay_updates) /* for protocol_version < 29 */
+               handle_delayed_updates(local_name);
 
-       if (verbose > 2)
+       if (DEBUG_GTE(RECV, 1))
                rprintf(FINFO,"recv_files finished\n");
-       
+
        return 0;
 }
-