From 03dbc0b831c0df53c45828b73ffcb816f84c28bf Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 18 May 2006 18:52:40 +0000 Subject: [PATCH] - Improved the setting of cleanup_new_fname and cleanup_fname. - Don't try to keep a partial file if cleanup_new_fname is not set. --- cleanup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cleanup.c b/cleanup.c index d6388689..9cf7be0f 100644 --- a/cleanup.c +++ b/cleanup.c @@ -121,7 +121,7 @@ void _exit_cleanup(int code, const char *file, int line) } } - if (cleanup_got_literal && cleanup_fname && keep_partial + if (cleanup_got_literal && cleanup_new_fname && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) { char *fname = cleanup_fname; cleanup_fname = NULL; @@ -168,7 +168,7 @@ void _exit_cleanup(int code, const char *file, int line) void cleanup_disable(void) { - cleanup_fname = NULL; + cleanup_fname = cleanup_new_fname = NULL; cleanup_got_literal = 0; } @@ -176,8 +176,8 @@ void cleanup_disable(void) void cleanup_set(char *fnametmp, char *fname, struct file_struct *file, int fd_r, int fd_w) { - cleanup_fname = fname ? fnametmp : NULL; - cleanup_new_fname = fname; + cleanup_fname = fnametmp; + cleanup_new_fname = fname; /* can be NULL on a partial-dir failure */ cleanup_file = file; cleanup_fd_r = fd_r; cleanup_fd_w = fd_w; -- 2.34.1