From: Sami Kerola <kerolasa@iki.fi>
Date: Fri, 6 Mar 2020 20:14:06 +0000 (+0000)
Subject: lsirq: mark --json and --pairs options mutually exclusive
X-Git-Tag: v2.36-rc1~196^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=968a50b30ebd75c56930b6a46e4a75a17476c433;p=thirdparty%2Futil-linux.git

lsirq: mark --json and --pairs options mutually exclusive

Before this change --pairs option would always win over --json.  That is
unnecessarily confusing, it is much better to disallow combination that does
not make sense.

Notice that the --noheadings in combination with --json or --pairs will not
cause any effect.  In strictest possible understanding --noheadings should
also be exclusive.  Looking from more relaxed point of view neither --json
nor --pairs has heading, so excluding is not necessary because --noheading
is happening already.

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

diff --git a/sys-utils/lsirq.c b/sys-utils/lsirq.c
index 3d7e26abb5..33fe48d257 100644
--- a/sys-utils/lsirq.c
+++ b/sys-utils/lsirq.c
@@ -32,6 +32,7 @@
 #include <libsmartcols.h>
 
 #include "closestream.h"
+#include "optutils.h"
 #include "strutils.h"
 #include "xalloc.h"
 
@@ -91,10 +92,17 @@ int main(int argc, char **argv)
 	};
 	int c;
 	const char *outarg = NULL;
+	static const ul_excl_t excl[] = {	/* rows and cols in ASCII order */
+		{'J', 'P'},
+		{0}
+	};
+	int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;
 
 	setlocale(LC_ALL, "");
 
 	while ((c = getopt_long(argc, argv, "no:s:hJPV", longopts, NULL)) != -1) {
+		err_exclusive_options(c, longopts, excl, excl_st);
+
 		switch (c) {
 		case 'J':
 			out.json = 1;