From: Tom Gundersen <teg@jklm.no>
Date: Mon, 9 Mar 2015 21:19:52 +0000 (+0100)
Subject: udev: simplify event_queue_update() and add debug logging
X-Git-Tag: v219.0~427
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=dfc4b6acf088f71f717fce8866a5841091219fa5;hp=7432b24b8357d913943580b442ffe7040e610f9e

udev: simplify event_queue_update() and add debug logging

This essentially replaces
  open("/run/udev/queue", O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444)
with
  open("/run/udev/queue", O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 0644),
which is ok for our purposes.
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 1c510f44f..c01fb4bb9 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -904,14 +904,17 @@ static void handle_signal(struct udev *udev, int signo) {
 }
 
 static void event_queue_update(void) {
-        if (!udev_list_node_is_empty(&event_list)) {
-                int fd;
+        int r;
 
-                fd = open("/run/udev/queue", O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
-                if (fd >= 0)
-                       close(fd);
-        } else
-                unlink("/run/udev/queue");
+        if (!udev_list_node_is_empty(&event_list)) {
+                r = touch("/run/udev/queue");
+                if (r < 0)
+                        log_warning_errno(r, "could not touch /run/udev/queue: %m");
+        } else {
+                r = unlink("/run/udev/queue");
+                if (r < 0 && errno != ENOENT)
+                        log_warning("could not unlink /run/udev/queue: %m");
+        }
 }
 
 static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink) {