"rsync error" is better than "transfer error", especially for -h

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index e0c99d1..7be9588 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -1,5 +1,6 @@
-/* 
-   Copyright (C) Andrew Tridgell 1996
+/* -*- 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
@@ -36,7 +37,6 @@ extern char *compare_dest;
 extern int make_backups;
 extern char *backup_suffix;
 
-
 static struct delete_list {
        dev_t dev;
        INO_T inode;
@@ -83,14 +83,15 @@ static void delete_one(struct file_struct *f)
 {
        if (!S_ISDIR(f->mode)) {
                if (robust_unlink(f_name(f)) != 0) {
-                       rprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
+                       rprintf(FERROR,"delete_one: 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));
+                               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));      
                }
@@ -103,19 +104,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;
        }
@@ -146,6 +148,7 @@ static void delete_files(struct file_list *flist)
                        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);
@@ -254,10 +257,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 +272,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",
@@ -291,6 +296,8 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
 }
 
 
+/* 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)
 {  
@@ -314,12 +321,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();