Changed "statx" to "stat_x" to try to work around a build problem on AIX.
[rsync/rsync.git] / rsync.c
diff --git a/rsync.c b/rsync.c
index f5a1f48..731528f 100644 (file)
--- a/rsync.c
+++ b/rsync.c
-/* 
-   Copyright (C) Andrew Tridgell 1996
-   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 common to more than one of the rsync processes.
+ *
+ * Copyright (C) 1996 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2003-2007 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 csum_length;
+#include "ifuncs.h"
+#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
+#include <libcharset.h>
+#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO
+#include <langinfo.h>
+#endif
 
 extern int verbose;
-extern int am_server;
-extern int always_checksum;
-extern time_t starttime;
-
-extern int remote_version;
-
-extern char *backup_suffix;
-extern char *tmpdir;
-
-extern int whole_file;
-extern int block_size;
-extern int update_only;
-extern int make_backups;
-extern int preserve_links;
-extern int preserve_hard_links;
+extern int dry_run;
+extern int preserve_acls;
+extern int preserve_xattrs;
 extern int preserve_perms;
-extern int preserve_devices;
-extern int preserve_uid;
-extern int preserve_gid;
+extern int preserve_executability;
 extern int preserve_times;
-extern int dry_run;
-extern int ignore_times;
-extern int recurse;
-extern int delete_mode;
-extern int cvs_exclude;
 extern int am_root;
-extern int relative_paths;
-extern int io_timeout;
-extern int io_error;
-extern struct stats stats;
-
-
-/* handling the cleanup when a transfer is interrupted is tricky when
-   --partial is selected. We need to ensure that the partial file is
-   kept if any real data has been transferred */
-static int cleanup_got_literal;
-static char *cleanup_fname;
-static char *cleanup_new_fname;
-static struct file_struct *cleanup_file;
-static void finish_transfer(char *fname, char *fnametmp, struct file_struct *file);
-
-void exit_cleanup(int code)
-{
-       extern int keep_partial;
-
-       signal(SIGUSR1, SIG_IGN);
-
-       if (cleanup_got_literal && cleanup_fname && keep_partial) {
-               char *fname = cleanup_fname;
-               cleanup_fname = NULL;
-               finish_transfer(cleanup_new_fname, fname, cleanup_file);
-       }
-       io_flush();
-       if (cleanup_fname)
-               do_unlink(cleanup_fname);
-       if (code) {
-               kill_all(SIGUSR1);
-       }
-       exit(code);
-}
-
-
-/*
-  free a sums struct
-  */
-static void free_sums(struct sum_struct *s)
-{
-       if (s->sums) free(s->sums);
-       free(s);
-}
-
-
-/*
- * delete a file or directory. If force_delet is set then delete 
- * recursively 
- */
-static int delete_file(char *fname)
-{
-       DIR *d;
-       struct dirent *di;
-       char buf[MAXPATHLEN];
-       extern int force_delete;
-       STRUCT_STAT st;
-       int ret;
-       extern int recurse;
-
-       if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
-
-#if SUPPORT_LINKS
-       ret = do_lstat(fname, &st);
-#else
-       ret = do_stat(fname, &st);
+extern int am_server;
+extern int am_sender;
+extern int am_generator;
+extern int am_starting_up;
+extern int allow_8bit_chars;
+extern int protocol_version;
+extern int uid_ndx;
+extern int gid_ndx;
+extern int inc_recurse;
+extern int inplace;
+extern int flist_eof;
+extern int keep_dirlinks;
+extern int make_backups;
+extern struct file_list *cur_flist, *first_flist, *dir_flist;
+extern struct chmod_mode_struct *daemon_chmod_modes;
+#ifdef ICONV_OPTION
+extern char *iconv_opt;
 #endif
-       if (ret) {
-               rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
-               return -1;
-       }
-
-       if (!S_ISDIR(st.st_mode)) {
-               rprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
-               return -1;
-       }
-
-       if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
-       if (!force_delete || !recurse || 
-           (errno != ENOTEMPTY && errno != EEXIST)) {
-               rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
-               return -1;
-       }
-
-       /* now we do a recsursive delete on the directory ... */
-       d = opendir(fname);
-       if (!d) {
-               rprintf(FERROR,"opendir(%s): %s\n",
-                       fname,strerror(errno));
-               return -1;
-       }
 
-       for (di=readdir(d); di; di=readdir(d)) {
-               char *dname = d_name(di);
-               if (strcmp(dname,".")==0 ||
-                   strcmp(dname,"..")==0)
-                       continue;
-               slprintf(buf, sizeof(buf)-1, "%s/%s", fname, dname);
-               if (verbose > 0)
-                       rprintf(FINFO,"deleting %s\n", buf);
-               if (delete_file(buf) != 0) {
-                       closedir(d);
-                       return -1;
-               }
-       }       
+#ifdef ICONV_CONST
+iconv_t ic_chck = (iconv_t)-1;
+# ifdef ICONV_OPTION
+iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1;
+# endif
 
-       closedir(d);
-       
-       if (do_rmdir(fname) != 0) {
-               rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
-               return -1;
-       }
-
-       return 0;
-}
-
-/*
-  send a sums struct down a fd
-  */
-static void send_sums(struct sum_struct *s,int f_out)
-{
-       int i;
-
-  /* tell the other guy how many we are going to be doing and how many
-     bytes there are in the last chunk */
-       write_int(f_out,s?s->count:0);
-       write_int(f_out,s?s->n:block_size);
-       write_int(f_out,s?s->remainder:0);
-       if (s)
-               for (i=0;i<s->count;i++) {
-                       write_int(f_out,s->sums[i].sum1);
-                       write_buf(f_out,s->sums[i].sum2,csum_length);
-               }
-}
-
-
-/*
-  generate a stream of signatures/checksums that describe a buffer
-
-  generate approximately one checksum every n bytes
-  */
-static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n)
-{
-       int i;
-       struct sum_struct *s;
-       int count;
-       int block_len = n;
-       int remainder = (len%block_len);
-       OFF_T offset = 0;
-
-       count = (len+(block_len-1))/block_len;
-
-       s = (struct sum_struct *)malloc(sizeof(*s));
-       if (!s) out_of_memory("generate_sums");
-
-       s->count = count;
-       s->remainder = remainder;
-       s->n = n;
-       s->flength = len;
-
-       if (count==0) {
-               s->sums = NULL;
-               return s;
-       }
-
-       if (verbose > 3)
-               rprintf(FINFO,"count=%d rem=%d n=%d flength=%d\n",
-                       s->count,s->remainder,s->n,(int)s->flength);
-
-       s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
-       if (!s->sums) out_of_memory("generate_sums");
-  
-       for (i=0;i<count;i++) {
-               int n1 = MIN(len,n);
-               char *map = map_ptr(buf,offset,n1);
-
-               s->sums[i].sum1 = get_checksum1(map,n1);
-               get_checksum2(map,n1,s->sums[i].sum2);
-
-               s->sums[i].offset = offset;
-               s->sums[i].len = n1;
-               s->sums[i].i = i;
-
-               if (verbose > 3)
-                       rprintf(FINFO,"chunk[%d] offset=%d len=%d sum1=%08x\n",
-                               i,(int)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1);
-
-               len -= n1;
-               offset += n1;
-       }
-
-       return s;
-}
-
-
-/*
-  receive the checksums for a buffer
-  */
-static struct sum_struct *receive_sums(int f)
+static const char *default_charset(void)
 {
-       struct sum_struct *s;
-       int i;
-       OFF_T offset = 0;
-
-       s = (struct sum_struct *)malloc(sizeof(*s));
-       if (!s) out_of_memory("receive_sums");
-
-       s->count = read_int(f);
-       s->n = read_int(f);
-       s->remainder = read_int(f);  
-       s->sums = NULL;
-
-       if (verbose > 3)
-               rprintf(FINFO,"count=%d n=%d rem=%d\n",
-                       s->count,s->n,s->remainder);
-
-       if (s->count == 0) 
-               return(s);
-
-       s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
-       if (!s->sums) out_of_memory("receive_sums");
-
-       for (i=0;i<s->count;i++) {
-               s->sums[i].sum1 = read_int(f);
-               read_buf(f,s->sums[i].sum2,csum_length);
-
-               s->sums[i].offset = offset;
-               s->sums[i].i = i;
-
-               if (i == s->count-1 && s->remainder != 0) {
-                       s->sums[i].len = s->remainder;
-               } else {
-                       s->sums[i].len = s->n;
-               }
-               offset += s->sums[i].len;
-
-               if (verbose > 3)
-                       rprintf(FINFO,"chunk[%d] len=%d offset=%d sum1=%08x\n",
-                               i,s->sums[i].len,(int)s->sums[i].offset,s->sums[i].sum1);
-       }
-
-       s->flength = offset;
-
-       return s;
+# if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
+       return locale_charset();
+# elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO
+       return nl_langinfo(CODESET);
+# else
+       return ""; /* Works with (at the very least) gnu iconv... */
+# endif
 }
 
