thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wdctl: use exclusive_option()

Browse source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-06-15 23:54:41 +02:00
parent 73e1d7fb02
commit e6dbcc4a20
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sys-utils/wdctl.c
View file

@ -29,6 +29,7 @@
#include "nls.h"
#include "c.h"
#include "closestream.h"
#include "optutils.h"
#include "pathnames.h"
#include "strutils.h"
#include "tt.h"
@ -381,6 +382,13 @@ int main(int argc, char *argv[])
char noflags = 0, noident = 0, notimeouts = 0, oneline = 0;
uint32_t wanted = 0;
enum {
EXCL_NONE,
EXCL_FLAGS,
EXCL_NOFLAGS
};
int excl_flag = EXCL_NONE;
static const struct option long_opts[] = {
{ "flags", required_argument, NULL, 'f' },
{ "flags-only", no_argument, NULL, 'x' },
@ -412,6 +420,7 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
break;
case 'f':
exclusive_option(&excl_flag, EXCL_FLAGS, "--{flags,noflags}");
if (string_to_bitmask(optarg, (unsigned long *) &wanted, name2bit) != 0)
return EXIT_FAILURE;
break;
@ -421,6 +430,7 @@ int main(int argc, char *argv[])
case 'h':
usage(stdout);
case 'F':
exclusive_option(&excl_flag, EXCL_NOFLAGS, "--{flags,noflags}");
noflags = 1;
break;
case 'I':
@ -449,9 +459,6 @@ int main(int argc, char *argv[])
}
}
if (wanted && noflags)
errx(EXIT_FAILURE, _("--flags and --noflags are mutually exclusive"));
if (!ncolumns) {
/* default columns */
columns[ncolumns++] = COL_FLAG;