chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add tests of strxcpyx
[elogind.git]
/
src
/
udev
/
udevadm.c
diff --git
a/src/udev/udevadm.c
b/src/udev/udevadm.c
index 5217d7f9dd66fac3efe63b107e404b7f27c9e9b9..53419ffa62e481cac1e530dd552d0412875c2aab 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,
@@
-99,8
+100,8
@@
int main(int argc, char *argv[])
if (udev == NULL)
goto out;
if (udev == NULL)
goto out;
- log_open();
log_parse_environment();
log_parse_environment();
+ log_open();
udev_set_log_fn(udev, udev_main_log);
label_init("/dev");
udev_set_log_fn(udev, udev_main_log);
label_init("/dev");
@@
-133,6
+134,7
@@
int main(int argc, char *argv[])
if (strcmp(udevadm_cmds[i]->name, command) == 0) {
argc -= optind;
argv += optind;
if (strcmp(udevadm_cmds[i]->name, command) == 0) {
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;