bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Bug-gnulib] too many FOO_exit_failure variables


From: Paul Eggert
Subject: Re: [Bug-gnulib] too many FOO_exit_failure variables
Date: 18 Jul 2003 13:59:18 -0700
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3

Bruno Haible <address@hidden> writes:

> OK, for simple modules like these, where every program wants to exit() on
> failure, I agree that it doesn't need a multitude of variables, and a single
> 'exit_failure' variable is enough. Very few programs use exit codes other
> than EXIT_FAILURE anyway.

Yes, I ran into this only because I was fixing 'expr', which has 4
exit codes.

Jim Meyering just reminded me that closeout also should be changed
accordingly, so I'm also proposing the following change (which I'll
test with coreutils before installing).

2003-07-18  Paul Eggert  <address@hidden>

        * closeout.h (close_stdout_set_status, close_stdout_status): Remove.
        * closeout.c: Likewise.  Include "closeout.h" right after config.h,
        to test that it can stand by itself.  Include "exitfail.h".
        Clients should set exit_failure instead.
        (EXIT_FAILURE): Remove; no longer needed.  Do not include <stdlib.h>.

--- closeout.h.~1.5.~   Tue Jun 17 22:52:19 2003
+++ closeout.h  Fri Jul 18 13:47:26 2003
@@ -19,9 +19,7 @@
 #ifndef CLOSEOUT_H
 # define CLOSEOUT_H 1
 
-void close_stdout_set_status (int status);
 void close_stdout_set_file_name (const char *file);
 void close_stdout (void);
-void close_stdout_status (int status);
 
 #endif
--- closeout.c.~1.11.~  Tue Nov  5 13:45:29 2002
+++ closeout.c  Fri Jul 18 13:56:42 2003
@@ -19,12 +19,7 @@
 # include <config.h>
 #endif
 
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+#include "closeout.h"
 
 #include <stdio.h>
 
@@ -36,33 +31,23 @@ extern int errno;
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "closeout.h"
 #include "error.h"
+#include "exitfail.h"
 #include "quotearg.h"
 #include "unlocked-io.h"
 #include "__fpending.h"
 
-static int default_exit_status = EXIT_FAILURE;
 static const char *file_name;
 
-/* Set the value to be used for the exit status when close_stdout is called.
-   This is useful when it is not convenient to call close_stdout_status,
-   e.g., when close_stdout is called via atexit.  */
-void
-close_stdout_set_status (int status)
-{
-  default_exit_status = status;
-}
-
 /* Set the file name to be reported in the event an error is detected
-   by close_stdout_status.  */
+   by close_stdout.  */
 void
 close_stdout_set_file_name (const char *file)
 {
   file_name = file;
 }
 
-/* Close standard output, exiting with status STATUS on failure.
+/* Close standard output, exiting with status 'exit_failure' on failure.
    If a program writes *anything* to stdout, that program should `fflush'
    stdout and make sure that it succeeds before exiting.  Otherwise,
    suppose that you go to the extreme of checking the return status
@@ -86,7 +71,7 @@ close_stdout_set_file_name (const char *
    on being able to detect failure in other tools via their exit status.  */
 
 void
-close_stdout_status (int status)
+close_stdout (void)
 {
   int e = ferror (stdout) ? 0 : -1;
 
@@ -102,15 +87,9 @@ close_stdout_status (int status)
     {
       char const *write_error = _("write error");
       if (file_name)
-       error (status, e, "%s: %s", quotearg_colon (file_name), write_error);
+       error (exit_failure, e, "%s: %s", quotearg_colon (file_name),
+              write_error);
       else
-       error (status, e, "%s", write_error);
+       error (exit_failure, e, "%s", write_error);
     }
-}
-
-/* Close standard output, exiting with status EXIT_FAILURE on failure.  */
-void
-close_stdout (void)
-{
-  close_stdout_status (default_exit_status);
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]