Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* posix/Makefile: Add rules to build and run bug-glob1.
	* posix/bug-glob1.c: New file.
  • Loading branch information
Ulrich Drepper committed Sep 30, 2004
1 parent c4f4ef8 commit 0da4ee5
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 1 deletion.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2004-09-30 Ulrich Drepper <drepper@redhat.com>

* posix/Makefile: Add rules to build and run bug-glob1.
* posix/bug-glob1.c: New file.

* iconv/iconv_prog.c (main): Print progress information to stderr.

* nscd/nscd.c (termination_handler): Reset timestamp so that
Expand Down
3 changes: 2 additions & 1 deletion posix/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ tests := tstgetopt testfnm runtests runptests \
bug-regex21 bug-regex22 bug-regex23 tst-nice tst-nanosleep \
transbug tst-rxspencer tst-pcre tst-boost \
bug-ga1 tst-vfork1 tst-vfork2 tst-waitid \
tst-getaddrinfo2
tst-getaddrinfo2 bug-glob1
xtests := bug-ga2
ifeq (yes,$(build-shared))
test-srcs := globtest
Expand Down Expand Up @@ -172,6 +172,7 @@ tst-rxspencer-ARGS = --utf8 rxspencer/tests
tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata
tst-pcre-ARGS = PCRE.tests
tst-boost-ARGS = BOOST.tests
bug-glob1-ARGS = "$(objpfx)"

testcases.h: TESTS TESTS2C.sed
sed -f TESTS2C.sed < $< > $@T
Expand Down
82 changes: 82 additions & 0 deletions posix/bug-glob1.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/* Test case for globbing dangling symlink. By Ulrich Drepper. */
#include <errno.h>
#include <error.h>
#include <glob.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>


static void prepare (int argc, char *argv[]);
#define PREPARE prepare
static int do_test (void);
#define TEST_FUNCTION do_test ()

#include "../test-skeleton.c"


static char *fname;

static void
prepare (int argc, char *argv[])
{
if (argc < 2)
error (EXIT_FAILURE, 0, "missing argument");

size_t len = strlen (argv[1]);
static const char ext[] = "globXXXXXX";
fname = malloc (len + 1 + sizeof (ext));
if (fname == NULL)
error (EXIT_FAILURE, errno, "cannot create temp file");
strcpy (stpcpy (stpcpy (fname, argv[1]), "/"), ext);
fname = mktemp (fname);
if (fname == NULL || *fname == '\0')
error (EXIT_FAILURE, errno, "cannot create temp file name");
if (symlink ("bug-glob1-does-not-exist", fname) != 0)
error (EXIT_FAILURE, errno, "cannot create symlink");
add_temp_file (fname);
}


static int
do_test (void)
{
glob_t gl;
int retval = 0;
int e;

e = glob (fname, 0, NULL, &gl);
if (e == 0)
{
printf ("glob(\"%s\") succeeded\n", fname);
retval = 1;
}
globfree (&gl);

size_t fnamelen = strlen (fname);
char buf[fnamelen + 2];

strcpy (buf, fname);
buf[fnamelen - 1] = '?';
e = glob (buf, 0, NULL, &gl);
if (e == 0)
{
printf ("glob(\"%s\") succeeded\n", buf);
retval = 1;
}
globfree (&gl);

strcpy (buf, fname);
buf[fnamelen] = '*';
buf[fnamelen + 1] = '\0';
e = glob (buf, 0, NULL, &gl);
if (e == 0)
{
printf ("glob(\"%s\") succeeded\n", buf);
retval = 1;
}
globfree (&gl);

return retval;
}

0 comments on commit 0da4ee5

Please sign in to comment.