New API calls: truncate, truncate_size, mkdir_mode, utimens, lchown.

[libguestfs.git] / daemon / mount.c

diff --git a/daemon/mount.c b/daemon/mount.c
index 89bef34..463e789 100644 (file)
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -48,6 +48,8 @@ do_mount_vfs (const char *options, const char *vfstype,
   char *mp;
   char *error;
 
+  ABS_PATH (mountpoint, return -1);
+
   is_root = strcmp (mountpoint, "/") == 0;
 
   if (!root_mounted && !is_root) {
@@ -105,24 +107,25 @@ do_mount_options (const char *options, const char *device,
 int
 do_umount (const char *pathordevice)
 {
-  int freeit = 0, r;
-  char *buf;
+  int r;
   char *err;
+  char *buf;
+  int is_dev;
 
-  if (strncmp (pathordevice, "/dev/", 5) == 0) {
-    buf = pathordevice;
-    RESOLVE_DEVICE (buf, return -1);
-  } else {
-    buf = sysroot_path (pathordevice);
-    if (buf == NULL) {
-      reply_with_perror ("malloc");
-      return -1;
-    }
-    freeit = 1;
+  is_dev = strncmp (pathordevice, "/dev/", 5) == 0;
+  buf = is_dev ? strdup (pathordevice)
+               : sysroot_path (pathordevice);
+  if (buf == NULL) {
+    reply_with_perror ("malloc");
+    return -1;
   }
 
+  if (is_dev)
+    RESOLVE_DEVICE (buf, { free (buf); return -1; });
+
   r = command (NULL, &err, "umount", buf, NULL);
-  if (freeit) free (buf);
+  free (buf);
+
   if (r == -1) {
     reply_with_error ("umount: %s: %s", pathordevice, err);
     free (err);
@@ -377,6 +380,9 @@ do_rmmountpoint (const char *path)
 {
   int r;
 
+  /* NEED_ROOT (return -1); - we don't want this test for this call. */
+  ABS_PATH (path, return -1);
+
   CHROOT_IN;
   r = rmdir (path);
   CHROOT_OUT;