-
-static int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
-                    int report)
+void setup_iconv(void)
 {
-       int updated = 0;
-       STRUCT_STAT st2;
-       extern int am_daemon;
-
-       if (dry_run) return 0;
-
-       if (!st) {
-               if (link_stat(fname,&st2) != 0) {
-                       rprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
-                       return 0;
-               }
-               st = &st2;
-       }
-
-       if (preserve_times && !S_ISLNK(st->st_mode) &&
-           st->st_mtime != file->modtime) {
-               updated = 1;
-               if (set_modtime(fname,file->modtime) != 0) {
-                       rprintf(FERROR,"failed to set times on %s : %s\n",
-                               fname,strerror(errno));
-                       return 0;
-               }
-       }
-
-       if ((am_root || !am_daemon) &&
-           ((am_root && preserve_uid && st->st_uid != file->uid) || 
-            (preserve_gid && st->st_gid != file->gid))) {
-               if (do_lchown(fname,
-                             (am_root&&preserve_uid)?file->uid:-1,
-                             preserve_gid?file->gid:-1) != 0) {
-                       if (preserve_uid && st->st_uid != file->uid)
-                               updated = 1;
-                       if (verbose>1 || preserve_uid) {
-                               rprintf(FERROR,"chown %s : %s\n",
-                                       fname,strerror(errno));
-                               return 0;
+       const char *defset = default_charset();
+# ifdef ICONV_OPTION
+       const char *charset;
+       char *cp;
+# endif
+
+       if (!am_server && !allow_8bit_chars) {
+
+               /* It's OK if this fails... */
+               ic_chck = iconv_open(defset, defset);
+
+               if (verbose > 3) {
+                       if (ic_chck == (iconv_t)-1) {
+                               rprintf(FINFO,
+                                       "note: iconv_open(\"%s\", \"%s\") failed (%d)"
+                                       " -- using isprint() instead of iconv().\n",
+                                       defset, defset, errno);
+                       } else {
+                               rprintf(FINFO,
+                                       "note: iconv_open(\"%s\", \"%s\") succeeded.\n",
+                                       defset, defset);
                        }
-               } else {
-                       updated = 1;
                }
        }
 
-#ifdef HAVE_CHMOD
-       if (preserve_perms && !S_ISLNK(st->st_mode) &&
-           (st->st_mode != file->mode || 
-            (updated && (file->mode & ~ACCESSPERMS)))) {
-               updated = 1;
-               if (do_chmod(fname,file->mode) != 0) {
-                       rprintf(FERROR,"failed to set permissions on %s : %s\n",
-                               fname,strerror(errno));
-                       return 0;
-               }
-       }
-#endif
-    
-       if (verbose > 1 && report) {
-               if (updated)
-                       rprintf(FINFO,"%s\n",fname);
+# ifdef ICONV_OPTION
+       if (!iconv_opt)
+               return;
+
+       if ((cp = strchr(iconv_opt, ',')) != NULL) {
+               if (am_server) /* A local transfer needs this. */
+                       iconv_opt = cp + 1;
                else
-                       rprintf(FINFO,"%s is uptodate\n",fname);
+                       *cp = '\0';
        }
-       return updated;
-}
 
+       if (!*iconv_opt || (*iconv_opt == '.' && iconv_opt[1] == '\0'))
+               charset = defset;
+       else
+               charset = iconv_opt;
 
-/* choose whether to skip a particular file */
-static int skip_file(char *fname,
-                    struct file_struct *file, STRUCT_STAT *st)
-{
-       if (st->st_size != file->length) {
-               return 0;
-       }
-       
-       /* if always checksum is set then we use the checksum instead 
-          of the file time to determine whether to sync */
-       if (always_checksum && S_ISREG(st->st_mode)) {
-               char sum[MD4_SUM_LENGTH];
-               file_checksum(fname,sum,st->st_size);
-               return (memcmp(sum,file->sum,csum_length) == 0);
+       if ((ic_send = iconv_open(UTF8_CHARSET, charset)) == (iconv_t)-1) {
+               rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n",
+                       UTF8_CHARSET, charset);
+               exit_cleanup(RERR_UNSUPPORTED);
        }
 
-       if (ignore_times) {
-               return 0;
+       if ((ic_recv = iconv_open(charset, UTF8_CHARSET)) == (iconv_t)-1) {
+               rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n",
+                       charset, UTF8_CHARSET);
+               exit_cleanup(RERR_UNSUPPORTED);
        }
 
-       return (st->st_mtime == file->modtime);
+       if (verbose > 1) {
+               rprintf(FINFO, "%s charset: %s\n",
+                       am_server ? "server" : "client",
+                       *charset ? charset : "[LOCALE]");
+       }
+# endif
 }
 
-
-/* use a larger block size for really big files */
-static int adapt_block_size(struct file_struct *file, int bsize)
+# ifdef ICONV_OPTION
+
+/* This function converts the characters in the "in" xbuf into characters
+ * in the "out" xbuf.  The "len" of the "in" xbuf is used starting from its
+ * "pos".  The "size" of the "out" xbuf restricts how many characters can be
+ * stored, starting at its "pos+len" position.  Note that the last byte of
+ * the buffer is never used, which reserves space for a terminating '\0'.
+ * We return a 0 on success or a -1 on error.  An error also sets errno to
+ * E2BIG, EILSEQ, or EINVAL (see below); otherwise errno will be set to 0.
+ * The "in" xbuf is altered to update "pos" and "len".  The "out" xbuf has
+ * data appended, and its "len" incremented.   If ICB_EXPAND_OUT is set in
+ * "flags", the "out" xbuf will also be allocated if empty, and expanded if
+ * too small (so E2BIG will not be returned).  If ICB_INCLUDE_BAD is set in
+ * "flags", any badly-encoded chars are included verbatim in the "out" xbuf,
+ * so EILSEQ will not be returned.  Likewise for ICB_INCLUDE_INCOMPLETE with
+ * respect to an incomplete multi-byte char at the end, which ensures that
+ * EINVAL is not returned.  Anytime "in.pos" is 0 we will reset the iconv()
+ * state prior to processing the characters. */
+int iconvbufs(iconv_t ic, xbuf *in, xbuf *out, int flags)
 {
-       int ret;
-
-       if (bsize != BLOCK_SIZE) return bsize;
+       ICONV_CONST char *ibuf;
+       size_t icnt, ocnt;
+       char *obuf;
 
-       ret = file->length / (10000); /* rough heuristic */
-       ret = ret & ~15; /* multiple of 16 */
-       if (ret < bsize) ret = bsize;
-       if (ret > CHUNK_SIZE/2) ret = CHUNK_SIZE/2;
-       return ret;
-}
+       if (!out->size && flags & ICB_EXPAND_OUT)
+               alloc_xbuf(out, 1024);
 
-static void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
-{  
-       int fd;
-       STRUCT_STAT st;
-       struct map_struct *buf;
-       struct sum_struct *s;
-       int statret;
-       struct file_struct *file = flist->files[i];
+       if (!in->pos)
+               iconv(ic, NULL, 0, NULL, 0);
 
-       if (verbose > 2)
-               rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
+       ibuf = in->buf + in->pos;
+       icnt = in->len;
 
-       statret = link_stat(fname,&st);
+       obuf = out->buf + (out->pos + out->len);
+       ocnt = out->size - (out->pos + out->len) - 1;
 
-       if (S_ISDIR(file->mode)) {
-               if (dry_run) return;
-               if (statret == 0 && !S_ISDIR(st.st_mode)) {
-                       if (do_unlink(fname) != 0) {
-                               rprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
-                               return;
-                       }
-                       statret = -1;
-               }
-               if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
-                       if (!(relative_paths && errno==ENOENT && 
-                             create_directory_path(fname)==0 && 
-                             do_mkdir(fname,file->mode)==0)) {
-                               rprintf(FERROR,"mkdir %s : %s (2)\n",
-                                       fname,strerror(errno));
+       while (icnt) {
+               while (iconv(ic, &ibuf, &icnt, &obuf, &ocnt) == (size_t)-1) {
+                       if (errno == EINTR)
+                               continue;
+                       if (errno == EINVAL) {
+                               if (!(flags & ICB_INCLUDE_INCOMPLETE))
+                                       goto finish;
+                       } else if (errno == EILSEQ) {
+                               if (!(flags & ICB_INCLUDE_BAD))
+                                       goto finish;
+                       } else {
+                               size_t opos = obuf - out->buf;
+                               if (!(flags & ICB_EXPAND_OUT)) {
+                                       errno = E2BIG;
+                                       goto finish;
+                               }
+                               realloc_xbuf(out, out->size + 1024);
+                               obuf = out->buf + opos;
+                               ocnt += 1024;
+                               continue;
                        }
+                       *obuf++ = *ibuf++;
+                       ocnt--, icnt--;
                }
-               if (set_perms(fname,file,NULL,0) && verbose) 
-                       rprintf(FINFO,"%s/\n",fname);
-               return;
        }
 
-       if (preserve_links && S_ISLNK(file->mode)) {
-#if SUPPORT_LINKS
-               char lnk[MAXPATHLEN];
-               int l;
-               extern int safe_symlinks;
+       errno = 0;
 
-               if (safe_symlinks && unsafe_symlink(file->link, fname)) {
-                       if (verbose) {
-                               rprintf(FINFO,"ignoring unsafe symlink %s -> %s\n",
-                                       fname,file->link);
-                       }
-                       return;
-               }
-               if (statret == 0) {
-                       l = readlink(fname,lnk,MAXPATHLEN-1);
-                       if (l > 0) {
-                               lnk[l] = 0;
-                               if (strcmp(lnk,file->link) == 0) {
-                                       set_perms(fname,file,&st,1);
-                                       return;
-                               }
-                       }
-               }
-               delete_file(fname);
-               if (do_symlink(file->link,fname) != 0) {
-                       rprintf(FERROR,"link %s -> %s : %s\n",
-                               fname,file->link,strerror(errno));
-               } else {
-                       set_perms(fname,file,NULL,0);
-                       if (verbose) {
-                               rprintf(FINFO,"%s -> %s\n",
-                                       fname,file->link);
-                       }
-               }
-#endif
-               return;
-       }
+  finish:
+       in->len = icnt;
+       in->pos = ibuf - in->buf;
+       out->len = obuf - out->buf - out->pos;
 
-#ifdef HAVE_MKNOD
-       if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
-               if (statret != 0 || 
-                   st.st_mode != file->mode ||
-                   st.st_rdev != file->rdev) { 
-                       delete_file(fname);
-                       if (verbose > 2)
-                               rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-                                       fname,(int)file->mode,(int)file->rdev);
-                       if (do_mknod(fname,file->mode,file->rdev) != 0) {
-                               rprintf(FERROR,"mknod %s : %s\n",fname,strerror(errno));
-                       } else {
-                               set_perms(fname,file,NULL,0);
-                               if (verbose)
-                                       rprintf(FINFO,"%s\n",fname);
-                       }
-               } else {
-                       set_perms(fname,file,&st,1);
-               }
-               return;
-       }
+       return errno ? -1 : 0;
+}
+# endif
 #endif
 
-       if (preserve_hard_links && check_hard_link(file)) {
-               if (verbose > 1)
-                       rprintf(FINFO,"%s is a hard link\n",f_name(file));
-               return;
-       }
+int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
+                      char *buf, int *len_ptr)
+{
+       int len, iflags = 0;
+       struct file_list *flist;
+       uchar fnamecmp_type = FNAMECMP_FNAME;
+       int ndx;
 
-       if (!S_ISREG(file->mode)) {
-               rprintf(FINFO,"skipping non-regular file %s\n",fname);
-               return;
-       }
+  read_loop:
+       while (1) {
+               ndx = read_ndx(f_in);
 
-       if (statret == -1) {
-               if (errno == ENOENT) {
-                       write_int(f_out,i);
-                       if (!dry_run) send_sums(NULL,f_out);
-               } else {
-                       if (verbose > 1)
-                               rprintf(FERROR,"recv_generator failed to open %s\n",fname);
+               if (ndx >= 0)
+                       break;
+               if (ndx == NDX_DONE)
+                       return ndx;
+               if (!inc_recurse || am_sender)
+                       goto invalid_ndx;
+               if (ndx == NDX_FLIST_EOF) {
+                       flist_eof = 1;
+                       send_msg(MSG_FLIST_EOF, "", 0, 0);
+                       continue;
                }
-               return;
-       }
-
-       if (!S_ISREG(st.st_mode)) {
-               if (delete_file(fname) != 0) {
-                       return;
+               ndx = NDX_FLIST_OFFSET - ndx;
+               if (ndx < 0 || ndx >= dir_flist->used) {
+                       ndx = NDX_FLIST_OFFSET - ndx;
+                       rprintf(FERROR,
+                               "[%s] Invalid dir index: %d (%d - %d)\n",
+                               who_am_i(), ndx, NDX_FLIST_OFFSET,
+                               NDX_FLIST_OFFSET - dir_flist->used + 1);
+                       exit_cleanup(RERR_PROTOCOL);
                }
 
-               /* now pretend the file didn't exist */
-               write_int(f_out,i);
-               if (!dry_run) send_sums(NULL,f_out);    
-               return;
-       }
-
-       if (update_only && st.st_mtime > file->modtime) {
-               if (verbose > 1)
-                       rprintf(FINFO,"%s is newer\n",fname);
-               return;
+               /* Send everything read from f_in to msg_fd_out. */
+               send_msg_int(MSG_FLIST, ndx);
+               start_flist_forward(f_in);
+               if (verbose > 3) {
+                       rprintf(FINFO, "[%s] receiving flist for dir %d\n",
+                               who_am_i(), ndx);
+               }
+               flist = recv_file_list(f_in);
+               flist->parent_ndx = ndx;
+               stop_flist_forward();
        }
 
-       if (skip_file(fname, file, &st)) {
-               set_perms(fname,file,&st,1);
-               return;
-       }
+       iflags = protocol_version >= 29 ? read_shortint(f_in)
+                  : ITEM_TRANSFER | ITEM_MISSING_DATA;
 
-       if (dry_run) {
-               write_int(f_out,i);
-               return;
+       /* Honor the old-style keep-alive indicator. */
+       if (protocol_version < 30
+        && ndx == cur_flist->used && iflags == ITEM_IS_NEW) {
+               if (am_sender)
+                       maybe_send_keepalive();
+               goto read_loop;
        }
 
-       if (whole_file) {
-               write_int(f_out,i);
-               send_sums(NULL,f_out);    
-               return;
+       if (!(flist = flist_for_ndx(ndx))) {
+         invalid_ndx:
+               rprintf(FERROR,
+                       "Invalid file index: %d (%d - %d) with iflags %x [%s]\n",
+                       ndx, first_flist->ndx_start - 1, first_flist->prev->ndx_end,
+                       iflags, who_am_i());
+               exit_cleanup(RERR_PROTOCOL);
        }
+       cur_flist = flist;
 
-       /* open the file */  
-       fd = open(fname,O_RDONLY);
-
-       if (fd == -1) {
-               rprintf(FERROR,"failed to open %s : %s\n",fname,strerror(errno));
-               rprintf(FERROR,"skipping %s\n",fname);
-               return;
-       }
+       if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+               fnamecmp_type = read_byte(f_in);
+       *type_ptr = fnamecmp_type;
 
-       if (st.st_size > 0) {
-               buf = map_file(fd,st.st_size);
+       if (iflags & ITEM_XNAME_FOLLOWS) {
+               if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
+                       exit_cleanup(RERR_PROTOCOL);
        } else {
-               buf = NULL;
+               *buf = '\0';
+               len = -1;
        }
+       *len_ptr = len;
 
-       if (verbose > 3)
-               rprintf(FINFO,"gen mapped %s of size %d\n",fname,(int)st.st_size);
-
-       s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size));
-
-       if (verbose > 2)
-               rprintf(FINFO,"sending sums for %d\n",i);
-
-       write_int(f_out,i);
-       send_sums(s,f_out);
-
-       close(fd);
-       if (buf) unmap_file(buf);
-
-       free_sums(s);
-}
-
-
-
-static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
-                       OFF_T total_size)
-{
-       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) {
-                       if (verbose > 3) {
-                               rprintf(FINFO,"data recv %d at %d\n",
-                                       i,(int)offset);
-                       }
-
-                       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(1);
-                       }
-                       offset += i;
-                       continue;
-               } 
-
-               i = -(i+1);
-               offset2 = i*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 %d offset=%d\n",
-                               i,len,(int)offset2,(int)offset);
-               
-               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(1);
+       if (iflags & ITEM_TRANSFER) {
+               int i = ndx - cur_flist->ndx_start;
+               if (i < 0 || !S_ISREG(cur_flist->files[i]->mode)) {
+                       rprintf(FERROR,
+                               "received request to transfer non-regular file: %d [%s]\n",
+                               ndx, who_am_i());
+                       exit_cleanup(RERR_PROTOCOL);
                }
-               offset += len;
        }
 
-       end_progress();
-
-       if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
-               rprintf(FERROR,"write failed on %s : %s\n",
-                       fname,strerror(errno));
-               exit_cleanup(1);
-       }
-
-       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");
-               }
-               if (fd != -1 && 
-                   memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) {
-                       return 0;
-               }
-       }
-       return 1;
+       *iflag_ptr = iflags;
+       return ndx;
 }
 
