diff options
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | daemon/Makefile.am | 1 | ||||
| -rw-r--r-- | daemon/realpath.c | 47 | ||||
| -rw-r--r-- | src/MAX_PROC_NR | 2 | ||||
| -rwxr-xr-x | src/generator.ml | 8 |
5 files changed, 57 insertions, 2 deletions
@@ -150,7 +150,6 @@ Ideas for extra commands utime / utimes / futimes / futimens / l.. more mk*temp calls some sort of alloc/fallocate/posix_fallocate call to create empty space - realpath trunc[ate??] ext2 properties: diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ecbc3c4b..c0e8bc94 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -54,6 +54,7 @@ guestfsd_SOURCES = \ pingdaemon.c \ proto.c \ readdir.c \ + realpath.c \ scrub.c \ sfdisk.c \ sleep.c \ diff --git a/daemon/realpath.c b/daemon/realpath.c new file mode 100644 index 00000000..9ab478d2 --- /dev/null +++ b/daemon/realpath.c @@ -0,0 +1,47 @@ +/* libguestfs - the guestfsd daemon + * Copyright (C) 2009 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <limits.h> + +#include "daemon.h" +#include "actions.h" + +char * +do_realpath (char *path) +{ + char *ret; + + NEED_ROOT (NULL); + ABS_PATH (path, NULL); + + CHROOT_IN; + ret = realpath (path, NULL); + CHROOT_OUT; + if (ret == NULL) { + reply_with_perror ("realpath"); + return NULL; + } + + return ret; /* caller frees */ +} diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR index 0234b515..9cc2bc3e 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -162 +163 diff --git a/src/generator.ml b/src/generator.ml index 324b131f..3a35fa2c 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -3133,6 +3133,14 @@ matching lines."); This calls the external C<zfgrep -i> program and returns the matching lines."); + ("realpath", (RString "rpath", [String "path"]), 163, [], + [InitSquashFS, Always, TestOutput ( + [["realpath"; "/../directory"]], "/directory")], + "canonicalized absolute pathname", + "\ +Return the canonicalized absolute pathname of C<path>. The +returned path has no C<.>, C<..> or symbolic link path elements."); + ] let all_functions = non_daemon_functions @ daemon_functions |