git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Add more suppressions for valgrind tests
[libguestfs.git]
/
daemon
/
headtail.c
diff --git
a/daemon/headtail.c
b/daemon/headtail.c
index
b522c55
..
83f3f5c
100644
(file)
--- a/
daemon/headtail.c
+++ b/
daemon/headtail.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
#include <config.h>
*/
#include <config.h>
@@
-22,33
+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, len
;
+ 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. */
- len = strlen (path) + 9;
- buf = malloc (len);
- if (!buf) {
- reply_with_perror ("malloc");
+ if (fd == -1) {
+ reply_with_perror ("%s", path);
return NULL;
}
return NULL;
}
- snprintf (buf, len, "/sysroot%s", path);
-
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);
@@
-72,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];
@@
-94,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];