posix: Allow glob to match dangling symlinks [BZ #866]
This patch makes glob match dangling symlinks. Compared to other glob
implementation (*BSD, bash, musl, and other shells as well), GLIBC seems
the be the only one that does not match dangling symlinks. As for
comment #5 in BZ #866, POSIX does not have any strict specification for
dangling symlinks match and it is reasonable that trying to glob everything
in a path should return all types of files (such as for a 'rm *'). Also,
comment #7 shows even more example where GLIBC current behavior is
unexepected.
I avoided adding another GNU specific flag to set this behavior and
instead make it the default. Although this change the semanthic from
previous implementation, I think adding another compat symbol to be
really unecessary as from aforementioned reasons (current behavior not
defined in any standard, general idea of different implementation is
to list dangling symbols).
This also sync glob with gnulib commit fd1daf4 (glob: match dangling
symlinks).
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.
[BZ #866]
[BZ #1062]
* posix/Makefile (tests): Remove bug-glob1 and tst-glob_symlinks.
* posix/bug-glob1.c: Remove file.
* posix/tst-glob_symlinks.c: New file.
* posix/glob.c (__lstat64): New macro.
(is_dir): New function.
(glob, glob_in_dir): Match symlinks even if they are dangling.
(link_stat, link_exists_p): Remove. All uses removed.
2017-09-04 19:22:28 +00:00
|
|
|
/* Test glob danglin symlink match (BZ #866).
|
2019-01-01 00:11:28 +00:00
|
|
|
Copyright (C) 2017-2019 Free Software Foundation, Inc.
|
posix: Allow glob to match dangling symlinks [BZ #866]
This patch makes glob match dangling symlinks. Compared to other glob
implementation (*BSD, bash, musl, and other shells as well), GLIBC seems
the be the only one that does not match dangling symlinks. As for
comment #5 in BZ #866, POSIX does not have any strict specification for
dangling symlinks match and it is reasonable that trying to glob everything
in a path should return all types of files (such as for a 'rm *'). Also,
comment #7 shows even more example where GLIBC current behavior is
unexepected.
I avoided adding another GNU specific flag to set this behavior and
instead make it the default. Although this change the semanthic from
previous implementation, I think adding another compat symbol to be
really unecessary as from aforementioned reasons (current behavior not
defined in any standard, general idea of different implementation is
to list dangling symbols).
This also sync glob with gnulib commit fd1daf4 (glob: match dangling
symlinks).
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.
[BZ #866]
[BZ #1062]
* posix/Makefile (tests): Remove bug-glob1 and tst-glob_symlinks.
* posix/bug-glob1.c: Remove file.
* posix/tst-glob_symlinks.c: New file.
* posix/glob.c (__lstat64): New macro.
(is_dir): New function.
(glob, glob_in_dir): Match symlinks even if they are dangling.
(link_stat, link_exists_p): Remove. All uses removed.
2017-09-04 19:22:28 +00:00
|
|
|
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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
posix: Allow glob to match dangling symlinks [BZ #866]
This patch makes glob match dangling symlinks. Compared to other glob
implementation (*BSD, bash, musl, and other shells as well), GLIBC seems
the be the only one that does not match dangling symlinks. As for
comment #5 in BZ #866, POSIX does not have any strict specification for
dangling symlinks match and it is reasonable that trying to glob everything
in a path should return all types of files (such as for a 'rm *'). Also,
comment #7 shows even more example where GLIBC current behavior is
unexepected.
I avoided adding another GNU specific flag to set this behavior and
instead make it the default. Although this change the semanthic from
previous implementation, I think adding another compat symbol to be
really unecessary as from aforementioned reasons (current behavior not
defined in any standard, general idea of different implementation is
to list dangling symbols).
This also sync glob with gnulib commit fd1daf4 (glob: match dangling
symlinks).
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.
[BZ #866]
[BZ #1062]
* posix/Makefile (tests): Remove bug-glob1 and tst-glob_symlinks.
* posix/bug-glob1.c: Remove file.
* posix/tst-glob_symlinks.c: New file.
* posix/glob.c (__lstat64): New macro.
(is_dir): New function.
(glob, glob_in_dir): Match symlinks even if they are dangling.
(link_stat, link_exists_p): Remove. All uses removed.
2017-09-04 19:22:28 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <glob.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#include <support/check.h>
|
|
|
|
#include <support/temp_file.h>
|
|
|
|
|
|
|
|
static void do_prepare (int argc, char *argv[]);
|
|
|
|
#define PREPARE do_prepare
|
|
|
|
static int do_test (void);
|
|
|
|
#include <support/test-driver.c>
|
|
|
|
|
|
|
|
/* Maximum number of symlink calls for create_link function. */
|
|
|
|
#define MAX_CREATE_LINK_TRIES 10
|
|
|
|
|
|
|
|
static void
|
|
|
|
create_link (const char *base, const char *fname, char *linkname,
|
|
|
|
size_t linknamesize)
|
|
|
|
{
|
|
|
|
int ntries = 0;
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
snprintf (linkname, linknamesize, "%s/%s%02d", test_dir, base,
|
|
|
|
ntries);
|
|
|
|
if (symlink (fname, linkname) == 0)
|
|
|
|
break;
|
|
|
|
if (errno != EEXIST)
|
|
|
|
FAIL_EXIT1 ("symlink failed: %m");
|
|
|
|
if (ntries++ == MAX_CREATE_LINK_TRIES)
|
|
|
|
FAIL_EXIT1 ("symlink failed with EEXIST too many times");
|
|
|
|
}
|
|
|
|
add_temp_file (linkname);
|
|
|
|
}
|
|
|
|
|
2018-01-06 21:19:13 +00:00
|
|
|
#ifndef PATH_MAX
|
|
|
|
# define PATH_MAX 1024
|
|
|
|
#endif
|
posix: Allow glob to match dangling symlinks [BZ #866]
This patch makes glob match dangling symlinks. Compared to other glob
implementation (*BSD, bash, musl, and other shells as well), GLIBC seems
the be the only one that does not match dangling symlinks. As for
comment #5 in BZ #866, POSIX does not have any strict specification for
dangling symlinks match and it is reasonable that trying to glob everything
in a path should return all types of files (such as for a 'rm *'). Also,
comment #7 shows even more example where GLIBC current behavior is
unexepected.
I avoided adding another GNU specific flag to set this behavior and
instead make it the default. Although this change the semanthic from
previous implementation, I think adding another compat symbol to be
really unecessary as from aforementioned reasons (current behavior not
defined in any standard, general idea of different implementation is
to list dangling symbols).
This also sync glob with gnulib commit fd1daf4 (glob: match dangling
symlinks).
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.
[BZ #866]
[BZ #1062]
* posix/Makefile (tests): Remove bug-glob1 and tst-glob_symlinks.
* posix/bug-glob1.c: Remove file.
* posix/tst-glob_symlinks.c: New file.
* posix/glob.c (__lstat64): New macro.
(is_dir): New function.
(glob, glob_in_dir): Match symlinks even if they are dangling.
(link_stat, link_exists_p): Remove. All uses removed.
2017-09-04 19:22:28 +00:00
|
|
|
static char valid_link[PATH_MAX];
|
|
|
|
static char dangling_link[PATH_MAX];
|
|
|
|
static char dangling_dir[PATH_MAX];
|
|
|
|
|
|
|
|
static void
|
|
|
|
do_prepare (int argc, char *argv[])
|
|
|
|
{
|
|
|
|
char *fname;
|
|
|
|
|
|
|
|
create_temp_file ("tst-glob_symlinks.", &fname);
|
|
|
|
|
|
|
|
/* Create an existing symlink. */
|
|
|
|
create_link ("valid-symlink-tst-glob_symlinks", fname, valid_link,
|
|
|
|
sizeof valid_link);
|
|
|
|
|
|
|
|
/* Create a dangling symlink to a file. */
|
|
|
|
int fd = create_temp_file ("dangling-tst-glob_file", &fname);
|
|
|
|
TEST_VERIFY_EXIT (close (fd) == 0);
|
|
|
|
/* It throws a warning at process end due 'add_temp_file' trying to
|
|
|
|
unlink it again. */
|
|
|
|
TEST_VERIFY_EXIT (unlink (fname) == 0);
|
|
|
|
create_link ("dangling-symlink-file-tst-glob", fname, dangling_link,
|
|
|
|
sizeof dangling_link);
|
|
|
|
|
|
|
|
/* Create a dangling symlink to a directory. */
|
|
|
|
char tmpdir[PATH_MAX];
|
|
|
|
snprintf (tmpdir, sizeof tmpdir, "%s/dangling-tst-glob_folder.XXXXXX",
|
|
|
|
test_dir);
|
|
|
|
TEST_VERIFY_EXIT (mkdtemp (tmpdir) != NULL);
|
|
|
|
create_link ("dangling-symlink-dir-tst-glob", tmpdir, dangling_dir,
|
|
|
|
sizeof dangling_dir);
|
|
|
|
TEST_VERIFY_EXIT (rmdir (tmpdir) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
do_test (void)
|
|
|
|
{
|
Fix truncation warnings in posix/tst-glob_symlinks.c.
The test posix/tst-glob_symlinks.c fails to build with GCC mainline:
tst-glob_symlinks.c: In function 'do_test':
tst-glob_symlinks.c:124:30: error: 'snprintf' output may be truncated before the last format character [-Werror=format-truncation=]
snprintf (buf, sizeof buf, "%s?", dangling_link);
^~~~~
tst-glob_symlinks.c:124:3: note: 'snprintf' output between 2 and 4097 bytes into a destination of size 4096
snprintf (buf, sizeof buf, "%s?", dangling_link);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tst-glob_symlinks.c:128:30: error: 'snprintf' output may be truncated before the last format character [-Werror=format-truncation=]
snprintf (buf, sizeof buf, "%s*", dangling_link);
^~~~~
tst-glob_symlinks.c:128:3: note: 'snprintf' output between 2 and 4097 bytes into a destination of size 4096
snprintf (buf, sizeof buf, "%s*", dangling_link);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This patch fixes the test to avoid such truncation warnings by
increasing the buffer in question by one byte, to ensure it can hold
any possible result of %s? or %s* formats where %s comes from a buffer
of size PATH_MAX.
Tested compilation with build-many-glibcs.py for aarch64-linux-gnu.
* posix/tst-glob_symlinks.c (do_test): Increase size of buf.
2017-12-18 22:54:01 +00:00
|
|
|
char buf[PATH_MAX + 1];
|
posix: Allow glob to match dangling symlinks [BZ #866]
This patch makes glob match dangling symlinks. Compared to other glob
implementation (*BSD, bash, musl, and other shells as well), GLIBC seems
the be the only one that does not match dangling symlinks. As for
comment #5 in BZ #866, POSIX does not have any strict specification for
dangling symlinks match and it is reasonable that trying to glob everything
in a path should return all types of files (such as for a 'rm *'). Also,
comment #7 shows even more example where GLIBC current behavior is
unexepected.
I avoided adding another GNU specific flag to set this behavior and
instead make it the default. Although this change the semanthic from
previous implementation, I think adding another compat symbol to be
really unecessary as from aforementioned reasons (current behavior not
defined in any standard, general idea of different implementation is
to list dangling symbols).
This also sync glob with gnulib commit fd1daf4 (glob: match dangling
symlinks).
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.
[BZ #866]
[BZ #1062]
* posix/Makefile (tests): Remove bug-glob1 and tst-glob_symlinks.
* posix/bug-glob1.c: Remove file.
* posix/tst-glob_symlinks.c: New file.
* posix/glob.c (__lstat64): New macro.
(is_dir): New function.
(glob, glob_in_dir): Match symlinks even if they are dangling.
(link_stat, link_exists_p): Remove. All uses removed.
2017-09-04 19:22:28 +00:00
|
|
|
glob_t gl;
|
|
|
|
|
|
|
|
TEST_VERIFY_EXIT (glob (valid_link, 0, NULL, &gl) == 0);
|
|
|
|
TEST_VERIFY_EXIT (gl.gl_pathc == 1);
|
|
|
|
TEST_VERIFY_EXIT (strcmp (gl.gl_pathv[0], valid_link) == 0);
|
|
|
|
globfree (&gl);
|
|
|
|
|
|
|
|
TEST_VERIFY_EXIT (glob (dangling_link, 0, NULL, &gl) == 0);
|
|
|
|
TEST_VERIFY_EXIT (gl.gl_pathc == 1);
|
|
|
|
TEST_VERIFY_EXIT (strcmp (gl.gl_pathv[0], dangling_link) == 0);
|
|
|
|
globfree (&gl);
|
|
|
|
|
|
|
|
TEST_VERIFY_EXIT (glob (dangling_dir, 0, NULL, &gl) == 0);
|
|
|
|
TEST_VERIFY_EXIT (gl.gl_pathc == 1);
|
|
|
|
TEST_VERIFY_EXIT (strcmp (gl.gl_pathv[0], dangling_dir) == 0);
|
|
|
|
globfree (&gl);
|
|
|
|
|
|
|
|
snprintf (buf, sizeof buf, "%s", dangling_link);
|
|
|
|
buf[strlen(buf) - 1] = '?';
|
|
|
|
TEST_VERIFY_EXIT (glob (buf, 0, NULL, &gl) == 0);
|
|
|
|
TEST_VERIFY_EXIT (gl.gl_pathc == 1);
|
|
|
|
TEST_VERIFY_EXIT (strcmp (gl.gl_pathv[0], dangling_link) == 0);
|
|
|
|
globfree (&gl);
|
|
|
|
|
|
|
|
/* glob should handle dangling symbol as normal file, so <file>? should
|
|
|
|
return an empty string. */
|
|
|
|
snprintf (buf, sizeof buf, "%s?", dangling_link);
|
|
|
|
TEST_VERIFY_EXIT (glob (buf, 0, NULL, &gl) != 0);
|
|
|
|
globfree (&gl);
|
|
|
|
|
|
|
|
snprintf (buf, sizeof buf, "%s*", dangling_link);
|
|
|
|
TEST_VERIFY_EXIT (glob (buf, 0, NULL, &gl) == 0);
|
|
|
|
TEST_VERIFY_EXIT (gl.gl_pathc == 1);
|
|
|
|
TEST_VERIFY_EXIT (strcmp (gl.gl_pathv[0], dangling_link) == 0);
|
|
|
|
globfree (&gl);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|