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.

13 files changed, 73 insertions, 63 deletions

diff --git a/ChangeLog b/ChangeLog
index f899c07366..6a4bf52c1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2000-08-12  Andreas Jaeger  <aj@suse.de>
 
 	* include/features.h (__STDC_ISO_10646__): Define.
diff --git a/NEWS b/NEWS
index 7e433e2d45..7aaf58ad08 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2000-08-11
+GNU C Library NEWS -- history of user-visible changes.  2000-08-13
 
 Copyright (C) 1992-1999, 2000 Free Software Foundation, Inc.
 See the end for copying conditions.
@@ -17,6 +17,9 @@ Version 2.2
 
 * The Berkeley db libraries have been removed.
 
+  Related, the nss_db module is now in a separate package since it
+  obviously requires a database library being available.
+
 * Wide character I/O streams implemented by Ulrich Drepper.
 
 * Functions from the extended socket API added by Ulrich Drepper.
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;
+}
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/time.h b/sysdeps/unix/sysv/linux/alpha/bits/time.h
index bbf93f6952..ed9382bda6 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/time.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/time.h
@@ -1,5 +1,5 @@
 /* System-dependent timing definitions.  Linux/Alpha version.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -39,12 +39,6 @@
 #   define CLK_TCK 1024
 #  endif
 
-/* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME	0
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h
index 445ca94e8f..13c389846f 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/types.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h
@@ -83,6 +83,12 @@ typedef long int __swblk_t;		/* Type of a swap block maybe?  */
 typedef long int __clock_t;
 typedef int __key_t;			/* Type of a SYSV IPC key. */
 
+/* Clock ID used in clock and timer functions.  */
+typedef int __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+typedef int __timer_t;
+
 /* Used in `struct shmid_ds'.  */
 typedef int __ipc_pid_t;
 
diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h
index d827193146..c5ff93035a 100644
--- a/sysdeps/unix/sysv/linux/bits/time.h
+++ b/sysdeps/unix/sysv/linux/bits/time.h
@@ -1,5 +1,5 @@
 /* System-dependent timing definitions.  Linux version.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -39,12 +39,6 @@
 #   define CLK_TCK 100
 #  endif
 
-/* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME	0
diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h
index a45b452534..d96ee32cf0 100644
--- a/sysdeps/unix/sysv/linux/bits/types.h
+++ b/sysdeps/unix/sysv/linux/bits/types.h
@@ -87,6 +87,13 @@ typedef long int __swblk_t;		/* Type of a swap block maybe?  */
 
 typedef long int __clock_t;
 
+/* Clock ID used in clock and timer functions.  */
+typedef int __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+typedef int __timer_t;
+
+
 /* One element in the file descriptor mask array.  */
 typedef unsigned long int __fd_mask;
 
diff --git a/sysdeps/unix/sysv/linux/i386/bits/time.h b/sysdeps/unix/sysv/linux/i386/bits/time.h
index fd143634e5..3e515aac47 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/time.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/time.h
@@ -39,12 +39,6 @@
 #   define CLK_TCK 100
 #  endif
 
-/* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME		0
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/types.h b/sysdeps/unix/sysv/linux/ia64/bits/types.h
index 4f37db4cce..9492c2133c 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/types.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/types.h
@@ -82,6 +82,12 @@ typedef long int __swblk_t;		/* Type of a swap block maybe?  */
 typedef long int __clock_t;
 typedef int __key_t;			/* Type of a SYSV IPC key. */
 
+/* Clock ID used in clock and timer functions.  */
+typedef int __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+typedef int __timer_t;
+
 /* Used in `struct shmid_ds'.  */
 typedef int __ipc_pid_t;
 
diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h
index 818b9479c3..927d6098dc 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/types.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/types.h
@@ -87,6 +87,12 @@ typedef long int __swblk_t;		/* Type of a swap block maybe?  */
 
 typedef long int __clock_t;
 
+/* Clock ID used in clock and timer functions.  */
+typedef int __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+typedef int __timer_t;
+
 /* One element in the file descriptor mask array.  */
 typedef unsigned long int __fd_mask;
 
diff --git a/sysdeps/unix/sysv/linux/s390/bits/time.h b/sysdeps/unix/sysv/linux/s390/bits/time.h
index dd1b0512b2..4e06a4b9e9 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/time.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/time.h
@@ -39,12 +39,6 @@
 #   define CLK_TCK 100
 #  endif
 
-/* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME		0
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types.h b/sysdeps/unix/sysv/linux/sparc/bits/types.h
index 78d85ab516..0cfd271e9b 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/types.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/types.h
@@ -104,6 +104,12 @@ typedef long int __swblk_t;		/* Type of a swap block maybe?  */
 
 typedef long int __clock_t;
 
+/* Clock ID used in clock and timer functions.  */
+typedef int __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+typedef int __timer_t;
+
 /* One element in the file descriptor mask array.  */
 typedef unsigned long int __fd_mask;