git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update generator to emit each RESOLVE_DEVICE call
[libguestfs.git]
/
daemon
/
dir.c
diff --git
a/daemon/dir.c
b/daemon/dir.c
index
a8f066f
..
20cbd24
100644
(file)
--- a/
daemon/dir.c
+++ b/
daemon/dir.c
@@
-35,7
+35,7
@@
do_rmdir (char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = rmdir (path);
CHROOT_IN;
r = rmdir (path);
@@
-60,7
+60,7
@@
do_rm_rf (char *path)
char *buf, *err;
NEED_ROOT (-1);
char *buf, *err;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
if (strcmp (path, "/") == 0) {
reply_with_error ("rm -rf: cannot remove root directory");
if (strcmp (path, "/") == 0) {
reply_with_error ("rm -rf: cannot remove root directory");
@@
-94,7
+94,7
@@
do_mkdir (char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = mkdir (path, 0777);
CHROOT_IN;
r = mkdir (path, 0777);
@@
-123,8
+123,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. */
}
@@
-160,7
+160,7
@@
do_mkdir_p (char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = recursive_mkdir (path);
CHROOT_IN;
r = recursive_mkdir (path);
@@
-181,7
+181,7
@@
do_is_dir (char *path)
struct stat buf;
NEED_ROOT (-1);
struct stat buf;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = lstat (path, &buf);
CHROOT_IN;
r = lstat (path, &buf);
@@
-205,7
+205,7
@@
do_mkdtemp (char *template)
char *r;
NEED_ROOT (NULL);
char *r;
NEED_ROOT (NULL);
- ABS_PATH (template, NULL);
+ ABS_PATH (template,
return
NULL);
CHROOT_IN;
r = mkdtemp (template);
CHROOT_IN;
r = mkdtemp (template);