X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevcontrol.c;h=4c93b8f464f4258a35116768fa81d77c459525af;hb=4cd71da5603898cff68a31774be570750d7fd659;hp=b20ce2e0717359aa99c1b204d95c098e9f93a1d2;hpb=1343a9524f9d2145dfbf2ba479eb859faf6a1e95;p=elogind.git

diff --git a/udevcontrol.c b/udevcontrol.c
index b20ce2e07..4c93b8f46 100644
--- a/udevcontrol.c
+++ b/udevcontrol.c
@@ -34,21 +34,7 @@
 static int sock = -1;
 static int udev_log = 0;
 
-#ifdef USE_LOG
-void log_message (int priority, const char *format, ...)
-{
-	va_list	args;
-
-	if (priority > udev_log)
-		return;
-
-	va_start(args, format);
-	vsyslog(priority, format, args);
-	va_end(args);
-}
-#endif
-
-int main(int argc, char *argv[], char *envp[])
+int udevcontrol(int argc, char *argv[], char *envp[])
 {
 	static struct udevd_ctrl_msg ctrl_msg;
 	struct sockaddr_un saddr;
@@ -64,7 +50,7 @@ int main(int argc, char *argv[], char *envp[])
 		udev_log = log_priority(env);
 
 	logging_init("udevcontrol");
-	dbg("version %s", UDEV_VERSION);
+	dbg("version %s\n", UDEV_VERSION);
 
 	if (argc < 2) {
 		fprintf(stderr, "missing command\n\n");
@@ -74,6 +60,10 @@ int main(int argc, char *argv[], char *envp[])
 	strcpy(ctrl_msg.magic, UDEVD_CTRL_MAGIC);
 	arg = argv[1];
 
+	/* allow instructions passed as options */
+	if (strncmp(arg, "--", 2) == 0)
+		arg += 2;
+
 	if (!strcmp(arg, "stop_exec_queue"))
 		ctrl_msg.type = UDEVD_CTRL_STOP_EXEC_QUEUE;
 	else if (!strcmp(arg, "start_exec_queue"))
@@ -85,7 +75,7 @@ int main(int argc, char *argv[], char *envp[])
 		val = &arg[strlen("log_priority=")];
 		ctrl_msg.type = UDEVD_CTRL_SET_LOG_LEVEL;
 		*intval = log_priority(val);
-		info("send log_priority=%i", *intval);
+		info("send log_priority=%i\n", *intval);
 	} else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
 		char *endp;
 		int count;
@@ -99,7 +89,7 @@ int main(int argc, char *argv[], char *envp[])
 			goto exit;
 		}
 		*intval = count;
-		info("send max_childs=%i", *intval);
+		info("send max_childs=%i\n", *intval);
 	} else if (!strncmp(arg, "max_childs_running=", strlen("max_childs_running="))) {
 		char *endp;
 		int count;
@@ -113,26 +103,29 @@ int main(int argc, char *argv[], char *envp[])
 			goto exit;
 		}
 		*intval = count;
-		info("send max_childs_running=%i", *intval);
+		info("send max_childs_running=%i\n", *intval);
 	} else if (!strncmp(arg, "env", strlen("env"))) {
-		val = argv[2];
+		if (!strncmp(arg, "env=", strlen("env=")))
+			val = &arg[strlen("env=")];
+		else
+			val = argv[2];
 		if (val == NULL) {
 			fprintf(stderr, "missing key\n");
 			goto exit;
 		}
 		ctrl_msg.type = UDEVD_CTRL_ENV;
 		strlcpy(ctrl_msg.buf, val, sizeof(ctrl_msg.buf));
-		info("send env '%s'", val);
-	} else if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
-		printf("Usage: udevcontrol COMMAND\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"
-			"  env <var>=<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");
+		info("send env '%s'\n", val);
+	} else if (strcmp(arg, "help") == 0  || strcmp(arg, "-h") == 0) {
+		printf("Usage: udevadm control COMMAND\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"
+			"  --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");
 		goto exit;
 	} else {
 		fprintf(stderr, "unrecognized command '%s'\n", arg);
@@ -146,7 +139,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 	if (sock == -1) {
-		err("error getting socket: %s", strerror(errno));
+		err("error getting socket: %s\n", strerror(errno));
 		goto exit;
 	}
 
@@ -154,14 +147,14 @@ int main(int argc, char *argv[], char *envp[])
 	saddr.sun_family = AF_LOCAL;
 	/* use abstract namespace for socket path */
 	strcpy(&saddr.sun_path[1], UDEVD_CTRL_SOCK_PATH);
-	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+	addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
 
 	retval = sendto(sock, &ctrl_msg, sizeof(ctrl_msg), 0, (struct sockaddr *)&saddr, addrlen);
 	if (retval == -1) {
-		err("error sending message: %s", strerror(errno));
+		err("error sending message: %s\n", strerror(errno));
 		retval = 1;
 	} else {
-		dbg("sent message type=0x%02x, %u bytes sent", ctrl_msg.type, retval);
+		dbg("sent message type=0x%02x, %u bytes sent\n", ctrl_msg.type, retval);
 		retval = 0;
 	}