-
-static void delete_one(struct file_struct *f)
+/*
+  free a sums struct
+  */
+void free_sums(struct sum_struct *s)
 {
-       if (!S_ISDIR(f->mode)) {
-               if (do_unlink(f_name(f)) != 0) {
-                       rprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
-               } else if (verbose) {
-                       rprintf(FINFO,"deleting %s\n",f_name(f));
-               }
-       } else {    
-               if (do_rmdir(f_name(f)) != 0) {
-                       if (errno != ENOTEMPTY && errno != EEXIST)
-                               rprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
-               } else if (verbose) {
-                       rprintf(FINFO,"deleting directory %s\n",f_name(f));      
-               }
-       }
+       if (s->sums) free(s->sums);
+       free(s);
 }
 
-
-
-static struct delete_list {
-       dev_t dev;
-       INO_T inode;
-} *delete_list;
-static int dlist_len, dlist_alloc_len;
-
-static void add_delete_entry(struct file_struct *file)
+/* This is only called when we aren't preserving permissions.  Figure out what
+ * the permissions should be and return them merged back into the mode. */
+mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
+                int exists)
 {
-       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 new_mode;
+       /* If the file already exists, we'll return the local permissions,
+        * possibly tweaked by the --executability option. */
+       if (exists) {
+               new_mode = (flist_mode & ~CHMOD_BITS) | (stat_mode & CHMOD_BITS);
+               if (preserve_executability && S_ISREG(flist_mode)) {
+                       /* If the source file is executable, grant execute
+                        * rights to everyone who can read, but ONLY if the
+                        * file isn't already executable. */
+                       if (!(flist_mode & 0111))
+                               new_mode &= ~0111;
+                       else if (!(stat_mode & 0111))
+                               new_mode |= (new_mode & 0444) >> 2;
+               }
+       } else {
+               /* Apply destination default permissions and turn
+                * off special permissions. */
+               new_mode = flist_mode & (~CHMOD_BITS | dflt_perms);
        }
-
-       delete_list[dlist_len].dev = file->dev;
-       delete_list[dlist_len].inode = file->inode;
-       dlist_len++;
-
-       if (verbose > 3)
-               rprintf(FINFO,"added %s to delete list\n", f_name(file));
+       return new_mode;
 }
 
