X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fhexdump.c;h=202f856c6367bc558f4666a2dc740af5198adecf;hp=7016faf49e373227e401fb6177f36aa441366fd6;hb=1e68f84c5a46f3ff650368a897bd4113bd3f4aea;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0

diff --git a/daemon/hexdump.c b/daemon/hexdump.c
index 7016faf..202f856 100644
--- a/daemon/hexdump.c
+++ b/daemon/hexdump.c
@@ -21,6 +21,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 #include "daemon.h"
 #include "actions.h"
@@ -28,20 +30,22 @@
 char *
 do_hexdump (const char *path)
 {
-  char *buf;
-  int r;
+  int fd, flags, r;
   char *out, *err;
 
-  buf = sysroot_path (path);
-  if (!buf) {
-    reply_with_perror ("malloc");
+  CHROOT_IN;
+  fd = open (path, O_RDONLY);
+  CHROOT_OUT;
+
+  if (fd == -1) {
+    reply_with_perror ("%s", path);
     return NULL;
   }
 
-  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) {
-    reply_with_error ("hexdump: %s: %s", path, err);
+    reply_with_error ("%s: %s", path, err);
     free (err);
     free (out);
     return NULL;