Commit daeb1978 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Gracefully handle inotify failures

parent d936dbc4

src/main.c

+2 −1
Original line number Diff line number Diff line
@@ -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

src/winwidget.c

+2 −2
Original line number Diff line number Diff line
@@ -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