From d13fe19eb6d1107d87de956e4b50dc5280ea8387 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 27 Sep 2017 20:10:56 +0200 Subject: cvs update --- src/usr.bin/calendar/io.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/usr.bin/calendar/io.c b/src/usr.bin/calendar/io.c index 8abe799..7d4353e 100644 --- a/src/usr.bin/calendar/io.c +++ b/src/usr.bin/calendar/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.46 2017/08/21 21:41:13 deraadt Exp $ */ +/* $OpenBSD: io.c,v 1.47 2017/09/25 19:13:56 krw Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -385,7 +385,7 @@ closecal(FILE *fp) struct stat sbuf; int nread, pdes[2], status; char buf[1024]; - pid_t pid; + pid_t pid = -1; if (!doall) return; @@ -422,9 +422,11 @@ closecal(FILE *fp) (void)write(pdes[1], buf, nread); (void)close(pdes[1]); done: (void)fclose(fp); - while (waitpid(pid, &status, 0) == -1) { - if (errno != EINTR) - break; + if (pid != -1) { + while (waitpid(pid, &status, 0) == -1) { + if (errno != EINTR) + break; + } } } -- cgit 1.4.1