diff options
| -rw-r--r-- | daemon/Makefile.am | 1 | ||||
| -rw-r--r-- | daemon/glob.c | 63 | ||||
| -rwxr-xr-x | src/generator.ml | 28 |
3 files changed, 92 insertions, 0 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ea4b721b..7ef2a6b8 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -36,6 +36,7 @@ guestfsd_SOURCES = \ file.c \ find.c \ fsck.c \ + glob.c \ grub.c \ guestfsd.c \ hexdump.c \ diff --git a/daemon/glob.c b/daemon/glob.c new file mode 100644 index 00000000..f39832ea --- /dev/null +++ b/daemon/glob.c @@ -0,0 +1,63 @@ +/* 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 <glob.h> + +#include "daemon.h" +#include "actions.h" + +char ** +do_glob_expand (char *pattern) +{ + int r; + glob_t buf; + + NEED_ROOT (NULL); + ABS_PATH (pattern, NULL); /* Required so chroot can be used. */ + + /* glob(3) in glibc never calls chdir, so this seems to be safe: */ + CHROOT_IN; + r = glob (pattern, GLOB_MARK|GLOB_BRACE, NULL, &buf); + CHROOT_OUT; + + if (r == GLOB_NOMATCH) { /* Return an empty list instead of an error. */ + char **rv; + + rv = malloc (sizeof (char *) * 1); + rv[0] = NULL; + return rv; /* Caller frees. */ + } + + if (r != 0) { + if (errno != 0) + reply_with_perror ("glob: %s", pattern); + else + reply_with_error ("glob failed: %s", pattern); + return NULL; + } + + /* We take a bit of a liberty here. 'globfree' just frees the + * strings in the glob_t structure. We will pass them out directly + * and the caller will free them. + */ + return buf.gl_pathv; +} diff --git a/src/generator.ml b/src/generator.ml index 64a8ab92..b716e0af 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -2373,6 +2373,34 @@ into a list of lines. See also: C<guestfs_command_lines>"); + ("glob_expand", (RStringList "paths", [String "pattern"]), 113, [], + [InitBasicFS, Always, TestOutputList ( + [["mkdir_p"; "/a/b/c"]; + ["touch"; "/a/b/c/d"]; + ["touch"; "/a/b/c/e"]; + ["glob_expand"; "/a/b/c/*"]], ["/a/b/c/d"; "/a/b/c/e"]); + InitBasicFS, Always, TestOutputList ( + [["mkdir_p"; "/a/b/c"]; + ["touch"; "/a/b/c/d"]; + ["touch"; "/a/b/c/e"]; + ["glob_expand"; "/a/*/c/*"]], ["/a/b/c/d"; "/a/b/c/e"]); + InitBasicFS, Always, TestOutputList ( + [["mkdir_p"; "/a/b/c"]; + ["touch"; "/a/b/c/d"]; + ["touch"; "/a/b/c/e"]; + ["glob_expand"; "/a/*/x/*"]], [])], + "expand a wildcard path", + "\ +This command searches for all the pathnames matching +C<pattern> according to the wildcard expansion rules +used by the shell. + +If no paths match, then this returns an empty list +(note: not an error). + +It is just a wrapper around the C L<glob(3)> function +with flags C<GLOB_MARK|GLOB_BRACE>. +See that manual page for more details."); ] |