From 86685f001d16dd382e97d86e44f97145593e8f98 Mon Sep 17 00:00:00 2001 From: Thomas Richter Date: Thu, 12 Nov 2020 10:13:54 +0100 Subject: [PATCH] cpumf/lscpumf.c: Check for help and version options first MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check command line arguments for help text and version string first, before doing any action. This ensures this information is always printed, even when invoked as non-root user. Fixes: https://github.com/ibm-s390-tools/s390-tools/issues/97 Signed-off-by: Thomas Richter Reviewed-by: Jan Hoeppner Signed-off-by: Jan Höppner --- cpumf/lscpumf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cpumf/lscpumf.c b/cpumf/lscpumf.c index 64ed581b..fe1317ef 100644 --- a/cpumf/lscpumf.c +++ b/cpumf/lscpumf.c @@ -3095,11 +3095,11 @@ int main(int argc, char **argv) util_prg_init(&prg); util_opt_init(opt_vec, NULL); - ret = read_info(); - if (ret == EXIT_FAILURE) - return ret; + ret = parse_args(argc, argv); + if (read_info() == EXIT_FAILURE) + return EXIT_FAILURE; - switch ((ret = parse_args(argc, argv))) { + switch (ret) { case ACTION_CNT: case ACTION_CNTALL: all = ret == ACTION_CNTALL; @@ -3115,6 +3115,7 @@ int main(int argc, char **argv) case ACTION_NONE: case ACTION_INFO: show_info(&cpumf, ret == ACTION_INFO); + ret = EXIT_SUCCESS; break; } return ret;