git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update generator to emit each RESOLVE_DEVICE call
[libguestfs.git]
/
daemon
/
file.c
diff --git
a/daemon/file.c
b/daemon/file.c
index
6062c50
..
2ba2aab
100644
(file)
--- a/
daemon/file.c
+++ b/
daemon/file.c
@@
-36,7
+36,7
@@
do_touch (char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666);
CHROOT_IN;
fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666);
@@
-74,7
+74,7
@@
do_cat (char *path)
char *buf, *buf2;
NEED_ROOT (NULL);
char *buf, *buf2;
NEED_ROOT (NULL);
- ABS_PATH (path,NULL);
+ ABS_PATH (path,
return
NULL);
CHROOT_IN;
fd = open (path, O_RDONLY);
CHROOT_IN;
fd = open (path, O_RDONLY);
@@
-97,18
+97,18
@@
do_cat (char *path)
if (size >= alloc) {
alloc += 8192;
if (alloc > max) {
if (size >= alloc) {
alloc += 8192;
if (alloc > max) {
- reply_with_error ("cat: %s: file is too large for message buffer",
- path);
- free (buf);
- close (fd);
- return NULL;
+
reply_with_error ("cat: %s: file is too large for message buffer",
+
path);
+
free (buf);
+
close (fd);
+
return NULL;
}
buf2 = realloc (buf, alloc);
if (buf2 == NULL) {
}
buf2 = realloc (buf, alloc);
if (buf2 == NULL) {
- reply_with_perror ("realloc");
- free (buf);
- close (fd);
- return NULL;
+
reply_with_perror ("realloc");
+
free (buf);
+
close (fd);
+
return NULL;
}
buf = buf2;
}
}
buf = buf2;
}
@@
-148,7
+148,7
@@
do_read_lines (char *path)
ssize_t n;
NEED_ROOT (NULL);
ssize_t n;
NEED_ROOT (NULL);
- ABS_PATH (path, NULL);
+ ABS_PATH (path,
return
NULL);
CHROOT_IN;
fp = fopen (path, "r");
CHROOT_IN;
fp = fopen (path, "r");
@@
-195,7
+195,7
@@
do_rm (char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = unlink (path);
CHROOT_IN;
r = unlink (path);
@@
-215,7
+215,7
@@
do_chmod (int mode, char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = chmod (path, mode);
CHROOT_IN;
r = chmod (path, mode);
@@
-235,7
+235,7
@@
do_chown (int owner, int group, char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = chown (path, owner, group);
CHROOT_IN;
r = chown (path, owner, group);
@@
-255,7
+255,7
@@
do_exists (char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = access (path, F_OK);
CHROOT_IN;
r = access (path, F_OK);
@@
-271,7
+271,7
@@
do_is_file (char *path)
struct stat buf;
NEED_ROOT (-1);
struct stat buf;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = lstat (path, &buf);
CHROOT_IN;
r = lstat (path, &buf);
@@
-295,7
+295,7
@@
do_write_file (char *path, char *content, int size)
int fd;
NEED_ROOT (-1);
int fd;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
if (size == 0)
size = strlen (content);
if (size == 0)
size = strlen (content);
@@
-331,7
+331,7
@@
do_read_file (char *path, size_t *size_r)
char *r;
NEED_ROOT (NULL);
char *r;
NEED_ROOT (NULL);
- ABS_PATH (path, NULL);
+ ABS_PATH (path,
return
NULL);
CHROOT_IN;
fd = open (path, O_RDONLY);
CHROOT_IN;
fd = open (path, O_RDONLY);
@@
-391,8
+391,7
@@
do_file (char *path)
char *buf;
int len;
char *buf;
int len;
- NEED_ROOT_OR_IS_DEVICE (path, NULL);
- ABS_PATH (path, NULL);
+ REQUIRE_ROOT_OR_RESOLVE_DEVICE (path, return NULL);
if (strncmp (path, "/dev/", 5) == 0)
buf = (char *) path;
if (strncmp (path, "/dev/", 5) == 0)
buf = (char *) path;
@@
-416,7
+415,7
@@
do_file (char *path)
return NULL;
}
return NULL;
}
- r = command (&out, &err, "file", "-bsL", buf, NULL);
+ r = command (&out, &err, "file", "-
z
bsL", buf, NULL);
if (freeit) free (buf);
if (r == -1) {
if (freeit) free (buf);
if (r == -1) {
@@
-446,7
+445,7
@@
do_zfile (char *method, char *path)
char line[256];
NEED_ROOT (NULL);
char line[256];
NEED_ROOT (NULL);
- ABS_PATH (path, NULL);
+ ABS_PATH (path,
return
NULL);
if (strcmp (method, "gzip") == 0 || strcmp (method, "compress") == 0)
zcat = "zcat";
if (strcmp (method, "gzip") == 0 || strcmp (method, "compress") == 0)
zcat = "zcat";