X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-control.c;h=130a71b3d0db6e9d17e65f5f54eb65a2b9767f45;hp=1f8008ab9e907074c804af604efe2fe05ba8b75b;hb=6415f8973241c6d854067f488f8419f0251c0336;hpb=87d55ff672d78ebf8afc755e88beeeb1bdf3ac5e

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index 1f8008ab9..130a71b3d 100644
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -30,22 +30,25 @@
 static void print_help(void)
 {
 	printf("Usage: udevadm control COMMAND\n"
+		"  --exit                   instruct the daemon to cleanup and exit\n"
 		"  --log-priority=<level>   set the udev log level for the daemon\n"
 		"  --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"
 		"  --property=<KEY>=<value> set a global property for all events\n"
 		"  --children-max=<N>       maximum number of children\n"
+		"  --timeout=<seconds>      maximum time to block for a reply\n"
 		"  --help                   print this help text\n\n");
 }
 
-int udevadm_control(struct udev *udev, int argc, char *argv[])
+static int adm_control(struct udev *udev, int argc, char *argv[])
 {
 	struct udev_ctrl *uctrl = NULL;
+	int timeout = 60;
 	int rc = 1;
 
-	/* compat values with '_' will be removed in a future release */
 	static const struct option options[] = {
+		{ "exit", no_argument, NULL, 'e' },
 		{ "log-priority", required_argument, NULL, 'l' },
 		{ "stop-exec-queue", no_argument, NULL, 's' },
 		{ "start-exec-queue", no_argument, NULL, 'S' },
@@ -53,6 +56,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 		{ "property", required_argument, NULL, 'p' },
 		{ "env", required_argument, NULL, 'p' },
 		{ "children-max", required_argument, NULL, 'm' },
+		{ "timeout", required_argument, NULL, 't' },
 		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
@@ -62,45 +66,52 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 		return 1;
 	}
 
-	uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
+	uctrl = udev_ctrl_new(udev);
 	if (uctrl == NULL)
 		return 2;
 
 	for (;;) {
 		int option;
-		int i;
-		char *endp;
 
-		option = getopt_long(argc, argv, "l:sSRp:m:M:h", options, NULL);
+		option = getopt_long(argc, argv, "el:sSRp:m:h", options, NULL);
 		if (option == -1)
 			break;
 
 		switch (option) {
-		case 'l':
+		case 'e':
+			if (udev_ctrl_send_exit(uctrl, timeout) < 0)
+				rc = 2;
+			else
+				rc = 0;
+			break;
+		case 'l': {
+			int i;
+
 			i = util_log_priority(optarg);
 			if (i < 0) {
 				fprintf(stderr, "invalid number '%s'\n", optarg);
-				goto exit;
+				goto out;
 			}
-			if (udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg)) < 0)
+			if (udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg), timeout) < 0)
 				rc = 2;
 			else
 				rc = 0;
 			break;
+		}
 		case 's':
-			if (udev_ctrl_send_stop_exec_queue(uctrl) < 0)
+			if (udev_ctrl_send_stop_exec_queue(uctrl, timeout) < 0)
 				rc = 2;
 			else
 				rc = 0;
 			break;
 		case 'S':
-			if (udev_ctrl_send_start_exec_queue(uctrl) < 0)
+			if (udev_ctrl_send_start_exec_queue(uctrl, timeout) < 0)
 				rc = 2;
 			else
 				rc = 0;
 			break;
 		case 'R':
-			if (udev_ctrl_send_reload_rules(uctrl) < 0)
+			if (udev_ctrl_send_reload_rules(uctrl, timeout) < 0)
 				rc = 2;
 			else
 				rc = 0;
@@ -108,24 +119,38 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 		case 'p':
 			if (strchr(optarg, '=') == NULL) {
 				fprintf(stderr, "expect <KEY>=<value> instead of '%s'\n", optarg);
-				goto exit;
+				goto out;
 			}
-			if (udev_ctrl_send_set_env(uctrl, optarg) < 0)
+			if (udev_ctrl_send_set_env(uctrl, optarg, timeout) < 0)
 				rc = 2;
 			else
 				rc = 0;
 			break;
-		case 'm':
+		case 'm': {
+			char *endp;
+			int i;
+
 			i = strtoul(optarg, &endp, 0);
 			if (endp[0] != '\0' || i < 1) {
 				fprintf(stderr, "invalid number '%s'\n", optarg);
-				goto exit;
+				goto out;
 			}
-			if (udev_ctrl_send_set_children_max(uctrl, i) < 0)
+			if (udev_ctrl_send_set_children_max(uctrl, i, timeout) < 0)
 				rc = 2;
 			else
 				rc = 0;
 			break;
+		}
+		case 't': {
+			int seconds;
+
+			seconds = atoi(optarg);
+			if (seconds >= 0)
+				timeout = seconds;
+			else
+				fprintf(stderr, "invalid timeout value\n");
+			break;
+		}
 		case 'h':
 			print_help();
 			rc = 0;
@@ -133,9 +158,17 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 		}
 	}
 
-	if (rc == 1)
-		err(udev, "unrecognized command\n");
-exit:
+	if (argv[optind] != NULL)
+		fprintf(stderr, "unknown option\n");
+	else if (optind == 1)
+		fprintf(stderr, "missing option\n");
+out:
 	udev_ctrl_unref(uctrl);
 	return rc;
 }
+
+const struct udevadm_cmd udevadm_control = {
+	.name = "control",
+	.cmd = adm_control,
+	.help = "control the udev daemon",
+};