git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mke2fs: Use e4fsprogs programs if available.
[libguestfs.git]
/
daemon
/
dir.c
diff --git
a/daemon/dir.c
b/daemon/dir.c
index
ad1c7c9
..
1ca6286
100644
(file)
--- a/
daemon/dir.c
+++ b/
daemon/dir.c
@@
-185,31
+185,22
@@
do_is_dir (const char *path)
}
char *
}
char *
-do_mkdtemp (char *template)
+do_mkdtemp (c
onst c
har *template)
{
{
- char *r;
-
- NEED_ROOT (return NULL);
- ABS_PATH (template, return NULL);
+ char *writable = strdup (template);
+ if (writable == NULL) {
+ reply_with_perror ("strdup");
+ return NULL;
+ }
CHROOT_IN;
CHROOT_IN;
-
r = mkdtemp (templat
e);
+
char *r = mkdtemp (writabl
e);
CHROOT_OUT;
if (r == NULL) {
reply_with_perror ("mkdtemp: %s", template);
CHROOT_OUT;
if (r == NULL) {
reply_with_perror ("mkdtemp: %s", template);
-
return NULL
;
+
free (writable)
;
}
}
- /* 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;
}
return r;
}