summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-02-12 13:17:08 +0100
committerLennart Poettering <lennart@poettering.net>2015-02-12 13:17:08 +0100
commit424d110ac010afb6577580aebd1448f28d7d982d (patch)
tree82df7db2e6cab565964d20e6aa2fccfd7b43f7fd
parentc2cc6b9aefb6f2085d3ca7eb9743093a17f751da (diff)
hwdb: adjust --help text to be more like other --help texts
Fix capitalization, indentation, make sure we support --version, and similar.
-rw-r--r--src/hwdb/hwdb.c42
1 files changed, 28 insertions, 14 deletions
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index ff1220886c..4539673ead 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -30,6 +30,7 @@
#include "mkdir.h"
#include "fileio.h"
#include "verbs.h"
+#include "build.h"
#include "hwdb-internal.h"
#include "hwdb-util.h"
@@ -651,25 +652,28 @@ static int hwdb_update(int argc, char *argv[], void *userdata) {
static void help(void) {
printf("Usage: %s OPTIONS COMMAND\n\n"
- "Options:\n"
- " --usr generate in " UDEVLIBEXECDIR " instead of /etc/udev\n"
- " -r,--root=PATH alternative root path in the filesystem\n"
- " -h,--help\n\n"
+ "Update or query the hardware database.\n\n"
+ " -h --help Show this help\n"
+ " --version Show package version\n"
+ " --usr Generate in " UDEVLIBEXECDIR " instead of /etc/udev\n"
+ " -r --root=PATH Alternative root path in the filesystem\n\n"
"Commands:\n"
- " update update the hwdb database\n"
- " query MODALIAS query database and print result\n\n",
+ " update Update the hwdb database\n"
+ " query MODALIAS Query database and print result\n",
program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
enum {
- ARG_USR = 0x100,
+ ARG_VERSION = 0x100,
+ ARG_USR,
};
static const struct option options[] = {
- { "usr", no_argument, NULL, ARG_USR },
- { "root", required_argument, NULL, 'r' },
- { "help", no_argument, NULL, 'h' },
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, ARG_VERSION },
+ { "usr", no_argument, NULL, ARG_USR },
+ { "root", required_argument, NULL, 'r' },
{}
};
@@ -680,17 +684,27 @@ static int parse_argv(int argc, char *argv[]) {
while ((c = getopt_long(argc, argv, "ut:r:h", options, NULL)) >= 0) {
switch(c) {
+
+ case 'h':
+ help();
+ return 0;
+
+ case ARG_VERSION:
+ puts(PACKAGE_STRING);
+ puts(SYSTEMD_FEATURES);
+ return 0;
+
case ARG_USR:
arg_hwdb_bin_dir = UDEVLIBEXECDIR;
break;
+
case 'r':
arg_root = optarg;
break;
- case 'h':
- help();
- return 0;
+
case '?':
return -EINVAL;
+
default:
assert_not_reached("Unknown option");
}
@@ -702,7 +716,7 @@ static int parse_argv(int argc, char *argv[]) {
static int hwdb_main(int argc, char *argv[]) {
const Verb verbs[] = {
{ "update", 1, 1, 0, hwdb_update },
- { "query", 2, 2, 0, hwdb_query },
+ { "query", 2, 2, 0, hwdb_query },
{},
};