/* 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
#include "actions.h"
int
-do_rmdir (const char *path)
+do_rmdir (char *path)
{
int r;
* do stupid stuff, who are we to try to stop them?
*/
int
-do_rm_rf (const char *path)
+do_rm_rf (char *path)
{
- int r, len;
+ int r;
char *buf, *err;
NEED_ROOT (-1);
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);
}
int
-do_mkdir (const char *path)
+do_mkdir (char *path)
{
int r;
int loop = 0;
int r;
char *ppath, *p;
+ struct stat buf;
again:
r = mkdir (path, 0777);
if (r == -1) {
+ if (errno == EEXIST) { /* Something exists here, might not be a dir. */
+ r = lstat (path, &buf);
+ if (r == -1) return -1;
+ if (!S_ISDIR (buf.st_mode)) {
+ errno = ENOTDIR;
+ return -1;
+ }
+ return 0; /* OK - directory exists here already. */
+ }
+
if (!loop && errno == ENOENT) {
loop = 1; /* Stops it looping forever. */
}
int
-do_mkdir_p (const char *path)
+do_mkdir_p (char *path)
{
int r;
}
int
-do_is_dir (const char *path)
+do_is_dir (char *path)
{
int r;
struct stat buf;
return S_ISDIR (buf.st_mode);
}
+
+char *
+do_mkdtemp (char *template)
+{
+ char *r;
+
+ NEED_ROOT (NULL);
+ ABS_PATH (template, NULL);
+
+ CHROOT_IN;
+ r = mkdtemp (template);
+ CHROOT_OUT;
+
+ if (r == NULL) {
+ reply_with_perror ("mkdtemp: %s", template);
+ return NULL;
+ }
+
+ /* The caller will free template AND try to free the return value,
+ * so we must make a copy here.
+ */
+ if (r == template) {
+ r = strdup (template);
+ if (r == NULL) {
+ reply_with_perror ("strdup");
+ return NULL;
+ }
+ }
+ return r;
+}