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 3e85d4e..551e438 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -1,19 +1,19 @@
 /* -*- c-file-style: "linux" -*-
-   
+
    Copyright (C) 1996-2000 by Andrew Tridgell
    Copyright (C) Paul Mackerras 1996
    Copyright (C) 2002 by Martin Pool
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -21,6 +21,10 @@
 
 #include "rsync.h"
 
+extern int io_error;
+extern int keep_partial;
+extern int log_got_error;
+
 /**
  * Close all open sockets and files, allowing a (somewhat) graceful
  * shutdown() of socket connections.  This eliminates the abortive
@@ -38,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);
                }
        }
@@ -65,15 +68,13 @@ 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_pid = 0;
-extern int io_error;
+static int cleanup_fd_r, cleanup_fd_w;
+static pid_t cleanup_pid = 0;
 
 pid_t cleanup_child_pid = -1;
 
@@ -85,8 +86,6 @@ pid_t cleanup_child_pid = -1;
 void _exit_cleanup(int code, const char *file, int line)
 {
        int ocode = code;
-       extern int keep_partial;
-       extern int log_got_error;
        static int inside_cleanup = 0;
 
        if (inside_cleanup > 10) {
@@ -98,37 +97,41 @@ void _exit_cleanup(int code, const char *file, int line)
        signal(SIGUSR1, SIG_IGN);
        signal(SIGUSR2, SIG_IGN);
 
-       if (verbose > 3)
-               rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", 
+       if (verbose > 3) {
+               rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
                        code, file, line);
+       }
 
        if (cleanup_child_pid != -1) {
                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);
-               finish_transfer(cleanup_new_fname, fname, cleanup_file);
+               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 != 0) && (cleanup_pid == (int) getpid())) {
+       if (cleanup_pid && cleanup_pid == getpid()) {
                char *pidf = lp_pid_file();
-               if (pidf && *pidf) {
+               if (pidf && *pidf)
                        unlink(lp_pid_file());
-               }
        }
 
        if (code == 0) {
@@ -138,11 +141,13 @@ 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", 
+       if (verbose > 2) {
+               rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
                        ocode, file, line, code);
+       }
 
        close_all();
        exit(code);
@@ -156,17 +161,16 @@ 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(int pid)
+void cleanup_set_pid(pid_t pid)
 {
        cleanup_pid = pid;
 }