X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fwc.c;h=93d4ebbd649a9c1da74b5af876ac17a1da871633;hp=370ffddebbbcd804d1b3287f68242fd50e1f053a;hb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf diff --git a/daemon/wc.c b/daemon/wc.c index 370ffdd..93d4ebb 100644 --- a/daemon/wc.c +++ b/daemon/wc.c @@ -28,23 +28,18 @@ #include "actions.h" static int -wc (char *flag, char *path) +wc (char *flag, const char *path) { char *buf; char *out, *err; - int r, len; - - NEED_ROOT (-1); - ABS_PATH (path, -1); + int r; /* Make the path relative to /sysroot. */ - len = strlen (path) + 9; - buf = malloc (len); + buf = sysroot_path (path); if (!buf) { reply_with_perror ("malloc"); return -1; } - snprintf (buf, len, "/sysroot%s", path); r = command (&out, &err, "wc", flag, buf, NULL); free (buf); @@ -75,19 +70,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); }