-/* 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)
+int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+                  const char *fnamecmp, int flags)
 {
-       int i;
-       STRUCT_STAT st;
-
-       if (link_stat(f_name(flist->files[j]), &st)) return 1;
+       int updated = 0;
+       stat_x sx2;
+       int change_uid, change_gid;
+       mode_t new_mode = file->mode;
+       int inherit;
 
-       for (i=0;i<dlist_len;i++) {
-               if (st.st_ino == delete_list[i].inode &&
-                   st.st_dev == delete_list[i].dev)
+       if (!sxp) {
+               if (dry_run)
                        return 1;
-       }
-
-       return 0;
-}
-
-
-/* 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 */
-static void delete_files(struct file_list *flist)
-{
-       struct file_list *local_file_list;
-       int i, j;
-       char *name;
-
-       if (cvs_exclude)
-               add_cvs_excludes();
+               if (link_stat(fname, &sx2.st, 0) < 0) {
+                       rsyserr(FERROR, errno, "stat %s failed",
+                               full_fname(fname));
+                       return 0;
+               }
+#ifdef SUPPORT_ACLS
+               sx2.acc_acl = sx2.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+               sx2.xattr = NULL;
+#endif
+               sxp = &sx2;
+               inherit = !preserve_perms;
+       } else
+               inherit = !preserve_perms && file->flags & FLAG_DIR_CREATED;
 
