From: Masatake YAMATO <yamato@redhat.com>
Date: Wed, 12 Jul 2023 15:30:34 +0000 (+0900)
Subject: lsfd: show default columns in the help message
X-Git-Tag: v2.40-rc1~329^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d1714a38d179e146e4d7d8dbb346f24237070c4;p=thirdparty%2Futil-linux.git

lsfd: show default columns in the help message

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/include/c.h b/include/c.h
index f9f90f3bbe..752f568c50 100644
--- a/include/c.h
+++ b/include/c.h
@@ -452,6 +452,7 @@ static inline void __attribute__((__noreturn__)) ul_sig_err(int excode, const ch
 #define USAGE_COMMANDS   _("\nCommands:\n")
 #define USAGE_ARGUMENTS   _("\nArguments:\n")
 #define USAGE_COLUMNS    _("\nAvailable output columns:\n")
+#define USAGE_DEFAULT_COLUMNS _("\nDefault columns:\n")
 #define USAGE_SEPARATOR    "\n"
 
 #define USAGE_OPTSTR_HELP     _("display this help")
diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index 014658c4e2..bc7f901d48 100644
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -1592,6 +1592,17 @@ static void __attribute__((__noreturn__)) list_colunms(FILE *out)
 	exit(EXIT_SUCCESS);
 }
 
+static void print_columns(FILE *out, const char *prefix, const int cols[], size_t n_cols)
+{
+	fprintf(out, "%15s: ", prefix);
+	for (size_t i = 0; i < n_cols; i++) {
+		if (i)
+			fputc(',', out);
+		fputs(infos[cols[i]].name, out);
+	}
+	fputc('\n', out);
+}
+
 static void __attribute__((__noreturn__)) usage(void)
 {
 	FILE *out = stdout;
@@ -1618,6 +1629,10 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -H, --list-columns           list the available columns\n"), out);
 	fprintf(out, USAGE_HELP_OPTIONS(30));
 
+	fputs(USAGE_DEFAULT_COLUMNS, out);
+	print_columns(out, _("Default"), default_columns, ARRAY_SIZE(default_columns));
+	print_columns(out, _("With --threads"), default_threads_columns, ARRAY_SIZE(default_threads_columns));
+
 	fprintf(out, USAGE_MAN_TAIL("lsfd(1)"));
 
 	exit(EXIT_SUCCESS);