X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fls.c;h=4d4714ee3fd4959172f0a97b2456c3c62c8c7a16;hb=77b2275dfcebce16ceea17ddf77a7f9d0a41c082;hp=261bc96481f2e97b7ec93a31ac44590af3f12746;hpb=8e570870f577ff0c3db074f88924633b559af5d4;p=libguestfs.git diff --git a/daemon/ls.c b/daemon/ls.c index 261bc96..4d4714e 100644 --- a/daemon/ls.c +++ b/daemon/ls.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 @@ -30,7 +30,7 @@ #include "actions.h" char ** -do_ls (const char *path) +do_ls (char *path) { char **r = NULL; int size = 0, alloc = 0; @@ -75,9 +75,9 @@ do_ls (const char *path) } char * -do_ll (const char *path) +do_ll (char *path) { - int r, len; + int r; char *out, *err; char *spath; @@ -90,13 +90,11 @@ do_ll (const char *path) * interactive sessions. For the same reason, you can also "escape" * the sysroot (eg. 'll /..'). */ - len = strlen (path) + 9; - spath = malloc (len); + spath = sysroot_path (path); if (!spath) { reply_with_perror ("malloc"); return NULL; } - snprintf (spath, len, "/sysroot%s", path); r = command (&out, &err, "ls", "-la", spath, NULL); free (spath);