diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-08-10 19:03:36 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-08-13 14:45:34 +0200 |
| commit | 0dd6c8c8442d4ff588f6dac2efab24d3409b0dec (patch) | |
| tree | 3b97e6facdd874b4573eb6142a2cd376cb7b88ef /daemon/file.c | |
| parent | 4a5e13f15734aa7363e605f716ad6e29c67475c5 (diff) | |
| download | libguestfs-0dd6c8c8442d4ff588f6dac2efab24d3409b0dec.tar.gz libguestfs-0dd6c8c8442d4ff588f6dac2efab24d3409b0dec.tar.xz libguestfs-0dd6c8c8442d4ff588f6dac2efab24d3409b0dec.zip | |
update all uses of ABS_PATH
run this command:
git grep -l -w ABS_PATH|xargs perl -pi -e \
's/(?:ABS_PATH)( \(.*?,) (.*?)\)/ABS_PATH$1 return $2)/'
Diffstat (limited to 'daemon/file.c')
| -rw-r--r-- | daemon/file.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/daemon/file.c b/daemon/file.c index d2ada997..e1851329 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -36,7 +36,7 @@ do_touch (char *path) int r; NEED_ROOT (-1); - ABS_PATH (path, -1); + ABS_PATH (path, return -1); CHROOT_IN; fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666); @@ -148,7 +148,7 @@ do_read_lines (char *path) ssize_t n; NEED_ROOT (NULL); - ABS_PATH (path, NULL); + ABS_PATH (path, return NULL); CHROOT_IN; fp = fopen (path, "r"); @@ -195,7 +195,7 @@ do_rm (char *path) int r; NEED_ROOT (-1); - ABS_PATH (path, -1); + ABS_PATH (path, return -1); CHROOT_IN; r = unlink (path); @@ -215,7 +215,7 @@ do_chmod (int mode, char *path) int r; NEED_ROOT (-1); - ABS_PATH (path, -1); + ABS_PATH (path, return -1); CHROOT_IN; r = chmod (path, mode); @@ -235,7 +235,7 @@ do_chown (int owner, int group, char *path) int r; NEED_ROOT (-1); - ABS_PATH (path, -1); + ABS_PATH (path, return -1); CHROOT_IN; r = chown (path, owner, group); @@ -255,7 +255,7 @@ do_exists (char *path) int r; NEED_ROOT (-1); - ABS_PATH (path, -1); + ABS_PATH (path, return -1); CHROOT_IN; r = access (path, F_OK); @@ -271,7 +271,7 @@ do_is_file (char *path) struct stat buf; NEED_ROOT (-1); - ABS_PATH (path, -1); + ABS_PATH (path, return -1); CHROOT_IN; r = lstat (path, &buf); @@ -295,7 +295,7 @@ do_write_file (char *path, char *content, int size) int fd; NEED_ROOT (-1); - ABS_PATH (path, -1); + ABS_PATH (path, return -1); if (size == 0) size = strlen (content); @@ -331,7 +331,7 @@ do_read_file (char *path, size_t *size_r) char *r; NEED_ROOT (NULL); - ABS_PATH (path, NULL); + ABS_PATH (path, return NULL); CHROOT_IN; fd = open (path, O_RDONLY); @@ -445,7 +445,7 @@ do_zfile (char *method, char *path) char line[256]; NEED_ROOT (NULL); - ABS_PATH (path, NULL); + ABS_PATH (path, return NULL); if (strcmp (method, "gzip") == 0 || strcmp (method, "compress") == 0) zcat = "zcat"; |