chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use LT_INIT to explicit that udev needs libtool series 2.
[elogind.git]
/
udev
/
udevadm.c
diff --git
a/udev/udevadm.c
b/udev/udevadm.c
index 3f2c78212ea139d522fc3a859a57db18497387a2..b7295f32964f00f5ffce8ec7a71ff5a13bfbd6a1 100644
(file)
--- a/
udev/udevadm.c
+++ b/
udev/udevadm.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2007-200
8
Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2007-200
9
Kay Sievers <kay.sievers@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
@@
-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",
},
{
@@
-138,9
+138,9
@@
int main(int argc, char *argv[])
if (udev == NULL)
goto out;
if (udev == NULL)
goto out;
-
loggin
g_init("udevadm");
+
udev_lo
g_init("udevadm");
udev_set_log_fn(udev, log_fn);
udev_set_log_fn(udev, log_fn);
-
sysfs_init(
);
+
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,8
+212,8
@@
int main(int argc, char *argv[])
help(udev, argc, argv);
rc = 2;
out:
help(udev, argc, argv);
rc = 2;
out:
-
sysfs_cleanup(
);
+
udev_selinux_exit(udev
);
udev_unref(udev);
udev_unref(udev);
-
loggin
g_close();
+
udev_lo
g_close();
return rc;
}
return rc;
}