X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm.c;h=072280a58e6242bc5679fdf85ae110b729710ce2;hp=6de50f42537205d8429472ed864d8d8b19171bdf;hb=647f7c49e8ddfbbe2afd9545484a3ad936f438e9;hpb=55e9959b155cefc5146f7a3d1ea73e74da91f303
diff --git a/udev/udevadm.c b/udev/udevadm.c
index 6de50f425..072280a58 100644
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -15,8 +15,6 @@
* along with this program. If not, see .
*/
-#include "config.h"
-
#include
#include
#include
@@ -81,7 +79,7 @@ static const struct command cmds[] = {
},
{
.name = "settle",
- .cmd = udevadm_settle, "",
+ .cmd = udevadm_settle,
.help = "wait for the event queue to finish",
},
{
@@ -126,9 +124,9 @@ int main(int argc, char *argv[])
{
struct udev *udev;
static const struct option options[] = {
- { "debug", 0, NULL, 'd' },
- { "help", 0, NULL, 'h' },
- { "version", 0, NULL, 'V' },
+ { "debug", no_argument, NULL, 'd' },
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, 'V' },
{}
};
const char *command;
@@ -142,7 +140,7 @@ int main(int argc, char *argv[])
logging_init("udevadm");
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];
@@ -202,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) {
- optind++;
+ argc -= optind;
+ argv += optind;
+ optind = 0;
rc = run_command(udev, &cmds[i], argc, argv);
goto out;
}
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
help(udev, argc, argv);
rc = 2;
out:
- sysfs_cleanup();
+ udev_selinux_exit(udev);
udev_unref(udev);
logging_close();
return rc;