X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fwc.c;h=5d35559c597c491571b378ba1919b7e8d7544fe1;hb=d81c0829ea4a99aadb98df37be9543a973269041;hp=b64940b7853f8607db18748d412db22441943ab6;hpb=29e7b9908ea6a4c2a864955e73d5b1d7d64f1fc8;p=libguestfs.git

diff --git a/daemon/wc.c b/daemon/wc.c
index b64940b..5d35559 100644
--- a/daemon/wc.c
+++ b/daemon/wc.c
@@ -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
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -22,27 +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 (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);
@@ -60,7 +62,7 @@ wc (const char *flag, const 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;
   }