summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2019-04-18 08:28:09 -0400
committerDaniel Friesel <derf@finalrewind.org>2019-04-18 08:28:09 -0400
commitdaeb19780dcb021ee12ec5ebe2adbb8ad835c075 (patch)
treecf94a9bd3a8d6a7cdf9cfd1922b07915accd6094
parentd936dbc41965b18474bc6ca7f17bd881ed4c4e46 (diff)
Gracefully handle inotify failures
-rw-r--r--src/main.c3
-rw-r--r--src/winwidget.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 570f906..f7ea18b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -62,7 +62,8 @@ int main(int argc, char **argv)
opt.inotify_fd = inotify_init();
if (opt.inotify_fd < 0) {
opt.auto_reload = 0;
- eprintf("inotify_init failed:");
+ weprintf("inotify_init failed:");
+ weprintf("Disabling inotify-based auto-reload");
}
}
#endif
diff --git a/src/winwidget.c b/src/winwidget.c
index 1111bc7..ce06309 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -690,7 +690,7 @@ void winwidget_inotify_remove(winwidget winwid)
if (winwid->inotify_wd >= 0) {
D(("Removing inotify watch\n"));
if (inotify_rm_watch(opt.inotify_fd, winwid->inotify_wd))
- eprintf("inotify_rm_watch failed:");
+ weprintf("inotify_rm_watch failed:");
winwid->inotify_wd = -1;
}
}
@@ -705,7 +705,7 @@ void winwidget_inotify_add(winwidget winwid, feh_file * file)
feh_file_dirname(dir, file, PATH_MAX);
winwid->inotify_wd = inotify_add_watch(opt.inotify_fd, dir, IN_CLOSE_WRITE | IN_MOVED_TO);
if (winwid->inotify_wd < 0)
- eprintf("inotify_add_watch failed:");
+ weprintf("inotify_add_watch failed:");
}
}
#endif