X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm.c;h=99ac3300829ae9c8382e0f79928e323835c6d767;hp=6de50f42537205d8429472ed864d8d8b19171bdf;hb=9060b066d9e7aaca9795010ac5fff61018947f87;hpb=55e9959b155cefc5146f7a3d1ea73e74da91f303

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 6de50f425..99ac33008 100644
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -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;
@@ -140,9 +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);
-	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,8 +212,8 @@ int main(int argc, char *argv[])
 	help(udev, argc, argv);
 	rc = 2;
 out:
-	sysfs_cleanup();
+	udev_selinux_exit(udev);
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return rc;
 }