Changes to m4/modules/m4.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/10/06 13:31:41

Index: modules/m4.c
===================================================================
RCS file: /sources/m4/m4/modules/m4.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- modules/m4.c        6 Oct 2006 13:13:15 -0000       1.79
+++ modules/m4.c        6 Oct 2006 13:31:41 -0000       1.80
@@ -717,6 +717,10 @@
       exit_code = EXIT_FAILURE;
     }
 
+  /* Ensure that atexit handlers see correct nonzero status.  */
+  if (exit_code != EXIT_SUCCESS)
+    exit_failure = exit_code;
+
   /* Ensure any module exit callbacks are executed.  */
   m4__module_exit (context);
 
@@ -726,10 +730,7 @@
 
   /* Check for saved error.  */
   if (exit_code == 0 && m4_get_exit_status (context) != 0)
-    exit_code == m4_get_exit_status (context);
-  /* Ensure that atexit handlers see correct nonzero status.  */
-  if (exit_code != 0)
-    exit_failure = exit_code;
+    exit_code = m4_get_exit_status (context);
   exit (exit_code);
 }