git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
daemon
/
headtail.c
diff --git
a/daemon/headtail.c
b/daemon/headtail.c
index
af2648c
..
528cc09
100644
(file)
--- a/
daemon/headtail.c
+++ b/
daemon/headtail.c
@@
-22,31
+22,30
@@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
-#include "
../src/
guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
static char **
#include "daemon.h"
#include "actions.h"
static char **
-headtail (const char *prog, const char *flag, const char *n, char *path)
+headtail (const char *prog, const char *flag, const char *n, c
onst c
har *path)
{
{
- char *buf;
char *out, *err;
char *out, *err;
- int r;
+ int
fd, flags,
r;
char **lines;
char **lines;
- NEED_ROOT (NULL);
- ABS_PATH (path, NULL);
+ CHROOT_IN;
+ fd = open (path, O_RDONLY);
+ CHROOT_OUT;
- /* Make the path relative to /sysroot. */
- buf = sysroot_path (path);
- if (!buf) {
- reply_with_perror ("malloc");
+ if (fd == -1) {
+ reply_with_perror ("%s", path);
return NULL;
}
return NULL;
}
-
r = command (&out, &err, prog, flag, n, buf, NULL)
;
-
free (buf
);
+
flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd
;
+
r = commandf (&out, &err, flags, prog, flag, n, NULL
);
if (r == -1) {
reply_with_error ("%s %s %s: %s", prog, flag, n, err);
free (out);
if (r == -1) {
reply_with_error ("%s %s %s: %s", prog, flag, n, err);
free (out);
@@
-70,19
+69,19
@@
headtail (const char *prog, const char *flag, const char *n, char *path)
}
char **
}
char **
-do_head (char *path)
+do_head (c
onst c
har *path)
{
return headtail ("head", "-n", "10", path);
}
char **
{
return headtail ("head", "-n", "10", path);
}
char **
-do_tail (char *path)
+do_tail (c
onst c
har *path)
{
return headtail ("tail", "-n", "10", path);
}
char **
{
return headtail ("tail", "-n", "10", path);
}
char **
-do_head_n (int n, char *path)
+do_head_n (int n, c
onst c
har *path)
{
char nbuf[16];
{
char nbuf[16];
@@
-92,7
+91,7
@@
do_head_n (int n, char *path)
}
char **
}
char **
-do_tail_n (int n, char *path)
+do_tail_n (int n, c
onst c
har *path)
{
char nbuf[16];
{
char nbuf[16];