chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: add missing comma
[elogind.git]
/
src
/
udev
/
udevadm.c
diff --git
a/src/udev/udevadm.c
b/src/udev/udevadm.c
index 818edee38f1ecd53553c423e7e9b2659c4d2dce4..dbca369011ebd5815fefce005ad70155f8af9112 100644
(file)
--- a/
src/udev/udevadm.c
+++ b/
src/udev/udevadm.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2007-2012 Kay Sievers <kay
.sievers
@vrfy.org>
+ * Copyright (C) 2007-2012 Kay Sievers <kay@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-56,6
+56,7
@@
static const struct udevadm_cmd *udevadm_cmds[] = {
&udevadm_settle,
&udevadm_control,
&udevadm_monitor,
&udevadm_settle,
&udevadm_control,
&udevadm_monitor,
+ &udevadm_hwdb,
&udevadm_test,
&udevadm_test_builtin,
&udevadm_version,
&udevadm_test,
&udevadm_test_builtin,
&udevadm_version,
@@
-78,7
+79,7
@@
static int run_command(struct udev *udev, const struct udevadm_cmd *cmd, int arg
{
if (cmd->debug)
log_set_max_level(LOG_DEBUG);
{
if (cmd->debug)
log_set_max_level(LOG_DEBUG);
- log_debug("calling: %s
\n
", cmd->name);
+ log_debug("calling: %s", cmd->name);
return cmd->cmd(udev, argc, argv);
}
return cmd->cmd(udev, argc, argv);
}
@@
-130,9
+131,10
@@
int main(int argc, char *argv[])
if (command != NULL)
for (i = 0; i < ELEMENTSOF(udevadm_cmds); i++) {
if (command != NULL)
for (i = 0; i < ELEMENTSOF(udevadm_cmds); i++) {
- if (str
cmp(udevadm_cmds[i]->name, command) == 0
) {
+ if (str
eq(udevadm_cmds[i]->name, command)
) {
argc -= optind;
argv += optind;
argc -= optind;
argv += optind;
+ /* we need '0' here to reset the internal state */
optind = 0;
rc = run_command(udev, udevadm_cmds[i], argc, argv);
goto out;
optind = 0;
rc = run_command(udev, udevadm_cmds[i], argc, argv);
goto out;