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 extra kernel modules required for ext4 support.
[libguestfs.git]
/
daemon
/
file.c
diff --git
a/daemon/file.c
b/daemon/file.c
index
c09de71
..
2439833
100644
(file)
--- a/
daemon/file.c
+++ b/
daemon/file.c
@@
-40,7
+40,7
@@
do_touch (const char *path)
ABS_PATH (path, -1);
CHROOT_IN;
ABS_PATH (path, -1);
CHROOT_IN;
- fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY
| O_NONBLOCK
, 0666);
+ fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666);
CHROOT_OUT;
if (fd == -1) {
CHROOT_OUT;
if (fd == -1) {
@@
-293,7
+293,7
@@
do_write_file (const char *path, const char *content, int size)
size = strlen (content);
CHROOT_IN;
size = strlen (content);
CHROOT_IN;
- fd = open (path, O_WRONLY | O_
CREAT | O_NOCTTY | O_NONBLOCK
, 0666);
+ fd = open (path, O_WRONLY | O_
TRUNC | O_CREAT | O_NOCTTY
, 0666);
CHROOT_OUT;
if (fd == -1) {
CHROOT_OUT;
if (fd == -1) {
@@
-323,7
+323,7
@@
do_file (const char *path)
int r, len, freeit = 0;
char *buf;
int r, len, freeit = 0;
char *buf;
- /*NEED_ROOT (NULL); - no: we allow people to run this on /dev devices. */
+ NEED_ROOT_OR_IS_DEVICE (path, NULL);
ABS_PATH (path, NULL);
if (strncmp (path, "/dev/", 5) == 0)
ABS_PATH (path, NULL);
if (strncmp (path, "/dev/", 5) == 0)