chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix NAME="" logic
[elogind.git]
/
udev
/
udevadm.c
diff --git
a/udev/udevadm.c
b/udev/udevadm.c
index 8fd976a6deac47db644279d72811bb947c0f54d3..072280a58e6242bc5679fdf85ae110b729710ce2 100644
(file)
--- a/
udev/udevadm.c
+++ b/
udev/udevadm.c
@@
-79,7
+79,7
@@
static const struct command cmds[] = {
},
{
.name = "settle",
},
{
.name = "settle",
- .cmd = udevadm_settle,
"",
+ .cmd = udevadm_settle,
.help = "wait for the event queue to finish",
},
{
.help = "wait for the event queue to finish",
},
{
@@
-140,7
+140,7
@@
int main(int argc, char *argv[])
logging_init("udevadm");
udev_set_log_fn(udev, log_fn);
logging_init("udevadm");
udev_set_log_fn(udev, log_fn);
- selinux_init(udev);
+
udev_
selinux_init(udev);
/* see if we are a compat link, this will be removed in a future release */
command = argv[0];
/* see if we are a compat link, this will be removed in a future release */
command = argv[0];
@@
-200,7
+200,9
@@
int main(int argc, char *argv[])
if (command != NULL)
for (i = 0; cmds[i].cmd != NULL; i++) {
if (strcmp(cmds[i].name, command) == 0) {
if (command != NULL)
for (i = 0; cmds[i].cmd != NULL; i++) {
if (strcmp(cmds[i].name, command) == 0) {
- optind++;
+ argc -= optind;
+ argv += optind;
+ optind = 0;
rc = run_command(udev, &cmds[i], argc, argv);
goto out;
}
rc = run_command(udev, &cmds[i], argc, argv);
goto out;
}
@@
-210,7
+212,7
@@
int main(int argc, char *argv[])
help(udev, argc, argv);
rc = 2;
out:
help(udev, argc, argv);
rc = 2;
out:
- selinux_exit(udev);
+
udev_
selinux_exit(udev);
udev_unref(udev);
logging_close();
return rc;
udev_unref(udev);
logging_close();
return rc;