X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm.c;h=99ac3300829ae9c8382e0f79928e323835c6d767;hb=a7c140c723b8022173db4910cf20dad3e461fdd5;hp=3671b9ee590148c4f3c137ce9fce677830b94c83;hpb=e598c5738c2dc85a3e93c3f68cd88e8eea51215b;p=elogind.git

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 3671b9ee5..99ac33008 100644
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -79,7 +79,7 @@ static const struct command cmds[] = {
 	},
 	{
 		.name = "settle",
-		.cmd = udevadm_settle, "",
+		.cmd = udevadm_settle,
 		.help = "wait for the event queue to finish",
 	},
 	{
@@ -138,10 +138,9 @@ int main(int argc, char *argv[])
 	if (udev == NULL)
 		goto out;
 
-	logging_init("udevadm");
+	udev_log_init("udevadm");
 	udev_set_log_fn(udev, log_fn);
-	selinux_init(udev);
-	sysfs_init();
+	udev_selinux_init(udev);
 
 	/* see if we are a compat link, this will be removed in a future release */
 	command = argv[0];
@@ -201,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;
 			}
@@ -211,9 +212,8 @@ int main(int argc, char *argv[])
 	help(udev, argc, argv);
 	rc = 2;
 out:
-	sysfs_cleanup();
-	selinux_exit(udev);
+	udev_selinux_exit(udev);
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return rc;
 }