Avoid leaving a file open on error return.

[rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index d84abb5d56446c9bbe345c8585b3b81f4e7a5063..c3ae799925b2531373bf03cc3ca76c853c40a563 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2013 Wayne Davison
+ * Copyright (C) 2003-2018 Wayne Davison
  *
  * 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
@@ -22,6 +22,7 @@
 
 #include "rsync.h"
 
+extern int dry_run;
 extern int am_server;
 extern int am_daemon;
 extern int am_receiver;
@@ -87,7 +88,7 @@ int cleanup_got_literal = 0;
 static const char *cleanup_fname;
 static const char *cleanup_new_fname;
 static struct file_struct *cleanup_file;
-static int cleanup_fd_r, cleanup_fd_w;
+static int cleanup_fd_r = -1, cleanup_fd_w = -1;
 static pid_t cleanup_pid = 0;
 
 pid_t cleanup_child_pid = -1;
@@ -137,7 +138,6 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
                                who_am_i(), code, file, line);
                }
 
-               /* FALLTHROUGH */
 #include "case_N.h"
                switch_step++;
 
@@ -151,33 +151,36 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
                        }
                }
 
-               /* FALLTHROUGH */
 #include "case_N.h"
                switch_step++;
 
-               if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
-                && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
-                       int tweak_modtime = 0;
-                       const char *fname = cleanup_fname;
-                       cleanup_fname = NULL;
-                       if (cleanup_fd_r != -1)
+               if (cleanup_got_literal && (cleanup_fname || cleanup_fd_w != -1)) {
+                       if (cleanup_fd_r != -1) {
                                close(cleanup_fd_r);
+                               cleanup_fd_r = -1;
+                       }
                        if (cleanup_fd_w != -1) {
                                flush_write_file(cleanup_fd_w);
                                close(cleanup_fd_w);
+                               cleanup_fd_w = -1;
                        }
-                       if (!partial_dir) {
-                           /* We don't want to leave a partial file with a modern time or it
-                            * could be skipped via --update.  Setting the time to something
-                            * really old also helps it to stand out as unfinished in an ls. */
-                           tweak_modtime = 1;
-                           cleanup_file->modtime = 0;
+                       if (cleanup_fname && cleanup_new_fname && keep_partial
+                        && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
+                               int tweak_modtime = 0;
+                               const char *fname = cleanup_fname;
+                               cleanup_fname = NULL;
+                               if (!partial_dir) {
+                                   /* We don't want to leave a partial file with a modern time or it
+                                    * could be skipped via --update.  Setting the time to something
+                                    * really old also helps it to stand out as unfinished in an ls. */
+                                   tweak_modtime = 1;
+                                   cleanup_file->modtime = 0;
+                               }
+                               finish_transfer(cleanup_new_fname, fname, NULL, NULL,
+                                               cleanup_file, tweak_modtime, !partial_dir);
                        }
-                       finish_transfer(cleanup_new_fname, fname, NULL, NULL,
-                                       cleanup_file, tweak_modtime, !partial_dir);
                }
 
-               /* FALLTHROUGH */
 #include "case_N.h"
                switch_step++;
 
@@ -189,7 +192,6 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
                if (!exit_code && !code)
                        io_flush(FULL_FLUSH);
 
-               /* FALLTHROUGH */
 #include "case_N.h"
                switch_step++;
 
@@ -220,18 +222,17 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
                 || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1))))
                        log_exit(exit_code, exit_file, exit_line);
 
-               /* FALLTHROUGH */
 #include "case_N.h"
                switch_step++;
 
                if (DEBUG_GTE(EXIT, 1)) {
                        rprintf(FINFO,
                                "[%s] _exit_cleanup(code=%d, file=%s, line=%d): "
-                               "about to call exit(%d)\n",
-                               who_am_i(), first_code, exit_file, exit_line, exit_code);
+                               "about to call exit(%d)%s\n",
+                               who_am_i(), first_code, exit_file, exit_line, exit_code,
+                               dry_run ? " (DRY RUN)" : "");
                }
 
-               /* FALLTHROUGH */
 #include "case_N.h"
                switch_step++;
 
@@ -247,7 +248,6 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
                        noop_io_until_death();
                }
 
-               /* FALLTHROUGH */
 #include "case_N.h"
                switch_step++;
 
@@ -266,6 +266,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 void cleanup_disable(void)
 {
        cleanup_fname = cleanup_new_fname = NULL;
+       cleanup_fd_r = cleanup_fd_w = -1;
        cleanup_got_literal = 0;
 }