[src/trunk]: src/usr.bin/calendar Stop playing games with stdin and stdout fi...

[matthias <matthias%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7c9ef7032fcd
branches:  trunk
changeset: 778538:7c9ef7032fcd
user:      matthias <matthias%NetBSD.org@localhost>
date:      Tue Apr 03 12:03:04 2012 +0000

description:
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.

diffstat:

 usr.bin/calendar/calendar.c |  34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diffs (103 lines):

diff -r f9f9b7af0a46 -r 7c9ef7032fcd usr.bin/calendar/calendar.c
--- a/usr.bin/calendar/calendar.c       Tue Apr 03 11:44:32 2012 +0000
+++ b/usr.bin/calendar/calendar.c       Tue Apr 03 12:03:04 2012 +0000
@@ -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 @@
 #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 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 @@
 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 @@
 }
 
 static FILE *
-opencal(void)
+opencal(FILE **in)
 {
        int fd;
        int pdes[2];
@@ -390,7 +390,7 @@
        /* 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 @@
                                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 @@
                (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 @@
                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;