X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fwc.c;h=397d90caf1e4e0eeb9bf9428f96d32f0b081e489;hb=2c57305f72cd6181d1849ae6e1b892aa01c7f844;hp=4878b57e16d9441011bc7906eaea3b3c63be9190;hpb=78029b529ad98769685d607230b70f71832d5906;p=libguestfs.git

diff --git a/daemon/wc.c b/daemon/wc.c
index 4878b57..397d90c 100644
--- a/daemon/wc.c
+++ b/daemon/wc.c
@@ -22,30 +22,29 @@
 #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 int
-wc (char *flag, char *path)
+wc (const char *flag, const char *path)
 {
-  char *buf;
   char *out, *err;
-  int r;
+  int fd, flags, r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  CHROOT_IN;
+  fd = open (path, O_RDONLY);
+  CHROOT_OUT;
 
-  /* Make the path relative to /sysroot. */
-  buf = sysroot_path (path);
-  if (!buf) {
-    reply_with_perror ("malloc");
+  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);
@@ -63,7 +62,7 @@ wc (char *flag, char *path)
 
   /* Parse the number. */
   if (sscanf (out, "%d", &r) != 1) {
-    reply_with_error ("wc: cannot parse number: %s", out);
+    reply_with_error ("cannot parse number: %s", out);
     free (out);
     return -1;
   }
@@ -73,19 +72,19 @@ wc (char *flag, char *path)
 }
 
 int
-do_wc_l (char *path)
+do_wc_l (const char *path)
 {
   return wc ("-l", path);
 }
 
 int
-do_wc_w (char *path)
+do_wc_w (const char *path)
 {
   return wc ("-w", path);
 }
 
 int
-do_wc_c (char *path)
+do_wc_c (const char *path)
 {
   return wc ("-c", path);
 }