X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-control.c;h=4303aeb5a8b1770e200b5997107616bf8e20fb1f;hp=e3a91fc9a40f6688ff0c7dfa1973dafff90394f3;hb=88cbfb09ee5510277503ff1830ecc3aa6c380b00;hpb=ecc9ec579feb4b7cc86bcf7caed3cb841faf3c9e

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index e3a91fc9a..4303aeb5a 100644
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -12,8 +12,6 @@
  * GNU General Public License for more details.
  */
 
-#include "config.h"
-
 #include <time.h>
 #include <errno.h>
 #include <stdio.h>
@@ -36,7 +34,7 @@ static void print_help(void)
 		"  --stop-exec-queue        keep udevd from executing events, queue only\n"
 		"  --start-exec-queue       execute events, flush queue\n"
 		"  --reload-rules           reloads the rules files\n"
-		"  --env=<KEY>=<value>      set a global environment variable\n"
+		"  --property=<KEY>=<value> set a global property for all events\n"
 		"  --max-childs=<N>         maximum number of childs\n"
 		"  --help                   print this help text\n\n");
 }
@@ -48,139 +46,95 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 
 	/* compat values with '_' will be removed in a future release */
 	static const struct option options[] = {
-		{ "log-priority", 1, NULL, 'l' },
-		{ "log_priority", 1, NULL, 'l' + 256 },
-		{ "stop-exec-queue", 0, NULL, 's' },
-		{ "stop_exec_queue", 0, NULL, 's' + 256 },
-		{ "start-exec-queue", 0, NULL, 'S' },
-		{ "start_exec_queue", 0, NULL, 'S' + 256},
-		{ "reload-rules", 0, NULL, 'R' },
-		{ "reload_rules", 0, NULL, 'R' + 256},
-		{ "env", 1, NULL, 'e' },
-		{ "max-childs", 1, NULL, 'm' },
-		{ "max_childs", 1, NULL, 'm' + 256},
-		{ "help", 0, NULL, 'h' },
+		{ "log-priority", required_argument, NULL, 'l' },
+		{ "stop-exec-queue", no_argument, NULL, 's' },
+		{ "start-exec-queue", no_argument, NULL, 'S' },
+		{ "reload-rules", no_argument, NULL, 'R' },
+		{ "property", required_argument, NULL, 'p' },
+		{ "env", required_argument, NULL, 'p' },
+		{ "max-childs", required_argument, NULL, 'm' },
+		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
 
 	if (getuid() != 0) {
 		fprintf(stderr, "root privileges required\n");
-		goto exit;
+		return 1;
 	}
 
 	uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
 	if (uctrl == NULL)
-		goto exit;
+		return 2;
 
-	while (1) {
+	for (;;) {
 		int option;
 		int i;
 		char *endp;
 
-		option = getopt_long(argc, argv, "l:sSRe:m:M:h", options, NULL);
+		option = getopt_long(argc, argv, "l:sSRp:m:M:h", options, NULL);
 		if (option == -1)
 			break;
 
-		if (option > 255) {
-			fprintf(stderr, "udevadm control expects commands without underscore, "
-				"this will stop working in a future release\n");
-			err(udev, "udevadm control expects commands without underscore, "
-			    "this will stop working in a future release\n");
-		}
-
 		switch (option) {
 		case 'l':
-		case 'l' + 256:
 			i = util_log_priority(optarg);
 			if (i < 0) {
 				fprintf(stderr, "invalid number '%s'\n", optarg);
 				goto exit;
 			}
-			udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg));
-			rc = 0;
+			if (udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg)) < 0)
+				rc = 2;
+			else
+				rc = 0;
 			break;
 		case 's':
-		case 's' + 256:
-			udev_ctrl_send_stop_exec_queue(uctrl);
-			rc = 0;
+			if (udev_ctrl_send_stop_exec_queue(uctrl) < 0)
+				rc = 2;
+			else
+				rc = 0;
 			break;
 		case 'S':
-		case 'S' + 256:
-			udev_ctrl_send_start_exec_queue(uctrl);
-			rc = 0;
+			if (udev_ctrl_send_start_exec_queue(uctrl) < 0)
+				rc = 2;
+			else
+				rc = 0;
 			break;
 		case 'R':
-		case 'R' + 256:
-			udev_ctrl_send_reload_rules(uctrl);
-			rc = 0;
+			if (udev_ctrl_send_reload_rules(uctrl) < 0)
+				rc = 2;
+			else
+				rc = 0;
 			break;
-		case 'e':
+		case 'p':
 			if (strchr(optarg, '=') == NULL) {
-				fprintf(stderr, "expect <KEY>=<valaue> instead of '%s'\n", optarg);
+				fprintf(stderr, "expect <KEY>=<value> instead of '%s'\n", optarg);
 				goto exit;
 			}
-			udev_ctrl_send_set_env(uctrl, optarg);
-			rc = 0;
+			if (udev_ctrl_send_set_env(uctrl, optarg) < 0)
+				rc = 2;
+			else
+				rc = 0;
 			break;
 		case 'm':
-		case 'm' + 256:
 			i = strtoul(optarg, &endp, 0);
 			if (endp[0] != '\0' || i < 1) {
 				fprintf(stderr, "invalid number '%s'\n", optarg);
 				goto exit;
 			}
-			udev_ctrl_send_set_max_childs(uctrl, i);
-			rc = 0;
+			if (udev_ctrl_send_set_max_childs(uctrl, i) < 0)
+				rc = 2;
+			else
+				rc = 0;
 			break;
 		case 'h':
 			print_help();
 			rc = 0;
-			goto exit;
-		default:
-			goto exit;
-		}
-	}
-
-	/* compat stuff which will be removed in a future release */
-	if (argv[optind] != NULL) {
-		const char *arg = argv[optind];
-
-		fprintf(stderr, "udevadm control commands requires the --<command> format, "
-			"this will stop working in a future release\n");
-		err(udev, "udevadm control commands requires the --<command> format, "
-		    "this will stop working in a future release\n");
-
-		if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
-			udev_ctrl_send_set_log_level(uctrl, util_log_priority(&arg[strlen("log_priority=")]));
-			rc = 0;
-			goto exit;
-		} else if (!strcmp(arg, "stop_exec_queue")) {
-			udev_ctrl_send_stop_exec_queue(uctrl);
-			rc = 0;
-			goto exit;
-		} else if (!strcmp(arg, "start_exec_queue")) {
-			udev_ctrl_send_start_exec_queue(uctrl);
-			rc = 0;
-			goto exit;
-		} else if (!strcmp(arg, "reload_rules")) {
-			udev_ctrl_send_reload_rules(uctrl);
-			rc = 0;
-			goto exit;
-		} else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
-			udev_ctrl_send_set_max_childs(uctrl, strtoul(&arg[strlen("max_childs=")], NULL, 0));
-			rc = 0;
-			goto exit;
-		} else if (!strncmp(arg, "env", strlen("env"))) {
-			udev_ctrl_send_set_env(uctrl, &arg[strlen("env=")]);
-			rc = 0;
-			goto exit;
+			break;
 		}
 	}
 
-	if (rc != 0) {
-		fprintf(stderr, "unrecognized command\n");
+	if (rc == 1)
 		err(udev, "unrecognized command\n");
-	}
 exit:
 	udev_ctrl_unref(uctrl);
 	return rc;