diff options
author | Jim Meyering <meyering@redhat.com> | 2009-08-11 15:59:56 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2009-08-13 14:45:34 +0200 |
commit | 84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0 (patch) | |
tree | 5ac525b34b3bf5b3ef336f567c72cd8859b18ab6 /daemon/mknod.c | |
parent | 79b5084f70cb67c37dd7cbe60821a78981fd8d59 (diff) | |
download | libguestfs-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/mknod.c')
-rw-r--r-- | daemon/mknod.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/daemon/mknod.c b/daemon/mknod.c index a6e6eca6..adaeb80e 100644 --- a/daemon/mknod.c +++ b/daemon/mknod.c @@ -31,13 +31,10 @@ #include "actions.h" int -do_mknod (int mode, int devmajor, int devminor, char *path) +do_mknod (int mode, int devmajor, int devminor, const char *path) { int r; - NEED_ROOT (return -1); - ABS_PATH (path, return -1); - CHROOT_IN; r = mknod (path, mode, makedev (devmajor, devminor)); CHROOT_OUT; @@ -51,19 +48,19 @@ do_mknod (int mode, int devmajor, int devminor, char *path) } int -do_mkfifo (int mode, char *path) +do_mkfifo (int mode, const char *path) { return do_mknod (mode | S_IFIFO, 0, 0, path); } int -do_mknod_b (int mode, int devmajor, int devminor, char *path) +do_mknod_b (int mode, int devmajor, int devminor, const char *path) { return do_mknod (mode | S_IFBLK, devmajor, devminor, path); } int -do_mknod_c (int mode, int devmajor, int devminor, char *path) +do_mknod_c (int mode, int devmajor, int devminor, const char *path) { return do_mknod (mode | S_IFCHR, devmajor, devminor, path); } |