include/closestream: define exit codes

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index dd89527032ea49556fc417302a21a2daa272aaa6..68b768ea1808fc7ce649fd0a268dba061179efdb 100644 (file)
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -52,7 +52,6 @@
 #include "pathnames.h"
 #include "exitcodes.h"
 #include "c.h"
-#include "closestream.h"
 #include "fileutils.h"
 #include "monotonic.h"
 
@@ -62,6 +61,9 @@
 #define XALLOC_EXIT_CODE       FSCK_EX_ERROR
 #include "xalloc.h"
 
+#define CLOSE_EXIT_CODE                FSCK_EX_ERROR
+#include "closestream.h"
+
 #ifndef DEFAULT_FSTYPE
 # define DEFAULT_FSTYPE        "ext2"
 #endif

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index bb1e4d04c91fdc498ed3baa7e7cd120412ca0d00..4e6b3ab85a2a1430a8224751757042a94b3c4406 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -40,11 +40,14 @@
 
 #include "c.h"
 #include "cramfs.h"
-#include "closestream.h"
 #include "md5.h"
 #include "nls.h"
 #include "exitcodes.h"
 #include "strutils.h"
+
+#define CLOSE_EXIT_CODE         MKFS_EX_ERROR
+#include "closestream.h"
+
 #define XALLOC_EXIT_CODE MKFS_EX_ERROR
 #include "xalloc.h"
 

diff --git a/include/closestream.h b/include/closestream.h
index 7842456fbac0201d84896c45ccc078cf16409371..2dfe113603bd2806677dcdb775c7e2b16b328b87 100644 (file)
--- a/include/closestream.h
+++ b/include/closestream.h
@@ -10,6 +10,10 @@
 #include "c.h"
 #include "nls.h"
 
+#ifndef CLOSE_EXIT_CODE
+# define CLOSE_EXIT_CODE EXIT_FAILURE
+#endif
+
 #ifndef HAVE___FPENDING
 static inline int
 __fpending(FILE *stream __attribute__((__unused__)))
@@ -42,11 +46,11 @@ close_stdout(void)
                        warn(_("write error"));
                else
                        warnx(_("write error"));
-               _exit(EXIT_FAILURE);
+               _exit(CLOSE_EXIT_CODE);
        }
 
        if (close_stream(stderr) != 0)
-               _exit(EXIT_FAILURE);
+               _exit(CLOSE_EXIT_CODE);
 }
 
 #ifndef HAVE_FSYNC

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 774634240781ac3c02f076d4ed4542e1bc8ef9a0..8e86200949d9e6c12eeda10ccf18a9526eccb7fb 100644 (file)
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -40,8 +40,9 @@
 #include "strutils.h"
 #define OPTUTILS_EXIT_CODE     BLKID_EXIT_OTHER        /* exclusive_option() */
 #include "optutils.h"
-
+#define CLOSE_EXIT_CODE                BLKID_EXIT_OTHER        /* close_stdout() */
 #include "closestream.h"
+
 #include "ttyutils.h"
 #include "xalloc.h"
 

diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 9add5edca5a660071a35458b259f0eabadd27307..01b58832b73024686bd20dd053cb7d97ede3e759 100644 (file)
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -54,6 +54,7 @@
 #define GETOPT_EXIT_CODE       1
 #define PARAMETER_EXIT_CODE    2
 #define XALLOC_EXIT_CODE       3
+#define CLOSE_EXIT_CODE                XALLOC_EXIT_CODE
 #define TEST_EXIT_CODE         4
 
 #include <stdio.h>