A few more improvements and a mention of the latest fix.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 225bab6..1ff029d 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2007 Wayne Davison
+ * 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
@@ -55,7 +55,7 @@ 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 server_filter_list;
+extern struct filter_list_struct daemon_filter_list;
 
 static struct bitbag *delayed_bits = NULL;
 static int phase = 0, redoing = 0;
@@ -489,8 +489,8 @@ int recv_files(int f_in, char *local_name)
 
                cleanup_got_literal = 0;
 
-               if (server_filter_list.head
-                   && check_filter(&server_filter_list, fname, 0) < 0) {
+               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);
                }
@@ -502,7 +502,7 @@ int recv_files(int f_in, char *local_name)
                        continue;
                }
                if (write_batch < 0) {
-                       log_item(FINFO, file, &stats, iflags, NULL);
+                       log_item(FCLIENT, file, &stats, iflags, NULL);
                        if (!am_server)
                                discard_receive_data(f_in, F_LENGTH(file));
                        continue;
@@ -555,8 +555,8 @@ int recv_files(int f_in, char *local_name)
                                fnamecmp = fnamecmpbuf;
                                break;
                        }
-                       if (!fnamecmp || (server_filter_list.head
-                         && check_filter(&server_filter_list, fname, 0) < 0)) {
+                       if (!fnamecmp || (daemon_filter_list.head
+                         && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
                                fnamecmp = fname;
                                fnamecmp_type = FNAMECMP_FNAME;
                        }
@@ -698,23 +698,30 @@ int recv_files(int f_in, char *local_name)
                                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))
+               } else if (keep_partial && partialptr) {
+                       if (!handle_partial_dir(partialptr, PDIR_CREATE)) {
+                               rprintf(FERROR,
+                                   "Unable to create partial-dir for %s -- discarding %s.\n",
+                                   local_name ? local_name : f_name(file, NULL),
+                                   recv_ok ? "completed file" : "partial file");
+                               do_unlink(fnametmp);
+                               recv_ok = -1;
+                       } else 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;
+                       } else
+                               partialptr = NULL;
+               } else
                        do_unlink(fnametmp);
-               }
 
                cleanup_disable();
 
                switch (recv_ok) {
+               case 2:
+                       break;
                case 1:
                        if (remove_source_files || inc_recurse
                         || (preserve_hard_links && F_IS_HLINKED(file)))