remove len == 0 check, the index root is always '\0'

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index 6f2e188ceaaa07a198f3a337a7a7cca126dfad72..08a87b033b46a47c2a60e3683d7d340449391591 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <getopt.h>
+#include <dirent.h>
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -180,7 +181,7 @@ static void event_fork(struct udev_event *event)
 
        if (debug_trace) {
                event->trace = 1;
-               printf("fork %s (%llu)\n",
+               fprintf(stderr, "fork %s (%llu)\n",
                       udev_device_get_syspath(event->dev),
                       udev_device_get_seqnum(event->dev));
        }
@@ -430,7 +431,6 @@ static void event_queue_manager(struct udev *udev)
                        continue;
                }
 
-               /* do dendencies, start event */
                event_fork(loop_event);
                dbg(udev, "moved seq %llu to running list\n", udev_device_get_seqnum(loop_event->dev));
        }
@@ -538,7 +538,7 @@ static void udev_done(int pid, int exitstatus)
                             exitstatus, time(NULL) - loop_event->queue_time);
                        loop_event->exitstatus = exitstatus;
                        if (debug_trace)
-                               printf("exit %s (%llu)\n",
+                               fprintf(stderr, "exit %s (%llu)\n",
                                       udev_device_get_syspath(loop_event->dev),
                                       udev_device_get_seqnum(loop_event->dev));
                        event_queue_delete(loop_event);
@@ -570,6 +570,38 @@ static void reap_sigchilds(void)
        }
 }
 
+static void cleanup_queue_dir(struct udev *udev)
+{
+       char dirname[UTIL_PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
+       DIR *dir;
+
+       util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
+       util_strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename));
+       unlink(filename);
+
+       util_strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname));
+       util_strlcat(dirname, "/.udev/queue", sizeof(dirname));
+       dir = opendir(dirname);
+       if (dir != NULL) {
+               while (1) {
+                       struct dirent *dent;
+
+                       dent = readdir(dir);
+                       if (dent == NULL || dent->d_name[0] == '\0')
+                               break;
+                       if (dent->d_name[0] == '.')
+                               continue;
+                       util_strlcpy(filename, dirname, sizeof(filename));
+                       util_strlcat(filename, "/", sizeof(filename));
+                       util_strlcat(filename, dent->d_name, sizeof(filename));
+                       unlink(filename);
+               }
+               closedir(dir);
+               rmdir(dirname);
+       }
+}
+
 static void export_initial_seqnum(struct udev *udev)
 {
        char filename[UTIL_PATH_SIZE];
@@ -733,6 +765,7 @@ int main(int argc, char *argv[])
                goto exit;
        }
        udev_list_init(&event_list);
+       cleanup_queue_dir(udev);
        export_initial_seqnum(udev);
 
        if (daemonize) {
@@ -831,7 +864,7 @@ int main(int argc, char *argv[])
                                          IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
                }
        } else if (errno == ENOSYS)
-               err(udev, "the kernel does not support inotify, udevd can't monitor rules file changes\n");
+               info(udev, "unable to use inotify, udevd will not monitor rule files changes\n");
        else
                err(udev, "inotify_init failed: %m\n");
 
@@ -955,7 +988,7 @@ exit:
        if (inotify_fd >= 0)
                close(inotify_fd);
        udev_monitor_unref(kernel_monitor);
-
+       cleanup_queue_dir(udev);
        udev_selinux_exit(udev);
        udev_unref(udev);
        logging_close();