diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2015-09-28 07:23:05 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2015-09-28 07:23:05 +0000 |
| commit | b27480c68d87d6aaade60f4e60e3647ad3a81d38 (patch) | |
| tree | 5f60a6fc45669979bed7dcb0fc78c2ed91ecb83d /usr.bin/usbhidaction | |
| parent | 6f5ed42a0cd1f3cc050b1124bfbdc94690036111 (diff) | |
Store PID after becoming a daemon() and not before to ensure the
correct PID gets written to the PID file.
Submitted by: Maxime Soule <btik-fbsd@scoubidou.com>
PR: 203252
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=288335
Diffstat (limited to 'usr.bin/usbhidaction')
| -rw-r--r-- | usr.bin/usbhidaction/usbhidaction.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c index 876dbca71daf..49cf0af2a8f2 100644 --- a/usr.bin/usbhidaction/usbhidaction.c +++ b/usr.bin/usbhidaction/usbhidaction.c @@ -166,17 +166,15 @@ main(int argc, char **argv) if (demon) { fp = open(pidfile, O_WRONLY|O_CREAT, S_IRUSR|S_IRGRP|S_IROTH); - if (fp >= 0) { - sz1 = snprintf(buf, sizeof buf, "%ld\n", - (long)getpid()); - if (sz1 > sizeof buf) - sz1 = sizeof buf; - write(fp, buf, sz1); - close(fp); - } else + if (fp < 0) err(1, "%s", pidfile); if (daemon(0, 0) < 0) err(1, "daemon()"); + snprintf(buf, sizeof(buf), "%ld\n", (long)getpid()); + sz1 = strlen(buf); + if (write(fp, buf, sz1) < 0) + err(1, "%s", pidfile); + close(fp); isdemon = 1; } |