X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fwc.c;h=43e28e0fb30995c46375a2e16f0f7e8bd7f3151d;hp=fe27bf19ea60522e3b101d9ada7b170216e3e05b;hb=4b753c62089be663ac722e4a875bb061d259e87d;hpb=e9c37113104c1cfb234535adc9b52ad3880a41ce

diff --git a/daemon/wc.c b/daemon/wc.c
index fe27bf1..43e28e0 100644
--- a/daemon/wc.c
+++ b/daemon/wc.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"
@@ -30,19 +31,20 @@
 static int
 wc (const char *flag, const char *path)
 {
-  char *buf;
   char *out, *err;
-  int r;
+  int fd, flags, r;
 
-  /* Make the path relative to /sysroot. */
-  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 ("wc %s: %s", flag, path);
     return -1;
   }
 
-  r = command (&out, &err, "wc", flag, buf, NULL);
-  free (buf);
+  flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
+  r = commandf (&out, &err, flags, "wc", flag, NULL);
   if (r == -1) {
     reply_with_error ("wc %s: %s", flag, err);
     free (out);