-       if (io_error) {
-               rprintf(FINFO,"IO error encountered - skipping file deletion\n");
-               return;
+       if (inherit && S_ISDIR(new_mode) && sxp->st.st_mode & S_ISGID) {
+               /* We just created this directory and its setgid
+                * bit is on, so make sure it stays on. */
+               new_mode |= S_ISGID;
        }
 
-       for (j=0;j<flist->count;j++) {
-               if (!S_ISDIR(flist->files[j]->mode) || 
-                   !(flist->files[j]->flags & FLAG_DELETE)) continue;
+#ifdef SUPPORT_ACLS
+       if (preserve_acls && !S_ISLNK(file->mode) && !ACL_READY(*sxp))
+               get_acl(fname, sxp);
+#endif
 
-               if (remote_version < 19 &&
-                   delete_already_done(flist, j)) continue;
+#ifdef SUPPORT_XATTRS
+       if (preserve_xattrs && fnamecmp)
+               set_xattr(fname, file, fnamecmp, sxp);
+       if (am_root < 0)
+               set_stat_xattr(fname, file);
+#endif
 
-               name = strdup(f_name(flist->files[j]));
+       if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1))
+               flags |= ATTRS_SKIP_MTIME;
+       if (!(flags & ATTRS_SKIP_MTIME)
+           && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
+               int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
+               if (ret < 0) {
+                       rsyserr(FERROR, errno, "failed to set times on %s",
+                               full_fname(fname));
+                       goto cleanup;
+               }
+               if (ret == 0) /* ret == 1 if symlink could not be set */
+                       updated = 1;
+       }
 
