X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fwc.c;h=5d35559c597c491571b378ba1919b7e8d7544fe1;hb=d81c0829ea4a99aadb98df37be9543a973269041;hp=fe27bf19ea60522e3b101d9ada7b170216e3e05b;hpb=e9c37113104c1cfb234535adc9b52ad3880a41ce;p=libguestfs.git diff --git a/daemon/wc.c b/daemon/wc.c index fe27bf1..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 @@ -22,27 +22,29 @@ #include #include #include +#include -#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);