df: Add --uuid option to print guest UUIDs instead of names (RHBZ#646821).

[libguestfs.git] / daemon / mount.c

diff --git a/daemon/mount.c b/daemon/mount.c
index e7265fe..5485116 100644 (file)
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -41,19 +41,19 @@ int root_mounted = 0;
  */
 
 int
-do_mount_vfs (char *options, char *vfstype,
-             char *device, char *mountpoint)
+do_mount_vfs (const char *options, const char *vfstype,
+              const char *device, const char *mountpoint)
 {
   int r, is_root;
   char *mp;
   char *error;
 
-  IS_DEVICE (device, -1);
+  ABS_PATH (mountpoint, 0, return -1);
 
-  is_root = strcmp (mountpoint, "/") == 0;
+  is_root = STREQ (mountpoint, "/");
 
   if (!root_mounted && !is_root) {
-    reply_with_error ("mount: you must mount something on / first");
+    reply_with_error ("you must mount something on / first");
     return -1;
   }
 
@@ -65,13 +65,13 @@ do_mount_vfs (char *options, char *vfstype,
 
   if (vfstype)
     r = command (NULL, &error,
-                "mount", "-o", options, "-t", vfstype, device, mp, NULL);
+                 "mount", "-o", options, "-t", vfstype, device, mp, NULL);
   else
     r = command (NULL, &error,
-                "mount", "-o", options, device, mp, NULL);
+                 "mount", "-o", options, device, mp, NULL);
   free (mp);
   if (r == -1) {
-    reply_with_error ("mount: %s on %s: %s", device, mountpoint, error);
+    reply_with_error ("%s on %s: %s", device, mountpoint, error);
     free (error);
     return -1;
   }
@@ -83,20 +83,20 @@ do_mount_vfs (char *options, char *vfstype,
 }
 
 int
-do_mount (char *device, char *mountpoint)
+do_mount (const char *device, const char *mountpoint)
 {
   return do_mount_vfs ("sync,noatime", NULL, device, mountpoint);
 }
 
 int
-do_mount_ro (char *device, char *mountpoint)
+do_mount_ro (const char *device, const char *mountpoint)
 {
   return do_mount_vfs ("ro", NULL, device, mountpoint);
 }
 
 int
-do_mount_options (char *options, char *device,
-                 char *mountpoint)
+do_mount_options (const char *options, const char *device,
+                  const char *mountpoint)
 {
   return do_mount_vfs (options, NULL, device, mountpoint);
 }
@@ -105,28 +105,29 @@ do_mount_options (char *options, char *device,
  * is kept updated.
  */
 int
-do_umount (char *pathordevice)
+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;
-    IS_DEVICE (buf, -1);
-  } else {
-    buf = sysroot_path (pathordevice);
-    if (buf == NULL) {
-      reply_with_perror ("malloc");
-      return -1;
-    }
-    freeit = 1;
+  is_dev = STREQLEN (pathordevice, "/dev/", 5);
+  buf = is_dev ? strdup (pathordevice)
+               : sysroot_path (pathordevice);
+  if (buf == NULL) {
+    reply_with_perror ("malloc");
+    return -1;
   }
 
+  if (is_dev)
+    RESOLVE_DEVICE (buf, 0, { 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);
+    reply_with_error ("%s: %s", pathordevice, err);
     free (err);
     return -1;
   }
@@ -176,22 +177,22 @@ mounts_or_mountpoints (int mp)
     if (p2 != NULL) {
       *p2 = '\0';
       if (add_string (&ret, &size, &alloc, p) == -1) {
-       free (out);
-       return NULL;
+        free (out);
+        return NULL;
       }
       if (mp) {
-       p2 += 4 + sysroot_len;  /* skip " on /sysroot" */
-       len = strcspn (p2, " ");
-
-       if (len == 0)           /* .. just /sysroot, so we turn it into "/" */
-         p2 = (char *) "/";
-       else
-         p2[len] = '\0';
-
-       if (add_string (&ret, &size, &alloc, p2) == -1) {
-         free (out);
-         return NULL;
-       }
+        p2 += 4 + sysroot_len; /* skip " on /sysroot" */
+        len = strcspn (p2, " ");
+
+        if (len == 0)          /* .. just /sysroot, so we turn it into "/" */
+          p2 = (char *) "/";
+        else
+          p2[len] = '\0';
+
+        if (add_string (&ret, &size, &alloc, p2) == -1) {
+          free (out);
+          return NULL;
+        }
       }
     }
 
@@ -277,8 +278,8 @@ do_umount_all (void)
       p3 = p2 + strcspn (p2, " ");
       *p3 = '\0';
       if (add_string (&mounts, &size, &alloc, p2) == -1) {
-       free (out);
-       return -1;
+        free (out);
+        return -1;
       }
     }
 
@@ -313,15 +314,12 @@ do_umount_all (void)
  * device.
  */
 int
-do_mount_loop (char *file, char *mountpoint)
+do_mount_loop (const char *file, const char *mountpoint)
 {
   int r;
   char *buf, *mp;
   char *error;
 
-  NEED_ROOT (-1);
-  ABS_PATH (file, -1);
-
   /* We have to prefix /sysroot on both the filename and the mountpoint. */
   mp = sysroot_path (mountpoint);
   if (!mp) {
@@ -340,7 +338,7 @@ do_mount_loop (char *file, char *mountpoint)
   free (mp);
   free (buf);
   if (r == -1) {
-    reply_with_error ("mount: %s on %s: %s", file, mountpoint, error);
+    reply_with_error ("%s on %s: %s", file, mountpoint, error);
     free (error);
     return -1;
   }
@@ -353,19 +351,19 @@ do_mount_loop (char *file, char *mountpoint)
  * mkmountpoint case) set the root_mounted flag.
  */
 int
-do_mkmountpoint (char *path)
+do_mkmountpoint (const char *path)
 {
   int r;
 
-  /* NEED_ROOT (-1); - we don't want this test for this call. */
-  ABS_PATH (path, -1);
+  /* NEED_ROOT (return -1); - we don't want this test for this call. */
+  ABS_PATH (path, 0, return -1);
 
   CHROOT_IN;
   r = mkdir (path, 0777);
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("mkmountpoint: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -378,19 +376,19 @@ do_mkmountpoint (char *path)
 }
 
 int
-do_rmmountpoint (char *path)
+do_rmmountpoint (const char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  /* NEED_ROOT (return -1); - we don't want this test for this call. */
+  ABS_PATH (path, 0, return -1);
 
   CHROOT_IN;
   r = rmdir (path);
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("rmmountpoint: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }