summaryrefslogtreecommitdiffstats
path: root/daemon/dir.c
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-08-11 15:59:56 +0200
committerJim Meyering <meyering@redhat.com>2009-08-13 14:45:34 +0200
commit84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0 (patch)
tree5ac525b34b3bf5b3ef336f567c72cd8859b18ab6 /daemon/dir.c
parent79b5084f70cb67c37dd7cbe60821a78981fd8d59 (diff)
downloadlibguestfs-84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0.tar.gz
libguestfs-84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0.tar.xz
libguestfs-84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0.zip
generator.ml: use new "Pathname" designation
Nearly every file-related function in daemons/*.c is affected: Remove this pair of statements from each affected do_* function: - NEED_ROOT (return -1); - ABS_PATH (dir, return -1); and change the type of the corresponding parameter to "const char *". * src/generator.ml: Emit NEED_ROOT just once, even when there are two or more Pathname args.
Diffstat (limited to 'daemon/dir.c')
-rw-r--r--daemon/dir.c25
1 files changed, 5 insertions, 20 deletions
diff --git a/daemon/dir.c b/daemon/dir.c
index ec072ddb..ad1c7c98 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -30,13 +30,10 @@
#include "actions.h"
int
-do_rmdir (char *path)
+do_rmdir (const char *path)
{
int r;
- NEED_ROOT (return -1);
- ABS_PATH (path, return -1);
-
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_rm_rf (char *path)
+do_rm_rf (const char *path)
{
int r;
char *buf, *err;
- NEED_ROOT (return -1);
- ABS_PATH (path, 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
-do_mkdir (char *path)
+do_mkdir (const char *path)
{
int r;
- NEED_ROOT (return -1);
- ABS_PATH (path, return -1);
-
CHROOT_IN;
r = mkdir (path, 0777);
CHROOT_OUT;
@@ -155,13 +146,10 @@ recursive_mkdir (const char *path)
}
int
-do_mkdir_p (char *path)
+do_mkdir_p (const char *path)
{
int r;
- NEED_ROOT (return -1);
- ABS_PATH (path, return -1);
-
CHROOT_IN;
r = recursive_mkdir (path);
CHROOT_OUT;
@@ -175,14 +163,11 @@ do_mkdir_p (char *path)
}
int
-do_is_dir (char *path)
+do_is_dir (const char *path)
{
int r;
struct stat buf;
- NEED_ROOT (return -1);
- ABS_PATH (path, return -1);
-
CHROOT_IN;
r = lstat (path, &buf);
CHROOT_OUT;