Module Name: src
Committed By: matthias
Date: Tue Apr 3 12:03:05 UTC 2012
Modified Files:
src/usr.bin/calendar: calendar.c
Log Message:
Stop playing games with stdin and stdout file descriptors.
calendar did not work with nss_ldap installed. Typical symptoms were
cc1: error: stdout: Bad file descriptor
in daily.out.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/calendar/calendar.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/calendar/calendar.c
diff -u src/usr.bin/calendar/calendar.c:1.48 src/usr.bin/calendar/calendar.c:1.49
--- src/usr.bin/calendar/calendar.c:1.48 Tue Dec 8 13:49:08 2009
+++ src/usr.bin/calendar/calendar.c Tue Apr 3 12:03:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: calendar.c,v 1.48 2009/12/08 13:49:08 wiz Exp $ */
+/* $NetBSD: calendar.c,v 1.49 2012/04/03 12:03:04 matthias Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)calendar.c 8.4 (Berkeley) 1/7/95";
#endif
-__RCSID("$NetBSD: calendar.c,v 1.48 2009/12/08 13:49:08 wiz Exp $");
+__RCSID("$NetBSD: calendar.c,v 1.49 2012/04/03 12:03:04 matthias Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -117,7 +117,7 @@ static int getfield(char *, char **, in
static void getmmdd(struct tm *, char *);
static int getmonth(char *);
static bool isnow(char *);
-static FILE *opencal(void);
+static FILE *opencal(FILE **);
static void settime(void);
static void usage(void) __dead;
@@ -192,13 +192,13 @@ static void
cal(void)
{
bool printing;
- FILE *fp;
+ FILE *fp, *in = NULL;
char *line;
- if ((fp = opencal()) == NULL)
+ if ((fp = opencal(&in)) == NULL || in == NULL)
return;
printing = false;
- while ((line = fparseln(stdin,
+ while ((line = fparseln(in,
NULL, NULL, NULL, FPARSELN_UNESCCOMM)) != NULL) {
if (line[0] == '\0')
continue;
@@ -381,7 +381,7 @@ getfield(char *p, char **endp, int *flag
}
static FILE *
-opencal(void)
+opencal(FILE **in)
{
int fd;
int pdes[2];
@@ -390,7 +390,7 @@ opencal(void)
/* open up calendar file as stdin */
if (fname == NULL) {
for (name = defaultnames; *name != NULL; name++) {
- if (freopen(*name, "rf", stdin) == NULL)
+ if ((fd = open(*name, O_RDONLY)) < 0)
continue;
else
break;
@@ -400,7 +400,7 @@ opencal(void)
return NULL;
err(EXIT_FAILURE, "Cannot open calendar file");
}
- } else if (freopen(fname, "rf", stdin) == NULL) {
+ } else if ((fd = open(fname, O_RDONLY)) < 0) {
if (doall)
return NULL;
err(EXIT_FAILURE, "Cannot open `%s'", fname);
@@ -418,7 +418,13 @@ opencal(void)
(void)close(pdes[1]);
return NULL;
case 0:
- /* child -- stdin already setup, set stdout to pipe input */
+ /* child */
+ /* set stdin to calendar file */
+ if (fd != STDIN_FILENO) {
+ (void)dup2(fd, STDIN_FILENO);
+ (void)close(fd);
+ }
+ /* set stdout to pipe input */
if (pdes[1] != STDOUT_FILENO) {
(void)dup2(pdes[1], STDOUT_FILENO);
(void)close(pdes[1]);
@@ -434,11 +440,13 @@ opencal(void)
err(EXIT_FAILURE, "Cannot exec `%s'", _PATH_CPP);
/*NOTREACHED*/
default:
- /* parent -- set stdin to pipe output */
- (void)dup2(pdes[0], STDIN_FILENO);
- (void)close(pdes[0]);
+ /* parent -- fdopen *in to pipe output */
+ *in = fdopen(pdes[0], "r");
(void)close(pdes[1]);
+ /* close calendar file */
+ close(fd);
+
/* not reading all calendar files, just set output to stdout */
if (!doall)
return stdout;
