diff options
| author | Vincent Labrecque <vincent@cvs.openbsd.org> | 2002-10-16 00:30:59 +0000 |
|---|---|---|
| committer | Vincent Labrecque <vincent@cvs.openbsd.org> | 2002-10-16 00:30:59 +0000 |
| commit | ace55006714f70e0c205f7b130effbb4ea1d66c6 (patch) | |
| tree | 6ee87d495633c5f6d0c8c1732086a8e27caf8a88 /usr.bin/calendar/io.c | |
| parent | 5722decb38bf352fd09d228c5772312f13d76a39 (diff) | |
don't bork if there's a "calendar" directory in the current directory....
ok millert
Diffstat (limited to 'usr.bin/calendar/io.c')
| -rw-r--r-- | usr.bin/calendar/io.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c index f05a3b8b995..6c9c91125b9 100644 --- a/usr.bin/calendar/io.c +++ b/usr.bin/calendar/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.19 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: io.c,v 1.20 2002/10/16 00:30:58 vincent Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -43,7 +43,7 @@ static const char copyright[] = #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.20 2002/10/16 00:30:58 vincent Exp $"; #endif #endif /* not lint */ @@ -82,7 +82,7 @@ struct iovec header[] = { void -cal() +cal(void) { int printing; char *p; @@ -315,13 +315,14 @@ getfield(p, endp, flags) 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 @@ opencal() calendarFile, calendarHome, calendarFile); } } + if (pipe(pdes) < 0) return (NULL); switch (vfork()) { @@ -348,7 +350,8 @@ opencal() (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) { |