diff options
| author | Karel Zak | 2017-06-26 13:47:04 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-06-26 13:47:04 +0200 |
| commit | dfdb1ca8186cfc84ad95d5e356334ce8633a28f7 (patch) | |
| tree | 37b568d27fa12194ec63f8122901fc8b2fd7bf1d /misc-utils/blkid.c | |
| parent | Merge branch 'usage-part1' of https://github.com/rudimeier/util-linux (diff) | |
| parent | misc: fix optutils.h related exit codes (diff) | |
| download | kernel-qcow2-util-linux-dfdb1ca8186cfc84ad95d5e356334ce8633a28f7.tar.gz kernel-qcow2-util-linux-dfdb1ca8186cfc84ad95d5e356334ce8633a28f7.tar.xz kernel-qcow2-util-linux-dfdb1ca8186cfc84ad95d5e356334ce8633a28f7.zip | |
Merge branch 'fix-exit-codes' of https://github.com/rudimeier/util-linux
* 'fix-exit-codes' of https://github.com/rudimeier/util-linux:
misc: fix optutils.h related exit codes
misc: fix xalloc.h related exit codes
misc: fix more strutils related exit codes
lib: fix strutils.h, remove STRTOXX_EXIT_CODE
misc: fix some broken exit codes
Diffstat (limited to 'misc-utils/blkid.c')
| -rw-r--r-- | misc-utils/blkid.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index f95f673a2..52179e5e1 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -34,7 +34,6 @@ #include "ismounted.h" -#define STRTOXX_EXIT_CODE BLKID_EXIT_OTHER /* strtoxx_or_err() */ #include "strutils.h" #define OPTUTILS_EXIT_CODE BLKID_EXIT_OTHER /* exclusive_option() */ #include "optutils.h" @@ -43,6 +42,8 @@ #include "nls.h" #include "ttyutils.h" + +#define XALLOC_EXIT_CODE BLKID_EXIT_OTHER /* x.*alloc(), xstrndup() */ #include "xalloc.h" struct blkid_control { @@ -691,6 +692,8 @@ int main(int argc, char **argv) textdomain(PACKAGE); atexit(close_stdout); + strutils_set_exitcode(BLKID_EXIT_OTHER); + while ((c = getopt_long (argc, argv, "c:dghilL:n:ko:O:ps:S:t:u:U:w:Vv", longopts, NULL)) != -1) { |