Improved checking, documentation of modes (RHBZ#582901, RHBZ#582929).

[libguestfs.git] / daemon / mknod.c

diff --git a/daemon/mknod.c b/daemon/mknod.c
index a6e6eca..2458a85 100644 (file)
--- a/daemon/mknod.c
+++ b/daemon/mknod.c
@@ -29,41 +29,62 @@
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
 
+#ifdef HAVE_MKNOD
 int
-do_mknod (int mode, int devmajor, int devminor, char *path)
+optgroup_mknod_available (void)
 {
+  return 1;
+}
+#else
+int
+optgroup_mknod_available (void)
+{
+  return 0;
+}
+#endif
+
+int
+do_mknod (int mode, int devmajor, int devminor, const char *path)
+{
+#ifdef HAVE_MKNOD
   int r;
 
-  NEED_ROOT (return -1);
-  ABS_PATH (path, return -1);
+  if (mode < 0) {
+    reply_with_error ("%s: mode is negative", path);
+    return -1;
+  }
 
   CHROOT_IN;
   r = mknod (path, mode, makedev (devmajor, devminor));
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("mknod: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
   return 0;
+#else
+  NOT_AVAILABLE (-1);
+#endif
 }
 
 int
-do_mkfifo (int mode, char *path)
+do_mkfifo (int mode, const char *path)
 {
   return do_mknod (mode | S_IFIFO, 0, 0, path);
 }
 
 int
-do_mknod_b (int mode, int devmajor, int devminor, char *path)
+do_mknod_b (int mode, int devmajor, int devminor, const char *path)
 {
   return do_mknod (mode | S_IFBLK, devmajor, devminor, path);
 }
 
 int
-do_mknod_c (int mode, int devmajor, int devminor, char *path)
+do_mknod_c (int mode, int devmajor, int devminor, const char *path)
 {
   return do_mknod (mode | S_IFCHR, devmajor, devminor, path);
 }