Got rid of calls to (the soon to vanish) safe_fname() function.

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index d183c9d..bb589e4 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -99,7 +99,7 @@ void _exit_cleanup(int code, const char *file, int line)
 
        if (verbose > 3) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
-                       code, safe_fname(file), line);
+                       code, file, line);
        }
 
        if (cleanup_child_pid != -1) {
@@ -136,10 +136,12 @@ void _exit_cleanup(int code, const char *file, int line)
        }
 
        if (code == 0) {
-               if ((io_error & ~IOERR_VANISHED) || log_got_error)
-                       code = RERR_PARTIAL;
-               else if (io_error)
+               if (io_error & IOERR_DEL_LIMIT)
+                       code = RERR_DEL_LIMIT;
+               if (io_error & IOERR_VANISHED)
                        code = RERR_VANISHED;
+               if (io_error & IOERR_GENERAL || log_got_error)
+                       code = RERR_PARTIAL;
        }
 
        if (code)
@@ -147,7 +149,7 @@ void _exit_cleanup(int code, const char *file, int line)
 
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
-                       ocode, safe_fname(file), line, code);
+                       ocode, file, line, code);
        }
 
        close_all();
@@ -164,7 +166,7 @@ void cleanup_disable(void)
 void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
                 int fd_r, int fd_w)
 {
-       cleanup_fname = fnametmp;
+       cleanup_fname = fname ? fnametmp : NULL;
        cleanup_new_fname = fname;
        cleanup_file = file;
        cleanup_fd_r = fd_r;