X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8638dd48f71023642d3af282250bbe157ee9b67d..66203a982b3d249bafda9b9272c4c103c19e4a9b:/cleanup.c diff --git a/cleanup.c b/cleanup.c index abd7b0df..b4ac82ad 100644 --- a/cleanup.c +++ b/cleanup.c @@ -30,11 +30,14 @@ 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; -void exit_cleanup(int code) +void _exit_cleanup(int code, const char *file, int line) { extern int keep_partial; + if (code == 0 && io_error) code = RERR_FILEIO; + signal(SIGUSR1, SIG_IGN); if (cleanup_got_literal && cleanup_fname && keep_partial) { @@ -51,8 +54,15 @@ void exit_cleanup(int code) if (code) { kill_all(SIGUSR1); } - if ((cleanup_pid != 0) && (cleanup_pid == (int) getpid())) - unlink(lp_pid_file()); + if ((cleanup_pid != 0) && (cleanup_pid == (int) getpid())) { + char *pidf = lp_pid_file(); + if (pidf && *pidf) { + unlink(lp_pid_file()); + } + } + + if (code) log_exit(code, file, line); + exit(code); }