-               if (!(local_file_list = send_file_list(-1,1,&name))) {
-                       free(name);
-                       continue;
+       change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
+       change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
+                 && sxp->st.st_gid != (gid_t)F_GROUP(file);
+#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
+       if (S_ISLNK(sxp->st.st_mode))
+               ;
+       else
+#endif
+       if (change_uid || change_gid) {
+               if (verbose > 2) {
+                       if (change_uid) {
+                               rprintf(FINFO,
+                                       "set uid of %s from %u to %u\n",
+                                       fname, (unsigned)sxp->st.st_uid, F_OWNER(file));
+                       }
+                       if (change_gid) {
+                               rprintf(FINFO,
+                                       "set gid of %s from %u to %u\n",
+                                       fname, (unsigned)sxp->st.st_gid, F_GROUP(file));
+                       }
                }
-
-               if (verbose > 1)
-                       rprintf(FINFO,"deleting in %s\n", name);
-
-               for (i=local_file_list->count-1;i>=0;i--) {
-                       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])) {
-                               delete_one(local_file_list->files[i]);
-                       }    
+               if (am_root < 0) {
+                       ;
+               } else if (do_lchown(fname,
+                   change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid,
+                   change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid) != 0) {
+                       /* shouldn't have attempted to change uid or gid
+                        * unless have the privilege */
+                       rsyserr(FERROR, errno, "%s %s failed",
+                           change_uid ? "chown" : "chgrp",
+                           full_fname(fname));
+                       goto cleanup;
+               } else
+               /* a lchown had been done - we have to re-stat if the
+                * destination had the setuid or setgid bits set due
+                * to the side effect of the chown call */
+               if (sxp->st.st_mode & (S_ISUID | S_ISGID)) {
+                       link_stat(fname, &sxp->st,
+                                 keep_dirlinks && S_ISDIR(sxp->st.st_mode));
                }
-               flist_free(local_file_list);
-               free(name);
+               updated = 1;
        }
-}
-
-void sig_int(void)
-{
-       exit_cleanup(1);
-}
 
+       if (daemon_chmod_modes && !S_ISLNK(new_mode))
+               new_mode = tweak_mode(new_mode, daemon_chmod_modes);
 
+#ifdef SUPPORT_ACLS
+       /* It's OK to call set_acl() now, even for a dir, as the generator
+        * will enable owner-writability using chmod, if necessary.
+        * 
+        * If set_acl() changes permission bits in the process of setting
+        * an access ACL, it changes sxp->st.st_mode so we know whether we
+        * need to chmod(). */
+       if (preserve_acls && !S_ISLNK(new_mode) && set_acl(fname, file, sxp) == 0)
+               updated = 1;
+#endif
 
-
-static int get_tmpname(char *fnametmp, char *fname)
-{
-       char *f;
-
-       /* 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;
-               }
-               slprintf(fnametmp,MAXPATHLEN-1, "%s/.%s.XXXXXX",tmpdir,f);
-               return 1;
-       } 
-
-       f = strrchr(fname,'/');
-
-       if (strlen(fname)+9 > MAXPATHLEN) {
-               rprintf(FERROR,"filename too long\n");
-               return 0;
+#ifdef HAVE_CHMOD
+       if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
+               int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode);
+               if (ret < 0) {
+                       rsyserr(FERROR, errno,
+                               "failed to set permissions on %s",
+                               full_fname(fname));
+                       goto cleanup;
+               }
+               if (ret == 0) /* ret == 1 if symlink could not be set */
+                       updated = 1;
        }
+#endif
 
-       if (f) {
-               *f = 0;
-               slprintf(fnametmp,MAXPATHLEN-1,"%s/.%s.XXXXXX",
-                        fname,f+1);
-               *f = '/';
-       } else {
-               slprintf(fnametmp,MAXPATHLEN-1,".%s.XXXXXX",fname);
+       if (verbose > 1 && flags & ATTRS_REPORT) {
+               if (updated)
+                       rprintf(FCLIENT, "%s\n", fname);
+               else
+                       rprintf(FCLIENT, "%s is uptodate\n", fname);
        }
-
-       return 1;
+  cleanup:
+       if (sxp == &sx2) {
+#ifdef SUPPORT_ACLS
+               if (preserve_acls)
+                       free_acl(&sx2);
+#endif
+#ifdef SUPPORT_XATTRS
+               if (preserve_xattrs)
+                       free_xattr(&sx2);
+#endif
+       }
+       return updated;
 }
 
-/* finish off a file transfer, renaming the file and setting the permissions
-   and ownership */
-static void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
+RETSIGTYPE sig_int(UNUSED(int val))
 {
-       if (make_backups) {
-               char fnamebak[MAXPATHLEN];
-               if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
-                       rprintf(FERROR,"backup filename too long\n");
-                       return;
-               }
-               slprintf(fnamebak,sizeof(fnamebak)-1,"%s%s",fname,backup_suffix);
-               if (do_rename(fname,fnamebak) != 0 && errno != ENOENT) {
-                       rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
-                       return;
-               }
-       }
-
-       /* move tmp file over real file */
-       if (do_rename(fnametmp,fname) != 0) {
-               if (errno == EXDEV) {
-                       /* rename failed on cross-filesystem link.  
-                          Copy the file instead. */
-                       if (copy_file(fnametmp,fname, file->mode & ACCESSPERMS)) {
-                               rprintf(FERROR,"copy %s -> %s : %s\n",
-                                       fnametmp,fname,strerror(errno));
-                       } else {
-                               set_perms(fname,file,NULL,0);
-                       }
-                       do_unlink(fnametmp);
-               } else {
-                       rprintf(FERROR,"rename %s -> %s : %s\n",
-                               fnametmp,fname,strerror(errno));
-                       do_unlink(fnametmp);
-               }
-       } else {
-               set_perms(fname,file,NULL,0);
-       }
+       /* KLUGE: if the user hits Ctrl-C while ssh is prompting
+        * for a password, then our cleanup's sending of a SIGUSR1
+        * signal to all our children may kill ssh before it has a
+        * chance to restore the tty settings (i.e. turn echo back
+        * on).  By sleeping for a short time, ssh gets a bigger
+        * chance to do the right thing.  If child processes are
+        * not ssh waiting for a password, then this tiny delay
+        * shouldn't hurt anything. */
+       msleep(400);
+       exit_cleanup(RERR_SIGNAL);
 }
 
