X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmount.c;h=89bef3463ecb728d30d92ad253304fee46be13b6;hp=9754ca9a6a4f7c8435fcf732ba5c4fbbd6368440;hb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;hpb=2f1a50d81671810256dce0852e6b1e0810ac44af

diff --git a/daemon/mount.c b/daemon/mount.c
index 9754ca9..89bef34 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -41,15 +41,13 @@ 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);
-
   is_root = strcmp (mountpoint, "/") == 0;
 
   if (!root_mounted && !is_root) {
@@ -83,20 +81,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,7 +103,7 @@ 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;
@@ -113,7 +111,7 @@ do_umount (char *pathordevice)
 
   if (strncmp (pathordevice, "/dev/", 5) == 0) {
     buf = pathordevice;
-    IS_DEVICE (buf, -1);
+    RESOLVE_DEVICE (buf, return -1);
   } else {
     buf = sysroot_path (pathordevice);
     if (buf == NULL) {
@@ -313,15 +311,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) {
@@ -353,12 +348,12 @@ 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, return -1);
 
   CHROOT_IN;
   r = mkdir (path, 0777);
@@ -378,13 +373,10 @@ do_mkmountpoint (char *path)
 }
 
 int
-do_rmmountpoint (char *path)
+do_rmmountpoint (const char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   CHROOT_IN;
   r = rmdir (path);
   CHROOT_OUT;