#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#ifdef HAVE_SYS_INOTIFY_H
#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 int inotify_fd = -1;
static char inotify_buf[64*1024*1024]; /* Event buffer, [0..posn-1] is valid */
-static int inotify_posn = 0;
+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. */
#define NEED_INOTIFY(errcode) \
int
do_inotify_init (int max_events)
{
+#ifdef HAVE_SYS_INOTIFY_H
FILE *fp;
- NEED_ROOT (-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;
}
if (do_inotify_close () == -1)
return -1;
+#ifdef HAVE_INOTIFY_INIT1
inotify_fd = inotify_init1 (IN_NONBLOCK | IN_CLOEXEC);
if (inotify_fd == -1) {
+ reply_with_perror ("inotify_init1");
+ return -1;
+ }
+#else
+ inotify_fd = inotify_init ();
+ if (inotify_fd == -1) {
reply_with_perror ("inotify_init");
return -1;
}
+ if (fcntl (inotify_fd, F_SETFL, O_NONBLOCK) == -1) {
+ reply_with_perror ("fcntl: O_NONBLOCK");
+ close (inotify_fd);
+ inotify_fd = -1;
+ return -1;
+ }
+ if (fcntl (inotify_fd, F_SETFD, FD_CLOEXEC) == -1) {
+ reply_with_perror ("fcntl: FD_CLOEXEC");
+ close (inotify_fd);
+ inotify_fd = -1;
+ return -1;
+ }
+#endif
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
int
do_inotify_close (void)
{
+#ifdef HAVE_SYS_INOTIFY_H
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;
}
inotify_posn = 0;
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
int64_t
-do_inotify_add_watch (char *path, int mask)
+do_inotify_add_watch (const char *path, int mask)
{
+#ifdef HAVE_SYS_INOTIFY_H
int64_t r;
char *buf;
NEED_INOTIFY (-1);
- ABS_PATH (path, -1);
buf = sysroot_path (path);
if (!buf) {
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
+ NOT_AVAILABLE (-1);
+#endif
}
int
do_inotify_rm_watch (int wd)
{
+#ifdef HAVE_SYS_INOTIFY_H
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
+ NOT_AVAILABLE (-1);
+#endif
}
guestfs_int_inotify_event_list *
do_inotify_read (void)
{
+#ifdef HAVE_SYS_INOTIFY_H
int space;
guestfs_int_inotify_event_list *ret;
while (space > 0) {
struct inotify_event *event;
- int n, r;
+ int r;
+ size_t n;
r = read (inotify_fd, inotify_buf + inotify_posn,
- sizeof (inotify_buf) - inotify_posn);
+ sizeof (inotify_buf) - inotify_posn);
if (r == -1) {
if (errno == EWOULDBLOCK || errno == EAGAIN) /* End of list. */
- break;
+ break;
reply_with_perror ("read");
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;
}
/* Have we got a complete event in the buffer? */
#ifdef __GNUC__
if (n + sizeof (struct inotify_event) > inotify_posn ||
- n + sizeof (struct inotify_event) + event->len > inotify_posn)
- break;
+ n + sizeof (struct inotify_event) + event->len > inotify_posn)
+ break;
#else
#error "this code needs fixing so it works on non-GCC compilers"
#endif
np = realloc (ret->guestfs_int_inotify_event_list_val,
- (ret->guestfs_int_inotify_event_list_len + 1) *
- sizeof (guestfs_int_inotify_event));
+ (ret->guestfs_int_inotify_event_list_len + 1) *
+ sizeof (guestfs_int_inotify_event));
if (np == NULL) {
- reply_with_perror ("realloc");
- goto error;
+ reply_with_perror ("realloc");
+ goto error;
}
ret->guestfs_int_inotify_event_list_val = np;
in = &ret->guestfs_int_inotify_event_list_val[ret->guestfs_int_inotify_event_list_len];
in->in_cookie = event->cookie;
if (event->len > 0)
- in->in_name = strdup (event->name);
+ in->in_name = strdup (event->name);
else
- in->in_name = strdup (""); /* Should have optional string fields XXX. */
+ in->in_name = strdup (""); /* Should have optional string fields XXX. */
if (in->in_name == NULL) {
- reply_with_perror ("strdup");
- goto error;
+ reply_with_perror ("strdup");
+ goto error;
}
/* Estimate space used by this event in the message. */
xdr_free ((xdrproc_t) xdr_guestfs_int_inotify_event_list, (char *) ret);
free (ret);
return NULL;
+#else
+ NOT_AVAILABLE (NULL);
+#endif
}
char **
do_inotify_files (void)
{
+#ifdef HAVE_SYS_INOTIFY_H
char **ret = NULL;
int size = 0, alloc = 0;
- int i;
+ unsigned int i;
FILE *fp;
guestfs_int_inotify_event_list *events;
char buf[PATH_MAX];
const char *name = events->guestfs_int_inotify_event_list_val[i].in_name;
if (name[0] != '\0')
- fprintf (fp, "%s\n", name);
+ fprintf (fp, "%s\n", name);
}
xdr_free ((xdrproc_t) xdr_guestfs_int_inotify_event_list, (char *) events);
error:
unlink ("/tmp/inotify");
return NULL;
+#else
+ NOT_AVAILABLE (NULL);
+#endif
}
git.annexia.org / libguestfs.git / blobdiff