X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-control.c;h=50020b57d9a28640e5933d28fe00f58020b2c1f7;hp=c710811ed4995636daa8d49f31e5c65d69b2a045;hb=1028fe14b65d861415cda99c4ff7d0bafd67bb7f;hpb=bd770e018301edd34c53d276872865ca13e824fa

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index c710811ed..50020b57d 100644
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -1,23 +1,17 @@
 /*
- * Copyright (C) 2005-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2008 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 the
- *	Free Software Foundation version 2 of the License.
- * 
- *	This program is distributed in the hope that it will be useful, but
- *	WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *	General Public License for more details.
- * 
- *	You should have received a copy of the GNU General Public License along
- *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-#include "config.h"
-
 #include <time.h>
 #include <errno.h>
 #include <stdio.h>
@@ -42,7 +36,6 @@ static void print_help(void)
 		"  --reload-rules           reloads the rules files\n"
 		"  --env=<KEY>=<value>      set a global environment variable\n"
 		"  --max-childs=<N>         maximum number of childs\n"
-		"  --max-childs-running=<N> maximum number of childs running at the same time\n"
 		"  --help                   print this help text\n\n");
 }
 
@@ -53,20 +46,18 @@ 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},
-		{ "max-childs-running", 1, NULL, 'M' },
-		{ "max_childs_running", 1, NULL, 'M' + 256},
-		{ "help", 0, NULL, 'h' },
+		{ "log-priority", required_argument, NULL, 'l' },
+		{ "log_priority", required_argument, NULL, 'l' + 256 },
+		{ "stop-exec-queue", no_argument, NULL, 's' },
+		{ "stop_exec_queue", no_argument, NULL, 's' + 256 },
+		{ "start-exec-queue", no_argument, NULL, 'S' },
+		{ "start_exec_queue", no_argument, NULL, 'S' + 256},
+		{ "reload-rules", no_argument, NULL, 'R' },
+		{ "reload_rules", no_argument, NULL, 'R' + 256},
+		{ "env", required_argument, NULL, 'e' },
+		{ "max-childs", required_argument, NULL, 'm' },
+		{ "max_childs", required_argument, NULL, 'm' + 256},
+		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
 
@@ -98,12 +89,12 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 		switch (option) {
 		case 'l':
 		case 'l' + 256:
-			i = log_priority(optarg);
+			i = util_log_priority(optarg);
 			if (i < 0) {
 				fprintf(stderr, "invalid number '%s'\n", optarg);
 				goto exit;
 			}
-			udev_ctrl_send_set_log_level(uctrl, log_priority(optarg));
+			udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg));
 			rc = 0;
 			break;
 		case 's':
@@ -139,16 +130,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 			udev_ctrl_send_set_max_childs(uctrl, i);
 			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_running(uctrl, i);
-			rc = 0;
-			break;
 		case 'h':
 			print_help();
 			rc = 0;
@@ -168,7 +149,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 		    "this will stop working in a future release\n");
 
 		if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
-			udev_ctrl_send_set_log_level(uctrl, log_priority(&arg[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")) {
@@ -187,10 +168,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 			udev_ctrl_send_set_max_childs(uctrl, strtoul(&arg[strlen("max_childs=")], NULL, 0));
 			rc = 0;
 			goto exit;
-		} else if (!strncmp(arg, "max_childs_running=", strlen("max_childs_running="))) {
-			udev_ctrl_send_set_max_childs_running(uctrl, strtoul(&arg[strlen("max_childs_running=")], NULL, 0));
-			rc = 0;
-			goto exit;
 		} else if (!strncmp(arg, "env", strlen("env"))) {
 			udev_ctrl_send_set_env(uctrl, &arg[strlen("env=")]);
 			rc = 0;