X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevcontrol.c;h=6d91adc1c4eff994416ce89dbda88ba4253d9c31;hp=4a54af805e2524b35340dbd7ee8d9e927d689041;hb=0d210b3ad9ebca9fb60c79b2ebbd3d1482485bd3;hpb=60d7b201008edb3c6d9226ef336c7ae0daa5742f

diff --git a/udevcontrol.c b/udevcontrol.c
index 4a54af805..6d91adc1c 100644
--- a/udevcontrol.c
+++ b/udevcontrol.c
@@ -1,11 +1,8 @@
 /*
  * udevcontrol.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2005 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.
@@ -35,20 +32,22 @@
 #include <linux/stddef.h>
 
 #include "udev.h"
-#include "udev_version.h"
 #include "udevd.h"
-#include "logging.h"
 
 /* global variables */
 static int sock = -1;
+static int udev_log = 0;
 
 #ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+void log_message (int priority, const char *format, ...)
 {
 	va_list	args;
 
+	if (priority > udev_log)
+		return;
+
 	va_start(args, format);
-	vsyslog(level, format, args);
+	vsyslog(priority, format, args);
 	va_end(args);
 }
 #endif
@@ -59,31 +58,71 @@ int main(int argc, char *argv[], char *envp[])
 	static struct udevd_msg usend_msg;
 	struct sockaddr_un saddr;
 	socklen_t addrlen;
+	const char *env;
+	const char *val;
+	int *intval;
+	int i;
 	int retval = 1;
 
+	env = getenv("UDEV_LOG");
+	if (env)
+		udev_log = log_priority(env);
+
 	logging_init("udevcontrol");
 	dbg("version %s", UDEV_VERSION);
 
-	if (argc != 2) {
-		info("usage: udevcontrol <cmd>\n");
+	if (argc < 2) {
+		fprintf(stderr, "missing command\n\n");
 		goto exit;
 	}
 
 	memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
 	strcpy(usend_msg.magic, UDEV_MAGIC);
 
-	if (strstr(argv[1], "stop_exec_queue"))
-		usend_msg.type = UDEVD_STOP_EXEC_QUEUE;
-	else if (strstr(argv[1], "start_exec_queue"))
-		usend_msg.type = UDEVD_START_EXEC_QUEUE;
-	else {
-		info("unknown command\n");
-		goto exit;
+	for (i = 1 ; i < argc; i++) {
+		char *arg = argv[i];
+
+		if (!strcmp(arg, "stop_exec_queue"))
+			usend_msg.type = UDEVD_STOP_EXEC_QUEUE;
+		else if (!strcmp(arg, "start_exec_queue"))
+			usend_msg.type = UDEVD_START_EXEC_QUEUE;
+		else if (!strcmp(arg, "reload_rules"))
+			usend_msg.type = UDEVD_RELOAD_RULES;
+		else if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
+			intval = (int *) usend_msg.envbuf;
+			val = &arg[strlen("log_priority=")];
+			usend_msg.type = UDEVD_SET_LOG_LEVEL;
+			*intval = log_priority(val);
+			info("send log_priority=%i", *intval);
+		} else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
+			intval = (int *) usend_msg.envbuf;
+			val = &arg[strlen("max_childs=")];
+			usend_msg.type = UDEVD_SET_MAX_CHILDS;
+			*intval = atoi(val);
+			info("send max_childs=%i", *intval);
+		} 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"
+				"  max_childs=<N>       maximum number of childs running at the same time\n"
+				"  --help               print this help text\n\n");
+			exit(0);
+		} else {
+			fprintf(stderr, "unknown option\n\n");
+			exit(1);
+		}
+	}
+
+	if (getuid() != 0) {
+		fprintf(stderr, "need to be root, exit\n\n");
+		exit(1);
 	}
 
 	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 	if (sock == -1) {
-		info("error getting socket");
+		err("error getting socket: %s", strerror(errno));
 		goto exit;
 	}
 
@@ -96,10 +135,10 @@ int main(int argc, char *argv[], char *envp[])
 
 	retval = sendto(sock, &usend_msg, sizeof(usend_msg), 0, (struct sockaddr *)&saddr, addrlen);
 	if (retval == -1) {
-		info("error sending message (%s)", strerror(errno));
+		err("error sending message: %s", strerror(errno));
 		retval = 1;
 	} else {
-		dbg("sent message '%x' (%u bytes sent)\n", usend_msg.type, retval);
+		dbg("sent message type=0x%02x, %u bytes sent", usend_msg.type, retval);
 		retval = 0;
 	}