about summary refs log tree commit diff
path: root/src/usr.bin/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr.bin/calendar')
-rw-r--r--src/usr.bin/calendar/calendars/calendar.birthday4
-rw-r--r--src/usr.bin/calendar/calendars/calendar.openbsd4
-rw-r--r--src/usr.bin/calendar/io.c7
3 files changed, 11 insertions, 4 deletions
diff --git a/src/usr.bin/calendar/calendars/calendar.birthday b/src/usr.bin/calendar/calendars/calendar.birthday
index 6f05dd7..785d9a9 100644
--- a/src/usr.bin/calendar/calendars/calendar.birthday
+++ b/src/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $OpenBSD: calendar.birthday,v 1.63 2016/04/11 09:03:41 sthen Exp $
+ * $OpenBSD: calendar.birthday,v 1.64 2016/08/31 12:33:03 schwarze Exp $
  */
 
 #ifndef _calendar_birthday_
@@ -330,6 +330,7 @@
 11/26	Norbert Wiener born, 1894
 11/27	Bruce Lee born in San Francisco, 1940
 11/28	Friedrich Engels born, 1820
+11/28	Joe Ossanna died, 1977
 11/29	John Mayall is born in Cheshire, England, 1933
 11/30	Cleopatra died, 30 BC
 11/30	Mark Twain (Samuel Clemens) born in Florida, Missouri, 1835
@@ -341,6 +342,7 @@
 12/08	Horace (Quintus Horatius Flaccus) born in Venosa (Italy), 65BC
 12/08	James (Grover) Thurber born in Columbus, Ohio, 1894
 12/10	Emily Dickinson born, 1830
+12/10	Joe Ossanna born, 1928
 12/12	E.G. Robinson born, 1893
 12/14	George Washington dies, 1799
 12/16	Arthur C. Clarke born in Somerset, England, 1917
diff --git a/src/usr.bin/calendar/calendars/calendar.openbsd b/src/usr.bin/calendar/calendars/calendar.openbsd
index 2823e23..208b23b 100644
--- a/src/usr.bin/calendar/calendars/calendar.openbsd
+++ b/src/usr.bin/calendar/calendars/calendar.openbsd
@@ -1,7 +1,7 @@
 /*
  * OpenBSD-related dates to celebrate
  *
- * $OpenBSD: calendar.openbsd,v 1.37 2016/03/11 20:20:26 jmc Exp $
+ * $OpenBSD: calendar.openbsd,v 1.38 2016/09/03 13:37:45 guenther Exp $
  */
 
 #ifndef _calendar_openbsd_
@@ -80,6 +80,8 @@ Aug 16	IPX network stack added to OpenBSD, from FreeBSD, 1996
 Aug 17	c2k1-2: Sparc64 hackathon, Washington D.C., 12 developers, 2001
 Aug 17	OpenBSD/sparc64 port is added, from NetBSD, 2001
 Aug 28	k2k6: IPSec hackathon, Schloss Kransberg, Germany, 14 developers, 2006
+Sep 01	Support for the sparc (32bit) architecture removed, 2016
+Sep 03	Support for the zaurus architecture removed, 2016
 Sep 16	s2k11: General hackathon, Ljubljana, Slovenia, 25 developers, 2011
 Sep 17	n2k12: Network hackathon, Starnberg, Germany, 23 developers, 2012
 Sep 19	j2k10: Mini-hackathon, Sakae Mura, Nagano, Japan, 19 developers, 2010
diff --git a/src/usr.bin/calendar/io.c b/src/usr.bin/calendar/io.c
index f17cacb..e4cb689 100644
--- a/src/usr.bin/calendar/io.c
+++ b/src/usr.bin/calendar/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.43 2015/12/08 19:04:50 mmcc Exp $	*/
+/*	$OpenBSD: io.c,v 1.44 2016/08/31 09:38:47 jsg Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -335,12 +335,15 @@ opencal(void)
 		}
 	}
 
-	if (pipe(pdes) < 0)
+	if (pipe(pdes) < 0) {
+		close(fdin);
 		return (NULL);
+	}
 	switch (vfork()) {
 	case -1:			/* error */
 		(void)close(pdes[0]);
 		(void)close(pdes[1]);
+		close(fdin);
 		return (NULL);
 	case 0:
 		dup2(fdin, STDIN_FILENO);