git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator.ml: use new "Pathname" designation
[libguestfs.git]
/
daemon
/
mount.c
diff --git
a/daemon/mount.c
b/daemon/mount.c
index
9754ca9
..
89bef34
100644
(file)
--- a/
daemon/mount.c
+++ b/
daemon/mount.c
@@
-41,15
+41,13
@@
int root_mounted = 0;
*/
int
*/
int
-do_mount_vfs (c
har *options,
char *vfstype,
- c
har *device,
char *mountpoint)
+do_mount_vfs (c
onst char *options, const
char *vfstype,
+ c
onst char *device, const
char *mountpoint)
{
int r, is_root;
char *mp;
char *error;
{
int r, is_root;
char *mp;
char *error;
- IS_DEVICE (device, -1);
-
is_root = strcmp (mountpoint, "/") == 0;
if (!root_mounted && !is_root) {
is_root = strcmp (mountpoint, "/") == 0;
if (!root_mounted && !is_root) {
@@
-83,20
+81,20
@@
do_mount_vfs (char *options, char *vfstype,
}
int
}
int
-do_mount (c
har *device,
char *mountpoint)
+do_mount (c
onst char *device, const
char *mountpoint)
{
return do_mount_vfs ("sync,noatime", NULL, device, mountpoint);
}
int
{
return do_mount_vfs ("sync,noatime", NULL, device, mountpoint);
}
int
-do_mount_ro (c
har *device,
char *mountpoint)
+do_mount_ro (c
onst char *device, const
char *mountpoint)
{
return do_mount_vfs ("ro", NULL, device, mountpoint);
}
int
{
return do_mount_vfs ("ro", NULL, device, mountpoint);
}
int
-do_mount_options (c
har *options,
char *device,
- char *mountpoint)
+do_mount_options (c
onst char *options, const
char *device,
+ c
onst c
har *mountpoint)
{
return do_mount_vfs (options, NULL, device, mountpoint);
}
{
return do_mount_vfs (options, NULL, device, mountpoint);
}
@@
-105,7
+103,7
@@
do_mount_options (char *options, char *device,
* is kept updated.
*/
int
* is kept updated.
*/
int
-do_umount (char *pathordevice)
+do_umount (c
onst c
har *pathordevice)
{
int freeit = 0, r;
char *buf;
{
int freeit = 0, r;
char *buf;
@@
-113,7
+111,7
@@
do_umount (char *pathordevice)
if (strncmp (pathordevice, "/dev/", 5) == 0) {
buf = 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) {
} else {
buf = sysroot_path (pathordevice);
if (buf == NULL) {
@@
-313,15
+311,12
@@
do_umount_all (void)
* device.
*/
int
* device.
*/
int
-do_mount_loop (c
har *file,
char *mountpoint)
+do_mount_loop (c
onst char *file, const
char *mountpoint)
{
int r;
char *buf, *mp;
char *error;
{
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) {
/* 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
* mkmountpoint case) set the root_mounted flag.
*/
int
-do_mkmountpoint (char *path)
+do_mkmountpoint (c
onst c
har *path)
{
int r;
{
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);
CHROOT_IN;
r = mkdir (path, 0777);
@@
-378,13
+373,10
@@
do_mkmountpoint (char *path)
}
int
}
int
-do_rmmountpoint (char *path)
+do_rmmountpoint (c
onst c
har *path)
{
int r;
{
int r;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
CHROOT_IN;
r = rmdir (path);
CHROOT_OUT;
CHROOT_IN;
r = rmdir (path);
CHROOT_OUT;