git.samba.org
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rename of global option
[rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index abd7b0dfb4ad57698a12d7c8138f4d80f81886ba..480c200985a269522d0905c0f4e94d481450e18c 100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-1,5
+1,6
@@
-/*
- Copyright (C) Andrew Tridgell 1996
+/* -*- c-file-style: "linux" -*-
+
+ Copyright (C) 1996-2000 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
This program is free software; you can redistribute it and/or modify
Copyright (C) Paul Mackerras 1996
This program is free software; you can redistribute it and/or modify
@@
-30,12
+31,28
@@
static struct file_struct *cleanup_file;
static int cleanup_fd1, cleanup_fd2;
static struct map_struct *cleanup_buf;
static int cleanup_pid = 0;
static int cleanup_fd1, cleanup_fd2;
static struct map_struct *cleanup_buf;
static int cleanup_pid = 0;
+extern int io_error;
+
+pid_t cleanup_child_pid = -1;
-void exit_cleanup(int code)
+/*
+ * Code is one of the RERR_* codes from errcode.h.
+ */
+void _exit_cleanup(int code, const char *file, int line)
{
extern int keep_partial;
{
extern int keep_partial;
+ extern int log_got_error;
signal(SIGUSR1, SIG_IGN);
signal(SIGUSR1, SIG_IGN);
+ signal(SIGUSR2, SIG_IGN);
+
+ 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 (cleanup_got_literal && cleanup_fname && keep_partial) {
char *fname = cleanup_fname;
if (cleanup_got_literal && cleanup_fname && keep_partial) {
char *fname = cleanup_fname;
@@
-51,8
+68,19
@@
void exit_cleanup(int code)
if (code) {
kill_all(SIGUSR1);
}
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 == 0 && (io_error || log_got_error)) {
+ code = RERR_PARTIAL;
+ }
+
+ if (code) log_exit(code, file, line);
+
exit(code);
}
exit(code);
}