+/* Finish off a file transfer: renaming the file and setting the file's
+ * attributes (e.g. permissions, ownership, etc.).  If partialptr is not
+ * NULL and the robust_rename() call is forced to copy the temp file, we
+ * stage the file into the partial-dir and then rename it into place. */
+void finish_transfer(const char *fname, const char *fnametmp,
+                    const char *fnamecmp, const char *partialptr,
+                    struct file_struct *file, int ok_to_set_time,
+                    int overwriting_basis)
+{
+       int ret;
 
-int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
-{  
-       int fd1,fd2;
-       STRUCT_STAT st;
-       char *fname;
-       char fnametmp[MAXPATHLEN];
-       struct map_struct *buf;
-       int i;
-       struct file_struct *file;
-       int phase=0;
-       int recv_ok;
-       
-       if (verbose > 2) {
-               rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
-       }
-
-       if (recurse && delete_mode && !local_name && flist->count>0) {
-               delete_files(flist);
-       }
-
-       while (1) {      
-               cleanup_fname = NULL;
-               cleanup_got_literal = 0;
-
-               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;
-                       }
-                       break;
-               }
-
-               if (i < 0 || i >= flist->count) {
-                       rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n", 
-                               i, flist->count);
-                       exit_cleanup(1);
-               }
-
-               file = flist->files[i];
-               fname = f_name(file);
-
-               stats.num_transferred_files++;
-               stats.total_transferred_size += file->length;
-
-               if (local_name)
-                       fname = local_name;
-
-               if (dry_run) {
-                       if (!am_server && verbose)
-                               rprintf(FINFO,"%s\n",fname);
-                       continue;
-               }
-
-               if (verbose > 2)
-                       rprintf(FINFO,"recv_files(%s)\n",fname);
-
-               /* open the file */  
-               fd1 = open(fname,O_RDONLY);
-
-               if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
-                       rprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
-                       receive_data(f_in,NULL,-1,NULL,file->length);
-                       close(fd1);
-                       continue;
-               }
-
-               if (fd1 != -1 && !S_ISREG(st.st_mode)) {
-                       rprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
-                       receive_data(f_in,NULL,-1,NULL,file->length);
-                       close(fd1);
-                       continue;
-               }
-
-               if (fd1 != -1 && st.st_size > 0) {
-                       buf = map_file(fd1,st.st_size);
-                       if (verbose > 2)
-                               rprintf(FINFO,"recv mapped %s of size %d\n",fname,(int)st.st_size);
-               } else {
-                       buf = NULL;
-               }
-
-               if (!get_tmpname(fnametmp,fname)) {
-                       if (buf) unmap_file(buf);
-                       if (fd1 != -1) close(fd1);
-                       continue;
-               }
-
-               if (NULL == do_mktemp(fnametmp)) {
-                       rprintf(FERROR,"mktemp %s failed\n",fnametmp);
-                       receive_data(f_in,buf,-1,NULL,file->length);
-                       if (buf) unmap_file(buf);
-                       if (fd1 != -1) close(fd1);
-                       continue;
-               }
-
-               /* 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 */
-               fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
-                             file->mode & ACCESSPERMS);
-
-               if (fd2 == -1 && relative_paths && errno == ENOENT && 
-                   create_directory_path(fnametmp) == 0) {
-                       fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
-                                     file->mode & ACCESSPERMS);
-               }
-               if (fd2 == -1) {
-                       rprintf(FERROR,"open %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);
-                       continue;
-               }
-      
-               cleanup_fname = fnametmp;
-               cleanup_new_fname = fname;
-               cleanup_file = file;
-
-               if (!am_server && verbose)
-                       rprintf(FINFO,"%s\n",fname);
-               
-               /* recv file data */
-               recv_ok = receive_data(f_in,buf,fd2,fname,file->length);
-               
-               if (buf) unmap_file(buf);
-               if (fd1 != -1) {
-                       close(fd1);
-               }
-               close(fd2);
-               
+       if (inplace) {
                if (verbose > 2)
-                       rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
-
-               finish_transfer(fname, fnametmp, file);
-               
-               cleanup_fname = NULL;
-               
-               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);
-                       }
-               }
-       }
-
-       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(f_name(file),flist,i,-1);
+                       rprintf(FINFO, "finishing %s\n", fname);
+               fnametmp = fname;
+               goto do_set_file_attrs;
        }
 
-       if (verbose > 2)
-               rprintf(FINFO,"recv_files finished\n");
-       
-       return 0;
-}
-
-
+       if (make_backups > 0 && overwriting_basis && !make_backup(fname))
+               return;
 
