summaryrefslogtreecommitdiffstats
path: root/misc-utils/uuidd.c
diff options
context:
space:
mode:
authorBenno Schulenberg2011-02-27 16:26:56 +0100
committerKarel Zak2011-03-08 13:14:48 +0100
commit3c06229414f084a1480a5dae1dbe65b7aaf26117 (patch)
tree28bf22d8a215041ef8b159ec16cb1f408eb5ee9b /misc-utils/uuidd.c
parentinclude: [c.h]: remove strings.h include dublicate (diff)
downloadkernel-qcow2-util-linux-3c06229414f084a1480a5dae1dbe65b7aaf26117.tar.gz
kernel-qcow2-util-linux-3c06229414f084a1480a5dae1dbe65b7aaf26117.tar.xz
kernel-qcow2-util-linux-3c06229414f084a1480a5dae1dbe65b7aaf26117.zip
uuidd: add "-q" to synopsis, order options alphabetically
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Diffstat (limited to 'misc-utils/uuidd.c')
-rw-r--r--misc-utils/uuidd.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index a01cf568f..ea0539be3 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -50,11 +50,11 @@ extern int optind;
static void usage(const char *progname)
{
- fprintf(stderr, _("Usage: %s [-d] [-p pidfile] [-s socketpath] "
+ fprintf(stderr, _("Usage: %s [-d] [-p pidfile] [-q] [-s socketpath] "
"[-T timeout]\n"), progname);
- fprintf(stderr, _(" %s [-r|t] [-n num] [-s socketpath]\n"),
+ fprintf(stderr, _(" %s [-r|t] [-n num] [-q] [-s socketpath]\n"),
progname);
- fprintf(stderr, _(" %s -k\n"), progname);
+ fprintf(stderr, _(" %s -k [-q]\n"), progname);
exit(1);
}
@@ -426,7 +426,7 @@ int main(int argc, char **argv)
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- while ((c = getopt (argc, argv, "dkn:qp:s:tT:r")) != EOF) {
+ while ((c = getopt (argc, argv, "dkn:p:qrs:tT:")) != EOF) {
switch (c) {
case 'd':
debug++;
@@ -449,6 +449,10 @@ int main(int argc, char **argv)
case 'q':
quiet++;
break;
+ case 'r':
+ do_type = UUIDD_OP_RANDOM_UUID;
+ drop_privs = 1;
+ break;
case 's':
socket_path = optarg;
drop_privs = 1;
@@ -464,10 +468,6 @@ int main(int argc, char **argv)
exit(1);
}
break;
- case 'r':
- do_type = UUIDD_OP_RANDOM_UUID;
- drop_privs = 1;
- break;
default:
usage(argv[0]);
}