clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-03 23:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwdb: adjust --help text to be more like other --help texts

Browse Source 
Fix capitalization, indentation, make sure we support --version, and
similar.
This commit is contained in:
Lennart Poettering
2015-02-12 13:17:08 +01:00
parent c2cc6b9aef
commit 424d110ac0
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hwdb/hwdb.c
+31 -17
View File
@@ -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 ARG_USR:
arg_hwdb_bin_dir = UDEVLIBEXECDIR;
break;
case 'r':
arg_root = optarg;
break;
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 '?':
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 },
{},
};