summaryrefslogtreecommitdiff
path: root/udev/udevd.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-11-06 17:43:12 +0100
committerKay Sievers <kay.sievers@vrfy.org>2008-11-06 17:43:12 +0100
commit78230c0dbedbb9273bf2abde8c48db1e8be952f8 (patch)
tree641e9016b44b31cddc4ade10497eebb4185c909c /udev/udevd.c
parente32135825f70ec1f1c449a9201a80917abe5d842 (diff)
cleanup /dev/.udev/queue on startup and exit
Diffstat (limited to 'udev/udevd.c')
-rw-r--r--udev/udevd.c36
1 files changed, 35 insertions, 1 deletions
diff --git a/udev/udevd.c b/udev/udevd.c
index 405a1ed907..15a197e561 100644
--- 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>
@@ -569,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];
@@ -732,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) {
@@ -954,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();