#include <sys/inotify.h>
#endif
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
#ifdef HAVE_SYS_INOTIFY_H
/* Currently open inotify handle, or -1 if not opened. */
static char inotify_buf[64*1024*1024]; /* Event buffer, [0..posn-1] is valid */
static size_t inotify_posn = 0;
+
+int
+optgroup_inotify_available (void)
+{
+ return 1;
+}
+#else /* !HAVE_SYS_INOTIFY_H */
+int
+optgroup_inotify_available (void)
+{
+ return 0;
+}
#endif
/* Because inotify_init does NEED_ROOT, NEED_INOTIFY implies NEED_ROOT. */
#ifdef HAVE_SYS_INOTIFY_H
FILE *fp;
- NEED_ROOT (return -1);
+ NEED_ROOT (0, return -1);
if (max_events < 0) {
- reply_with_error ("inotify_init: max_events < 0");
+ reply_with_error ("max_events < 0");
return -1;
}
#ifdef HAVE_INOTIFY_INIT1
inotify_fd = inotify_init1 (IN_NONBLOCK | IN_CLOEXEC);
if (inotify_fd == -1) {
- reply_with_perror ("inotify_init");
+ reply_with_perror ("inotify_init1");
return -1;
}
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
NEED_INOTIFY (-1);
if (inotify_fd == -1) {
- reply_with_error ("inotify_close: handle is not open");
+ reply_with_error ("handle is not open");
return -1;
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
r = inotify_add_watch (inotify_fd, buf, mask);
free (buf);
if (r == -1) {
- reply_with_perror ("inotify_add_watch: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
return r;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
NEED_INOTIFY (-1);
if (inotify_rm_watch (inotify_fd, wd) == -1) {
- reply_with_perror ("inotify_rm_watch: %d", wd);
+ reply_with_perror ("%d", wd);
return -1;
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
goto error;
}
if (r == 0) { /* End of file - we're not expecting it. */
- reply_with_error ("inotify_read: unexpected end of file");
+ reply_with_error ("unexpected end of file");
goto error;
}
free (ret);
return NULL;
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
unlink ("/tmp/inotify");
return NULL;
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}