X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Finotify.c;h=d5a5a73ef3dce7c3b29490a5408510d276a5648c;hp=465d0b6ec6f9b991bba4058b42a751bf8dd509b9;hb=6b500f1b8e1ac8d28c485a5591c2833b18cc86e2;hpb=edb9b3abc03c0a0f84b1cbd9cf5920e3c84e5c18

diff --git a/daemon/inotify.c b/daemon/inotify.c
index 465d0b6..d5a5a73 100644
--- a/daemon/inotify.c
+++ b/daemon/inotify.c
@@ -31,6 +31,7 @@
 #include "../src/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. */
@@ -38,6 +39,18 @@ static int inotify_fd = -1;
 
 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. */
@@ -57,10 +70,10 @@ do_inotify_init (int max_events)
 #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;
   }
 
@@ -81,7 +94,7 @@ do_inotify_init (int max_events)
 #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
@@ -106,8 +119,7 @@ do_inotify_init (int max_events)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -118,7 +130,7 @@ do_inotify_close (void)
   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;
   }
 
@@ -132,8 +144,7 @@ do_inotify_close (void)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -155,14 +166,13 @@ do_inotify_add_watch (const char *path, int mask)
   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
 }
 
@@ -173,14 +183,13 @@ do_inotify_rm_watch (int wd)
   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
 }
 
@@ -221,7 +230,7 @@ do_inotify_read (void)
       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;
     }
 
@@ -294,8 +303,7 @@ do_inotify_read (void)
   free (ret);
   return NULL;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return NULL;
+  NOT_AVAILABLE (NULL);
 #endif
 }
 
@@ -371,7 +379,6 @@ do_inotify_files (void)
   unlink ("/tmp/inotify");
   return NULL;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return NULL;
+  NOT_AVAILABLE (NULL);
 #endif
 }