daemon: Fix hexdump to work on absolute symbolic links (RHBZ#579608).

[libguestfs.git] / daemon / hexdump.c

diff --git a/daemon/hexdump.c b/daemon/hexdump.c
index 7016faf..202f856 100644 (file)
--- 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;