add a --ignore-errors option

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 20afb4f..b10f7c6 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -102,19 +102,20 @@ static void delete_one(struct file_struct *f)
 /* 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)
+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)) {
+       if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
                rprintf(FINFO,"IO error encountered - skipping file deletion\n");
                return;
        }
@@ -254,10 +255,12 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
                        rprintf(FINFO,"chunk[%d] of size %d at %.0f offset=%.0f\n",
                                i,len,(double)offset2,(double)offset);
                
-               map = map_ptr(buf,offset2,len);
+               if (buf) {
+                       map = map_ptr(buf,offset2,len);
                
-               see_token(map, len);
-               sum_update(map,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",
@@ -267,7 +270,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
                offset += len;
        }
 
-       end_progress();
+       end_progress(total_size);
 
        if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
                rprintf(FERROR,"write failed on %s : %s\n",
@@ -316,12 +319,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
                rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
        }
 
-       if (!delete_after) {
-               if (recurse && delete_mode && !local_name && flist->count>0) {
-                       delete_files(flist);
-               }
-       }
-
        while (1) {      
                cleanup_disable();