Moved the verbose message about renaming the finished file down into

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index acc5da8..0aeda10 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -30,6 +30,7 @@ extern struct stats stats;
 extern int dry_run;
 extern int am_server;
 extern int relative_paths;
+extern int keep_dirlinks;
 extern int preserve_hard_links;
 extern int preserve_perms;
 extern int cvs_exclude;
@@ -46,21 +47,27 @@ extern int module_id;
 extern int ignore_errors;
 extern int orig_umask;
 extern int keep_partial;
+extern int checksum_seed;
 
 static void delete_one(char *fn, int is_dir)
 {
        if (!is_dir) {
                if (robust_unlink(fn) != 0) {
-                       rprintf(FERROR, "delete_one: unlink %s failed: %s\n",
-                               full_fname(fn), strerror(errno));
+                       rsyserr(FERROR, errno, "delete_one: unlink %s failed",
+                               full_fname(fn));
                } else if (verbose) {
                        rprintf(FINFO, "deleting %s\n", fn);
                }
        } else {
                if (do_rmdir(fn) != 0) {
+                       if (errno == ENOTDIR && keep_dirlinks) {
+                               delete_one(fn, 0);
+                               return;
+                       }
                        if (errno != ENOTEMPTY && errno != EEXIST) {
-                               rprintf(FERROR, "delete_one: rmdir %s failed: %s\n",
-                                       full_fname(fn), strerror(errno));
+                               rsyserr(FERROR, errno,
+                                       "delete_one: rmdir %s failed",
+                                       full_fname(fn));
                        }
                } else if (verbose) {
                        rprintf(FINFO, "deleting directory %s\n", fn);
@@ -201,11 +208,11 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
        char *data;
        static char file_sum1[MD4_SUM_LENGTH];
        static char file_sum2[MD4_SUM_LENGTH];
-       char *map=NULL;
+       char *map = NULL;
 
        read_sum_head(f_in, &sum);
 
-       sum_init();
+       sum_init(checksum_seed);
 
        while ((i = recv_token(f_in, &data)) != 0) {
                if (do_progress)
@@ -223,8 +230,8 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
                        sum_update(data,i);
 
                        if (fd != -1 && write_file(fd,data,i) != i) {
-                               rprintf(FERROR, "write failed on %s: %s\n",
-                                       full_fname(fname), strerror(errno));
+                               rsyserr(FERROR, errno, "write failed on %s",
+                                       full_fname(fname));
                                exit_cleanup(RERR_FILEIO);
                        }
                        offset += i;
@@ -251,8 +258,8 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
                }
 
                if (fd != -1 && write_file(fd,map,len) != (int) len) {
-                       rprintf(FERROR, "write failed on %s: %s\n",
-                               full_fname(fname), strerror(errno));
+                       rsyserr(FERROR, errno, "write failed on %s",
+                               full_fname(fname));
                        exit_cleanup(RERR_FILEIO);
                }
                offset += len;
@@ -264,8 +271,8 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
                end_progress(total_size);
 
        if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
-               rprintf(FERROR, "write failed on %s: %s\n",
-                       full_fname(fname), strerror(errno));
+               rsyserr(FERROR, errno, "write failed on %s",
+                       full_fname(fname));
                exit_cleanup(RERR_FILEIO);
        }
 
@@ -296,11 +303,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
        char *fnamecmp;
        char fnamecmpbuf[MAXPATHLEN];
        struct map_struct *mapbuf;
-       int i;
        struct file_struct *file;
-       int phase=0;
-       int recv_ok;
        struct stats initial_stats;
+       int save_make_backups = make_backups;
+       int i, recv_ok, phase = 0;
 
        if (verbose > 2) {
                rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
@@ -316,15 +322,16 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 
                i = read_int(f_in);
                if (i == -1) {
-                       if (phase == 0) {
-                               phase++;
-                               csum_length = SUM_LENGTH;
-                               if (verbose > 2)
-                                       rprintf(FINFO,"recv_files phase=%d\n",phase);
-                               send_msg(MSG_DONE, "", 0);
-                               continue;
-                       }
-                       break;
+                       if (phase)
+                               break;
+                       phase = 1;
+                       csum_length = SUM_LENGTH;
+                       if (verbose > 2)
+                               rprintf(FINFO, "recv_files phase=%d\n", phase);
+                       send_msg(MSG_DONE, "", 0);
+                       if (keep_partial)
+                               make_backups = 0; /* prevents double backup */
+                       continue;
                }
 
                if (i < 0 || i >= flist->count) {
@@ -371,8 +378,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                }
 
                if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
-                       rprintf(FERROR, "fstat %s failed: %s\n",
-                               full_fname(fnamecmp), strerror(errno));
+                       rsyserr(FERROR, errno, "fstat %s failed",
+                               full_fname(fnamecmp));
                        receive_data(f_in,NULL,-1,NULL,file->length);
                        close(fd1);
                        continue;
@@ -406,8 +413,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 
                if (fd1 != -1 && st.st_size > 0) {
                        mapbuf = map_file(fd1,st.st_size);
-                       if (verbose > 2)
-                               rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
+                       if (verbose > 2) {
+                               rprintf(FINFO, "recv mapped %s of size %.0f\n",
+                                       fnamecmp, (double)st.st_size);
+                       }
                } else
                        mapbuf = NULL;
 
@@ -436,8 +445,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                        fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
                }
                if (fd2 == -1) {
-                       rprintf(FERROR, "mkstemp %s failed: %s\n",
-                               full_fname(fnametmp), strerror(errno));
+                       rsyserr(FERROR, errno, "mkstemp %s failed",
+                               full_fname(fnametmp));
                        receive_data(f_in,mapbuf,-1,NULL,file->length);
                        if (mapbuf) unmap_file(mapbuf);
                        if (fd1 != -1) close(fd1);
@@ -460,14 +469,11 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                        close(fd1);
                }
                if (close(fd2) < 0) {
-                       rprintf(FERROR, "close failed on %s: %s\n",
-                               full_fname(fnametmp), strerror(errno));
+                       rsyserr(FERROR, errno, "close failed on %s",
+                               full_fname(fnametmp));
                        exit_cleanup(RERR_FILEIO);
                }
 
-               if (verbose > 2)
-                       rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
-
                if (recv_ok || keep_partial)
                        finish_transfer(fname, fnametmp, file, recv_ok);
                else
@@ -488,6 +494,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                        }
                }
        }
+       make_backups = save_make_backups;
 
        if (delete_after && recurse && delete_mode && !local_name
            && flist->count > 0)