diff options
Diffstat (limited to 'posix')
-rw-r--r-- | posix/Makefile | 4 | ||||
-rw-r--r-- | posix/Versions | 3 | ||||
-rw-r--r-- | posix/glob-lstat-compat.c | 36 | ||||
-rw-r--r-- | posix/glob.c | 67 | ||||
-rw-r--r-- | posix/glob64-lstat-compat.c | 36 | ||||
-rw-r--r-- | posix/glob64.c | 5 | ||||
-rw-r--r-- | posix/tst-glob_lstat_compat.c | 263 |
7 files changed, 389 insertions, 25 deletions
diff --git a/posix/Makefile b/posix/Makefile index 7f77b07..b589442 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -46,6 +46,7 @@ routines := \ getresuid getresgid setresuid setresgid \ pathconf sysconf fpathconf \ glob glob64 globfree globfree64 glob_pattern_p fnmatch regex \ + glob-lstat-compat glob64-lstat-compat \ confstr \ getopt getopt1 \ sched_setp sched_getp sched_sets sched_gets sched_yield sched_primax \ @@ -95,7 +96,8 @@ tests := test-errno tstgetopt testfnm runtests runptests \ tst-posix_fadvise tst-posix_fadvise64 \ tst-sysconf-empty-chroot tst-glob_symlinks tst-fexecve tests-internal := bug-regex5 bug-regex20 bug-regex33 \ - tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 + tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 \ + tst-glob_lstat_compat xtests := bug-ga2 ifeq (yes,$(build-shared)) test-srcs := globtest diff --git a/posix/Versions b/posix/Versions index bb481a5..65e9687 100644 --- a/posix/Versions +++ b/posix/Versions @@ -134,6 +134,9 @@ libc { GLIBC_2.11 { execvpe; } + GLIBC_2.27 { + glob; glob64; + } GLIBC_PRIVATE { __libc_fork; __libc_pread; __libc_pwrite; } diff --git a/posix/glob-lstat-compat.c b/posix/glob-lstat-compat.c new file mode 100644 index 0000000..e30d343 --- /dev/null +++ b/posix/glob-lstat-compat.c @@ -0,0 +1,36 @@ +/* Compat glob which does not use gl_lstat for GLOB_ALTDIRFUNC. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_27) + +# include <glob.h> + +# define __glob(pattern, flags, errfunc, pglob) \ + __glob_lstat_compat (pattern, flags, errfunc, pglob) + +# define GLOB_ATTRIBUTE attribute_compat_text_section + +/* Avoid calling gl_lstat with GLOB_ALTDIRFUNC. */ +# define GLOB_NO_LSTAT + +# include <posix/glob.c> + +compat_symbol (libc, __glob_lstat_compat, glob, GLIBC_2_0); +#endif diff --git a/posix/glob.c b/posix/glob.c index c699177..98122da 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -57,7 +57,9 @@ # endif # define struct_stat64 struct stat64 # define FLEXIBLE_ARRAY_MEMBER +# include <shlib-compat.h> #else /* !_LIBC */ +# define __glob glob # define __getlogin_r(buf, len) getlogin_r (buf, len) # define __lstat64(fname, buf) lstat (fname, buf) # define __stat64(fname, buf) stat (fname, buf) @@ -179,6 +181,29 @@ convert_dirent64 (const struct dirent64 *source) ((void) (buf), (void) (len), (void) (newlen), (void) (avar), (void *) 0) #endif +static int +glob_lstat (glob_t *pglob, int flags, const char *fullname) +{ +/* Use on glob-lstat-compat.c to provide a compat symbol which does not + use lstat / gl_lstat. */ +#ifdef GLOB_NO_LSTAT +# define GL_LSTAT gl_stat +# define LSTAT64 __stat64 +#else +# define GL_LSTAT gl_lstat +# define LSTAT64 __lstat64 +#endif + + union + { + struct stat st; + struct_stat64 st64; + } ust; + return (__glibc_unlikely (flags & GLOB_ALTDIRFUNC) + ? pglob->GL_LSTAT (fullname, &ust.st) + : LSTAT64 (fullname, &ust.st64)); +} + /* Set *R = A + B. Return true if the answer is mathematically incorrect due to overflow; in this case, *R is the low order bits of the correct answer. */ @@ -248,6 +273,9 @@ next_brace_sub (const char *cp, int flags) return *cp != '\0' ? cp : NULL; } +#ifndef GLOB_ATTRIBUTE +# define GLOB_ATTRIBUTE +#endif /* Do glob searching for PATTERN, placing results in PGLOB. The bits defined above may be set in FLAGS. @@ -258,11 +286,9 @@ next_brace_sub (const char *cp, int flags) If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned. Otherwise, 'glob' returns zero. */ int -#ifdef GLOB_ATTRIBUTE GLOB_ATTRIBUTE -#endif -glob (const char *pattern, int flags, int (*errfunc) (const char *, int), - glob_t *pglob) +__glob (const char *pattern, int flags, int (*errfunc) (const char *, int), + glob_t *pglob) { const char *filename; char *dirname = NULL; @@ -406,9 +432,10 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), /* Construct the new glob expression. */ mempcpy (mempcpy (alt_start, p, next - p), rest, rest_len); - result = glob (onealt, - ((flags & ~(GLOB_NOCHECK | GLOB_NOMAGIC)) - | GLOB_APPEND), errfunc, pglob); + result = __glob (onealt, + ((flags & ~(GLOB_NOCHECK | GLOB_NOMAGIC)) + | GLOB_APPEND), + errfunc, pglob); /* If we got an error, return it. */ if (result && result != GLOB_NOMATCH) @@ -557,7 +584,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), flags &= ~(GLOB_NOCHECK | GLOB_NOMAGIC); } } - int val = glob (dirname, flags | GLOB_MARK, errfunc, pglob); + int val = __glob (dirname, flags | GLOB_MARK, errfunc, pglob); if (val == 0) pglob->gl_flags = ((pglob->gl_flags & ~GLOB_MARK) | (flags & GLOB_MARK)); @@ -931,11 +958,10 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), dirs.gl_lstat = pglob->gl_lstat; } - status = glob (dirname, - ((flags & (GLOB_ERR | GLOB_NOESCAPE - | GLOB_ALTDIRFUNC)) - | GLOB_NOSORT | GLOB_ONLYDIR), - errfunc, &dirs); + status = __glob (dirname, + ((flags & (GLOB_ERR | GLOB_NOESCAPE | GLOB_ALTDIRFUNC)) + | GLOB_NOSORT | GLOB_ONLYDIR), + errfunc, &dirs); if (status != 0) { if ((flags & GLOB_NOCHECK) == 0 || status != GLOB_NOMATCH) @@ -1133,8 +1159,9 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), return retval; } -#if defined _LIBC && !defined glob -libc_hidden_def (glob) +#if defined _LIBC && !defined __glob +versioned_symbol (libc, __glob, glob, GLIBC_2_27); +libc_hidden_ver (__glob, glob) #endif @@ -1250,11 +1277,6 @@ glob_in_dir (const char *pattern, const char *directory, int flags, } else if (meta == GLOBPAT_NONE) { - union - { - struct stat st; - struct_stat64 st64; - } ust; size_t patlen = strlen (pattern); size_t fullsize; bool alloca_fullname @@ -1273,10 +1295,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags, mempcpy (mempcpy (mempcpy (fullname, directory, dirlen), "/", 1), pattern, patlen + 1); - if (((__builtin_expect (flags & GLOB_ALTDIRFUNC, 0) - ? (*pglob->gl_lstat) (fullname, &ust.st) - : __lstat64 (fullname, &ust.st64)) - == 0) + if (glob_lstat (pglob, flags, fullname) == 0 || errno == EOVERFLOW) /* We found this file to be existing. Now tell the rest of the function to copy this name into the result. */ diff --git a/posix/glob64-lstat-compat.c b/posix/glob64-lstat-compat.c new file mode 100644 index 0000000..1fabf86 --- /dev/null +++ b/posix/glob64-lstat-compat.c @@ -0,0 +1,36 @@ +/* Compat glob which does not use gl_lstat for GLOB_ALTDIRFUNC. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_27) + +# include <glob.h> + +# define glob(pattern, flags, errfunc, pglob) \ + __glob64_lstat_compat (pattern, flags, errfunc, pglob) + +# define GLOB_ATTRIBUTE attribute_compat_text_section + +/* Avoid calling gl_lstat with GLOB_ALTDIRFUNC. */ +# define GLOB_NO_LSTAT + +# include <posix/glob64.c> + +compat_symbol (libc, __glob64_lstat_compat, glob64, GLIBC_2_0); +#endif diff --git a/posix/glob64.c b/posix/glob64.c index a515a1c..ee7ef84 100644 --- a/posix/glob64.c +++ b/posix/glob64.c @@ -20,6 +20,10 @@ #include <glob.h> #include <errno.h> +#ifdef GLOB_ATTRIBUTE +# define GLOB_ATTRIBUTE +#endif + /* Do glob searching for PATTERN, placing results in PGLOB. The bits defined above may be set in FLAGS. If a directory cannot be opened or read and ERRFUNC is not nil, @@ -29,6 +33,7 @@ If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned. Otherwise, `glob' returns zero. */ int +GLOB_ATTRIBUTE glob64 (const char *pattern, int flags, int (*errfunc) (const char *, int), glob64_t *pglob) { diff --git a/posix/tst-glob_lstat_compat.c b/posix/tst-glob_lstat_compat.c new file mode 100644 index 0000000..ccfda4b --- /dev/null +++ b/posix/tst-glob_lstat_compat.c @@ -0,0 +1,263 @@ +/* Test glob compat symbol which avoid call GLOB_ALTDIRFUNC/gl_lstat. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <glob.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <dirent.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +#include <stdio.h> + +#include <shlib-compat.h> +#include <support/check.h> +#include <support/temp_file.h> + +#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_27) + +__typeof (glob) glob; +compat_symbol_reference (libc, glob, glob, GLIBC_2_0); + +/* Compat glob should not call gl_lstat since for some old binaries it + might be unitialized (for instance GNUmake). Check if it is indeed + not called. */ +static bool stat_called; +static bool lstat_called; + +static struct +{ + const char *name; + int level; + int type; +} filesystem[] = +{ + { ".", 1, DT_DIR }, + { "..", 1, DT_DIR }, + { "dir1lev1", 1, DT_UNKNOWN }, + { ".", 2, DT_DIR }, + { "..", 2, DT_DIR }, + { "file1lev2", 2, DT_REG }, + { "file2lev2", 2, DT_REG }, +}; +static const size_t nfiles = sizeof (filesystem) / sizeof (filesystem [0]); + +typedef struct +{ + int level; + int idx; + struct dirent d; + char room_for_dirent[NAME_MAX]; +} my_DIR; + +static long int +find_file (const char *s) +{ + int level = 1; + long int idx = 0; + + while (s[0] == '/') + { + if (s[1] == '\0') + { + s = "."; + break; + } + ++s; + } + + if (strcmp (s, ".") == 0) + return 0; + + if (s[0] == '.' && s[1] == '/') + s += 2; + + while (*s != '\0') + { + char *endp = strchrnul (s, '/'); + + while (idx < nfiles && filesystem[idx].level >= level) + { + if (filesystem[idx].level == level + && memcmp (s, filesystem[idx].name, endp - s) == 0 + && filesystem[idx].name[endp - s] == '\0') + break; + ++idx; + } + + if (idx == nfiles || filesystem[idx].level < level) + { + errno = ENOENT; + return -1; + } + + if (*endp == '\0') + return idx + 1; + + if (filesystem[idx].type != DT_DIR + && (idx + 1 >= nfiles + || filesystem[idx].level >= filesystem[idx + 1].level)) + { + errno = ENOTDIR; + return -1; + } + + ++idx; + + s = endp + 1; + ++level; + } + + errno = ENOENT; + return -1; +} + +static void * +my_opendir (const char *s) +{ + long int idx = find_file (s); + if (idx == -1 || filesystem[idx].type != DT_DIR) + return NULL; + + my_DIR *dir = malloc (sizeof (my_DIR)); + if (dir == NULL) + FAIL_EXIT1 ("cannot allocate directory handle"); + + dir->level = filesystem[idx].level; + dir->idx = idx; + + return dir; +} + +static struct dirent * +my_readdir (void *gdir) +{ + my_DIR *dir = gdir; + + if (dir->idx == -1) + return NULL; + + while (dir->idx < nfiles && filesystem[dir->idx].level > dir->level) + ++dir->idx; + + if (dir->idx == nfiles || filesystem[dir->idx].level < dir->level) + { + dir->idx = -1; + return NULL; + } + + dir->d.d_ino = 1; /* glob should not skip this entry. */ + +#ifdef _DIRENT_HAVE_D_TYPE + dir->d.d_type = filesystem[dir->idx].type; +#endif + + strcpy (dir->d.d_name, filesystem[dir->idx].name); + + ++dir->idx; + + return &dir->d; +} + +static void +my_closedir (void *dir) +{ + free (dir); +} + +static int +my_stat (const char *name, struct stat *st) +{ + stat_called = true; + + long int idx = find_file (name); + if (idx == -1) + return -1; + + memset (st, '\0', sizeof (*st)); + + if (filesystem[idx].type == DT_UNKNOWN) + st->st_mode = DTTOIF (idx + 1 < nfiles + && filesystem[idx].level < filesystem[idx + 1].level + ? DT_DIR : DT_REG) | 0777; + else + st->st_mode = DTTOIF (filesystem[idx].type) | 0777; + return 0; +} + +static int +my_lstat (const char *name, struct stat *st) +{ + lstat_called = true; + + long int idx = find_file (name); + if (idx == -1) + return -1; + + memset (st, '\0', sizeof (*st)); + + if (filesystem[idx].type == DT_UNKNOWN) + st->st_mode = DTTOIF (idx + 1 < nfiles + && filesystem[idx].level < filesystem[idx + 1].level + ? DT_DIR : DT_REG) | 0777; + else + st->st_mode = DTTOIF (filesystem[idx].type) | 0777; + return 0; +} + +static int +do_test (void) +{ + glob_t gl; + + memset (&gl, '\0', sizeof (gl)); + + gl.gl_closedir = my_closedir; + gl.gl_readdir = my_readdir; + gl.gl_opendir = my_opendir; + gl.gl_lstat = my_lstat; + gl.gl_stat = my_stat; + + int flags = GLOB_ALTDIRFUNC; + + stat_called = false; + lstat_called = false; + + TEST_VERIFY_EXIT (glob ("*/file1lev2", flags, NULL, &gl) == 0); + TEST_VERIFY_EXIT (gl.gl_pathc == 1); + TEST_VERIFY_EXIT (strcmp (gl.gl_pathv[0], "dir1lev1/file1lev2") == 0); + + TEST_VERIFY_EXIT (stat_called == true); + TEST_VERIFY_EXIT (lstat_called == false); + + return 0; +} + +#else /* TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_27) */ + +static int +do_test (void) +{ + return 77; +} +#endif + +#include <support/test-driver.c> |