X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevd.c;h=23f5fd6980183a2cf56481b3ee903914f6b85512;hb=88caa9da18841561c604c5a237cb776375eee035;hp=df6e2228106173db10212ee025cb1184bb633f6b;hpb=b52a01ee39dad3b04aaa7e3af7435f062d3e887f;p=elogind.git

diff --git a/udevd.c b/udevd.c
index df6e22281..23f5fd698 100644
--- a/udevd.c
+++ b/udevd.c
@@ -45,6 +45,9 @@
 #include "udevd.h"
 #include "udev_selinux.h"
 
+static int debug_trace;
+static int verbose;
+
 static struct udev_rules rules;
 static int udevd_sock = -1;
 static int uevent_netlink_sock = -1;
@@ -76,6 +79,13 @@ void log_message(int priority, const char *format, ...)
 	va_start(args, format);
 	vsyslog(priority, format, args);
 	va_end(args);
+
+	if (verbose) {
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+		printf("\n");
+	}
 }
 
 #endif
@@ -298,6 +308,15 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 
 	export_event_state(msg, EVENT_QUEUED);
 
+	/* run one event after the other in debug mode */
+	if (debug_trace) {
+		list_add_tail(&msg->node, &running_list);
+		udev_event_run(msg);
+		waitpid(msg->pid, NULL, 0);
+		msg_queue_delete(msg);
+		return;
+	}
+
 	/* run all events with a timeout set immediately */
 	if (msg->timeout != 0) {
 		list_add_tail(&msg->node, &running_list);
@@ -921,7 +940,10 @@ int main(int argc, char *argv[], char *envp[])
 	int option;
 	static const struct option options[] = {
 		{ "daemon", 0, NULL, 'd' },
+		{ "debug-trace", 0, NULL, 't' },
+		{ "verbose", 0, NULL, 'v' },
 		{ "help", 0, NULL, 'h' },
+		{ "version", 0, NULL, 'V' },
 		{}
 	};
 	int rc = 1;
@@ -934,7 +956,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	/* parse commandline options */
 	while (1) {
-		option = getopt_long(argc, argv, "dtvh", options, NULL);
+		option = getopt_long(argc, argv, "dtvhV", options, NULL);
 		if (option == -1)
 			break;
 
@@ -942,8 +964,19 @@ int main(int argc, char *argv[], char *envp[])
 		case 'd':
 			daemonize = 1;
 			break;
+		case 't':
+			debug_trace = 1;
+			break;
+		case 'v':
+			verbose = 1;
+			if (udev_log_priority < LOG_INFO)
+				udev_log_priority = LOG_INFO;
+			break;
 		case 'h':
-			printf("Usage: udevd [--help] [--daemon]\n");
+			printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--verbose] [--version]\n");
+			goto exit;
+		case 'V':
+			printf("%s\n", UDEV_VERSION);
 			goto exit;
 		default:
 			goto exit;
@@ -977,6 +1010,35 @@ int main(int argc, char *argv[], char *envp[])
 		goto exit;
 	}
 
+	/* setup signal handler pipe */
+	retval = pipe(signal_pipe);
+	if (retval < 0) {
+		err("error getting pipes: %s", strerror(errno));
+		goto exit;
+	}
+
+	retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+	if (retval < 0) {
+		err("error fcntl on read pipe: %s", strerror(errno));
+		goto exit;
+	}
+	retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
+	if (retval < 0) {
+		err("error fcntl on read pipe: %s", strerror(errno));
+		goto exit;
+	}
+
+	retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+	if (retval < 0) {
+		err("error fcntl on write pipe: %s", strerror(errno));
+		goto exit;
+	}
+	retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
+	if (retval < 0) {
+		err("error fcntl on write pipe: %s", strerror(errno));
+		goto exit;
+	}
+
 	/* parse the rules and keep them in memory */
 	sysfs_init();
 	udev_rules_init(&rules, 1);
@@ -1006,7 +1068,8 @@ int main(int argc, char *argv[], char *envp[])
 	fd = open("/dev/null", O_RDWR);
 	if (fd >= 0) {
 		dup2(fd, STDIN_FILENO);
-		dup2(fd, STDOUT_FILENO);
+		if (!verbose)
+			dup2(fd, STDOUT_FILENO);
 		dup2(fd, STDERR_FILENO);
 		if (fd > STDERR_FILENO)
 			close(fd);
@@ -1032,35 +1095,6 @@ int main(int argc, char *argv[], char *envp[])
 		close(fd);
 	}
 
-	/* setup signal handler pipe */
-	retval = pipe(signal_pipe);
-	if (retval < 0) {
-		err("error getting pipes: %s", strerror(errno));
-		goto exit;
-	}
-
-	retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
-	if (retval < 0) {
-		err("error fcntl on read pipe: %s", strerror(errno));
-		goto exit;
-	}
-	retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
-	if (retval < 0) {
-		err("error fcntl on read pipe: %s", strerror(errno));
-		goto exit;
-	}
-
-	retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
-	if (retval < 0) {
-		err("error fcntl on write pipe: %s", strerror(errno));
-		goto exit;
-	}
-	retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
-	if (retval < 0) {
-		err("error fcntl on write pipe: %s", strerror(errno));
-		goto exit;
-	}
-
 	/* set signal handlers */
 	memset(&act, 0x00, sizeof(struct sigaction));
 	act.sa_handler = (void (*)(int)) sig_handler;
@@ -1074,7 +1108,7 @@ int main(int argc, char *argv[], char *envp[])
 	/* watch rules directory */
 	inotify_fd = inotify_init();
 	if (inotify_fd >= 0)
-		inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+		inotify_add_watch(inotify_fd, udev_rules_dir, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
 	else if (errno == ENOSYS)
 		err("the kernel does not support inotify, udevd can't monitor configuration file changes");
 	else
@@ -1112,6 +1146,8 @@ int main(int argc, char *argv[], char *envp[])
 	/* export log_priority , as called programs may want to follow that setting */
 	sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
 	putenv(udev_log);
+	if (debug_trace)
+		putenv("DEBUG=1");
 
 	maxfd = udevd_sock;
 	maxfd = UDEV_MAX(maxfd, uevent_netlink_sock);