This patch syncs posix/glob.c implementation with gnulib version
b5ec983 (glob: simplify symlink detection). The only difference
to gnulib code is
* DT_UNKNOWN, DT_DIR, and DT_LNK definition in the case there
were not already defined. Gnulib code which uses
HAVE_STRUCT_DIRENT_D_TYPE will redefine them wrongly because
GLIBC does not define HAVE_STRUCT_DIRENT_D_TYPE. Instead
the patch check for each definition instead.
Also, the patch requires additional globfree and globfree64 files
for compatibility version on some architectures. Also the code
simplification leads to not macro simplification (not need for
NO_GLOB_PATTERN_P anymore).
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.
[BZ #1062]
* posix/Makefile (routines): Add globfree, globfree64, and
glob_pattern_p.
* posix/flexmember.h: New file.
* posix/glob_internal.h: Likewise.
* posix/glob_pattern_p.c: Likewise.
* posix/globfree.c: Likewise.
* posix/globfree64.c: Likewise.
* sysdeps/gnu/globfree64.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/globfree.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/globfree64.c: Likewise.
* sysdeps/unix/sysv/linux/oldglob.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/globfree64.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/globfree.c: Likewise.
* sysdeps/wordsize-64/globfree.c: Likewise.
* sysdeps/wordsize-64/globfree64.c: Likewise.
* posix/glob.c (HAVE_CONFIG_H): Use !_LIBC instead.
[NDEBUG): Remove comments.
(GLOB_ONLY_P, _AMIGA, VMS): Remove define.
(dirent_type): New type. Use uint_fast8_t not
uint8_t, as C99 does not require uint8_t.
(DT_UNKNOWN, DT_DIR, DT_LNK): New macros.
(struct readdir_result): Use dirent_type. Do not define skip_entry
unless it is needed; this saves a byte on platforms lacking d_ino.
(readdir_result_type, readdir_result_skip_entry):
New functions, replacing ...
(readdir_result_might_be_symlink, readdir_result_might_be_dir):
these functions, which were removed. This makes the callers
easier to read. All callers changed.
(D_INO_TO_RESULT): Now empty if there is no d_ino.
(size_add_wrapv, glob_use_alloca): New static functions.
(glob, glob_in_dir): Check for size_t overflow in several places,
and fix some size_t checks that were not quite right.
Remove old code using SHELL since Bash no longer
uses this.
(glob, prefix_array): Separate MS code better.
(glob_in_dir): Remove old Amiga and VMS code.
(globfree, __glob_pattern_type, __glob_pattern_p): Move to
separate files.
(glob_in_dir): Do not rely on undefined behavior in accessing
struct members beyond their bounds. Use a flexible array member
instead
(link_stat): Rename from link_exists2_p and return -1/0 instead of
0/1. Caller changed.
(glob): Fix memory leaks.
* posix/glob64 (globfree64): Move to separate file.
* sysdeps/gnu/glob64.c (NO_GLOB_PATTERN_P): Remove define.
(globfree64): Remove hidden alias.
* sysdeps/unix/sysv/linux/Makefile (sysdeps_routines): Add
oldglob.
* sysdeps/unix/sysv/linux/alpha/glob.c (__new_globfree): Move to
separate file.
* sysdeps/unix/sysv/linux/i386/glob64.c (NO_GLOB_PATTERN_P): Remove
define.
Move compat code to separate file.
* sysdeps/wordsize-64/glob.c (globfree): Move definitions to
separate file.
Also fixed the following whitespace nits to satisfy the push:
sysdeps/alpha/alphaev6/memset.S:142: space before tab in indent.
sysdeps/alpha/configure:1: new blank line at EOF.
sysdeps/alpha/fpu/e_sqrt.c:126: space before tab in indent.
sysdeps/alpha/preconfigure:1: new blank line at EOF.
sysdeps/unix/sysv/linux/alpha/syscalls.list:1: new blank line at EOF.
2001-07-06 Paul Eggert <eggert@twinsun.com>
* manual/argp.texi: Remove ignored LGPL copyright notice; it's
not appropriate for documentation anyway.
* manual/libc-texinfo.sh: "Library General Public License" ->
"Lesser General Public License".
2001-07-06 Andreas Jaeger <aj@suse.de>
* All files under GPL/LGPL version 2: Place under LGPL version
2.1.
1998-08-12 17:03 Ulrich Drepper <drepper@cygnus.com>
* include/unistd.h: Protect against multiple inclusion.
* posix/glob.c: Don't define __glob_pattern_p is NO_GLOB_PATTERN_P
is defined, not is glob is defined.
* sysdeps/unix/sysv/linux/glob64.c: Define NO_GLOB_PATTERN_P.
1998-08-01 17:18 H.J. Lu <hjl@gnu.org>
* sunrpc/rpcsvc/rusers.x (xdr_utmp): Use xdr_bytes instead of
xdr_string for ut_line, ut_name and ut_host.
1998-08-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/paths.h (_PATH_MAILDIR): Change to
/var/mail in accordance with FHS 2.0.
Reported by Javier Kohen <root@jkohen.tough.com.ar> [PR libc/639].
1998-08-12 Richard Henderson <rth@cygnus.com>
* sysdeps/unix/sysv/linux/alpha/syscalls.list (recvmsg, sendmsg):
Update aliases for cancelation.
* sysdeps/unix/sysv/linux/alpha/glob.c: Undef glob*64 before
playing with symbol versions.
(_hurd_canonicalize_directory_name_internal): Do not loop forever
for unknown root directories.
be reached.
1998-08-10 15:49 Ulrich Drepper <drepper@cygnus.com>
* include/dirent.h: Protect from double inclusion.
1998-08-09 Mark Kettenis <kettenis@phys.uva.nl>
* posix/glob.h: Add LFS support for glob and globfree.
* posix/Versions [GLIBC_2.1]: Add glob64 and globfree64.
* posix/Makefile (routines): Add glob64.
* sysdeps/generic/glob64.c: New file.
* sysdeps/unix/sysv/linux/glob64.c: New file.
* sysdeps/unix/sysv/linux/alpha/glob64.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc64/glob64.c: New file.
* sysdeps/generic/glob.c [_LIBC && glob] (__glob_pattern_p):
Elide function.
* sysdeps/unix/sysv/linux/alpha/glob.c: Add glob64 as a weak alias
for __new_glob. Likewise for globfree64.
* sysdeps/unix/sysv/linux/sparc/sparc64/glob.c: New file.
1998-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/Makefile ($(common-objpfx)s-proto.d): Remove
-include flag from command.
1998-05-12 12:15 Ulrich Drepper <drepper@cygnus.com>
* posix/glob.c: Move to ...
* sysdeps/generic/glob.c: ...here.
* posix/glob.h (glob_t): Use correct types for gl_pathc and gl_offs
elements.
* sysdeps/unix/sysv/linux/alpha/glob.c: New file.
* sysdeps/unix/sysv/linux/alpha/oldglob.c: New file.
* sysdeps/unix/sysv/linux/alpha/Dist: Add oldglob.c.
* sysdeps/unix/sysv/linux/alpha/Makefile: Compile oldglob in posix
subdir.
* libc.map [GLIBC_2.1]: Add glob and globfree.
1998-05-12 Ulrich Drepper <drepper@cygnus.com>
* sunrpc/Makefile (generated): Restore old list.
1998-05-11 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* rt/Makefile (tests): Define only if we have a thread library.
* nis/ypclnt.c: Add: #include <errno.h>.
1998-05-10 15:39 Zack Weinberg <zack@rabi.phys.columbia.edu>
* configure.in: Define and substitute RELEASE as well as
VERSION.
* config.make.in: Add RELEASE and VERSION to be substituted.
* Makeconfig: Delete all references to version.mk.
* Make-dist: Likewise.
* MakeTAGS: Likewise.
* elf/Makefile: Likewise.
1998-05-10 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/ypclnt.c: Move "(none)" domainname check from __yp_check to
yp_get_default_domain.
1998-05-12 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/profil.c (__profil): Don't define act and timer
variables as static. Patch by Joe Keane <jgk@jgk.org>.
1998-05-12 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/malloc.c: Fix for NO_THREADS case.
Remove statfs and fstatfs.
and pwrite as EXTRA.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
Adhemerval Zanella
Joseph Myers
Richard Henderson
Roland McGrath
Ulrich Drepper
Jakub Jelinek
Andreas Jaeger
Richard Henderson