X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=b221692944c74dbc9604fd157852f0c08a98ce00;hp=ddf72738c321bff0c2a81f24423f525d5deda4a7;hb=b3518c16e3c3795a5ff278ef4c71f8e439057d6d;hpb=fc465079caefbbfb838019e3c2b86ffa3e889efa

diff --git a/udevd.c b/udevd.c
index ddf72738c..b22169294 100644
--- a/udevd.c
+++ b/udevd.c
@@ -1,7 +1,7 @@
 /*
  * udevd.c - event listener and serializer
  *
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
  *
  *
@@ -39,18 +39,14 @@
 #include <sys/un.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <linux/types.h>
 #include <linux/netlink.h>
 
-#include "list.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_version.h"
 #include "udev_rules.h"
-#include "udev_utils.h"
 #include "udevd.h"
-#include "logging.h"
 
-struct udev_rules rules;
+static struct udev_rules rules;
 static int udevd_sock;
 static int uevent_netlink_sock;
 static int inotify_fd;
@@ -90,11 +86,10 @@ static void asmlinkage udev_event_sig_handler(int signum)
 		exit(1);
 }
 
-static int udev_event_process(struct uevent_msg *msg)
+static int udev_event_process(struct udevd_uevent_msg *msg)
 {
 	struct sigaction act;
-	struct udevice udev;
-	struct name_entry *name_loop;
+	struct udevice *udev;
 	int i;
 	int retval;
 
@@ -105,40 +100,149 @@ static int udev_event_process(struct uevent_msg *msg)
 	act.sa_flags = 0;
 	sigaction(SIGALRM, &act, NULL);
 
+	/* reset to default */
+	act.sa_handler = SIG_DFL;
+	sigaction(SIGINT, &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
+	sigaction(SIGCHLD, &act, NULL);
+	sigaction(SIGHUP, &act, NULL);
+
 	/* trigger timeout to prevent hanging processes */
 	alarm(UDEV_ALARM_TIMEOUT);
 
-	/* reconstruct env from message */
+	/* reconstruct event environment from message */
 	for (i = 0; msg->envp[i]; i++)
 		putenv(msg->envp[i]);
 
-	udev_init_device(&udev, msg->devpath, msg->subsystem, msg->action);
-	retval = udev_process_event(&rules, &udev);
+	udev = udev_device_init();
+	if (udev == NULL)
+		return -1;
+	strlcpy(udev->action, msg->action, sizeof(udev->action));
+	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem);
+	udev->devt = msg->devt;
+
+	retval = udev_device_event(&rules, udev);
 
 	/* run programs collected by RUN-key*/
-	if (!retval) {
-		list_for_each_entry(name_loop, &udev.run_list, node) {
+	if (retval == 0 && !udev->ignore_device && udev_run) {
+		struct name_entry *name_loop;
+
+		dbg("executing run list");
+		list_for_each_entry(name_loop, &udev->run_list, node) {
 			if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
-				pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
-			else
-				run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+				pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action);
+			else {
+				char program[PATH_SIZE];
+
+				strlcpy(program, name_loop->name, sizeof(program));
+				udev_rules_apply_format(udev, program, sizeof(program));
+				if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
+						(udev_log_priority >= LOG_INFO)))
+					retval = -1;
+			}
 		}
 	}
 
-	udev_cleanup_device(&udev);
+	udev_device_cleanup(udev);
+	return retval;
+}
+
+enum event_state {
+	EVENT_QUEUED,
+	EVENT_FINISHED,
+	EVENT_FAILED,
+};
 
