If there is no lchown(), don't try to set the user & group of a symlink.

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 3919c7c..551e438 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -42,9 +42,8 @@ void close_all(void)
        for (fd = max_fd; fd >= 0; fd--) {
                ret = fstat(fd,&st);
                if (fstat(fd,&st) == 0) {
-                       if (is_a_socket(fd)) {
+                       if (is_a_socket(fd))
                                ret = shutdown(fd, 2);
-                       }
                        ret = close(fd);
                }
        }
@@ -69,13 +68,12 @@ void close_all(void)
  * --partial is selected.  We need to ensure that the partial file is
  * kept if any real data has been transferred.
  **/
-int cleanup_got_literal=0;
+int cleanup_got_literal = 0;
 
 static char *cleanup_fname;
 static char *cleanup_new_fname;
 static struct file_struct *cleanup_file;
-static int cleanup_fd1, cleanup_fd2;
-static struct map_struct *cleanup_buf;
+static int cleanup_fd_r, cleanup_fd_w;
 static pid_t cleanup_pid = 0;
 
 pid_t cleanup_child_pid = -1;
@@ -108,29 +106,32 @@ void _exit_cleanup(int code, const char *file, int line)
                int status;
                if (waitpid(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) {
                        status = WEXITSTATUS(status);
-                       if (status > code) code = status;
+                       if (status > code)
+                               code = status;
                }
        }
 
-       if (cleanup_got_literal && cleanup_fname && keep_partial) {
+       if (cleanup_got_literal && cleanup_fname && keep_partial
+           && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
                char *fname = cleanup_fname;
                cleanup_fname = NULL;
-               if (cleanup_buf) unmap_file(cleanup_buf);
-               if (cleanup_fd1 != -1) close(cleanup_fd1);
-               if (cleanup_fd2 != -1) close(cleanup_fd2);
+               if (cleanup_fd_r != -1)
+                       close(cleanup_fd_r);
+               if (cleanup_fd_w != -1) {
+                       flush_write_file(cleanup_fd_w);
+                       close(cleanup_fd_w);
+               }
                finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
        }
        io_flush(FULL_FLUSH);
        if (cleanup_fname)
                do_unlink(cleanup_fname);
-       if (code) {
+       if (code)
                kill_all(SIGUSR1);
-       }
        if (cleanup_pid && cleanup_pid == getpid()) {
                char *pidf = lp_pid_file();
-               if (pidf && *pidf) {
+               if (pidf && *pidf)
                        unlink(lp_pid_file());
-               }
        }
 
        if (code == 0) {
@@ -140,7 +141,8 @@ void _exit_cleanup(int code, const char *file, int line)
                        code = RERR_VANISHED;
        }
 
-       if (code) log_exit(code, file, line);
+       if (code)
+               log_exit(code, file, line);
 
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
@@ -159,14 +161,13 @@ void cleanup_disable(void)
 
 
 void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
-                struct map_struct *buf, int fd1, int fd2)
+                int fd_r, int fd_w)
 {
        cleanup_fname = fnametmp;
        cleanup_new_fname = fname;
        cleanup_file = file;
-       cleanup_buf = buf;
-       cleanup_fd1 = fd1;
-       cleanup_fd2 = fd2;
+       cleanup_fd_r = fd_r;
+       cleanup_fd_w = fd_w;
 }
 
 void cleanup_set_pid(pid_t pid)