X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdir.c;h=a8f066fd149f5215b2ead5f14fc73a4b8ad508c8;hb=bbe5877b6c86ace6f27c6f95c559a61888693923;hp=753323d11fa01a5ad171d0506329f73e5610ea82;hpb=8228eec99045ae720d8ef35851aa8c278f6b4e5c;p=libguestfs.git diff --git a/daemon/dir.c b/daemon/dir.c index 753323d..a8f066f 100644 --- a/daemon/dir.c +++ b/daemon/dir.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 @@ -56,7 +56,7 @@ do_rmdir (char *path) int do_rm_rf (char *path) { - int r, len; + int r; char *buf, *err; NEED_ROOT (-1); @@ -67,15 +67,12 @@ do_rm_rf (char *path) return -1; } - len = strlen (path) + 9; - buf = malloc (len); + buf = sysroot_path (path); if (buf == NULL) { reply_with_perror ("malloc"); return -1; } - snprintf (buf, len, "/sysroot%s", path); - r = command (NULL, &err, "rm", "-rf", buf, NULL); free (buf);