-	return 0;
+static void export_event_state(struct udevd_uevent_msg *msg, enum event_state state)
+{
+	char filename[PATH_SIZE];
+	char filename_failed[PATH_SIZE];
+	char target[PATH_SIZE];
+	size_t start, end, i;
+	struct udevd_uevent_msg *loop_msg;
+
+	/* add location of queue files */
+	strlcpy(filename, udev_root, sizeof(filename));
+	strlcat(filename, "/", sizeof(filename));
+	start = strlcat(filename, EVENT_QUEUE_DIR, sizeof(filename));
+	end = strlcat(filename, msg->devpath, sizeof(filename));
+	if (end > sizeof(filename))
+		end = sizeof(filename);
+
+	/* replace '/' to transform path into a filename */
+	for (i = start+1; i < end; i++)
+		if (filename[i] == '/')
+			filename[i] = PATH_TO_NAME_CHAR;
+
+	/* add location of failed files */
+	strlcpy(filename_failed, udev_root, sizeof(filename_failed));
+	strlcat(filename_failed, "/", sizeof(filename_failed));
+	start = strlcat(filename_failed, EVENT_FAILED_DIR, sizeof(filename_failed));
+	end = strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
+	if (end > sizeof(filename_failed))
+		end = sizeof(filename_failed);
+
+	/* replace '/' to transform path into a filename */
+	for (i = start+1; i < end; i++)
+		if (filename_failed[i] == '/')
+			filename_failed[i] = PATH_TO_NAME_CHAR;
+
+	switch (state) {
+	case EVENT_QUEUED:
+		unlink(filename_failed);
+		delete_path(filename_failed);
+
+		strlcpy(target, sysfs_path, sizeof(target));
+		strlcat(target, msg->devpath, sizeof(target));
+		create_path(filename);
+		symlink(target, filename);
+		return;
+	case EVENT_FINISHED:
+	case EVENT_FAILED:
+		unlink(filename_failed);
+		delete_path(filename_failed);
+
+		/* don't remove, if events for the same path are still pending */
+		list_for_each_entry(loop_msg, &running_list, node)
+			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+				return;
+
+		list_for_each_entry(loop_msg, &exec_list, node)
+			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+				return;
+
+		/* move failed events to the failed directory */
+		if (state == EVENT_FAILED) {
+			create_path(filename_failed);
+			rename(filename, filename_failed);
+		} else {
+			unlink(filename);
+		}
+
+		/* clean up the queue directory */
+		delete_path(filename);
+
+		return;
+	}
 }
 
-static void msg_queue_delete(struct uevent_msg *msg)
+static void msg_queue_delete(struct udevd_uevent_msg *msg)
 {
 	list_del(&msg->node);
+
+	/* mark as failed, if add event returns non-zero */
+	if (msg->exitstatus && strcmp(msg->action, "add") == 0)
+		export_event_state(msg, EVENT_FAILED);
+	else
+		export_event_state(msg, EVENT_FINISHED);
+
 	free(msg);
 }
 
-static void udev_event_run(struct uevent_msg *msg)
+static void udev_event_run(struct udevd_uevent_msg *msg)
 {
 	pid_t pid;
+	int retval;
 
 	pid = fork();
 	switch (pid) {
@@ -146,7 +250,7 @@ static void udev_event_run(struct uevent_msg *msg)
 		/* child */
 		close(uevent_netlink_sock);
 		close(udevd_sock);
-		if (inotify_fd > 0)
+		if (inotify_fd >= 0)
 			close(inotify_fd);
 		close(signal_pipe[READ_END]);
 		close(signal_pipe[WRITE_END]);
@@ -154,13 +258,16 @@ static void udev_event_run(struct uevent_msg *msg)
 
 		logging_init("udevd-event");
 		setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
-		udev_event_process(msg);
+
+		retval = udev_event_process(msg);
 		info("seq %llu finished", msg->seqnum);
 
 		logging_close();
+		if (retval)
+			exit(1);
 		exit(0);
 	case -1:
-		err("fork of child failed");
+		err("fork of child failed: %s", strerror(errno));
 		msg_queue_delete(msg);
 		break;
 	default:
@@ -171,10 +278,27 @@ static void udev_event_run(struct uevent_msg *msg)
 	}
 }
 
