X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm.c;h=2a2915891797dcba2b17940ed7db701722b7e7e4;hp=3f2c78212ea139d522fc3a859a57db18497387a2;hb=b466e9ab3951207a3c0c8d2ba6167be1eac1e41a;hpb=033e9f8cde5a7feec1334888aec69def99c945b5

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 3f2c78212..2a2915891 100644
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2007-2009 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
@@ -25,7 +25,7 @@
 
 #include "udev.h"
 
-static int debug;
+static bool debug;
 
 static void log_fn(struct udev *udev, int priority,
 		   const char *file, int line, const char *fn,
@@ -35,6 +35,11 @@ static void log_fn(struct udev *udev, int priority,
 		fprintf(stderr, "%s: ", fn);
 		vfprintf(stderr, format, args);
 	} else {
+		va_list args2;
+
+		va_copy(args2, args);
+		vfprintf(stderr, format, args2);
+		va_end(args2);
 		vsyslog(priority, format, args);
 	}
 }
@@ -79,7 +84,7 @@ static const struct command cmds[] = {
 	},
 	{
 		.name = "settle",
-		.cmd = udevadm_settle, "",
+		.cmd = udevadm_settle,
 		.help = "wait for the event queue to finish",
 	},
 	{
@@ -96,7 +101,7 @@ static const struct command cmds[] = {
 		.name = "test",
 		.cmd = udevadm_test,
 		.help = "simulation run",
-		.debug = 1,
+		.debug = true,
 	},
 	{
 		.name = "version",
@@ -112,7 +117,7 @@ static const struct command cmds[] = {
 static int run_command(struct udev *udev, const struct command *cmd, int argc, char *argv[])
 {
 	if (cmd->debug) {
-		debug = 1;
+		debug = true;
 		if (udev_get_log_priority(udev) < LOG_INFO)
 			udev_set_log_priority(udev, LOG_INFO);
 	}
@@ -131,48 +136,17 @@ int main(int argc, char *argv[])
 	};
 	const char *command;
 	int i;
-	const char *pos;
 	int rc = 1;
 
 	udev = udev_new();
 	if (udev == NULL)
 		goto out;
 
-	logging_init("udevadm");
+	udev_log_init("udevadm");
 	udev_set_log_fn(udev, log_fn);
-	sysfs_init();
-
-	/* see if we are a compat link, this will be removed in a future release */
-	command = argv[0];
-	pos = strrchr(command, '/');
-	if (pos != NULL)
-		command = &pos[1];
-
-	/* the trailing part of the binary or link name is the command */
-	if (strncmp(command, "udev", 4) == 0)
-		command = &command[4];
-
-	for (i = 0; cmds[i].cmd != NULL; i++) {
-		if (strcmp(cmds[i].name, command) == 0) {
-			char path[128];
-			char prog[512];
-			ssize_t len;
-
-			snprintf(path, sizeof(path), "/proc/%lu/exe", (unsigned long) getppid());
-			len = readlink(path, prog, sizeof(prog));
-			if (len > 0) {
-				prog[len] = '\0';
-				fprintf(stderr, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
-				       "this will stop working in a future release\n", prog, argv[0], command);
-				err(udev, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
-				    "this will stop working in a future release\n", prog, argv[0], command);
-			}
-			rc = run_command(udev, &cmds[i], argc, argv);
-			goto out;
-		}
-	}
+	udev_selinux_init(udev);
 
-	while (1) {
+	for (;;) {
 		int option;
 
 		option = getopt_long(argc, argv, "+dhV", options, NULL);
@@ -181,7 +155,7 @@ int main(int argc, char *argv[])
 
 		switch (option) {
 		case 'd':
-			debug = 1;
+			debug = true;
 			if (udev_get_log_priority(udev) < LOG_INFO)
 				udev_set_log_priority(udev, LOG_INFO);
 			break;
@@ -197,10 +171,14 @@ int main(int argc, char *argv[])
 	}
 	command = argv[optind];
 
+	info(udev, "runtime dir '%s'\n", udev_get_run_path(udev));
+
 	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;
 			}
@@ -210,8 +188,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;
 }