aboutsummaryrefslogtreecommitdiffstats
path: root/cleanup.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2004-01-27 08:14:33 +0000
committerWayne Davison <wayned@samba.org>2004-01-27 08:14:33 +0000
commit65fc84b32e2a558cca3a66587ac4cd06e16f1471 (patch)
tree9ed0694b62cf74043df30f1943743d4936e63be3 /cleanup.c
parent45e08edb0869c680ffe110bf0e5117baa5a85510 (diff)
downloadandroid_external_rsync-65fc84b32e2a558cca3a66587ac4cd06e16f1471.tar.gz
android_external_rsync-65fc84b32e2a558cca3a66587ac4cd06e16f1471.tar.bz2
android_external_rsync-65fc84b32e2a558cca3a66587ac4cd06e16f1471.zip
Better pid handling.
Diffstat (limited to 'cleanup.c')
-rw-r--r--cleanup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cleanup.c b/cleanup.c
index 3e85d4e1..779f284c 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -72,7 +72,7 @@ static char *cleanup_new_fname;
static struct file_struct *cleanup_file;
static int cleanup_fd1, cleanup_fd2;
static struct map_struct *cleanup_buf;
-static int cleanup_pid = 0;
+static pid_t cleanup_pid = 0;
extern int io_error;
pid_t cleanup_child_pid = -1;
@@ -124,7 +124,7 @@ void _exit_cleanup(int code, const char *file, int line)
if (code) {
kill_all(SIGUSR1);
}
- if ((cleanup_pid != 0) && (cleanup_pid == (int) getpid())) {
+ if (cleanup_pid && cleanup_pid == getpid()) {
char *pidf = lp_pid_file();
if (pidf && *pidf) {
unlink(lp_pid_file());
@@ -166,7 +166,7 @@ void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
cleanup_fd2 = fd2;
}
-void cleanup_set_pid(int pid)
+void cleanup_set_pid(pid_t pid)
{
cleanup_pid = pid;
}