-static void msg_queue_insert(struct uevent_msg *msg)
+static void msg_queue_insert(struct udevd_uevent_msg *msg)
 {
+	char filename[PATH_SIZE];
+	int fd;
+
 	msg->queue_time = time(NULL);
 
+	strlcpy(filename, udev_root, sizeof(filename));
+	strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+	fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+	if (fd >= 0) {
+		char str[32];
+		int len;
+
+		len = sprintf(str, "%llu\n", msg->seqnum);
+		write(fd, str, len);
+		close(fd);
+	}
+
+	export_event_state(msg, EVENT_QUEUED);
+
 	/* run all events with a timeout set immediately */
 	if (msg->timeout != 0) {
 		list_add_tail(&msg->node, &running_list);
@@ -190,7 +314,7 @@ static void msg_queue_insert(struct uevent_msg *msg)
 static int running_processes(void)
 {
 	int f;
-	static char buf[4096];
+	char buf[32768];
 	int len;
 	int running;
 	const char *pos;
@@ -307,21 +431,16 @@ static int compare_devpath(const char *running, const char *waiting)
 }
 
 /* returns still running task for the same device, its parent or its physical device */
-static int running_with_devpath(struct uevent_msg *msg, int limit)
+static int running_with_devpath(struct udevd_uevent_msg *msg, int limit)
 {
-	struct uevent_msg *loop_msg;
+	struct udevd_uevent_msg *loop_msg;
 	int childs_count = 0;
 
-	if (msg->devpath == NULL)
-		return 0;
-
 	list_for_each_entry(loop_msg, &running_list, node) {
 		if (limit && childs_count++ > limit) {
 			dbg("%llu, maximum number (%i) of child reached", msg->seqnum, childs_count);
 			return 1;
 		}
-		if (loop_msg->devpath == NULL)
-			continue;
 
 		/* return running parent/child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
@@ -345,8 +464,8 @@ static int running_with_devpath(struct uevent_msg *msg, int limit)
 /* exec queue management routine executes the events and serializes events in the same sequence */
 static void msg_queue_manager(void)
 {
-	struct uevent_msg *loop_msg;
-	struct uevent_msg *tmp_msg;
+	struct udevd_uevent_msg *loop_msg;
+	struct udevd_uevent_msg *tmp_msg;
 	int running;
 
 	if (list_empty(&exec_list))
@@ -382,18 +501,18 @@ static void msg_queue_manager(void)
 	}
 }
 
-static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
+static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
 {
 	int bufpos;
 	int i;
-	struct uevent_msg *msg;
+	struct udevd_uevent_msg *msg;
 	int major = 0;
 	int minor = 0;
 
-	msg = malloc(sizeof(struct uevent_msg) + buf_size);
+	msg = malloc(sizeof(struct udevd_uevent_msg) + buf_size);
 	if (msg == NULL)
 		return NULL;
-	memset(msg, 0x00, sizeof(struct uevent_msg) + buf_size);
+	memset(msg, 0x00, sizeof(struct udevd_uevent_msg) + buf_size);
 
 	/* copy environment buffer and reconstruct envp */
 	memcpy(msg->envbuf, buf, buf_size);
@@ -430,26 +549,29 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
 	msg->envp[i++] = "UDEVD_EVENT=1";
 	msg->envp[i] = NULL;
 
+	if (msg->devpath == NULL || msg->action == NULL) {
+		info("DEVPATH or ACTION missing, ignore message");
+		free(msg);
+		return NULL;
+	}
 	return msg;
 }
 
 /* receive the udevd message from userspace */
-static struct uevent_msg *get_udevd_msg(void)
+static void get_ctrl_msg(void)
 {
-	static struct udevd_msg usend_msg;
-	struct uevent_msg *msg;
+	struct udevd_ctrl_msg ctrl_msg;
 	ssize_t size;
 	struct msghdr smsg;
 	struct cmsghdr *cmsg;
 	struct iovec iov;
 	struct ucred *cred;
 	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
-	int envbuf_size;
 	int *intval;
 
-	memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
-	iov.iov_base = &usend_msg;
-	iov.iov_len = sizeof(struct udevd_msg);
+	memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg));
+	iov.iov_base = &ctrl_msg;
+	iov.iov_len = sizeof(struct udevd_ctrl_msg);
 
 	memset(&smsg, 0x00, sizeof(struct msghdr));
 	smsg.msg_iov = &iov;
@@ -460,82 +582,71 @@ static struct uevent_msg *get_udevd_msg(void)
 	size = recvmsg(udevd_sock, &smsg, 0);
 	if (size <  0) {
 		if (errno != EINTR)
-			err("unable to receive udevd message");
-		return NULL;
+			err("unable to receive user udevd message: %s", strerror(errno));
+		return;
 	}
 	cmsg = CMSG_FIRSTHDR(&smsg);
 	cred = (struct ucred *) CMSG_DATA(cmsg);
 
 	if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
 		err("no sender credentials received, message ignored");
-		return NULL;
+		return;
 	}
 
 	if (cred->uid != 0) {
 		err("sender uid=%i, message ignored", cred->uid);
-		return NULL;
+		return;
 	}
 
-	if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
-		err("message magic '%s' doesn't match, ignore it", usend_msg.magic);
-		return NULL;
+	if (strncmp(ctrl_msg.magic, UDEVD_CTRL_MAGIC, sizeof(UDEVD_CTRL_MAGIC)) != 0 ) {
+		err("message magic '%s' doesn't match, ignore it", ctrl_msg.magic);
+		return;
 	}
 
-	switch (usend_msg.type) {
-	case UDEVD_UEVENT_UDEVSEND:
-	case UDEVD_UEVENT_INITSEND:
-		info("udevd event message received");
-		envbuf_size = size - offsetof(struct udevd_msg, envbuf);
-		dbg("envbuf_size=%i", envbuf_size);
-		msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size);
-		if (msg == NULL)
-			return NULL;
-		msg->type = usend_msg.type;
-		return msg;
-	case UDEVD_STOP_EXEC_QUEUE:
+	switch (ctrl_msg.type) {
+	case UDEVD_CTRL_STOP_EXEC_QUEUE:
 		info("udevd message (STOP_EXEC_QUEUE) received");
 		stop_exec_q = 1;
 		break;
-	case UDEVD_START_EXEC_QUEUE:
+	case UDEVD_CTRL_START_EXEC_QUEUE:
 		info("udevd message (START_EXEC_QUEUE) received");
 		stop_exec_q = 0;
 		msg_queue_manager();
 		break;
-	case UDEVD_SET_LOG_LEVEL:
-		intval = (int *) usend_msg.envbuf;
+	case UDEVD_CTRL_SET_LOG_LEVEL:
+		intval = (int *) ctrl_msg.buf;
 		info("udevd message (SET_LOG_PRIORITY) received, udev_log_priority=%i", *intval);
 		udev_log_priority = *intval;
 		sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
 		putenv(udev_log);
 		break;
-	case UDEVD_SET_MAX_CHILDS:
-		intval = (int *) usend_msg.envbuf;
+	case UDEVD_CTRL_SET_MAX_CHILDS:
+		intval = (int *) ctrl_msg.buf;
 		info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval);
 		max_childs = *intval;
 		break;
-	case UDEVD_RELOAD_RULES:
+	case UDEVD_CTRL_RELOAD_RULES:
 		info("udevd message (RELOAD_RULES) received");
 		reload_config = 1;
 		break;
 	default:
 		dbg("unknown message type");
 	}
