Changes to m4/src/Attic/m4.c,v [branch-1_4]

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch-1_4
Changes by:     Eric Blake <ericb>      06/10/13 22:25:32

Index: src/m4.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/m4.c,v
retrieving revision 1.1.1.1.2.33
retrieving revision 1.1.1.1.2.34
diff -u -b -r1.1.1.1.2.33 -r1.1.1.1.2.34
--- src/m4.c    10 Oct 2006 03:54:26 -0000      1.1.1.1.2.33
+++ src/m4.c    13 Oct 2006 22:25:32 -0000      1.1.1.1.2.34
@@ -204,11 +204,6 @@
 ", stdout);
       printf ("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
     }
-
-  if (close_stream (stdout) != 0)
-    M4ERROR ((EXIT_FAILURE, errno, "write error"));
-  if (close_stream (stderr) != 0)
-    exit (EXIT_FAILURE); /* Can't really do much else without stderr.  */
   exit (status);
 }
 
@@ -286,6 +281,7 @@
 
   program_name = argv[0];
   retcode = EXIT_SUCCESS;
+  atexit (close_stdout);
 
   include_init ();
   debug_init ();
@@ -429,11 +425,6 @@
 \n\
 Written by Rene' Seindal.\n\
 ", stdout);
-
-        if (close_stream (stdout) != 0)
-          M4ERROR ((EXIT_FAILURE, errno, "write error"));
-        if (close_stream (stderr) != 0)
-          exit (EXIT_FAILURE);
         exit (EXIT_SUCCESS);
        break;
 
@@ -532,7 +523,7 @@
        else
          {
            const char *name;
-           fp = path_search (argv[optind], &name);
+           fp = m4_path_search (argv[optind], &name);
            if (fp == NULL)
              {
                error (0, errno, "%s", argv[optind]);
@@ -570,10 +561,5 @@
       make_diversion (0);
       undivert_all ();
     }
-
-  if (close_stream (stdout) != 0)
-    M4ERROR ((EXIT_FAILURE, errno, "write error"));
-  if (close_stream (stderr) != 0)
-    exit (EXIT_FAILURE); /* Can't really do much else without stderr.  */
   exit (retcode);
 }