diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-14 06:17:28 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-14 06:17:28 +0000 |
| commit | 47b853e80188cd79fe0a6b444ed35be7ad3448ed (patch) | |
| tree | 271a3e2afd8e4284256324f417530bda6af2d1fc /posix | |
| parent | 91bc38d09ce2df68d5f03e88df144243907437da (diff) | |
| download | glibc-47b853e80188cd79fe0a6b444ed35be7ad3448ed.tar.gz glibc-47b853e80188cd79fe0a6b444ed35be7ad3448ed.tar.xz glibc-47b853e80188cd79fe0a6b444ed35be7ad3448ed.zip | |
Update.
2000-08-13 Ulrich Drepper <drepper@redhat.com> * posix/Makefile: Remove rules to generate glob package. * posix/Makefile (tests): Add tst-regexloc. (tst-regexloc-ENV): Add LOCPATH. * posix/tst-regexloc.c: New file.
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/Makefile | 38 | ||||
| -rw-r--r-- | posix/tst-regexloc.c | 26 |
2 files changed, 28 insertions, 36 deletions
diff --git a/posix/Makefile b/posix/Makefile index 46c1fed620..8745462a26 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -68,7 +68,7 @@ aux := init-posix environ tests := tstgetopt testfnm runtests runptests \ tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \ tst-getlogin tst-mmap tst-getaddrinfo tst-truncate \ - tst-truncate64 tst-fork tst-fnmatch + tst-truncate64 tst-fork tst-fnmatch tst-regexloc ifeq (yes,$(build-shared)) test-srcs := globtest tests += wordexp-test tst-exec tst-spawn @@ -107,6 +107,7 @@ tst-exec-ARGS = -- $(built-program-cmd) tst-spawn-ARGS = -- $(built-program-cmd) tst-fnmatch-ENV = LOCPATH=$(common-objpfx)localedata +tst-regexloc-ENV = LOCPATH=$(common-objpfx)localedata testcases.h: TESTS TESTS2C.sed sed -f TESTS2C.sed < $< > $@T @@ -121,41 +122,6 @@ ptestcases.h: PTESTS PTESTS2C.sed ifeq ($(with-cvs),yes) test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@ endif - -# Make the standalone glob/fnmatch package. - -glob.tar: glob/ChangeLog glob/COPYING.LIB \ - glob/Makefile.in glob/configure glob/configure.in glob/configure.bat\ - glob/SCOPTIONS glob/SMakefile glob/Makefile.ami \ - glob/fnmatch.h glob/glob.h glob/fnmatch.c glob/glob.c - tar cho$(verbose)f $@ $^ -glob/%.c: %.c - rm -f $@ - ln -s ../$< $@ -glob/%.h: %.h - rm -f $@ - ln -s ../$< $@ - -glob/configure: glob/configure.in - cd glob && autoconf $(ACFLAGS) -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@ -endif - -glob/ChangeLog: ../ChangeLog - changelog-extract --regexp 'posix/(glob|fnmatch).*' < $< > $@.new - chmod a-w $@.new - mv -f $@.new $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@ -endif - -%.Z: % - compress -c $< > $@-tmp - mv $@-tmp $@ -%.gz: % - gzip -9v -c $< > $@-tmp - mv $@-tmp $@ # Run a test on the header files we use. # XXX Please note that for now we ignore the result of this test. diff --git a/posix/tst-regexloc.c b/posix/tst-regexloc.c new file mode 100644 index 0000000000..49872a80df --- /dev/null +++ b/posix/tst-regexloc.c @@ -0,0 +1,26 @@ +#include <sys/types.h> +#include <regex.h> +#include <locale.h> +#include <stdio.h> + +int +main (int argc, char *argv[]) +{ + regex_t re; + regmatch_t mat[1]; + int res = 1; + + if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL) + puts ("cannot set locale"); + else if (regcomp (&re, "[a-f]*", 0) != REG_NOERROR) + puts ("cannot compile expression \"[a-f]*\""); + else if (regexec (&re, "abcdefCDEF", 1, mat, 0) == REG_NOMATCH) + puts ("no match"); + else + { + printf ("match from %d to %d\n", mat[0].rm_so, mat[0].rm_eo); + res = mat[0].rm_so != 0 || mat[0].rm_eo != 6; + } + + return res; +} |