added a replacement inet_aton() for systems that don't have it.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 6eb9aca..9621578 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -109,11 +109,12 @@ static void delete_files(struct file_list *flist)
        struct file_list *local_file_list;
        int i, j;
        char *name;
+       extern int module_id;
 
        if (cvs_exclude)
                add_cvs_excludes();
 
-       if (io_error) {
+       if (io_error && !lp_ignore_errors(module_id)) {
                rprintf(FINFO,"IO error encountered - skipping file deletion\n");
                return;
        }
@@ -302,6 +303,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
        int phase=0;
        int recv_ok;
        extern struct stats stats;              
+       extern int preserve_perms;
        struct stats initial_stats;
 
        if (verbose > 2) {
@@ -382,6 +384,13 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
                        continue;
                }
 
+               if (fd1 != -1 && !preserve_perms) {
+                       /* if the file exists already and we aren't perserving
+                          presmissions then act as though the remote end sent
+                          us the file permissions we already have */
+                       file->mode = st.st_mode;
+               }
+
                if (fd1 != -1 && st.st_size > 0) {
                        buf = map_file(fd1,st.st_size);
                        if (verbose > 2)