git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator.ml: use new "Pathname" designation
[libguestfs.git]
/
daemon
/
dir.c
diff --git
a/daemon/dir.c
b/daemon/dir.c
index
a8f066f
..
ad1c7c9
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,14
+51,11
@@
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;
char *buf, *err;
{
int r;
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;
@@
-89,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;
@@
-123,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. */
}
@@
-155,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;
@@
-175,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;
@@
-204,8
+189,8
@@
do_mkdtemp (char *template)
{
char *r;
{
char *r;
- NEED_ROOT (NULL);
- ABS_PATH (template, NULL);
+ NEED_ROOT (
return
NULL);
+ ABS_PATH (template,
return
NULL);
CHROOT_IN;
r = mkdtemp (template);
CHROOT_IN;
r = mkdtemp (template);