New logging categories added to allow differentiation between

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 13ae8e4..33d5b94 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -6,8 +6,9 @@
  * 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 version 3 as
- * published by the Free Software Foundation.
+ * 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
@@ -43,7 +44,7 @@ extern int inplace;
 extern int batch_fd;
 extern int write_batch;
 extern struct stats stats;
-extern struct file_list *cur_flist, *first_flist;
+extern struct file_list *cur_flist, *first_flist, *dir_flist;
 
 /**
  * @file
@@ -210,7 +211,10 @@ void send_files(int f_in, int f_out)
                if (inc_recurse)
                        send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
 
-               file = cur_flist->files[ndx - cur_flist->ndx_start];
+               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];
                if (F_PATHNAME(file)) {
                        path = F_PATHNAME(file);
                        slash = "/";
@@ -285,13 +289,13 @@ void send_files(int f_in, int f_out)
                        if (errno == ENOENT) {
                                enum logcode c = am_daemon
                                    && protocol_version < 28 ? FERROR
-                                                            : FINFO;
+                                                            : FWARNING;
                                io_error |= IOERR_VANISHED;
                                rprintf(c, "file has vanished: %s\n",
                                        full_fname(fname));
                        } else {
                                io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR, errno,
+                               rsyserr(FERROR_XFER, errno,
                                        "send_files failed to open %s",
                                        full_fname(fname));
                        }
@@ -345,7 +349,7 @@ void send_files(int f_in, int f_out)
                        j = unmap_file(mbuf);
                        if (j) {
                                io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR, j,
+                               rsyserr(FERROR_XFER, j,
                                        "read errors mapping %s",
                                        full_fname(fname));
                        }