Merge branch 'help-description' of https://github.com/rudimeier/util-linux

* 'help-description' of https://github.com/rudimeier/util-linux:
  misc: update --help content again
  login: add --help text
  blockdev: improve --help and man page
  misc: consolidate all --help option descriptions
  misc: introduce print_usage_help_options()
  misc: revert to the old USAGE_HELP strings

19 files changed, 21 insertions, 40 deletions

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index f4757e8c8..3aa2ee5a6 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -103,8 +103,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(	" -n, --match-types <list>   filter by filesystem type (e.g. -n vfat,ext3)\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(28);
 	fprintf(out, USAGE_MAN_TAIL("blkid(8)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index f73cbbf30..870fa689b 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -1015,8 +1015,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	        "                         %s\n", USAGE_COLORS_DEFAULT);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(23);
 	fprintf(out, USAGE_MAN_TAIL("cal(1)"));
 
 	exit(EXIT_SUCCESS);
diff --git a/misc-utils/fincore.c b/misc-utils/fincore.c
index f1b9fa758..9ef912758 100644
--- a/misc-utils/fincore.c
+++ b/misc-utils/fincore.c
@@ -274,8 +274,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -r, --raw             use raw output format\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(23);
 
 	fprintf(out, USAGE_COLUMNS);
 
diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c
index c01dc1d53..fc16e44e6 100644
--- a/misc-utils/findfs.c
+++ b/misc-utils/findfs.c
@@ -33,8 +33,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Find a filesystem by label or UUID.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(16);
 	fprintf(out, USAGE_MAN_TAIL("findfs(8)"));
 	exit(FINDFS_SUCCESS);
 }
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 5394d1a60..521942500 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1243,11 +1243,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputc('\n', out);
 	fputs(_(" -x, --verify           verify mount table content (default is fstab)\n"), out);
 	fputs(_("     --verbose          print more details\n"), out);
-	fputc('\n', out);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(24);
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 87d088ed5..8150e3c03 100644
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -346,8 +346,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -T, --test                    test for getopt(1) version\n"), stdout);
 	fputs(_(" -u, --unquoted                do not quote the output\n"), stdout);
 	fputs(USAGE_SEPARATOR, stdout);
-	fputs(USAGE_HELP, stdout);
-	fputs(USAGE_VERSION, stdout);
+	print_usage_help_options(31);
 	printf(USAGE_MAN_TAIL("getopt(1)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index ecee26c4e..0778c6fad 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -318,8 +318,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("     --verbose          print pids that will be signaled\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(24);
 	fprintf(out, USAGE_MAN_TAIL("kill(1)"));
 
 	exit(EXIT_SUCCESS);
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 0ae5c61d0..1ef60bb76 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -1027,8 +1027,7 @@ static void __attribute__((__noreturn__)) usage(void)
 #endif
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(26);
 	fprintf(out, USAGE_MAN_TAIL("logger(1)"));
 
 	exit(EXIT_SUCCESS);
diff --git a/misc-utils/look.c b/misc-utils/look.c
index a0d898db1..dfb77319b 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -365,8 +365,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -t, --terminate <char>   define the string-termination character\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(26);
 	fprintf(out, USAGE_MAN_TAIL("look(1)"));
 
 	exit(EXIT_SUCCESS);
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index d997bc71e..983804b9c 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1658,8 +1658,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -t, --topology       output info about topology\n"), out);
 	fputs(_(" -x, --sort <column>  sort output by <column>\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(22);
 
 	fprintf(out, USAGE_COLUMNS);
 
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 54440496a..d872e2dc7 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -507,8 +507,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -u, --notruncate       don't truncate text in columns\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(24);
 
 	fputs(USAGE_COLUMNS, out);
 
diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index 89b9a01eb..ce9c4bf44 100644
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -91,8 +91,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose         explain what is being done\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(23);
 	fprintf(out, USAGE_MAN_TAIL("mcookie(1)"));
 
 	exit(EXIT_SUCCESS);
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index dcaf5d2eb..92ee22e1f 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -336,14 +336,14 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Follow a pathname until a terminal point is found.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	fputs(_(" -h, --help          displays this help text\n"
-		" -V, --version       output version information and exit\n"
+	fputs(_(
 		" -x, --mountpoints   show mount point directories with a 'D'\n"
 		" -m, --modes         show the mode bits of each file\n"
 		" -o, --owners        show owner and group name of each file\n"
 		" -l, --long          use a long listing format (-m -o -v) \n"
 		" -n, --nosymlinks    don't follow symlinks\n"
 		" -v, --vertical      vertical align of modes and owners\n"), out);
+	print_usage_help_options(21);
 
 	fprintf(out, USAGE_MAN_TAIL("namei(1)"));
 	exit(EXIT_SUCCESS);
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index 48606d75e..f5029836a 100644
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -144,8 +144,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -n, --no-act        do not make any changes\n"), out);
 	fputs(_(" -o, --no-overwrite  don't overwrite existing files\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(21);
 	fprintf(out, USAGE_MAN_TAIL("rename(1)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index faaa0c12f..492ad83d9 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -79,8 +79,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -d, --debug             run in debugging mode\n"), out);
 	fputs(_(" -q, --quiet             turn on quiet mode\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(25);
 	fprintf(out, USAGE_MAN_TAIL("uuidd(8)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 77fda2fb3..8252fd528 100644
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -32,8 +32,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -r, --random     generate random-based uuid\n"), out);
 	fputs(_(" -t, --time       generate time-based uuid\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(18);
 	fprintf(out, USAGE_MAN_TAIL("uuidgen(1)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/uuidparse.c b/misc-utils/uuidparse.c
index 09a6b46a8..d9dba493a 100644
--- a/misc-utils/uuidparse.c
+++ b/misc-utils/uuidparse.c
@@ -105,8 +105,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -r, --raw              use the raw output format\n"), stdout);
 
 	fputs(USAGE_SEPARATOR, stdout);
-	fputs(USAGE_HELP, stdout);
-	fputs(USAGE_VERSION, stdout);
+	print_usage_help_options(24);
 
 	fputs(USAGE_COLUMNS, stdout);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 897a7a213..b4291c4e8 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -205,8 +205,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -l         output effective lookup paths\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
+	print_usage_help_options(16);
 	fprintf(out, USAGE_MAN_TAIL("whereis(1)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 0bd53253d..87abba39b 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -465,16 +465,15 @@ usage(void)
 	fputs(_(" -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 		" -b, --backup        create a signature backup in $HOME\n"
 		" -f, --force         force erasure\n"
-		" -h, --help          show this help text\n"
 		" -n, --no-act        do everything except the actual write() call\n"
 		" -o, --offset <num>  offset to erase, in bytes\n"
 		" -p, --parsable      print out in parsable instead of printable format\n"
 		" -q, --quiet         suppress output messages\n"
 		" -t, --types <list>  limit the set of filesystem, RAIDs or partition tables\n"
-		" -V, --version       output version information and exit\n"), out);
+		), out);
+	print_usage_help_options(21);
 
 	fprintf(out, USAGE_MAN_TAIL("wipefs(8)"));
-
 	exit(EXIT_SUCCESS);
 }