Convert all TABs-as-indentation to spaces.

[libguestfs.git] / daemon / dir.c

diff --git a/daemon/dir.c b/daemon/dir.c
index 753323d..5945862 100644 (file)
--- 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);
 
@@ -126,8 +123,8 @@ recursive_mkdir (const char *path)
       r = lstat (path, &buf);
       if (r == -1) return -1;
       if (!S_ISDIR (buf.st_mode)) {
-       errno = ENOTDIR;
-       return -1;
+        errno = ENOTDIR;
+        return -1;
       }
       return 0;                        /* OK - directory exists here already. */
     }