git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'sh' and 'sh-lines' commands.
[libguestfs.git]
/
daemon
/
mount.c
diff --git
a/daemon/mount.c
b/daemon/mount.c
index
4e0ecdb
..
4955fcf
100644
(file)
--- a/
daemon/mount.c
+++ b/
daemon/mount.c
@@
-39,13
+39,15
@@
int root_mounted = 0;
*/
int
*/
int
-do_mount_vfs (c
onst char *options, const
char *vfstype,
- c
onst char *device, const
char *mountpoint)
+do_mount_vfs (c
har *options,
char *vfstype,
+ c
har *device,
char *mountpoint)
{
int len, r, is_root;
char *mp;
char *error;
{
int len, 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) {
@@
-82,20
+84,20
@@
do_mount_vfs (const char *options, const char *vfstype,
}
int
}
int
-do_mount (c
onst char *device, const
char *mountpoint)
+do_mount (c
har *device,
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
onst char *device, const
char *mountpoint)
+do_mount_ro (c
har *device,
char *mountpoint)
{
return do_mount_vfs ("ro", NULL, device, mountpoint);
}
int
{
return do_mount_vfs ("ro", NULL, device, mountpoint);
}
int
-do_mount_options (c
onst char *options, const
char *device,
- c
onst c
har *mountpoint)
+do_mount_options (c
har *options,
char *device,
+ char *mountpoint)
{
return do_mount_vfs (options, NULL, device, mountpoint);
}
{
return do_mount_vfs (options, NULL, device, mountpoint);
}
@@
-104,15
+106,16
@@
do_mount_options (const char *options, const char *device,
* is kept updated.
*/
int
* is kept updated.
*/
int
-do_umount (c
onst c
har *pathordevice)
+do_umount (char *pathordevice)
{
int len, freeit = 0, r;
char *buf;
char *err;
{
int len, freeit = 0, r;
char *buf;
char *err;
- if (strncmp (pathordevice, "/dev/", 5) == 0)
- buf = (char *) pathordevice;
- else {
+ if (strncmp (pathordevice, "/dev/", 5) == 0) {
+ buf = pathordevice;
+ IS_DEVICE (buf, -1);
+ } else {
len = strlen (pathordevice) + 9;
freeit = 1;
buf = malloc (len);
len = strlen (pathordevice) + 9;
freeit = 1;
buf = malloc (len);