X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fglob.c;h=e94e4aa764015628a9c0cc9e607d70414ba9c406;hp=40b7c50e26a8ed90106806e44aaa3d33d30664a8;hb=d600342b7d29c0176ff96a7807ebb38303ecb3a6;hpb=6bda071b5cd8393b37653687027c4ae6c6cf3804 diff --git a/daemon/glob.c b/daemon/glob.c index 40b7c50..e94e4aa 100644 --- a/daemon/glob.c +++ b/daemon/glob.c @@ -26,14 +26,11 @@ #include "actions.h" char ** -do_glob_expand (char *pattern) +do_glob_expand (const char *pattern) { int r; glob_t buf; - NEED_ROOT (return NULL); - ABS_PATH (pattern, return 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); @@ -49,7 +46,7 @@ do_glob_expand (char *pattern) if (r != 0) { if (errno != 0) - reply_with_perror ("glob: %s", pattern); + reply_with_perror ("%s", pattern); else reply_with_error ("glob failed: %s", pattern); return NULL;