-void send_files(struct file_list *flist,int f_out,int f_in)
-{ 
-       int fd;
-       struct sum_struct *s;
-       struct map_struct *buf;
-       STRUCT_STAT st;
-       char fname[MAXPATHLEN];  
-       int i;
-       struct file_struct *file;
-       int phase = 0;
+       /* Change permissions before putting the file into place. */
+       set_file_attrs(fnametmp, file, NULL, fnamecmp,
+                      ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
 
+       /* move tmp file over real file */
        if (verbose > 2)
-               rprintf(FINFO,"send_files starting\n");
-
-       setup_readbuffer(f_in);
-
-       while (1) {
-               int offset=0;
-
-               i = read_int(f_in);
-               if (i == -1) {
-                       if (phase==0 && remote_version >= 13) {
-                               phase++;
-                               csum_length = SUM_LENGTH;
-                               write_int(f_out,-1);
-                               if (verbose > 2)
-                                       rprintf(FINFO,"send_files phase=%d\n",phase);
-                               continue;
-                       }
-                       break;
-               }
-
-               if (i < 0 || i >= flist->count) {
-                       rprintf(FERROR,"Invalid file index %d (count=%d)\n", 
-                               i, flist->count);
-                       exit_cleanup(1);
-               }
-
-               file = flist->files[i];
-
-               stats.num_transferred_files++;
-               stats.total_transferred_size += file->length;
-
-               fname[0] = 0;
-               if (file->basedir) {
-                       strlcpy(fname,file->basedir,MAXPATHLEN-1);
-                       if (strlen(fname) == MAXPATHLEN-1) {
-                               io_error = 1;
-                               rprintf(FERROR, "send_files failed on long-named directory %s\n",
-                                       fname);
-                               return;
-                       }
-                       strlcat(fname,"/",MAXPATHLEN-1);
-                       offset = strlen(file->basedir)+1;
-               }
-               strlcat(fname,f_name(file),MAXPATHLEN-strlen(fname));
-         
-               if (verbose > 2) 
-                       rprintf(FINFO,"send_files(%d,%s)\n",i,fname);
-         
-               if (dry_run) {  
-                       if (!am_server && verbose)
-                               rprintf(FINFO,"%s\n",fname);
-                       write_int(f_out,i);
-                       continue;
-               }
-
-               s = receive_sums(f_in);
-               if (!s) {
-                       io_error = 1;
-                       rprintf(FERROR,"receive_sums failed\n");
-                       return;
-               }
-         
-               fd = open(fname,O_RDONLY);
-               if (fd == -1) {
-                       io_error = 1;
-                       rprintf(FERROR,"send_files failed to open %s: %s\n",
-                               fname,strerror(errno));
-                       free_sums(s);
-                       continue;
-               }
-         
-               /* map the local file */
-               if (do_fstat(fd,&st) != 0) {
-                       io_error = 1;
-                       rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
-                       free_sums(s);
-                       close(fd);
-                       return;
-               }
-         
-               if (st.st_size > 0) {
-                       buf = map_file(fd,st.st_size);
-               } else {
-                       buf = NULL;
-               }
-         
-               if (verbose > 2)
-                       rprintf(FINFO,"send_files mapped %s of size %d\n",
-                               fname,(int)st.st_size);
-         
-               write_int(f_out,i);
-         
-               write_int(f_out,s->count);
-               write_int(f_out,s->n);
-               write_int(f_out,s->remainder);
-         
-               if (verbose > 2)
-                       rprintf(FINFO,"calling match_sums %s\n",fname);
-         
-               if (!am_server && verbose)
-                       rprintf(FINFO,"%s\n",fname+offset);
-         
-               match_sums(f_out,s,buf,st.st_size);
-         
-               if (buf) unmap_file(buf);
-               close(fd);
-         
-               free_sums(s);
-         
-               if (verbose > 2)
-                       rprintf(FINFO,"sender finished %s\n",fname);
+               rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
+       ret = robust_rename(fnametmp, fname, partialptr,
+                           file->mode & INITACCESSPERMS);
+       if (ret < 0) {
+               rsyserr(FERROR, errno, "%s %s -> \"%s\"",
+                       ret == -2 ? "copy" : "rename",
+                       full_fname(fnametmp), fname);
+               do_unlink(fnametmp);
+               return;
        }
+       if (ret == 0) {
+               /* The file was moved into place (not copied), so it's done. */
+               return;
+       }
+       /* The file was copied, so tweak the perms of the copied file.  If it
+        * was copied to partialptr, move it into its final destination. */
+       fnametmp = partialptr ? partialptr : fname;
 
-       if (verbose > 2)
-               rprintf(FINFO,"send files finished\n");
-
-       match_report();
+  do_set_file_attrs:
+       set_file_attrs(fnametmp, file, NULL, fnamecmp,
+                      ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
 
-       write_int(f_out,-1);
+       if (partialptr) {
+               if (do_rename(fnametmp, fname) < 0) {
+                       rsyserr(FERROR, errno, "rename %s -> \"%s\"",
+                               full_fname(fnametmp), fname);
+               } else
+                       handle_partial_dir(partialptr, PDIR_DELETE);
+       }
 }
 
-
-
-void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
+struct file_list *flist_for_ndx(int ndx)
 {
-       int i;
-       int phase=0;
+       struct file_list *flist = cur_flist;
 
-       if (verbose > 2)
-               rprintf(FINFO,"generator starting pid=%d count=%d\n",
-                       (int)getpid(),flist->count);
-
-       for (i = 0; i < flist->count; i++) {
-               struct file_struct *file = flist->files[i];
-               mode_t saved_mode = file->mode;
-               if (!file->basename) continue;
-
-               /* we need to ensure that any directories we create have writeable
-                  permissions initially so that we can create the files within
-                  them. This is then fixed after the files are transferred */
-               if (!am_root && S_ISDIR(file->mode)) {
-                       file->mode |= S_IWUSR; /* user write */
-               }
-
-               recv_generator(local_name?local_name:f_name(file),
-                              flist,i,f);
+       if (!flist && !(flist = first_flist))
+               return NULL;
 
-               file->mode = saved_mode;
+       while (ndx < flist->ndx_start-1) {
+               if (flist == first_flist)
+                       return NULL;
+               flist = flist->prev;
        }
-
-       phase++;
-       csum_length = SUM_LENGTH;
-       ignore_times=1;
-
-       if (verbose > 2)
-               rprintf(FINFO,"generate_files phase=%d\n",phase);
-
-       write_int(f,-1);
-
-       /* we expect to just sit around now, so don't exit on a
-          timeout. If we really get a timeout then the other process should
-          exit */
-       io_timeout = 0;
-
-       if (remote_version >= 13) {
-               /* in newer versions of the protocol the files can cycle through
-                  the system more than once to catch initial checksum errors */
-               for (i=read_int(f_recv); i != -1; i=read_int(f_recv)) {
-                       struct file_struct *file = flist->files[i];
-                       recv_generator(local_name?local_name:f_name(file),
-                                      flist,i,f);    
-               }
-
-               phase++;
-               if (verbose > 2)
-                       rprintf(FINFO,"generate_files phase=%d\n",phase);
-
-               write_int(f,-1);
+       while (ndx > flist->ndx_end) {
+               if (!(flist = flist->next))
+                       return NULL;
        }
+       return flist;
 }
 
-
+const char *who_am_i(void)
+{
+       if (am_starting_up)
+               return am_server ? "server" : "client";
+       return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+}