X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fwc.c;h=b64940b7853f8607db18748d412db22441943ab6;hp=91e1942e9c25744bf0f7a2e0636b795c7f2f257a;hb=ac2a53bbab44fe94306092b47aeddb899c55345a;hpb=f450ce75b754fb869b34433c0126f7bb592b141b diff --git a/daemon/wc.c b/daemon/wc.c index 91e1942..b64940b 100644 --- a/daemon/wc.c +++ b/daemon/wc.c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,23 +28,18 @@ #include "actions.h" static int -wc (char *flag, char *path) +wc (const 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); }