From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 18 May 2014 11:37:24 +0000 (+0100)
Subject: setterm: correct usage() bright color argument
X-Git-Tag: v2.25-rc1~119^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=253e5e7161e2fb66c65204f91ceaaf8268a42777;p=thirdparty%2Futil-linux.git

setterm: correct usage() bright color argument

This has been wrong since commit 2dc8716.  The bright is a prefix
attribute to other colors.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/bash-completion/setterm b/bash-completion/setterm
index 6ddc2c61b2..dd46472de7 100644
--- a/bash-completion/setterm
+++ b/bash-completion/setterm
@@ -1,6 +1,6 @@
 _setterm_module()
 {
-	local cur prev OPTS
+	local bright cur prev OPTS
 	COMPREPLY=()
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
@@ -14,8 +14,17 @@ _setterm_module()
 			COMPREPLY=( $(compgen -W "$TERM_LIST" -- $cur) )
 			return 0
 			;;
-		'--foreground'|'--background'|'--ulcolor'|'--hbcolor')
-			COMPREPLY=( $(compgen -W "default black blue cyan green magenta red white yellow" -- $cur) )
+		'--foreground'|'--background')
+			COMPREPLY=( $(compgen -W "black blue cyan default green magenta red white yellow" -- $cur) )
+			return 0
+			;;
+		'--ulcolor'|'--hbcolor'|'bright')
+			if [ $prev != 'bright' ]; then
+				bright='bright black grey'
+			else
+				bright=''
+			fi
+			COMPREPLY=( $(compgen -W "$bright blue cyan green magenta red white yellow" -- $cur) )
 			return 0
 			;;
 		'--cursor'|'--repeat'|'--appcursorkeys'|'--linewrap'|'--inversescreen'|'--bold'|'--half-bright'|'--blink'|'--reverse'|'--underline'|'--msg')
diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 01f7ab116c..5e70821d42 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -395,18 +395,15 @@ static int parse_bfreq(char **argv, char *optarg, int *optind)
 	return strtos32_or_err(arg, _("argument error"));
 }
 
-static void __attribute__ ((__noreturn__))
-usage(FILE *out) {
-/* Print error message about arguments, and the command's syntax. */
-
+static void __attribute__((__noreturn__)) usage(FILE *out)
+{
 	if (out == stderr)
-		warnx(_("Argument error."));
+		warnx(_("argument error"));
 
-	fputs(_("\nUsage:\n"), out);
+	fputs(USAGE_HEADER, out);
 	fprintf(out,
 	      _(" %s [options]\n"), program_invocation_short_name);
-
-	fputs(_("\nOptions:\n"), out);
+	fputs(USAGE_OPTIONS, out);
 	fputs(_(" --term <terminal_name>\n"), out);
 	fputs(_(" --reset\n"), out);
 	fputs(_(" --initialize\n"), out);
@@ -415,12 +412,13 @@ usage(FILE *out) {
 	fputs(_(" --appcursorkeys <on|off>\n"), out);
 	fputs(_(" --linewrap <on|off>\n"), out);
 	fputs(_(" --default\n"), out);
-	fputs(_(" --foreground <default|black|blue|cyan|green|magenta|red|white|yellow>\n"), out);
-	fputs(_(" --background <default|black|blue|cyan|green|magenta|red|white|yellow>\n"), out);
-	fputs(_(" --ulcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"), out);
-	fputs(_(" --ulcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"), out);
-	fputs(_(" --hbcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"), out);
-	fputs(_(" --hbcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"), out);
+	fputs(_(" --foreground <default|color>\n"), out);
+	fputs(_(" --background <default|color>\n"), out);
+	fputs(_(" --ulcolor <bright> <color>\n"), out);
+	fputs(_(" --ulcolor <bright> <color>\n"), out);
+	fputs(_(" --hbcolor <bright> <color>\n"), out);
+	fputs(_(" --hbcolor <bright> <color>\n"), out);
+	fputs(_(" <color>: black blue cyan green grey magenta red white yellow\n"), out);
 	fputs(_(" --inversescreen <on|off>\n"), out);
 	fputs(_(" --bold <on|off>\n"), out);
 	fputs(_(" --half-bright <on|off>\n"), out);