summaryrefslogtreecommitdiffstats
path: root/bus/dir-watch-inotify.c
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2008-04-03 11:11:19 -0400
committerJohn (J5) Palmieri <johnp@redhat.com>2008-04-03 11:11:19 -0400
commit960fef844bdb0054c082a31e43f9631b1d5eb69b (patch)
treee39cc0f5db0dce6149711c9088d2965130ade8e0 /bus/dir-watch-inotify.c
parenta37404111be4912cd8b51080bcbe219edded35f5 (diff)
parent68f69d38182ed5974984b0434086e6a288b477cb (diff)
Merge branch 'master' of git+ssh://johnp@git.freedesktop.org/git/dbus/dbus
Conflicts: ChangeLog
Diffstat (limited to 'bus/dir-watch-inotify.c')
-rw-r--r--bus/dir-watch-inotify.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
index 1622cde2..e15faadc 100644
--- a/bus/dir-watch-inotify.c
+++ b/bus/dir-watch-inotify.c
@@ -64,7 +64,7 @@ _handle_inotify_watch (DBusWatch *watch, unsigned int flags, void *data)
ret = read (inotify_fd, buffer, INOTIFY_BUF_LEN);
if (ret < 0)
- _dbus_verbose ("Error reading inotify event: '%s'\n, _dbus_strerror(errno)");
+ _dbus_verbose ("Error reading inotify event: '%s'\n", _dbus_strerror(errno));
else if (!ret)
_dbus_verbose ("Error reading inotify event: buffer too small\n");
@@ -134,7 +134,7 @@ bus_watch_directory (const char *dir, BusContext *context)
goto out;
}
- wd = inotify_add_watch (inotify_fd, dir, IN_MODIFY | IN_CREATE | IN_DELETE);
+ wd = inotify_add_watch (inotify_fd, dir, IN_CLOSE_WRITE | IN_DELETE | IN_MOVED_TO | IN_MOVED_FROM);
if (wd < 0)
{
_dbus_warn ("Cannot setup inotify for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
@@ -156,7 +156,7 @@ bus_drop_all_directory_watches (void)
_dbus_verbose ("Dropping all watches on config directories\n");
ret = close (inotify_fd);
if (ret)
- _dbus_verbose ("Error dropping watches: '%s'\n", perror(ret));
+ _dbus_verbose ("Error dropping watches: '%s'\n", _dbus_strerror(errno));
num_wds = 0;
inotify_fd = -1;