Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use `id -G` rather than `groups` to get a list of groups for this
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
57fce18
..
480c200
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
@@
-29,12
+30,29
@@
static char *cleanup_new_fname;
static struct file_struct *cleanup_file;
static int cleanup_fd1, cleanup_fd2;
static struct map_struct *cleanup_buf;
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;
+
+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;
@@
-50,6
+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())) {
+ 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);
}
@@
-70,3
+101,8
@@
void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
cleanup_fd1 = fd1;
cleanup_fd2 = fd2;
}
cleanup_fd1 = fd1;
cleanup_fd2 = fd2;
}
+
+void cleanup_set_pid(int pid)
+{
+ cleanup_pid = pid;
+}