[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/src/Attic/builtin.c,v [branch-1_4]
From: |
Eric Blake |
Subject: |
Changes to m4/src/Attic/builtin.c,v [branch-1_4] |
Date: |
Fri, 13 Oct 2006 22:25:34 +0000 |
CVSROOT: /sources/m4
Module name: m4
Branch: branch-1_4
Changes by: Eric Blake <ericb> 06/10/13 22:25:32
Index: src/builtin.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/builtin.c,v
retrieving revision 1.1.1.1.2.42
retrieving revision 1.1.1.1.2.43
diff -u -b -r1.1.1.1.2.42 -r1.1.1.1.2.43
--- src/builtin.c 13 Oct 2006 12:59:17 -0000 1.1.1.1.2.42
+++ src/builtin.c 13 Oct 2006 22:25:32 -0000 1.1.1.1.2.43
@@ -1088,7 +1088,7 @@
"non-numeric argument to builtin `%s'", ARG (0)));
else
{
- fp = path_search (ARG (i), NULL);
+ fp = m4_path_search (ARG (i), NULL);
if (fp != NULL)
{
insert_file (fp);
@@ -1200,7 +1200,7 @@
if (bad_argc (argv[0], argc, 2, 2))
return;
- fp = path_search (ARG (1), &name);
+ fp = m4_path_search (ARG (1), &name);
if (fp == NULL)
{
if (!silent)
@@ -1329,16 +1329,11 @@
detect any errors it might have encountered. */
debug_set_output (NULL);
debug_flush_files ();
- if (close_stream (stdout) != 0)
- {
- M4ERROR ((warning_status, errno, "write error"));
- if (exit_code == 0)
- exit_code = EXIT_FAILURE;
- }
- if (close_stream (stderr) != 0 && exit_code == 0)
- exit_code = EXIT_FAILURE;
- if (exit_code == 0 && retcode != 0)
+ if (exit_code == EXIT_SUCCESS && retcode != EXIT_SUCCESS)
exit_code = retcode;
+ /* Propagate non-zero status to atexit handlers. */
+ if (exit_code != EXIT_SUCCESS)
+ exit_failure = exit_code;
exit (exit_code);
}
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/10/13
- Changes to m4/src/Attic/builtin.c,v [branch-1_4],
Eric Blake <=
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/10/14
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/10/20
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/10/26
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/10/29
- Changes to m4/src/Attic/builtin.c,v [branch-1_4], Eric Blake, 2006/10/31