===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/io.c,v
retrieving revision 1.19
retrieving revision 1.21
diff -u -r1.19 -r1.21
--- src/usr.bin/calendar/io.c	2001/11/19 19:02:13	1.19
+++ src/usr.bin/calendar/io.c	2002/12/18 20:34:44	1.21
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.19 2001/11/19 19:02:13 mpech Exp $	*/
+/*	$OpenBSD: io.c,v 1.21 2002/12/18 20:34:44 mickey Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -43,7 +43,7 @@
 #if 0
 static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: io.c,v 1.19 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: io.c,v 1.21 2002/12/18 20:34:44 mickey Exp $";
 #endif
 #endif /* not lint */
 
@@ -82,7 +82,7 @@
 
 
 void
-cal()
+cal(void)
 {
 	int printing;
 	char *p;
@@ -179,7 +179,7 @@
 						int l1 = strlen(prefix);
 						int l2 = strlen(p);
 						if ((cur_evt->ldesc =
-						    malloc(l1 + l2)) == NULL)
+						    malloc(l1 + l2 + 2)) == NULL)
 							err(1, "malloc");
 						sprintf(cur_evt->ldesc,
 						    "\t%s %s", prefix, p + 1);
@@ -315,13 +315,14 @@
 
 
 FILE *
-opencal()
+opencal(void)
 {
-	int pdes[2];
-	int fdin;
+	int pdes[2], fdin;
+	struct stat st;
 
 	/* open up calendar file as stdin */
-	if ((fdin = open(calendarFile, O_RDONLY)) == -1) {
+	if ((fdin = open(calendarFile, O_RDONLY)) == -1 ||
+	    fstat(fdin, &st) == -1 || !S_ISREG(st.st_mode)) {
 		if (!doall) {
 			char *home = getenv("HOME");
 			if (home == NULL || *home == '\0')
@@ -333,6 +334,7 @@
 				    calendarFile, calendarHome, calendarFile);
 		}
 	}
+
 	if (pipe(pdes) < 0)
 		return (NULL);
 	switch (vfork()) {
@@ -348,7 +350,8 @@
 			(void)close(pdes[1]);
 		}
 		(void)close(pdes[0]);
-		/* Set stderr to /dev/null.  Necessary so that cron does not
+		/* 
+		 * Set stderr to /dev/null.  Necessary so that cron does not
 		 * wait for cpp to finish if it's running calendar -a.
 		 */
 		if (doall) {