about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeah Neukirchen <leah@vuxu.org>2017-09-27 20:10:56 +0200
committerLeah Neukirchen <leah@vuxu.org>2017-09-27 20:10:56 +0200
commitd13fe19eb6d1107d87de956e4b50dc5280ea8387 (patch)
treeaa025d9ebc92a06f05485121ec5de994c1106264
parent21aa46256916122007b3db3ebc1096ad34105957 (diff)
downloadoutils-d13fe19eb6d1107d87de956e4b50dc5280ea8387.tar.gz
outils-d13fe19eb6d1107d87de956e4b50dc5280ea8387.tar.xz
outils-d13fe19eb6d1107d87de956e4b50dc5280ea8387.zip
cvs update
-rw-r--r--src/usr.bin/calendar/io.c12
1 files 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;
+		}
 	}
 }