[Bug glob/1062] sysdeps/generic/glob.c merge from gnulib (part 3 of 3)

["cvs-commit at gcc dot gnu.org" <sourceware-bugzilla at sourceware dot org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=1062

--- Comment #11 from cvs-commit at gcc dot gnu.org <cvs-commit at gcc dot gnu.org> ---
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, release/2.26/master has been updated
       via  305f4f057dace256e99e4321e21a23267187d77f (commit)
      from  c96d7a646b52e8d50e7ca98e0a60af5f24e4b441 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=305f4f057dace256e99e4321e21a23267187d77f

commit 305f4f057dace256e99e4321e21a23267187d77f
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Fri Oct 20 19:36:33 2017 +0200

    posix: Sync glob with gnulib [BZ #1062]

    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.

    (cherry picked from commit c66c908230169c1bab1f83b071eb585baa214b9f)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   62 ++
 NEWS                                               |    1 +
 posix/Makefile                                     |    2 +-
 posix/flexmember.h                                 |   45 ++
 posix/glob.c                                       |  774 ++++++++++----------
 posix/glob64.c                                     |    6 -
 posix/glob_internal.h                              |   57 ++
 posix/glob_pattern_p.c                             |   33 +
 posix/globfree.c                                   |   41 +
 posix/globfree64.c                                 |   31 +
 sysdeps/gnu/glob64.c                               |    3 -
 sysdeps/gnu/globfree64.c                           |   10 +
 sysdeps/unix/sysv/linux/Makefile                   |    2 +-
 sysdeps/unix/sysv/linux/alpha/glob.c               |    4 -
 sysdeps/unix/sysv/linux/alpha/globfree.c           |   37 +
 sysdeps/unix/sysv/linux/i386/glob64.c              |   39 +-
 .../unix/sysv/linux/mips/mips64/n64/globfree64.c   |    1 +
 sysdeps/unix/sysv/linux/oldglob.c                  |   42 ++
 sysdeps/unix/sysv/linux/wordsize-64/globfree64.c   |    2 +
 sysdeps/unix/sysv/linux/x86_64/x32/globfree.c      |    1 +
 sysdeps/wordsize-64/glob.c                         |    2 -
 sysdeps/wordsize-64/globfree.c                     |    5 +
 sysdeps/wordsize-64/globfree64.c                   |    1 +
 23 files changed, 742 insertions(+), 459 deletions(-)
 create mode 100644 posix/flexmember.h
 create mode 100644 posix/glob_internal.h
 create mode 100644 posix/glob_pattern_p.c
 create mode 100644 posix/globfree.c
 create mode 100644 posix/globfree64.c
 create mode 100644 sysdeps/gnu/globfree64.c
 create mode 100644 sysdeps/unix/sysv/linux/alpha/globfree.c
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/globfree64.c
 create mode 100644 sysdeps/unix/sysv/linux/oldglob.c
 create mode 100644 sysdeps/unix/sysv/linux/wordsize-64/globfree64.c
 create mode 100644 sysdeps/unix/sysv/linux/x86_64/x32/globfree.c
 create mode 100644 sysdeps/wordsize-64/globfree.c
 create mode 100644 sysdeps/wordsize-64/globfree64.c

-- 
You are receiving this mail because:
You are on the CC list for the bug.