From 2c308875a7fa1aaa44892c368f6b37bcfcb8879a Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 16 Apr 2019 15:14:13 +0200 Subject: misc: consolidate version printing and close_stdout() Signed-off-by: Karel Zak --- text-utils/column.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'text-utils/column.c') diff --git a/text-utils/column.c b/text-utils/column.c index 8961bd38b..78eeddb8e 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -706,7 +706,7 @@ int main(int argc, char **argv) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); ctl.output_separator = " "; ctl.input_separator = mbs_to_wcs("\t "); @@ -731,9 +731,6 @@ int main(int argc, char **argv) case 'H': ctl.tab_colhide = optarg; break; - case 'h': - usage(); - break; case 'i': ctl.tree_id = optarg; break; @@ -776,15 +773,17 @@ int main(int argc, char **argv) case 't': ctl.mode = COLUMN_MODE_TABLE; break; - case 'V': - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; case 'W': ctl.tab_colwrap = optarg; break; case 'x': ctl.mode = COLUMN_MODE_FILLROWS; break; + + case 'h': + usage(); + case 'V': + print_version(EXIT_SUCCESS); default: errtryhelp(EXIT_FAILURE); } -- cgit v1.2.3-55-g7522