-	return NULL;
 }
 
 /* receive the kernel user event message and do some sanity checks */
-static struct uevent_msg *get_netlink_msg(void)
+static struct udevd_uevent_msg *get_netlink_msg(void)
 {
-	struct uevent_msg *msg;
+	struct udevd_uevent_msg *msg;
 	int bufpos;
 	ssize_t size;
-	static char buffer[UEVENT_BUFFER_SIZE + 512];
+	static char buffer[UEVENT_BUFFER_SIZE+512];
 	char *pos;
 
 	size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
 	if (size <  0) {
 		if (errno != EINTR)
-			err("unable to receive udevd message");
+			err("unable to receive kernel netlink message: %s", strerror(errno));
 		return NULL;
 	}
 
@@ -549,7 +660,6 @@ static struct uevent_msg *get_netlink_msg(void)
 	msg = get_msg_from_envbuf(&buffer[bufpos], size-bufpos);
 	if (msg == NULL)
 		return NULL;
-	msg->type = UDEVD_UEVENT_NETLINK;
 
 	/* validate message */
 	pos = strchr(buffer, '@');
@@ -595,14 +705,16 @@ static void asmlinkage sig_handler(int signum)
 	write(signal_pipe[WRITE_END], "", 1);
 }
 
-static void udev_done(int pid)
+static void udev_done(int pid, int exitstatus)
 {
 	/* find msg associated with pid and delete it */
-	struct uevent_msg *msg;
+	struct udevd_uevent_msg *msg;
 
 	list_for_each_entry(msg, &running_list, node) {
 		if (msg->pid == pid) {
-			info("seq %llu, pid [%d] exit, %ld seconds old", msg->seqnum, msg->pid, time(NULL) - msg->queue_time);
+			info("seq %llu, pid [%d] exit with %i, %ld seconds old", msg->seqnum, msg->pid,
+			     exitstatus, time(NULL) - msg->queue_time);
+			msg->exitstatus = exitstatus;
 			msg_queue_delete(msg);
 
 			/* there may be events waiting with the same devpath */
@@ -615,12 +727,19 @@ static void udev_done(int pid)
 static void reap_sigchilds(void)
 {
 	pid_t pid;
+	int status;
 
 	while (1) {
-		pid = waitpid(-1, NULL, WNOHANG);
+		pid = waitpid(-1, &status, WNOHANG);
 		if (pid <= 0)
 			break;
-		udev_done(pid);
+		if (WIFEXITED(status))
+			status = WEXITSTATUS(status);
+		else if (WIFSIGNALED(status))
+			status = WTERMSIG(status) + 128;
+		else
+			status = 0;
+		udev_done(pid, status);
 	}
 }
 
@@ -635,12 +754,12 @@ static int init_udevd_socket(void)
 	memset(&saddr, 0x00, sizeof(saddr));
 	saddr.sun_family = AF_LOCAL;
 	/* use abstract namespace for socket path */
-	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
+	strcpy(&saddr.sun_path[1], UDEVD_CTRL_SOCK_PATH);
 	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
 	udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 	if (udevd_sock == -1) {
-		err("error getting socket, %s", strerror(errno));
+		err("error getting socket: %s", strerror(errno));
 		return -1;
 	}
 
@@ -650,7 +769,7 @@ static int init_udevd_socket(void)
 	/* the bind takes care of ensuring only one copy running */
 	retval = bind(udevd_sock, (struct sockaddr *) &saddr, addrlen);
 	if (retval < 0) {
-		err("bind failed, %s", strerror(errno));
+		err("bind failed: %s", strerror(errno));
 		return -1;
 	}
 
@@ -669,11 +788,11 @@ static int init_uevent_netlink_sock(void)
 	memset(&snl, 0x00, sizeof(struct sockaddr_nl));
 	snl.nl_family = AF_NETLINK;
 	snl.nl_pid = getpid();
-	snl.nl_groups = 0xffffffff;
+	snl.nl_groups = 1;
 
 	uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
 	if (uevent_netlink_sock == -1) {
-		err("error getting socket, %s", strerror(errno));
+		err("error getting socket: %s", strerror(errno));
 		return -1;
 	}
 
@@ -682,7 +801,7 @@ static int init_uevent_netlink_sock(void)
 
 	retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl, sizeof(struct sockaddr_nl));
 	if (retval < 0) {
-		err("bind failed, %s", strerror(errno));
+		err("bind failed: %s", strerror(errno));
 		close(uevent_netlink_sock);
 		uevent_netlink_sock = -1;
 		return -1;
@@ -690,6 +809,34 @@ static int init_uevent_netlink_sock(void)
 	return 0;
 }
 
+static void export_initial_seqnum(void)
+{
+	char filename[PATH_SIZE];
+	int fd;
+	char seqnum[32];
+	ssize_t len = 0;
+
+	strlcpy(filename, sysfs_path, sizeof(filename));
+	strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+	fd = open(filename, O_RDONLY);
+	if (fd >= 0) {
+		len = read(fd, seqnum, sizeof(seqnum)-1);
+		close(fd);
+	}
+	if (len <= 0) {
+		strcpy(seqnum, "0\n");
+		len = 3;
+	}
+	strlcpy(filename, udev_root, sizeof(filename));
+	strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+	create_path(filename);
+	fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+	if (fd >= 0) {
+		write(fd, seqnum, len);
+		close(fd);
+	}
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
 	int retval;
@@ -717,9 +864,9 @@ int main(int argc, char *argv[], char *envp[])
 
 	logging_init("udevd");
 	if (fd < 0)
-		err("fatal, could not open /dev/null");
+		err("fatal, could not open /dev/null: %s", strerror(errno));
 
-	udev_init_config();
+	udev_config_init();
 	dbg("version %s", UDEV_VERSION);
 
 	if (getuid() != 0) {
@@ -743,10 +890,10 @@ int main(int argc, char *argv[], char *envp[])
 	/* init sockets to receive events */
 	if (init_udevd_socket() < 0) {
 		if (errno == EADDRINUSE) {
-			dbg("another udevd running, exit");
+			err("another udevd running, exit");
 			rc = 1;
 		} else {
-			dbg("error initializing udevd socket: %s", strerror(errno));
+			err("error initializing udevd socket: %s", strerror(errno));
 			rc = 2;
 		}
 		goto exit;
@@ -759,8 +906,11 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	/* parse the rules and keep it in memory */
+	sysfs_init();
 	udev_rules_init(&rules, 1);
 
+	export_initial_seqnum();
+
 	if (daemonize) {
 		pid_t pid;
 
@@ -770,7 +920,7 @@ int main(int argc, char *argv[], char *envp[])
 			dbg("daemonized fork running");
 			break;
 		case -1:
-			err("fork of daemon failed");
+			err("fork of daemon failed: %s", strerror(errno));
 			rc = 4;
 			goto exit;
 		default:
@@ -792,7 +942,7 @@ int main(int argc, char *argv[], char *envp[])
 	/* OOM_DISABLE == -17 */
 	fd = open("/proc/self/oom_adj", O_RDWR);
 	if (fd < 0)
-		err("error disabling OOM");
+		err("error disabling OOM: %s", strerror(errno));
 	else {
 		write(fd, "-17", 3);
 		close(fd);
@@ -804,12 +954,24 @@ int main(int argc, char *argv[], char *envp[])
 		err("error getting pipes: %s", strerror(errno));
 		goto exit;
 	}
-	retval = fcntl(signal_pipe[READ_END], F_SETFL, O_NONBLOCK);
+
+	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[WRITE_END], F_SETFL, O_NONBLOCK);
+	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;
@@ -827,8 +989,12 @@ int main(int argc, char *argv[], char *envp[])
 
 	/* watch rules directory */
 	inotify_fd = inotify_init();
-	if (inotify_fd > 0)
+	if (inotify_fd >= 0)
 		inotify_add_watch(inotify_fd, udev_rules_filename, 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
+		err("inotify_init failed: %s", strerror(errno));
 
 	/* maximum limit of forked childs */
 	value = getenv("UDEVD_MAX_CHILDS");
@@ -859,36 +1025,28 @@ int main(int argc, char *argv[], char *envp[])
 	maxfd = UDEV_MAX(maxfd, inotify_fd);
 
 	while (!udev_exit) {
-		struct uevent_msg *msg;
+		struct udevd_uevent_msg *msg;
 		int fdcount;
 
 		FD_ZERO(&readfds);
 		FD_SET(signal_pipe[READ_END], &readfds);
 		FD_SET(udevd_sock, &readfds);
 		FD_SET(uevent_netlink_sock, &readfds);
-		if (inotify_fd > 0)
+		if (inotify_fd >= 0)
 			FD_SET(inotify_fd, &readfds);
 
 		fdcount = select(maxfd+1, &readfds, NULL, NULL, NULL);
 		if (fdcount < 0) {
 			if (errno != EINTR)
-				dbg("error in select: %s", strerror(errno));
+				err("error in select: %s", strerror(errno));
 			continue;
 		}
 
-		/* get user socket message */
-		if (FD_ISSET(udevd_sock, &readfds)) {
-			msg = get_udevd_msg();
-			if (msg) {
-				if (msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
-					info("skip non-kernel message with SEQNUM");
-					free(msg);
-				} else
-					msg_queue_insert(msg);
-			}
-		}
+		/* get control message */
+		if (FD_ISSET(udevd_sock, &readfds))
+			get_ctrl_msg();
 
-		/* get kernel netlink message */
+		/* get netlink message */
 		if (FD_ISSET(uevent_netlink_sock, &readfds)) {
 			msg = get_netlink_msg();
 			if (msg)
@@ -903,7 +1061,7 @@ int main(int argc, char *argv[], char *envp[])
 		}
 
 		/* rules directory inotify watch */
-		if ((inotify_fd > 0) && FD_ISSET(inotify_fd, &readfds)) {
+		if ((inotify_fd >= 0) && FD_ISSET(inotify_fd, &readfds)) {
 			int nbytes;
 
 			/* discard all possible events, we can just reload the config */
@@ -925,7 +1083,7 @@ int main(int argc, char *argv[], char *envp[])
 		/* rules changed, set by inotify or a signal*/
 		if (reload_config) {
 			reload_config = 0;
-			udev_rules_close(&rules);
+			udev_rules_cleanup(&rules);
 			udev_rules_init(&rules, 1);
 		}
 
@@ -943,18 +1101,19 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 exit:
-	udev_rules_close(&rules);
+	udev_rules_cleanup(&rules);
+	sysfs_cleanup();
 
-	if (signal_pipe[READ_END] > 0)
+	if (signal_pipe[READ_END] >= 0)
 		close(signal_pipe[READ_END]);
-	if (signal_pipe[WRITE_END] > 0)
+	if (signal_pipe[WRITE_END] >= 0)
 		close(signal_pipe[WRITE_END]);
 
-	if (udevd_sock > 0)
+	if (udevd_sock >= 0)
 		close(udevd_sock);
-	if (inotify_fd > 0)
+	if (inotify_fd >= 0)
 		close(inotify_fd);
-	if (uevent_netlink_sock > 0)
+	if (uevent_netlink_sock >= 0)
 		close(uevent_netlink_sock);
 
 	logging_close();