ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Sami Kerola 2020-03-06 20:14:06 +00:00
parent 723ec12457
commit 968a50b30e
No known key found for this signature in database
GPG Key ID: 0D46FEF7E61DBB46
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys-utils/lsirq.c
View File

@ -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;