git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
df, testing: Add notes on virt-df numbers (thanks Kashyap Chamarthy).
[libguestfs.git]
/
daemon
/
hexdump.c
diff --git
a/daemon/hexdump.c
b/daemon/hexdump.c
index
9de602a
..
3698613
100644
(file)
--- a/
daemon/hexdump.c
+++ b/
daemon/hexdump.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>
@@
-21,6
+21,8
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
@@
-28,27
+30,22
@@
char *
do_hexdump (const char *path)
{
char *
do_hexdump (const char *path)
{
- int len;
- char *buf;
- int r;
+ int fd, flags, r;
char *out, *err;
char *out, *err;
- NEED_ROOT (NULL);
- ABS_PATH (path, NULL);
+ CHROOT_IN;
+ fd = open (path, O_RDONLY);
+ CHROOT_OUT;
- 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, "hexdump", "-C", buf, NULL);
- free (buf);
+ flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
+ r = commandf (&out, &err, flags, "hexdump", "-C", NULL);
if (r == -1) {
if (r == -1) {
- reply_with_error ("
hexdump:
%s: %s", path, err);
+ reply_with_error ("%s: %s", path, err);
free (err);
free (out);
return NULL;
free (err);
free (out);
return NULL;