X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ffind.c;h=d8829530827d2d05846cc983a1db72233cc12111;hb=e315e0723ec8c2f84809f06d7f2ede4955dd6c67;hp=85994b6dc4e4c8e73b8ecfdde7cebb2ebf75682a;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf;p=libguestfs.git diff --git a/daemon/find.c b/daemon/find.c index 85994b6..d882953 100644 --- a/daemon/find.c +++ b/daemon/find.c @@ -56,21 +56,27 @@ do_find (char *dir) FILE *fp; char **res = NULL; int size = 0, alloc = 0; - char sysrootdir[PATH_MAX]; + char *sysrootdir; char str[PATH_MAX]; NEED_ROOT (NULL); ABS_PATH (dir, NULL); - snprintf (sysrootdir, sizeof sysrootdir, "/sysroot%s", dir); + sysrootdir = sysroot_path (dir); + if (!sysrootdir) { + reply_with_perror ("malloc"); + return NULL; + } r = stat (sysrootdir, &statbuf); if (r == -1) { reply_with_perror ("%s", dir); + free (sysrootdir); return NULL; } if (!S_ISDIR (statbuf.st_mode)) { reply_with_error ("%s: not a directory", dir); + free (sysrootdir); return NULL; } @@ -81,11 +87,13 @@ do_find (char *dir) cmd = malloc (len); if (!cmd) { reply_with_perror ("malloc"); + free (sysrootdir); return NULL; } strcpy (cmd, "find "); shell_quote (cmd+5, len-5, sysrootdir); + free (sysrootdir); strcat (cmd, " -print0"); if (verbose)