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
6eb86bb
..
1ca6286
100644
(file)
--- a/
daemon/dir.c
+++ b/
daemon/dir.c
@@
-30,13
+30,10
@@
#include "actions.h"
int
#include "actions.h"
int
-do_rmdir (char *path)
+do_rmdir (c
onst c
har *path)
{
int r;
{
int r;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
CHROOT_IN;
r = rmdir (path);
CHROOT_OUT;
CHROOT_IN;
r = rmdir (path);
CHROOT_OUT;
@@
-54,28
+51,22
@@
do_rmdir (char *path)
* do stupid stuff, who are we to try to stop them?
*/
int
* do stupid stuff, who are we to try to stop them?
*/
int
-do_rm_rf (char *path)
+do_rm_rf (c
onst c
har *path)
{
{
- int r
, len
;
+ int r;
char *buf, *err;
char *buf, *err;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
if (strcmp (path, "/") == 0) {
reply_with_error ("rm -rf: cannot remove root directory");
return -1;
}
if (strcmp (path, "/") == 0) {
reply_with_error ("rm -rf: cannot remove root directory");
return -1;
}
- len = strlen (path) + 9;
- buf = malloc (len);
+ buf = sysroot_path (path);
if (buf == NULL) {
reply_with_perror ("malloc");
return -1;
}
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);
r = command (NULL, &err, "rm", "-rf", buf, NULL);
free (buf);
@@
-92,13
+83,10
@@
do_rm_rf (char *path)
}
int
}
int
-do_mkdir (char *path)
+do_mkdir (c
onst c
har *path)
{
int r;
{
int r;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
CHROOT_IN;
r = mkdir (path, 0777);
CHROOT_OUT;
CHROOT_IN;
r = mkdir (path, 0777);
CHROOT_OUT;
@@
-126,8
+114,8
@@
recursive_mkdir (const char *path)
r = lstat (path, &buf);
if (r == -1) return -1;
if (!S_ISDIR (buf.st_mode)) {
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. */
}
}
return 0; /* OK - directory exists here already. */
}
@@
-158,13
+146,10
@@
recursive_mkdir (const char *path)
}
int
}
int
-do_mkdir_p (char *path)
+do_mkdir_p (c
onst c
har *path)
{
int r;
{
int r;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
CHROOT_IN;
r = recursive_mkdir (path);
CHROOT_OUT;
CHROOT_IN;
r = recursive_mkdir (path);
CHROOT_OUT;
@@
-178,14
+163,11
@@
do_mkdir_p (char *path)
}
int
}
int
-do_is_dir (char *path)
+do_is_dir (c
onst c
har *path)
{
int r;
struct stat buf;
{
int r;
struct stat buf;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
CHROOT_IN;
r = lstat (path, &buf);
CHROOT_OUT;
CHROOT_IN;
r = lstat (path, &buf);
CHROOT_OUT;
@@
-203,31
+185,22
@@
do_is_dir (char *path)
}
char *
}
char *
-do_mkdtemp (char *template)
+do_mkdtemp (c
onst c
har *template)
{
{
- char *r;
-
- NEED_ROOT (NULL);
- ABS_PATH (template, 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;
}