mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
74 lines
2.3 KiB
Diff
74 lines
2.3 KiB
Diff
From 857973e6f7e0a3d03535a9df7f9373fd7a0b65cc Mon Sep 17 00:00:00 2001
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
Date: Mon, 15 Dec 2014 15:58:13 +0000
|
|
Subject: [PATCH 10/98] Teach the new inotify code about symlinks.
|
|
|
|
---
|
|
src/inotify.c | 43 +++++++++++++++++++++++++++----------------
|
|
1 file changed, 27 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/src/inotify.c b/src/inotify.c
|
|
index a0223443d6b6..960bf5efb41f 100644
|
|
--- a/src/inotify.c
|
|
+++ b/src/inotify.c
|
|
@@ -41,29 +41,40 @@ void inotify_dnsmasq_init()
|
|
|
|
inotify_buffer = safe_malloc(INOTIFY_SZ);
|
|
|
|
- daemon->inotifyfd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
|
|
|
|
+ daemon->inotifyfd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
|
|
+
|
|
if (daemon->inotifyfd == -1)
|
|
die(_("failed to create inotify: %s"), NULL, EC_MISC);
|
|
-
|
|
+
|
|
for (res = daemon->resolv_files; res; res = res->next)
|
|
{
|
|
- char *d = strrchr(res->name, '/');
|
|
-
|
|
- if (!d)
|
|
- die(_("resolv-file %s not an absolute path"), res->name, EC_MISC);
|
|
-
|
|
- *d = 0; /* make ->name just directory */
|
|
- res->wd = inotify_add_watch(daemon->inotifyfd, res->name, IN_CLOSE_WRITE | IN_MOVED_TO);
|
|
- res->file = d+1; /* pointer to filename */
|
|
-
|
|
- if (res->wd == -1 && errno == ENOENT)
|
|
- die(_("directory %s for resolv-file is missing, cannot poll"), res->name, EC_MISC);
|
|
+ char *d = NULL, *path;
|
|
|
|
- *d = '/'; /* restore name */
|
|
+ if (!(path = realpath(res->name, NULL)))
|
|
+ {
|
|
+ /* realpath will fail if the file doesn't exist, but
|
|
+ dnsmasq copes with missing files, so fall back
|
|
+ and assume that symlinks are not in use in that case. */
|
|
+ if (errno == ENOENT)
|
|
+ path = res->name;
|
|
+ else
|
|
+ die(_("cannot cannonicalise resolv-file %s: %s"), res->name, EC_MISC);
|
|
+ }
|
|
|
|
- if (res->wd == -1)
|
|
- die(_("failed to create inotify for %s: %s"), res->name, EC_MISC);
|
|
+ if ((d = strrchr(path, '/')))
|
|
+ {
|
|
+ *d = 0; /* make path just directory */
|
|
+ res->wd = inotify_add_watch(daemon->inotifyfd, path, IN_CLOSE_WRITE | IN_MOVED_TO);
|
|
+ res->file = d+1; /* pointer to filename */
|
|
+ *d = '/';
|
|
+
|
|
+ if (res->wd == -1 && errno == ENOENT)
|
|
+ die(_("directory %s for resolv-file is missing, cannot poll"), res->name, EC_MISC);
|
|
+
|
|
+ if (res->wd == -1)
|
|
+ die(_("failed to create inotify for %s: %s"), res->name, EC_MISC);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
2.1.0
|
|
|