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-drive-opts: Correctly handle unreadable and unwritable files (RHBZ#747287).
[libguestfs.git]
/
daemon
/
mount.c
diff --git
a/daemon/mount.c
b/daemon/mount.c
index
a379d39
..
ab43c20
100644
(file)
--- a/
daemon/mount.c
+++ b/
daemon/mount.c
@@
-116,13
+116,14
@@
do_mount_vfs (const char *options, const char *vfstype,
return -1;
}
return -1;
}
+ free (error);
return 0;
}
int
do_mount (const char *device, const char *mountpoint)
{
return 0;
}
int
do_mount (const char *device, const char *mountpoint)
{
- return do_mount_vfs ("
sync,noatime
", NULL, device, mountpoint);
+ return do_mount_vfs ("", NULL, device, mountpoint);
}
int
}
int
@@
-352,7
+353,7
@@
do_mount_loop (const char *file, const char *mountpoint)
}
buf = sysroot_path (file);
}
buf = sysroot_path (file);
- if (!
file
) {
+ if (!
buf
) {
reply_with_perror ("malloc");
free (mp);
return -1;
reply_with_perror ("malloc");
free (mp);
return -1;
@@
-367,6
+368,7
@@
do_mount_loop (const char *file, const char *mountpoint)
return -1;
}
return -1;
}
+ free (error);
return 0;
}
return 0;
}