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

uuidd: set options to be mutually exclusive 

--pid     || --no-pid
--debug   || --quiet
--random  || --time

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2014-05-24 17:58:05 +01:00
parent caac206429
commit e4faf64847
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc-utils/uuidd.c
View File

@ -37,6 +37,7 @@ extern int optind;
#include "c.h"
#include "closestream.h"
#include "strutils.h"
#include "optutils.h"
#ifdef HAVE_LIBSYSTEMD
# include <systemd/sd-daemon.h>
@ -510,6 +511,13 @@ int main(int argc, char **argv)
{"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, 0}
};
static const ul_excl_t excl[] = {
{ 'P', 'p' },
{ 'd', 'q' },
{ 'r', 't' },
{ 0 }
};
int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
@ -519,6 +527,7 @@ int main(int argc, char **argv)
while ((c =
getopt_long(argc, argv, "p:s:T:krtn:PFSdqVh", longopts,
NULL)) != -1) {
err_exclusive_options(c, longopts, excl, excl_st);
switch (c) {
case 'd':
uuidd_cxt.debug = 1;
@ -576,9 +585,6 @@ int main(int argc, char **argv)
}
}
if (no_pid && pidfile_path_param && !uuidd_cxt.quiet)
warnx(_("Both --pid and --no-pid specified. Ignoring --no-pid."));
if (!no_pid && !pidfile_path_param)
pidfile_path = UUIDD_PIDFILE_PATH;
else if (pidfile_path_param)