chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bash-completion: split completions and move to new location
[elogind.git]
/
src
/
udev
/
udevadm.c
diff --git
a/src/udev/udevadm.c
b/src/udev/udevadm.c
index 2b4a845d778bb48e77afeb9682b8fb8c4d57007e..e14b3ca27c0248f9c063a38f13e65f1e872a7846 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,10
+100,10
@@
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);
udev_set_log_fn(udev, udev_main_log);
-
udev_selinux_init(udev
);
+
label_init("/dev"
);
for (;;) {
int option;
for (;;) {
int option;
@@
-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;
@@
-143,7
+145,7
@@
int main(int argc, char *argv[])
adm_help(udev, argc, argv);
rc = 2;
out:
adm_help(udev, argc, argv);
rc = 2;
out:
-
udev_selinux_exit(udev
);
+
label_finish(
);
udev_unref(udev);
log_close();
return rc;
udev_unref(udev);
log_close();
return rc;