From f5a81caf106d46ebf7f8eb2815f2de8c7febcf22 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 6 Dec 2023 12:37:10 +0100 Subject: [PATCH] lsfd: cleanup --list-columns * remove dependence on command-line options order ("-H -J" vs. "-J -H") References: https://github.com/util-linux/util-linux/pull/2602 Signed-off-by: Karel Zak --- misc-utils/lsfd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c index abb98a1fc71..cc6a00e374d 100644 --- a/misc-utils/lsfd.c +++ b/misc-utils/lsfd.c @@ -1833,7 +1833,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -l, --threads list in threads level\n"), out); fputs(_(" -J, --json use JSON output format\n"), out); fputs(_(" -n, --noheadings don't print headings\n"), out); - fputs(_(" -o, --output output columns\n"), out); + fputs(_(" -o, --output output columns (see --list-columns)\n"), out); fputs(_(" -r, --raw use raw output format\n"), out); fputs(_(" -u, --notruncate don't truncate text in columns\n"), out); fputs(_(" -p, --pid collect information only specified processes\n"), out); @@ -2167,7 +2167,7 @@ static const char *inet46_subexpr = INET_SUBEXP_BEGIN int main(int argc, char *argv[]) { - int c; + int c, collist = 0; size_t i; char *outarg = NULL; char *filter_expr = NULL; @@ -2286,11 +2286,16 @@ int main(int argc, char *argv[]) case 'h': usage(); case 'H': - list_colunms("lsfd-columns", stdout, ctl.raw, ctl.json); + collist = 1; + break; default: errtryhelp(EXIT_FAILURE); } } + + if (collist) + list_colunms("lsfd-columns", stdout, ctl.raw, ctl.json); /* print and exit */ + if (argv[optind]) errtryhelp(EXIT_FAILURE);