From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 18 May 2014 13:39:58 +0000 (+0100)
Subject: setterm: mark some options to be exclusive with each other
X-Git-Tag: v2.25-rc1~119^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11f69359fabca6cf3f0561fc1e5a6d4337853bd4;p=thirdparty%2Futil-linux.git

setterm: mark some options to be exclusive with each other

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

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 854efcbd59..d2fb596a0c 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -78,6 +78,7 @@
 #include "c.h"
 #include "closestream.h"
 #include "nls.h"
+#include "optutils.h"
 #include "strutils.h"
 #include "xalloc.h"
 
@@ -533,8 +534,16 @@ static void parse_option(struct setterm_control *ctl, int argc, char **argv)
 		{"help", no_argument, NULL, OPT_HELP},
 		{NULL, 0, NULL, 0}
 	};
+	static const ul_excl_t excl[] = {
+		{ OPT_DEFAULT, OPT_STORE },
+		{ OPT_TABS, OPT_CLRTABS, OPT_REGTABS },
+		{ OPT_MSG, OPT_MSGLEVEL },
+		{ 0 }
+	};
+	int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;
 
 	while ((c = getopt_long_only(argc, argv, "", longopts, NULL)) != -1) {
+		err_exclusive_options(c, longopts, excl, excl_st);
 		switch (c) {
 		case OPT_TERM:
 			ctl->opt_term = set_opt_flag(ctl->opt_term);