X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmount.c;h=463e789f1c7ac011f69fea26144a82300fd99cdc;hp=20811f15b4d2c7b00c192e3de390950e4da69f54;hb=7cd4b6aeee3693463b03608a31cf53f21152c2e8;hpb=7428b0a70caed014d0cb4126fe8a77432d8957c6 diff --git a/daemon/mount.c b/daemon/mount.c index 20811f1..463e789 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -41,14 +41,14 @@ 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 len, r, is_root; + int r, is_root; char *mp; char *error; - IS_DEVICE (device, -1); + ABS_PATH (mountpoint, return -1); is_root = strcmp (mountpoint, "/") == 0; @@ -57,22 +57,18 @@ do_mount_vfs (char *options, char *vfstype, return -1; } - len = strlen (mountpoint) + 9; - - mp = malloc (len); + mp = sysroot_path (mountpoint); if (!mp) { reply_with_perror ("malloc"); return -1; } - snprintf (mp, len, "/sysroot%s", mountpoint); - 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); @@ -87,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); } @@ -109,28 +105,27 @@ do_mount_options (char *options, char *device, * is kept updated. */ int -do_umount (char *pathordevice) +do_umount (const char *pathordevice) { - int len, 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 { - len = strlen (pathordevice) + 9; - freeit = 1; - buf = malloc (len); - if (buf == NULL) { - reply_with_perror ("malloc"); - return -1; - } - snprintf (buf, len, "/sysroot%s", pathordevice); + 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); @@ -153,6 +148,7 @@ mounts_or_mountpoints (int mp) int size = 0, alloc = 0; char *p, *pend, *p2; int len; + char matching[5 + sysroot_len]; r = command (&out, &err, "mount", NULL); if (r == -1) { @@ -164,6 +160,11 @@ mounts_or_mountpoints (int mp) free (err); + /* Lines have the format: + * /dev/foo on /mountpoint type ... + */ + snprintf (matching, 5 + sysroot_len, " on %s", sysroot); + p = out; while (p) { pend = strchr (p, '\n'); @@ -172,29 +173,26 @@ mounts_or_mountpoints (int mp) pend++; } - /* Lines have the format: - * /dev/foo on /mountpoint type ... - */ - p2 = strstr (p, " on /sysroot"); + p2 = strstr (p, matching); if (p2 != NULL) { *p2 = '\0'; if (add_string (&ret, &size, &alloc, p) == -1) { - free (out); - return NULL; + free (out); + return NULL; } if (mp) { - p2 += 12; /* 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; + } } } @@ -249,6 +247,7 @@ do_umount_all (void) char **mounts = NULL; int size = 0, alloc = 0; char *p, *p2, *p3, *pend; + char matching[5 + sysroot_len]; r = command (&out, &err, "mount", NULL); if (r == -1) { @@ -260,6 +259,11 @@ do_umount_all (void) free (err); + /* Lines have the format: + * /dev/foo on /mountpoint type ... + */ + snprintf (matching, 5 + sysroot_len, " on %s", sysroot); + p = out; while (p) { pend = strchr (p, '\n'); @@ -268,17 +272,14 @@ do_umount_all (void) pend++; } - /* Lines have the format: - * /dev/foo on /mountpoint type ... - */ - p2 = strstr (p, " on /sysroot"); + p2 = strstr (p, matching); if (p2 != NULL) { p2 += 4; p3 = p2 + strcspn (p2, " "); *p3 = '\0'; if (add_string (&mounts, &size, &alloc, p2) == -1) { - free (out); - return -1; + free (out); + return -1; } } @@ -313,32 +314,25 @@ do_umount_all (void) * device. */ int -do_mount_loop (char *file, char *mountpoint) +do_mount_loop (const char *file, const char *mountpoint) { - int len, r; + 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. */ - len = strlen (mountpoint) + 9; - mp = malloc (len); + mp = sysroot_path (mountpoint); if (!mp) { reply_with_perror ("malloc"); return -1; } - snprintf (mp, len, "/sysroot%s", mountpoint); - len = strlen (file) + 9; - buf = malloc (len); + buf = sysroot_path (file); if (!file) { reply_with_perror ("malloc"); free (mp); return -1; } - snprintf (buf, len, "/sysroot%s", file); r = command (NULL, &error, "mount", "-o", "loop", buf, mp, NULL); free (mp); @@ -357,12 +351,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); @@ -382,12 +376,12 @@ 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, return -1); CHROOT_IN; r = rmdir (path);