Imported Upstream version 0.19

54 files changed, 1410 insertions, 626 deletions

diff --git a/ChangeLog b/ChangeLog
index 26f70af..dd4aa4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+2008-03-03  Miloslav Trmač  <mitr@redhat.com>
+
+	* configure.ac: Version 0.19.
+	* NEWS: Update.
+
+	* src/conf.h (conf_debug_pruning): New declaration.
+	* src/updatedb.c (rebuild_bind_mount_paths)
+	(filesystem_is_excluded, scan): Print detailed information about pruning
+	decisions to stderr if conf_debug_pruning.
+	* src/conf.c (conf_debug_pruning): New variable.
+	(parse_arguments): Handle --debug-pruning.
+	(conf_prepare): Print conf_block to stderr if conf_debug_pruning.
+	* doc/updatedb.8.in: Document --debug-pruning.
+	* tests/config.at (config: --debug-pruning): Add a M_CONF_UNTESTED note.
+
+	* po/Makevars (MSGID_BUGS_ADDRESS): Update.  (This makes
+	(intltool-update -p) work, and should fix Transifex.)
+
+2008-03-02  Miloslav Trmač  <mitr@redhat.com>
+
+	* tests/locate.at (locate: LOCATE_PATH): Don't assume the our full
+	path doesn't contain "/f".
+
+	* README: Point to the new home page.
+
+2008-02-12  Miloslav Trmač  <mitr@redhat.com>
+
+	* doc/locate.1.in
+	* doc/updatedb.8.in: Fix typos.  Patch by A. Costa <agcosta@gis.net>.
+
+2007-12-13  Miloslav Trmač  <mitr@redhat.com>
+
+	* src/updatedb.c (main): Report what group we were trying to reassign
+	the file to on failure.
+
+2007-10-16  Miloslav Trmač  <mitr@redhat.com>
+
+	* gnulib/m4/gnulib-cache.m4 (gl_MODULES): Use module gettext-h.
+	* src/lib.h: #include "gettext.h" instead of <libintl.h>.
+	(gettext, ngettext): Remove macros.  gettext.h provides them along with
+	bindtextdomain() and textdomain().
+
+	* tests/locate.at (locate: -S): Don't rely on GNU sed's \?.  Patch by
+	Steve Edwards <sgedward@korime.demon.co.uk>.
+
+	* src/lib.c (htonll, dir_path_cmp, db_open, db_refill)
+	* src/updatedb.c (copy_old_dir, new_db_open): Move verify () among
+	declarations in a block, it is implemented as an extern declaration.
+
+	* src/updatedb.c (scan_subdirs): Remove useless duplicate "const".
+	Patch by Steve Edwards <sgedward@korime.demon.co.uk>.
+
 2007-08-25  Miloslav Trmač  <mitr@redhat.com>
 
 	* configure.ac: Release 0.18.
diff --git a/Makefile.in b/Makefile.in
index 074329d..c2a09e4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,6 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
 	$(top_srcdir)/gnulib/m4/stdint.m4 \
 	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
 	$(top_srcdir)/gnulib/m4/strchrnul.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
 	$(top_srcdir)/gnulib/m4/string_h.m4 \
 	$(top_srcdir)/gnulib/m4/strnlen.m4 \
 	$(top_srcdir)/gnulib/m4/time_h.m4 \
@@ -207,6 +208,7 @@ FNMATCH_H = @FNMATCH_H@
 GETOPT_H = @GETOPT_H@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
@@ -216,6 +218,7 @@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
 GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
 GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
 GNULIB_MBSCHR = @GNULIB_MBSCHR@
@@ -236,12 +239,14 @@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
 GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
 GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
 GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
 GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
 GNULIB_STRPBRK = @GNULIB_STRPBRK@
@@ -249,10 +254,12 @@ GNULIB_STRSEP = @GNULIB_STRSEP@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
 HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
@@ -264,9 +271,11 @@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
 HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -338,6 +347,7 @@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRPTIME = @REPLACE_STRPTIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
diff --git a/NEWS b/NEWS
index ef471a6..dfe6662 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes in version 0.19:
+- New home page at https://fedorahosted.org/mlocate/ .
+- New updatedb option --debug-pruning.
+- Fix typos in man pages.  Patch by A. Costa <agcosta@gis.net>.
+- Make some aspects of the source code more portable.  Patches by Steve Edwards
+  <sgedward@korime.demon.co.uk>.
+
 Changes in version 0.18:
 - Fix uninitialized memory access when dbpath contains "-"
 - Add some examples to the man pages
diff --git a/README b/README
index 9d259ee..02289ec 100644
--- a/README
+++ b/README
@@ -9,6 +9,8 @@ The locate(1) utility is intended to be completely compatible to slocate.  It
 also attempts to be compatible to GNU locate, when it does not conflict with
 slocate compatibility.
 
+New releases will be available at https://fedorahosted.org/mlocate/ .
+
 Installation
 ============
 Before installation it is necessary to create a group called "mlocate" to allow
@@ -25,5 +27,7 @@ currently tested only on recent Linux distributions.
 
 Bugs
 ====
-Please report bugs to <mitr@redhat.com>.  Bug reports with patches are
-especially welcome.
+Please consider reporting the bug to your distribution's bug tracking system.
+
+Otherwise, report bugs at https://fedorahosted.org/mlocate/ .  Bug reports
+with patches are especially welcome.
diff --git a/aclocal.m4 b/aclocal.m4
index c742b96..6656ce1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -928,6 +928,7 @@ m4_include([gnulib/m4/stdbool.m4])
 m4_include([gnulib/m4/stdint.m4])
 m4_include([gnulib/m4/stdlib_h.m4])
 m4_include([gnulib/m4/strchrnul.m4])
+m4_include([gnulib/m4/strerror.m4])
 m4_include([gnulib/m4/string_h.m4])
 m4_include([gnulib/m4/strnlen.m4])
 m4_include([gnulib/m4/time_h.m4])
diff --git a/configure b/configure
index 0c23c05..ff70809 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mlocate 0.18.
+# Generated by GNU Autoconf 2.61 for mlocate 0.19.
 #
 # Report bugs to <mitr@redhat.com>.
 #
@@ -589,8 +589,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='mlocate'
 PACKAGE_TARNAME='mlocate'
-PACKAGE_VERSION='0.18'
-PACKAGE_STRING='mlocate 0.18'
+PACKAGE_VERSION='0.19'
+PACKAGE_STRING='mlocate 0.19'
 PACKAGE_BUGREPORT='mitr@redhat.com'
 
 ac_unique_file="src/locate.c"
@@ -756,6 +756,7 @@ GNULIB_MBSPBRK
 GNULIB_MBSSPN
 GNULIB_MBSSEP
 GNULIB_MBSTOK_R
+GNULIB_STRERROR
 HAVE_DECL_MEMMEM
 HAVE_MEMPCPY
 HAVE_DECL_MEMRCHR
@@ -772,6 +773,8 @@ HAVE_STRPBRK
 HAVE_STRSEP
 HAVE_STRCASESTR
 HAVE_DECL_STRTOK_R
+HAVE_DECL_STRERROR
+REPLACE_STRERROR
 GNULIB_CHOWN
 GNULIB_DUP2
 GNULIB_FCHDIR
@@ -817,11 +820,17 @@ SIZE_T_SUFFIX
 WCHAR_T_SUFFIX
 WINT_T_SUFFIX
 STDINT_H
+GNULIB_MALLOC_POSIX
+GNULIB_REALLOC_POSIX
+GNULIB_CALLOC_POSIX
 GNULIB_GETSUBOPT
 GNULIB_MKDTEMP
 GNULIB_MKSTEMP
+HAVE_CALLOC_POSIX
 HAVE_GETSUBOPT
+HAVE_MALLOC_POSIX
 HAVE_MKDTEMP
+HAVE_REALLOC_POSIX
 REPLACE_MKSTEMP
 NEXT_STDLIB_H
 NEXT_STRING_H
@@ -1374,7 +1383,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mlocate 0.18 to adapt to many kinds of systems.
+\`configure' configures mlocate 0.19 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1444,7 +1453,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mlocate 0.18:";;
+     short | recursive ) echo "Configuration of mlocate 0.19:";;
    esac
   cat <<\_ACEOF
 
@@ -1541,7 +1550,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mlocate configure 0.18
+mlocate configure 0.19
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1570,7 +1579,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mlocate $as_me 0.18, which was
+It was created by mlocate $as_me 0.19, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1861,6 +1870,7 @@ ac_header_list="$ac_header_list sys/time.h"
 ac_header_list="$ac_header_list stdint.h"
 ac_header_list="$ac_header_list wchar.h"
 ac_header_list="$ac_header_list stdlib.h"
+ac_func_list="$ac_func_list strerror"
 ac_header_list="$ac_header_list string.h"
 ac_header_list="$ac_header_list time.h"
 ac_func_list="$ac_func_list iswcntrl"
@@ -2291,7 +2301,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mlocate'
- VERSION='0.18'
+ VERSION='0.19'
 
 
 # Some tools Automake needs.
@@ -3742,12 +3752,6 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4141,35 +4145,6 @@ echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-
-{ echo "$as_me:$LINENO: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef _AIX
-  yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
-_ACEOF
-
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-rm -f conftest*
-
-
 { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -4413,7 +4388,8 @@ fi
 done
 
 
-if test "${ac_cv_header_minix_config_h+set}" = set; then
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for minix/config.h" >&5
 echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
@@ -4550,7 +4526,7 @@ else
 fi
 
 
-if test "$MINIX" = yes; then
+  if test "$MINIX" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _POSIX_SOURCE 1
@@ -4566,15 +4542,7 @@ cat >>confdefs.h <<\_ACEOF
 #define _MINIX 1
 _ACEOF
 
-fi
-
-
-
-
-
-
-
-
+  fi
 
 
 
@@ -4635,6 +4603,14 @@ echo "${ECHO_T}$ac_cv_safe_to_define___extensions__" >&6; }
 _ACEOF
 
   cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
 #define _POSIX_PTHREAD_SEMANTICS 1
 _ACEOF
 
@@ -4649,7 +4625,6 @@ _ACEOF
 
 
 
-
 # FIXME: we rely on the cache variable name because
 # there is no other way.
 set dummy $CC
@@ -4912,6 +4887,10 @@ else
 # contain a buggy version.  If you still want to use their alloca,
 # use ar to extract alloca.o from them instead of compiling alloca.c.
 
+
+
+
+
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
 cat >>confdefs.h <<\_ACEOF
@@ -7089,6 +7068,7 @@ _ACEOF
   GNULIB_MBSSPN=0;
   GNULIB_MBSSEP=0;
   GNULIB_MBSTOK_R=0;
+  GNULIB_STRERROR=0;
     HAVE_DECL_MEMMEM=1;
   HAVE_MEMPCPY=1;
   HAVE_DECL_MEMRCHR=1;
@@ -7105,6 +7085,8 @@ _ACEOF
   HAVE_STRSEP=1;
   HAVE_STRCASESTR=1;
   HAVE_DECL_STRTOK_R=1;
+  HAVE_DECL_STRERROR=1;
+  REPLACE_STRERROR=0;
 
 { echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
 echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6; }
@@ -7594,11 +7576,17 @@ _ACEOF
 
 
 
+  GNULIB_MALLOC_POSIX=0;
+  GNULIB_REALLOC_POSIX=0;
+  GNULIB_CALLOC_POSIX=0;
   GNULIB_GETSUBOPT=0;
   GNULIB_MKDTEMP=0;
   GNULIB_MKSTEMP=0;
-    HAVE_GETSUBOPT=1;
+    HAVE_CALLOC_POSIX=1;
+  HAVE_GETSUBOPT=1;
+  HAVE_MALLOC_POSIX=1;
   HAVE_MKDTEMP=1;
+  HAVE_REALLOC_POSIX=1;
   REPLACE_MKSTEMP=0;
 
 
@@ -7613,6 +7601,107 @@ _ACEOF
 
 
 
+  :
+
+  if test $ac_cv_func_strerror = no; then
+    HAVE_DECL_STRERROR=0
+    gl_cv_func_working_strerror=no
+  else
+    { echo "$as_me:$LINENO: checking for working strerror function" >&5
+echo $ECHO_N "checking for working strerror function... $ECHO_C" >&6; }
+if test "${gl_cv_func_working_strerror+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#ifndef __INTERIX
+  assuming success
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "assuming success" >/dev/null 2>&1; then
+  gl_cv_func_working_strerror=yes
+else
+  gl_cv_func_working_strerror=no
+fi
+rm -f conftest*
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <string.h>
+
+int
+main ()
+{
+return !*strerror (-2);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_func_working_strerror=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_working_strerror=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $gl_cv_func_working_strerror" >&5
+echo "${ECHO_T}$gl_cv_func_working_strerror" >&6; }
+    if test $gl_cv_func_working_strerror = no ; then
+      REPLACE_STRERROR=1
+    fi
+  fi
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -7846,7 +7935,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
 echo "${ECHO_T}$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
-    if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
+    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     fi
   fi
@@ -8125,7 +8214,15 @@ _ACEOF
 
 
   if test $ac_cv_func_canonicalize_file_name = no; then
-    gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext"
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext"
+
 
 cat >>confdefs.h <<\_ACEOF
 #define realpath rpl_realpath
@@ -8218,7 +8315,17 @@ _ACEOF
 
 
 
-  { echo "$as_me:$LINENO: checking for error_at_line" >&5
+
+
+
+
+
+
+
+
+
+
+{ echo "$as_me:$LINENO: checking for error_at_line" >&5
 echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6; }
 if test "${ac_cv_lib_error_at_line+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8270,7 +8377,15 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5
 echo "${ECHO_T}$ac_cv_lib_error_at_line" >&6; }
 if test $ac_cv_lib_error_at_line = no; then
+
+
+
+
+
+
+
   gl_LIBOBJS="$gl_LIBOBJS error.$ac_objext"
+
 fi
 
 
@@ -8279,8 +8394,16 @@ fi
 
 
 
+
+
+
+
+
+
+
   gl_LIBOBJS="$gl_LIBOBJS exitfail.$ac_objext"
 
+
     :
 
   # No macro. You should also use one of fnmatch-posix or fnmatch-gnu.
@@ -8487,7 +8610,15 @@ fi
 
 
 
-gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext"
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext"
+
 FNMATCH_H=fnmatch.h
 
 fi
@@ -8513,9 +8644,25 @@ _ACEOF
 
   if test -n "$GETOPT_H"; then
 
+
+
+
+
+
+
+
   gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
+
+
+
+
+
+
+
+
   gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
 
+
   GETOPT_H=getopt.h
 
 cat >>confdefs.h <<\_ACEOF
@@ -8646,6 +8793,13 @@ _ACEOF
 
 
 
+
+
+
+
+
+
+
 for ac_func in memchr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -8737,10 +8891,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
 _ACEOF
 
 else
-  gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
+
   if test $ac_cv_func_memchr = no; then
 
 
@@ -8898,6 +9055,13 @@ done
 
 
 
+
+
+
+
+
+
+
 for ac_func in mempcpy
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -8989,10 +9153,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
 _ACEOF
 
 else
-  gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
+
   if test $ac_cv_func_mempcpy = no; then
     HAVE_MEMPCPY=0
 
@@ -9004,7 +9171,17 @@ done
 
   GNULIB_MEMPCPY=1
 
-  { echo "$as_me:$LINENO: checking for obstacks" >&5
+
+
+
+
+
+
+
+
+
+
+{ echo "$as_me:$LINENO: checking for obstacks" >&5
 echo $ECHO_N "checking for obstacks... $ECHO_C" >&6; }
 if test "${ac_cv_func_obstack+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9067,7 +9244,15 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
+
+
+
+
+
+
+
   gl_LIBOBJS="$gl_LIBOBJS obstack.$ac_objext"
+
 fi
 
 
@@ -9088,7 +9273,15 @@ fi
 
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
-    gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
+
 
   :
 
@@ -9099,6 +9292,13 @@ fi
   GNULIB_READLINK=1
 
 
+
+
+
+
+
+
+
   gl_LIBOBJS="$gl_LIBOBJS safe-read.$ac_objext"
 
 
@@ -9106,6 +9306,7 @@ fi
 
 
 
+
   { echo "$as_me:$LINENO: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
 if test "${gt_cv_ssize_t+set}" = set; then
@@ -11132,6 +11333,13 @@ echo "${ECHO_T}$gl_cv_next_stdlib_h" >&6; }
 
 
 
+
+
+
+
+
+
+
 for ac_func in strchrnul
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -11223,10 +11431,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
 _ACEOF
 
 else
-  gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
+
 fi
 done
 
+
   if test $ac_cv_func_strchrnul = no; then
     HAVE_STRCHRNUL=0
     :
@@ -11238,6 +11449,29 @@ done
 
 
 
+  if test $gl_cv_func_working_strerror = no; then
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS strerror.$ac_objext"
+
+
+cat >>confdefs.h <<_ACEOF
+#define REPLACE_STRERROR $REPLACE_STRERROR
+_ACEOF
+
+  fi
+
+
+
+  GNULIB_STRERROR=1
+
+
+
 
 
 
@@ -11325,10 +11559,18 @@ fi
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_strnlen_working" >&5
 echo "${ECHO_T}$ac_cv_func_strnlen_working" >&6; }
-test $ac_cv_func_strnlen_working = no && gl_LIBOBJS="$gl_LIBOBJS strnlen.$ac_objext"
+test $ac_cv_func_strnlen_working = no &&
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS strnlen.$ac_objext"
+
 
   if test $ac_cv_func_strnlen_working = no; then
-    # This is necessary because automake-1.6.1 doens't understand
+    # This is necessary because automake-1.6.1 doesn't understand
     # that the above use of AC_FUNC_STRNLEN means we may have to use
     # lib/strnlen.c.
     #AC_LIBOBJ(strnlen)
@@ -11802,7 +12044,15 @@ echo "${ECHO_T}$gl_cv_func_wcwidth_works" >&6; }
     esac
   fi
   if test $REPLACE_WCWIDTH = 1; then
-    gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext"
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext"
+
   fi
 
   if test $REPLACE_WCWIDTH = 1 || test $HAVE_DECL_WCWIDTH = 0; then
@@ -11814,10 +12064,18 @@ echo "${ECHO_T}$gl_cv_func_wcwidth_works" >&6; }
   GNULIB_WCWIDTH=1
 
 
+
+
+
+
+
+
+
   gl_LIBOBJS="$gl_LIBOBJS xmalloc.$ac_objext"
 
 
 
+
   :
 
 
@@ -14703,7 +14961,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mlocate $as_me 0.18, which was
+This file was extended by mlocate $as_me 0.19, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14756,7 +15014,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mlocate config.status 0.18
+mlocate config.status 0.19
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -15111,6 +15369,7 @@ GNULIB_MBSPBRK!$GNULIB_MBSPBRK$ac_delim
 GNULIB_MBSSPN!$GNULIB_MBSSPN$ac_delim
 GNULIB_MBSSEP!$GNULIB_MBSSEP$ac_delim
 GNULIB_MBSTOK_R!$GNULIB_MBSTOK_R$ac_delim
+GNULIB_STRERROR!$GNULIB_STRERROR$ac_delim
 HAVE_DECL_MEMMEM!$HAVE_DECL_MEMMEM$ac_delim
 HAVE_MEMPCPY!$HAVE_MEMPCPY$ac_delim
 HAVE_DECL_MEMRCHR!$HAVE_DECL_MEMRCHR$ac_delim
@@ -15127,6 +15386,8 @@ HAVE_STRPBRK!$HAVE_STRPBRK$ac_delim
 HAVE_STRSEP!$HAVE_STRSEP$ac_delim
 HAVE_STRCASESTR!$HAVE_STRCASESTR$ac_delim
 HAVE_DECL_STRTOK_R!$HAVE_DECL_STRTOK_R$ac_delim
+HAVE_DECL_STRERROR!$HAVE_DECL_STRERROR$ac_delim
+REPLACE_STRERROR!$REPLACE_STRERROR$ac_delim
 GNULIB_CHOWN!$GNULIB_CHOWN$ac_delim
 GNULIB_DUP2!$GNULIB_DUP2$ac_delim
 GNULIB_FCHDIR!$GNULIB_FCHDIR$ac_delim
@@ -15172,15 +15433,12 @@ SIZE_T_SUFFIX!$SIZE_T_SUFFIX$ac_delim
 WCHAR_T_SUFFIX!$WCHAR_T_SUFFIX$ac_delim
 WINT_T_SUFFIX!$WINT_T_SUFFIX$ac_delim
 STDINT_H!$STDINT_H$ac_delim
+GNULIB_MALLOC_POSIX!$GNULIB_MALLOC_POSIX$ac_delim
+GNULIB_REALLOC_POSIX!$GNULIB_REALLOC_POSIX$ac_delim
+GNULIB_CALLOC_POSIX!$GNULIB_CALLOC_POSIX$ac_delim
 GNULIB_GETSUBOPT!$GNULIB_GETSUBOPT$ac_delim
 GNULIB_MKDTEMP!$GNULIB_MKDTEMP$ac_delim
 GNULIB_MKSTEMP!$GNULIB_MKSTEMP$ac_delim
-HAVE_GETSUBOPT!$HAVE_GETSUBOPT$ac_delim
-HAVE_MKDTEMP!$HAVE_MKDTEMP$ac_delim
-REPLACE_MKSTEMP!$REPLACE_MKSTEMP$ac_delim
-NEXT_STDLIB_H!$NEXT_STDLIB_H$ac_delim
-NEXT_STRING_H!$NEXT_STRING_H$ac_delim
-REPLACE_LOCALTIME_R!$REPLACE_LOCALTIME_R$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -15222,6 +15480,15 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+HAVE_CALLOC_POSIX!$HAVE_CALLOC_POSIX$ac_delim
+HAVE_GETSUBOPT!$HAVE_GETSUBOPT$ac_delim
+HAVE_MALLOC_POSIX!$HAVE_MALLOC_POSIX$ac_delim
+HAVE_MKDTEMP!$HAVE_MKDTEMP$ac_delim
+HAVE_REALLOC_POSIX!$HAVE_REALLOC_POSIX$ac_delim
+REPLACE_MKSTEMP!$REPLACE_MKSTEMP$ac_delim
+NEXT_STDLIB_H!$NEXT_STDLIB_H$ac_delim
+NEXT_STRING_H!$NEXT_STRING_H$ac_delim
+REPLACE_LOCALTIME_R!$REPLACE_LOCALTIME_R$ac_delim
 REPLACE_NANOSLEEP!$REPLACE_NANOSLEEP$ac_delim
 REPLACE_STRPTIME!$REPLACE_STRPTIME$ac_delim
 REPLACE_TIMEGM!$REPLACE_TIMEGM$ac_delim
@@ -15260,7 +15527,7 @@ gl_LIBOBJS!$gl_LIBOBJS$ac_delim
 gl_LTLIBOBJS!$gl_LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 45; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index f7c8e33..ae349bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([mlocate], [0.18], [mitr@redhat.com])
+AC_INIT([mlocate], [0.19], [mitr@redhat.com])
 AC_COPYRIGHT(
 [Copyright (C) 2005, 2006, 2007 Red Hat, Inc. All rights reserved.
 This copyrighted material is made available to anyone wishing to use, modify,
diff --git a/doc/locate.1.in b/doc/locate.1.in
index a35fa08..9ab9bf3 100644
--- a/doc/locate.1.in
+++ b/doc/locate.1.in
@@ -112,7 +112,7 @@ The opposite can be specified using \fB\-\-nofollow\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Write a summary of the available options to standard output
-and exit sucessfully.
+and exit successfully.
 
 .TP
 \fB\-i\fR, \fB\-\-ignore\-case\fR
@@ -152,7 +152,7 @@ Separate the entries on output using the
 .SM ASCII NUL
 character instead of
 writing each entry on a separate line.
-This option is designed for interoprerability with the
+This option is designed for interoperability with the
 .B \-\-null
 option of
 .SM GNU
@@ -191,7 +191,7 @@ and
 \fB\-V\fR, \fB\-\-version\fR
 Write information about the version and licence of
 .B locate
-on standard output and exit sucessfully.
+on standard output and exit successfully.
 
 .TP
 \fB\-w\fR, \fB\-\-wholename\fR
diff --git a/doc/updatedb.8.in b/doc/updatedb.8.in
index 8cc216d..a103b5c 100644
--- a/doc/updatedb.8.in
+++ b/doc/updatedb.8.in
@@ -1,6 +1,6 @@
 .\" A man page for updatedb(8). -*- nroff -*-
 .\"
-.\" Copyright (C) 2005, 2007 Red Hat, Inc. All rights reserved.
+.\" Copyright (C) 2005, 2007, 2008 Red Hat, Inc. All rights reserved.
 .\"
 .\" This copyrighted material is made available to anyone wishing to use,
 .\" modify, copy, or redistribute it subject to the terms and conditions of the
@@ -66,13 +66,17 @@ the generated database.
 The whole file system is scanned by default.
 
 .BR locate (1)
-outputs entries as absolute path names which don't contain symblic links,
+outputs entries as absolute path names which don't contain symbolic links,
 regardless of the form of \fIPATH\fR.
 
 .TP
+\fB\-\-debug\-pruning\fR
+Write debugging infromation about pruning decisions to standard error output.
+
+.TP
 \fB\-h\fR, \fB\-\-help\fR
 Write a summary of the available options to standard output
-and exit sucessfully.
+and exit successfully.
 
 .TP
 \fB\-o\fR, \fB\-\-output\fR \fIFILE\fR
@@ -136,7 +140,7 @@ Output path names of files to standard output, as soon as they are found.
 \fB\-V\fR, \fB\-\-version\fR
 Write information about the version and licence of
 .B locate
-on standard output and exit sucessfully.
+on standard output and exit successfully.
 
 .SH EXAMPLES
 To create a private mlocate database as an user other than \fBroot\fR,
diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
index a6aa965..ce50e76 100644
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=admin --no-libtool --macro-prefix=gl canonicalize-lgpl config-h d-type error fnmatch-gnu fwriteerror getopt mbsstr mempcpy obstack progname safe-read stat-time strchrnul timespec verify xalloc
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=admin --no-libtool --macro-prefix=gl canonicalize-lgpl config-h d-type error fnmatch-gnu fwriteerror getopt gettext-h mbsstr mempcpy obstack progname safe-read stat-time strchrnul timespec verify xalloc
 
 AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
 
@@ -60,14 +60,14 @@ BUILT_SOURCES += $(ALLOCA_H)
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-alloca.h: alloca_.h
+alloca.h: alloca.in.h
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/alloca_.h; \
+	  cat $(srcdir)/alloca.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
-EXTRA_DIST += alloca_.h
+EXTRA_DIST += alloca.in.h
 
 ## end   gnulib module alloca-opt
 
@@ -160,14 +160,14 @@ BUILT_SOURCES += $(FNMATCH_H)
 
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
-fnmatch.h: fnmatch_.h
+fnmatch.h: fnmatch.in.h
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/fnmatch_.h; \
+	  cat $(srcdir)/fnmatch.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
 
-EXTRA_DIST += fnmatch.c fnmatch_.h fnmatch_loop.c
+EXTRA_DIST += fnmatch.c fnmatch.in.h fnmatch_loop.c
 
 EXTRA_libgnu_a_SOURCES += fnmatch.c fnmatch_loop.c
 
@@ -185,14 +185,14 @@ BUILT_SOURCES += $(GETOPT_H)
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt_.h
+getopt.h: getopt.in.h
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/getopt_.h; \
+	  cat $(srcdir)/getopt.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
-EXTRA_DIST += getopt.c getopt1.c getopt_.h getopt_int.h
+EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h
 
 EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
 
@@ -375,15 +375,15 @@ BUILT_SOURCES += $(STDBOOL_H)
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-stdbool.h: stdbool_.h
+stdbool.h: stdbool.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h; \
+	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
-EXTRA_DIST += stdbool_.h
+EXTRA_DIST += stdbool.in.h
 
 ## end   gnulib module stdbool
 
@@ -393,7 +393,7 @@ BUILT_SOURCES += $(STDINT_H)
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-stdint.h: stdint_.h
+stdint.h: stdint.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
@@ -418,12 +418,12 @@ stdint.h: stdint_.h
 	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
 	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
 	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-	      < $(srcdir)/stdint_.h; \
+	      < $(srcdir)/stdint.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 
-EXTRA_DIST += stdint_.h
+EXTRA_DIST += stdint.in.h
 
 ## end   gnulib module stdint
 
@@ -433,24 +433,30 @@ BUILT_SOURCES += stdlib.h
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib_.h
+stdlib.h: stdlib.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
 	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
 	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
 	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	      < $(srcdir)/stdlib_.h; \
+	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
 
-EXTRA_DIST += stdlib_.h
+EXTRA_DIST += stdlib.in.h
 
 ## end   gnulib module stdlib
 
@@ -470,13 +476,22 @@ EXTRA_DIST += streq.h
 
 ## end   gnulib module streq
 
+## begin gnulib module strerror
+
+
+EXTRA_DIST += strerror.c
+
+EXTRA_libgnu_a_SOURCES += strerror.c
+
+## end   gnulib module strerror
+
 ## begin gnulib module string
 
 BUILT_SOURCES += string.h
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string_.h
+string.h: string.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -508,6 +523,7 @@ string.h: string_.h
 	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
 	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
 	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
 	      -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
@@ -524,13 +540,15 @@ string.h: string_.h
 	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
 	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
+	      -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \
+	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	      < $(srcdir)/string_.h; \
+	      < $(srcdir)/string.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += string.h string.h-t
 
-EXTRA_DIST += string_.h
+EXTRA_DIST += string.in.h
 
 ## end   gnulib module string
 
@@ -555,7 +573,7 @@ BUILT_SOURCES += time.h
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time_.h
+time.h: time.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -566,12 +584,12 @@ time.h: time_.h
 	      -e 's|@REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
 	      -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
-	      < $(srcdir)/time_.h; \
+	      < $(srcdir)/time.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += time.h time.h-t
 
-EXTRA_DIST += time_.h
+EXTRA_DIST += time.in.h
 
 ## end   gnulib module time
 
@@ -588,7 +606,7 @@ BUILT_SOURCES += unistd.h
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd_.h
+unistd.h: unistd.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
@@ -614,12 +632,12 @@ unistd.h: unistd_.h
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
-	      < $(srcdir)/unistd_.h; \
+	      < $(srcdir)/unistd.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += unistd.h unistd.h-t
 
-EXTRA_DIST += unistd_.h
+EXTRA_DIST += unistd.in.h
 
 ## end   gnulib module unistd
 
@@ -657,7 +675,7 @@ BUILT_SOURCES += $(WCHAR_H)
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar_.h
+wchar.h: wchar.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -667,12 +685,12 @@ wchar.h: wchar_.h
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	    < $(srcdir)/wchar_.h; \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
 
-EXTRA_DIST += wchar_.h
+EXTRA_DIST += wchar.in.h
 
 ## end   gnulib module wchar
 
@@ -682,7 +700,7 @@ BUILT_SOURCES += $(WCTYPE_H)
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype_.h
+wctype.h: wctype.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
@@ -690,12 +708,12 @@ wctype.h: wctype_.h
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      < $(srcdir)/wctype_.h; \
+	      < $(srcdir)/wctype.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
 
-EXTRA_DIST += wctype_.h
+EXTRA_DIST += wctype.in.h
 
 ## end   gnulib module wctype
 
diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
index 6c67d4f..4162648 100644
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -23,7 +23,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=admin --no-libtool --macro-prefix=gl canonicalize-lgpl config-h d-type error fnmatch-gnu fwriteerror getopt mbsstr mempcpy obstack progname safe-read stat-time strchrnul timespec verify xalloc
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=admin --no-libtool --macro-prefix=gl canonicalize-lgpl config-h d-type error fnmatch-gnu fwriteerror getopt gettext-h mbsstr mempcpy obstack progname safe-read stat-time strchrnul timespec verify xalloc
 
 
 
@@ -83,6 +83,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/alloca.m4 \
 	$(top_srcdir)/gnulib/m4/stdint.m4 \
 	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
 	$(top_srcdir)/gnulib/m4/strchrnul.m4 \
+	$(top_srcdir)/gnulib/m4/strerror.m4 \
 	$(top_srcdir)/gnulib/m4/string_h.m4 \
 	$(top_srcdir)/gnulib/m4/strnlen.m4 \
 	$(top_srcdir)/gnulib/m4/time_h.m4 \
@@ -160,6 +161,7 @@ FNMATCH_H = @FNMATCH_H@
 GETOPT_H = @GETOPT_H@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
@@ -169,6 +171,7 @@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
 GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
 GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
 GNULIB_MBSCHR = @GNULIB_MBSCHR@
@@ -189,12 +192,14 @@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
 GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
 GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
 GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
 GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
 GNULIB_STRPBRK = @GNULIB_STRPBRK@
@@ -202,10 +207,12 @@ GNULIB_STRSEP = @GNULIB_STRSEP@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GREP = @GREP@
+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
 HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
@@ -217,9 +224,11 @@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_READLINK = @HAVE_READLINK@
+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
 HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -291,6 +300,7 @@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRPTIME = @REPLACE_STRPTIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
@@ -365,16 +375,17 @@ AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
 noinst_HEADERS = 
 noinst_LIBRARIES = libgnu.a
 noinst_LTLIBRARIES = 
-EXTRA_DIST = alloca.c alloca_.h canonicalize-lgpl.c canonicalize.h \
-	error.c error.h exitfail.c exitfail.h fnmatch.c fnmatch_.h \
-	fnmatch_loop.c getopt.c getopt1.c getopt_.h getopt_int.h \
+EXTRA_DIST = alloca.c alloca.in.h canonicalize-lgpl.c canonicalize.h \
+	error.c error.h exitfail.c exitfail.h fnmatch.c fnmatch.in.h \
+	fnmatch_loop.c getopt.c getopt.in.h getopt1.c getopt_int.h \
 	$(top_srcdir)/admin/link-warning.h config.charset ref-add.sin \
 	ref-del.sin malloca.h malloca.valgrind mbchar.h memchr.c \
 	mempcpy.c obstack.c obstack.h pathmax.h readlink.c safe-read.c \
-	safe-read.h stat-time.h stdbool_.h stdint_.h stdlib_.h \
-	strchrnul.c streq.h string_.h strnlen.c time_.h timespec.h \
-	unistd_.h unitypes.h localcharset.h uniwidth.h uniwidth/cjk.h \
-	wchar_.h wctype_.h wcwidth.c xalloc.h xmalloc.c
+	safe-read.h stat-time.h stdbool.in.h stdint.in.h stdlib.in.h \
+	strchrnul.c streq.h strerror.c string.in.h strnlen.c time.in.h \
+	timespec.h unistd.in.h unitypes.h localcharset.h uniwidth.h \
+	uniwidth/cjk.h wchar.in.h wctype.in.h wcwidth.c xalloc.h \
+	xmalloc.c
 BUILT_SOURCES = $(ALLOCA_H) configmake.h $(FNMATCH_H) $(GETOPT_H) \
 	$(STDBOOL_H) $(STDINT_H) stdlib.h string.h time.h unistd.h \
 	$(WCHAR_H) $(WCTYPE_H)
@@ -399,7 +410,7 @@ libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@
 EXTRA_libgnu_a_SOURCES = alloca.c canonicalize-lgpl.c error.c \
 	exitfail.c fnmatch.c fnmatch_loop.c getopt.c getopt1.c \
 	memchr.c mempcpy.c obstack.c readlink.c safe-read.c \
-	strchrnul.c strnlen.c wcwidth.c xmalloc.c
+	strchrnul.c strerror.c strnlen.c wcwidth.c xmalloc.c
 
 # Use this preprocessor expression to decide whether #include_next works.
 # Do not rely on a 'configure'-time test for this, since the expression
@@ -496,6 +507,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@
@@ -708,9 +720,9 @@ uninstall-am: uninstall-local
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-alloca.h: alloca_.h
+alloca.h: alloca.in.h
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/alloca_.h; \
+	  cat $(srcdir)/alloca.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
@@ -766,17 +778,17 @@ configmake.h: Makefile
 
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
-fnmatch.h: fnmatch_.h
+fnmatch.h: fnmatch.in.h
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/fnmatch_.h; \
+	  cat $(srcdir)/fnmatch.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt_.h
+getopt.h: getopt.in.h
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/getopt_.h; \
+	  cat $(srcdir)/getopt.in.h; \
 	} > $@-t
 	mv -f $@-t $@
 
@@ -825,16 +837,16 @@ charset.alias: config.charset
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-stdbool.h: stdbool_.h
+stdbool.h: stdbool.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h; \
+	  sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
 	} > $@-t
 	mv $@-t $@
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-stdint.h: stdint_.h
+stdint.h: stdint.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
@@ -859,31 +871,37 @@ stdint.h: stdint_.h
 	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
 	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
 	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-	      < $(srcdir)/stdint_.h; \
+	      < $(srcdir)/stdint.in.h; \
 	} > $@-t
 	mv $@-t $@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib_.h
+stdlib.h: stdlib.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
 	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
 	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
 	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
+	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
+	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	      < $(srcdir)/stdlib_.h; \
+	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t
 	mv $@-t $@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string_.h
+string.h: string.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -915,6 +933,7 @@ string.h: string_.h
 	      -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
 	      -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
 	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
 	      -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
@@ -931,14 +950,16 @@ string.h: string_.h
 	      -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
 	      -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
+	      -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \
+	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	      < $(srcdir)/string_.h; \
+	      < $(srcdir)/string.in.h; \
 	} > $@-t
 	mv $@-t $@
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time_.h
+time.h: time.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -949,13 +970,13 @@ time.h: time_.h
 	      -e 's|@REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
 	      -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
-	      < $(srcdir)/time_.h; \
+	      < $(srcdir)/time.in.h; \
 	} > $@-t
 	mv $@-t $@
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd_.h
+unistd.h: unistd.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
@@ -981,13 +1002,13 @@ unistd.h: unistd_.h
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
-	      < $(srcdir)/unistd_.h; \
+	      < $(srcdir)/unistd.in.h; \
 	} > $@-t
 	mv $@-t $@
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar_.h
+wchar.h: wchar.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -997,13 +1018,13 @@ wchar.h: wchar_.h
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	    < $(srcdir)/wchar_.h; \
+	    < $(srcdir)/wchar.in.h; \
 	} > $@-t
 	mv $@-t $@
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype_.h
+wctype.h: wctype.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
@@ -1011,7 +1032,7 @@ wctype.h: wctype_.h
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-	      < $(srcdir)/wctype_.h; \
+	      < $(srcdir)/wctype.in.h; \
 	} > $@-t
 	mv $@-t $@
 
diff --git a/gnulib/lib/alloca_.h b/gnulib/lib/alloca.in.h
index af274b9..af274b9 100644
--- a/gnulib/lib/alloca_.h
+++ b/gnulib/lib/alloca.in.h
diff --git a/gnulib/lib/canonicalize-lgpl.c b/gnulib/lib/canonicalize-lgpl.c
index 14dd536..2ed149b 100644
--- a/gnulib/lib/canonicalize-lgpl.c
+++ b/gnulib/lib/canonicalize-lgpl.c
@@ -135,7 +135,12 @@ __realpath (const char *name, char *resolved)
     {
       rpath = malloc (path_max);
       if (rpath == NULL)
-	return NULL;
+	{
+	  /* It's easier to set errno to ENOMEM than to rely on the
+	     'malloc-posix' gnulib module.  */
+	  errno = ENOMEM;
+	  return NULL;
+	}
     }
   else
     rpath = resolved;
@@ -209,7 +214,12 @@ __realpath (const char *name, char *resolved)
 		new_size += path_max;
 	      new_rpath = (char *) realloc (rpath, new_size);
 	      if (new_rpath == NULL)
-		goto error;
+		{
+		  /* It's easier to set errno to ENOMEM than to rely on the
+		     'realloc-posix' gnulib module.  */
+		  errno = ENOMEM;
+		  goto error;
+		}
 	      rpath = new_rpath;
 	      rpath_limit = rpath + new_size;
 
diff --git a/gnulib/lib/fnmatch_.h b/gnulib/lib/fnmatch.in.h
index b086b45..b086b45 100644
--- a/gnulib/lib/fnmatch_.h
+++ b/gnulib/lib/fnmatch.in.h
diff --git a/gnulib/lib/getopt_.h b/gnulib/lib/getopt.in.h
index 615ef9a..615ef9a 100644
--- a/gnulib/lib/getopt_.h
+++ b/gnulib/lib/getopt.in.h
diff --git a/gnulib/lib/stat-time.h b/gnulib/lib/stat-time.h
index 2851564..ca9a37d 100644
--- a/gnulib/lib/stat-time.h
+++ b/gnulib/lib/stat-time.h
@@ -161,8 +161,8 @@ get_stat_birthtime (struct stat const *st)
   t.tv_sec = st->st_ctime;
   t.tv_nsec = 0;
 #else
-  (void)st;
   /* Birth time is not supported.  Set tv_sec to avoid undefined behavior.  */
+  (void)st;
   t.tv_sec = -1;
   t.tv_nsec = -1;
 #endif
diff --git a/gnulib/lib/stdbool_.h b/gnulib/lib/stdbool.in.h
index 150a010..150a010 100644
--- a/gnulib/lib/stdbool_.h
+++ b/gnulib/lib/stdbool.in.h
diff --git a/gnulib/lib/stdint_.h b/gnulib/lib/stdint.in.h
index 121118c..121118c 100644
--- a/gnulib/lib/stdint_.h
+++ b/gnulib/lib/stdint.in.h
diff --git a/gnulib/lib/stdlib_.h b/gnulib/lib/stdlib.in.h
index d1e254a..a4946e6 100644
--- a/gnulib/lib/stdlib_.h
+++ b/gnulib/lib/stdlib.in.h
@@ -55,6 +55,51 @@ extern "C" {
 #endif
 
 
+#if @GNULIB_MALLOC_POSIX@
+# if !@HAVE_MALLOC_POSIX@
+#  undef malloc
+#  define malloc rpl_malloc
+extern void * malloc (size_t size);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef malloc
+# define malloc(s) \
+    (GL_LINK_WARNING ("malloc is not POSIX compliant everywhere - " \
+                      "use gnulib module malloc-posix for portability"), \
+     malloc (s))
+#endif
+
+
+#if @GNULIB_REALLOC_POSIX@
+# if !@HAVE_REALLOC_POSIX@
+#  undef realloc
+#  define realloc rpl_realloc
+extern void * realloc (void *ptr, size_t size);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef realloc
+# define realloc(p,s) \
+    (GL_LINK_WARNING ("realloc is not POSIX compliant everywhere - " \
+                      "use gnulib module realloc-posix for portability"), \
+     realloc (p, s))
+#endif
+
+
+#if @GNULIB_CALLOC_POSIX@
+# if !@HAVE_CALLOC_POSIX@
+#  undef calloc
+#  define calloc rpl_calloc
+extern void * calloc (size_t nmemb, size_t size);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef calloc
+# define calloc(n,s) \
+    (GL_LINK_WARNING ("calloc is not POSIX compliant everywhere - " \
+                      "use gnulib module calloc-posix for portability"), \
+     calloc (n, s))
+#endif
+
+
 #if @GNULIB_GETSUBOPT@
 /* Assuming *OPTIONP is a comma separated list of elements of the form
    "token" or "token=value", getsubopt parses the first of these elements.
diff --git a/gnulib/lib/streq.h b/gnulib/lib/streq.h
index 133a5d3..03ea1d1 100644
--- a/gnulib/lib/streq.h
+++ b/gnulib/lib/streq.h
@@ -18,6 +18,9 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
+#ifndef _GL_STREQ_H
+#define _GL_STREQ_H
+
 #include <string.h>
 
 /* STREQ allows to optimize string comparison with a small literal string.
@@ -171,3 +174,5 @@ streq0 (const char *s1, const char *s2, char s20, char s21, char s22, char s23,
   (strcmp (s1, s2) == 0)
 
 #endif
+
+#endif /* _GL_STREQ_H */
diff --git a/gnulib/lib/strerror.c b/gnulib/lib/strerror.c
new file mode 100644
index 0000000..ef6234e
--- /dev/null
+++ b/gnulib/lib/strerror.c
@@ -0,0 +1,79 @@
+/* strerror.c --- ANSI C compatible system error routine
+
+   Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006, 2007 Free
+   Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <config.h>
+
+#if REPLACE_STRERROR
+
+# include <string.h>
+# include <stdio.h>
+
+# undef strerror
+
+char *rpl_strerror (int n)
+{
+  static char const fmt[] = "Unknown error (%d)";
+  static char mesg[sizeof fmt + sizeof n * CHAR_BIT / 3];
+
+  char *result = strerror (n);
+
+  if (! result)
+    {
+      sprintf (mesg, fmt, n);
+      return mesg;
+    }
+  return result;
+}
+
+#elif !HAVE_STRERROR
+
+#include <limits.h>
+
+/* Don't include <stdio.h>, since it may or may not declare
+   sys_errlist and its declarations may collide with ours.  Just
+   declare the stuff that we need directly.  Standard hosted C89
+   implementations define strerror and they don't need this strerror
+   function, so take some liberties with the standard to cater to
+   ancient or limited freestanding implementations.  */
+int sprintf (char *, char const *, ...);
+extern int sys_nerr;
+extern char *sys_errlist[];
+
+char *
+strerror (int n)
+{
+  static char const fmt[] = "Unknown error (%d)";
+  static char mesg[sizeof fmt + sizeof n * CHAR_BIT / 3];
+
+  if (n < 0 || n >= sys_nerr)
+    {
+      sprintf (mesg, fmt, n);
+      return mesg;
+    }
+  else
+    return sys_errlist[n];
+}
+
+#else
+
+/* This declaration is solely to ensure that after preprocessing
+   this file is never empty.  */
+typedef int dummy;
+
+#endif
diff --git a/gnulib/lib/string_.h b/gnulib/lib/string.in.h
index bfb22b0..41e539f 100644
--- a/gnulib/lib/string_.h
+++ b/gnulib/lib/string.in.h
@@ -539,6 +539,23 @@ extern char * mbssep (char **stringp, const char *delim);
 extern char * mbstok_r (char *string, const char *delim, char **save_ptr);
 #endif
 
+/* Map any int, typically from errno, into an error message.  */
+#if @GNULIB_STRERROR@
+# if @REPLACE_STRERROR@
+#  undef strerror
+#  define strerror rpl_strerror
+# endif
+# if !@HAVE_DECL_STRERROR@ || @REPLACE_STRERROR@
+extern char *strerror (int);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strerror
+# define strerror(e) \
+    (GL_LINK_WARNING ("strerror is unportable - " \
+                      "use gnulib module strerror to guarantee non-NULL result"), \
+     strerror (e))
+#endif
+
 
 #ifdef __cplusplus
 }
diff --git a/gnulib/lib/time_.h b/gnulib/lib/time.in.h
index 4d5cab8..4d5cab8 100644
--- a/gnulib/lib/time_.h
+++ b/gnulib/lib/time.in.h
diff --git a/gnulib/lib/unistd_.h b/gnulib/lib/unistd.in.h
index 07c4877..07c4877 100644
--- a/gnulib/lib/unistd_.h
+++ b/gnulib/lib/unistd.in.h
diff --git a/gnulib/lib/wchar_.h b/gnulib/lib/wchar.in.h
index 924a338..924a338 100644
--- a/gnulib/lib/wchar_.h
+++ b/gnulib/lib/wchar.in.h
diff --git a/gnulib/lib/wctype_.h b/gnulib/lib/wctype.in.h
index 73ce09f..73ce09f 100644
--- a/gnulib/lib/wctype_.h
+++ b/gnulib/lib/wctype.in.h
diff --git a/gnulib/m4/canonicalize-lgpl.m4 b/gnulib/m4/canonicalize-lgpl.m4
index b0a7902..b0a7902 100755..100644
--- a/gnulib/m4/canonicalize-lgpl.m4
+++ b/gnulib/m4/canonicalize-lgpl.m4
diff --git a/gnulib/m4/extensions.m4 b/gnulib/m4/extensions.m4
index 143a9e5..bcbb3ce 100644
--- a/gnulib/m4/extensions.m4
+++ b/gnulib/m4/extensions.m4
@@ -1,14 +1,14 @@
-# serial 4  -*- Autoconf -*-
+# serial 5  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
 # Autoconf.  Perhaps we can remove this once we can assume Autoconf
-# 2.61 or later everywhere, but since CVS Autoconf mutates rapidly
+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
 # enough in this area it's likely we'll need to redefine
 # AC_USE_SYSTEM_EXTENSIONS for quite some time.
 
@@ -16,26 +16,48 @@
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
+# Remember that #undef in AH_VERBATIM gets replaced with #define by
+# AC_DEFINE.  The goal here is to define all known feature-enabling
+# macros, then, if reports of conflicts are made, disable macros that
+# cause problems on some platforms (such as __EXTENSIONS__).
 AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
-[
-  AC_BEFORE([$0], [AC_COMPILE_IFELSE])
-  AC_BEFORE([$0], [AC_RUN_IFELSE])
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 
-  AC_REQUIRE([AC_GNU_SOURCE])
-  AC_REQUIRE([AC_AIX])
-  AC_REQUIRE([AC_MINIX])
+  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
+  if test "$MINIX" = yes; then
+    AC_DEFINE([_POSIX_SOURCE], [1],
+      [Define to 1 if you need to in order for `stat' and other
+       things to work.])
+    AC_DEFINE([_POSIX_1_SOURCE], [2],
+      [Define to 2 if the system does not provide POSIX.1 features
+       except with this defined.])
+    AC_DEFINE([_MINIX], [1],
+      [Define to 1 if on MINIX.])
+  fi
 
   AH_VERBATIM([__EXTENSIONS__],
-[/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
+[/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+/* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
-#endif])
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+])
   AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
     [ac_cv_safe_to_define___extensions__],
     [AC_COMPILE_IFELSE(
@@ -46,9 +68,11 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
        [ac_cv_safe_to_define___extensions__=no])])
   test $ac_cv_safe_to_define___extensions__ = yes &&
     AC_DEFINE([__EXTENSIONS__])
+  AC_DEFINE([_ALL_SOURCE])
+  AC_DEFINE([_GNU_SOURCE])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
   AC_DEFINE([_TANDEM_SOURCE])
-])
+])# AC_USE_SYSTEM_EXTENSIONS
 
 # gl_USE_SYSTEM_EXTENSIONS
 # ------------------------
diff --git a/gnulib/m4/fnmatch.m4 b/gnulib/m4/fnmatch.m4
index 34eb3d9..495cbf9 100644
--- a/gnulib/m4/fnmatch.m4
+++ b/gnulib/m4/fnmatch.m4
@@ -1,4 +1,4 @@
-# Check for fnmatch.
+# Check for fnmatch - serial 2.
 
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
 # Foundation, Inc.
@@ -110,7 +110,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
 AC_DEFUN([gl_FUNC_FNMATCH_GNU],
 [
   dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc.
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   FNMATCH_H=
   _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu],
diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4
index 96d3f8c..dfb3f5e 100644
--- a/gnulib/m4/gnulib-comp.m4
+++ b/gnulib/m4/gnulib-comp.m4
@@ -26,7 +26,6 @@ AC_DEFUN([gl_EARLY],
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
   AC_REQUIRE([AC_PROG_RANLIB])
   AC_REQUIRE([AM_PROG_CC_C_O])
-  AC_REQUIRE([AC_GNU_SOURCE])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 ])
 
@@ -80,6 +79,8 @@ AC_DEFUN([gl_INIT],
   gl_STDLIB_H
   gl_FUNC_STRCHRNUL
   gl_STRING_MODULE_INDICATOR([strchrnul])
+  gl_FUNC_STRERROR
+  gl_STRING_MODULE_INDICATOR([strerror])
   gl_HEADER_STRING_H
   gl_FUNC_STRNLEN
   gl_STRING_MODULE_INDICATOR([strnlen])
@@ -116,25 +117,38 @@ AC_DEFUN([gl_INIT],
 
 # Like AC_LIBOBJ, except that the module name goes
 # into gl_LIBOBJS instead of into LIBOBJS.
-AC_DEFUN([gl_LIBOBJ],
-  [gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"])
+AC_DEFUN([gl_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
+  gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
+])
 
 # Like AC_REPLACE_FUNCS, except that the module name goes
 # into gl_LIBOBJS instead of into LIBOBJS.
-AC_DEFUN([gl_REPLACE_FUNCS],
-  [AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])])
+AC_DEFUN([gl_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
+])
 
-# Like AC_LIBSOURCES, except that it does nothing.
-# We rely on EXTRA_lib..._SOURCES instead.
-AC_DEFUN([gl_LIBSOURCES],
-  [])
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parametrization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gl_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_syscmd([test -r gnulib/lib/]_gl_NAME[ || test ! -d gnulib/lib])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([missing gnulib/lib/]_gl_NAME)])
+    ])
+  ])
+])
 
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gl_FILE_LIST], [
   build-aux/link-warning.h
   lib/alloca.c
-  lib/alloca_.h
+  lib/alloca.in.h
   lib/canonicalize-lgpl.c
   lib/canonicalize.h
   lib/config.charset
@@ -143,13 +157,13 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/exitfail.c
   lib/exitfail.h
   lib/fnmatch.c
-  lib/fnmatch_.h
+  lib/fnmatch.in.h
   lib/fnmatch_loop.c
   lib/fwriteerror.c
   lib/fwriteerror.h
   lib/getopt.c
+  lib/getopt.in.h
   lib/getopt1.c
-  lib/getopt_.h
   lib/getopt_int.h
   lib/gettext.h
   lib/localcharset.c
@@ -175,25 +189,26 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/safe-read.c
   lib/safe-read.h
   lib/stat-time.h
-  lib/stdbool_.h
-  lib/stdint_.h
-  lib/stdlib_.h
+  lib/stdbool.in.h
+  lib/stdint.in.h
+  lib/stdlib.in.h
   lib/strchrnul.c
   lib/streq.h
-  lib/string_.h
+  lib/strerror.c
+  lib/string.in.h
   lib/strnlen.c
   lib/strnlen1.c
   lib/strnlen1.h
-  lib/time_.h
+  lib/time.in.h
   lib/timespec.h
-  lib/unistd_.h
+  lib/unistd.in.h
   lib/unitypes.h
   lib/uniwidth.h
   lib/uniwidth/cjk.h
   lib/uniwidth/width.c
   lib/verify.h
-  lib/wchar_.h
-  lib/wctype_.h
+  lib/wchar.in.h
+  lib/wctype.in.h
   lib/wcwidth.c
   lib/xalloc-die.c
   lib/xalloc.h
@@ -234,6 +249,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/stdint.m4
   m4/stdlib_h.m4
   m4/strchrnul.m4
+  m4/strerror.m4
   m4/string_h.m4
   m4/strnlen.m4
   m4/time_h.m4
diff --git a/gnulib/m4/mbchar.m4 b/gnulib/m4/mbchar.m4
index 02f9eff..e73e2b4 100644
--- a/gnulib/m4/mbchar.m4
+++ b/gnulib/m4/mbchar.m4
@@ -1,4 +1,4 @@
-# mbchar.m4 serial 6
+# mbchar.m4 serial 7
 dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,5 +9,5 @@ dnl From Bruno Haible.
 
 AC_DEFUN([gl_MBCHAR],
 [
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 ])
diff --git a/gnulib/m4/mempcpy.m4 b/gnulib/m4/mempcpy.m4
index 9e854e8..d1a12eb 100644
--- a/gnulib/m4/mempcpy.m4
+++ b/gnulib/m4/mempcpy.m4
@@ -1,4 +1,4 @@
-# mempcpy.m4 serial 7
+# mempcpy.m4 serial 9
 dnl Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,9 +7,9 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_MEMPCPY],
 [
   dnl Persuade glibc <string.h> to declare mempcpy().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  dnl The mempcpy() declaration in lib/string_.h uses 'restrict'.
+  dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'.
   AC_REQUIRE([AC_C_RESTRICT])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/gnulib/m4/stdint.m4 b/gnulib/m4/stdint.m4
index 03bb093..bb6c34f 100644
--- a/gnulib/m4/stdint.m4
+++ b/gnulib/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 28
+# stdint.m4 serial 29
 dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -370,7 +370,7 @@ AC_DEFUN([gl_STDINT_INCLUDES],
 
 dnl gl_STDINT_TYPE_PROPERTIES
 dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t
-dnl of interest to stdint_.h.
+dnl of interest to stdint.in.h.
 AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
 [
   gl_STDINT_BITSIZEOF([ptrdiff_t sig_atomic_t size_t wchar_t wint_t],
diff --git a/gnulib/m4/stdlib_h.m4 b/gnulib/m4/stdlib_h.m4
index f13b429..ea9286e 100644
--- a/gnulib/m4/stdlib_h.m4
+++ b/gnulib/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 2
+# stdlib_h.m4 serial 3
 dnl Copyright (C) 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19,11 +19,17 @@ AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
 
 AC_DEFUN([gl_STDLIB_H_DEFAULTS],
 [
-  GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT])
-  GNULIB_MKDTEMP=0;   AC_SUBST([GNULIB_MKDTEMP])
-  GNULIB_MKSTEMP=0;   AC_SUBST([GNULIB_MKSTEMP])
+  GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
+  GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
+  GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
+  GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
+  GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
+  GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_GETSUBOPT=1;   AC_SUBST([HAVE_GETSUBOPT])
-  HAVE_MKDTEMP=1;     AC_SUBST([HAVE_MKDTEMP])
-  REPLACE_MKSTEMP=0;  AC_SUBST([REPLACE_MKSTEMP])
+  HAVE_CALLOC_POSIX=1;    AC_SUBST([HAVE_CALLOC_POSIX])
+  HAVE_GETSUBOPT=1;       AC_SUBST([HAVE_GETSUBOPT])
+  HAVE_MALLOC_POSIX=1;    AC_SUBST([HAVE_MALLOC_POSIX])
+  HAVE_MKDTEMP=1;         AC_SUBST([HAVE_MKDTEMP])
+  HAVE_REALLOC_POSIX=1;   AC_SUBST([HAVE_REALLOC_POSIX])
+  REPLACE_MKSTEMP=0;      AC_SUBST([REPLACE_MKSTEMP])
 ])
diff --git a/gnulib/m4/strchrnul.m4 b/gnulib/m4/strchrnul.m4
index fec2a10..7c1273a 100644
--- a/gnulib/m4/strchrnul.m4
+++ b/gnulib/m4/strchrnul.m4
@@ -1,4 +1,4 @@
-# strchrnul.m4 serial 5
+# strchrnul.m4 serial 6
 dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_STRCHRNUL],
 [
   dnl Persuade glibc <string.h> to declare strchrnul().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REPLACE_FUNCS(strchrnul)
diff --git a/gnulib/m4/strerror.m4 b/gnulib/m4/strerror.m4
new file mode 100644
index 0000000..52f3e3f
--- /dev/null
+++ b/gnulib/m4/strerror.m4
@@ -0,0 +1,49 @@
+# strerror.m4 serial 4
+dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_STRERROR],
+[
+  AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE])
+  if test $gl_cv_func_working_strerror = no; then
+    AC_LIBOBJ([strerror])
+    AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR],
+      [Define this to 1 if strerror is broken.])
+  fi
+])
+
+# Like gl_FUNC_STRERROR, except prepare for separate compilation (no AC_LIBOBJ).
+AC_DEFUN([gl_FUNC_STRERROR_SEPARATE],
+[
+  AC_CHECK_FUNCS_ONCE([strerror])
+  gl_PREREQ_STRERROR
+  if test $ac_cv_func_strerror = no; then
+    HAVE_DECL_STRERROR=0
+    gl_cv_func_working_strerror=no
+  else
+    AC_CACHE_CHECK([for working strerror function],
+     [gl_cv_func_working_strerror],
+     [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM([
+#include <string.h>
+	 ], [return !*strerror (-2);])],
+       [gl_cv_func_working_strerror=yes], [gl_cv_func_working_strerror=no],
+       [dnl assume success except on Interix
+	AC_EGREP_CPP([assuming success], [
+#ifndef __INTERIX
+  assuming success
+#endif
+	], [gl_cv_func_working_strerror=yes],
+	[gl_cv_func_working_strerror=no])])])
+    if test $gl_cv_func_working_strerror = no ; then
+      REPLACE_STRERROR=1
+    fi
+  fi
+])
+
+# Prerequisites of lib/strerror.c.
+AC_DEFUN([gl_PREREQ_STRERROR], [
+  :
+])
diff --git a/gnulib/m4/string_h.m4 b/gnulib/m4/string_h.m4
index ec51e9a..d811e26 100644
--- a/gnulib/m4/string_h.m4
+++ b/gnulib/m4/string_h.m4
@@ -57,6 +57,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
   GNULIB_MBSSPN=0;      AC_SUBST([GNULIB_MBSSPN])
   GNULIB_MBSSEP=0;      AC_SUBST([GNULIB_MBSSEP])
   GNULIB_MBSTOK_R=0;    AC_SUBST([GNULIB_MBSTOK_R])
+  GNULIB_STRERROR=0;    AC_SUBST([GNULIB_STRERROR])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_DECL_MEMMEM=1;		AC_SUBST([HAVE_DECL_MEMMEM])
   HAVE_MEMPCPY=1;		AC_SUBST([HAVE_MEMPCPY])
@@ -74,4 +75,6 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
   HAVE_STRSEP=1;		AC_SUBST([HAVE_STRSEP])
   HAVE_STRCASESTR=1;		AC_SUBST([HAVE_STRCASESTR])
   HAVE_DECL_STRTOK_R=1;		AC_SUBST([HAVE_DECL_STRTOK_R])
+  HAVE_DECL_STRERROR=1;		AC_SUBST([HAVE_DECL_STRERROR])
+  REPLACE_STRERROR=0;		AC_SUBST([REPLACE_STRERROR])
 ])
diff --git a/gnulib/m4/strnlen.m4 b/gnulib/m4/strnlen.m4
index 0e2815b..d8307ed 100644
--- a/gnulib/m4/strnlen.m4
+++ b/gnulib/m4/strnlen.m4
@@ -1,4 +1,4 @@
-# strnlen.m4 serial 8
+# strnlen.m4 serial 9
 dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_STRNLEN],
 [
   dnl Persuade glibc <string.h> to declare strnlen().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_CHECK_DECLS_ONCE([strnlen])
@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRNLEN],
 
   AC_FUNC_STRNLEN
   if test $ac_cv_func_strnlen_working = no; then
-    # This is necessary because automake-1.6.1 doens't understand
+    # This is necessary because automake-1.6.1 doesn't understand
     # that the above use of AC_FUNC_STRNLEN means we may have to use
     # lib/strnlen.c.
     #AC_LIBOBJ(strnlen)
diff --git a/gnulib/m4/time_h.m4 b/gnulib/m4/time_h.m4
index 3f543a1..d42a635 100644
--- a/gnulib/m4/time_h.m4
+++ b/gnulib/m4/time_h.m4
@@ -65,7 +65,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
 	    [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
 	 [gl_cv_sys_struct_timespec_in_sys_time_h=yes],
 	 [gl_cv_sys_struct_timespec_in_sys_time_h=no])])
-    if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
+    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     fi
   fi
diff --git a/gnulib/m4/wcwidth.m4 b/gnulib/m4/wcwidth.m4
index a260998..df7919b 100644
--- a/gnulib/m4/wcwidth.m4
+++ b/gnulib/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 11
+# wcwidth.m4 serial 12
 dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
 
   dnl Persuade glibc <wchar.h> to declare wcwidth().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
diff --git a/po/Makevars b/po/Makevars
index bca49d3..62a744e 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -34,7 +34,7 @@ COPYRIGHT_HOLDER = Red Hat, Inc
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = <mitr@redhat.com>
+MSGID_BUGS_ADDRESS = https://fedorahosted.org/mlocate/
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
diff --git a/po/cs.gmo b/po/cs.gmo
index 2062f01..c048aa2 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index b946475..a30ea6f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,12 +4,13 @@
 # This file is distributed under the same license as the mlocate package.
 # Miloslav Trmac <mitr@volny.cz>, 2005, 2006, 2007.
 #
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: mlocate VERSION\n"
-"Report-Msgid-Bugs-To: <mitr@redhat.com>\n"
-"POT-Creation-Date: 2007-08-25 00:48+0200\n"
-"PO-Revision-Date: 2006-03-15 16:35+0100\n"
+"Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n"
+"POT-Creation-Date: 2008-03-03 04:14+0100\n"
+"PO-Revision-Date: 2007-12-13 15:04+0100\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,56 +18,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/conf.c:232
+#: src/conf.c:235
 msgid "warning: Line number overflow"
 msgstr "varování: Číslo řádku přeteklo"
 
-#: src/conf.c:250
+#: src/conf.c:253
 msgid "missing closing `\"'"
 msgstr "chybí uzavírající `\"'"
 
-#: src/conf.c:298 src/locate.c:946 src/updatedb.c:936
+#: src/conf.c:301 src/locate.c:946 src/updatedb.c:977
 #, c-format
 msgid "can not open `%s'"
 msgstr "nemohu otevřít `%s'"
 
-#: src/conf.c:337
+#: src/conf.c:340
 #, c-format
 msgid "unknown variable `%s'"
 msgstr "neznámá proměnná `%s'"
 
-#: src/conf.c:342
+#: src/conf.c:345
 msgid "variable name expected"
 msgstr "očekáván název proměnné"
 
-#: src/conf.c:348
+#: src/conf.c:351
 #, c-format
 msgid "variable `%s' was already defined"
 msgstr "proměnná `%s' již byla definována"
 
-#: src/conf.c:357
+#: src/conf.c:360
 msgid "`=' expected after variable name"
 msgstr "po názvu proměnné očekáváno `='"
 
-#: src/conf.c:364
+#: src/conf.c:367
 msgid "value in quotes expected after `='"
 msgstr "po `=' očekávána hodnota v uvozovkách"
 
-#: src/conf.c:372
+#: src/conf.c:375
 #, c-format
 msgid "invalid value `%s' of PRUNE_BIND_MOUNTS"
 msgstr "neplatná hodnota PRUNE_BIND_MOUNTS `%s'"
 
-#: src/conf.c:387
+#: src/conf.c:390
 msgid "unexpected data after variable value"
 msgstr "neočekávaná data po hodnotě proměnné"
 
-#: src/conf.c:401 src/lib.c:238
+#: src/conf.c:404 src/lib.c:244
 #, c-format
 msgid "I/O error reading `%s'"
 msgstr "chyba I/O při čtení `%s'"
 
-#: src/conf.c:419
+#: src/conf.c:422
 #, c-format
 msgid ""
 "Usage: updatedb [OPTION]...\n"
@@ -114,7 +115,7 @@ msgstr ""
 "Nastavení má implicitní hodnoty čtené\n"
 "z `%s'.\n"
 
-#: src/conf.c:443 src/locate.c:636
+#: src/conf.c:446 src/locate.c:636
 #, c-format
 msgid ""
 "\n"
@@ -123,27 +124,27 @@ msgstr ""
 "\n"
 "Chyby hlaste na %s.\n"
 
-#: src/conf.c:461
+#: src/conf.c:464
 msgid "can not get current working directory"
 msgstr "nemohu zjistit současný pracovní adresář"
 
-#: src/conf.c:513 src/conf.c:524 src/conf.c:534 src/locate.c:691
+#: src/conf.c:519 src/conf.c:530 src/conf.c:540 src/locate.c:691
 #: src/locate.c:700 src/locate.c:726 src/locate.c:784
 #, c-format
 msgid "--%s would override earlier command-line argument"
 msgstr "--%s by nahradilo dřívejší parametr na příkazovém řádku"
 
-#: src/conf.c:517 src/conf.c:547 src/conf.c:580 src/locate.c:763
+#: src/conf.c:523 src/conf.c:553 src/conf.c:586 src/locate.c:763
 #, c-format
 msgid "invalid value `%s' of --%s"
 msgstr "neplatná hodnota `%s' přepínače --%s"
 
-#: src/conf.c:543 src/conf.c:576 src/conf.c:586 src/locate.c:757
+#: src/conf.c:549 src/conf.c:582 src/conf.c:592 src/locate.c:757
 #, c-format
 msgid "--%s specified twice"
 msgstr "--%s zadáno dvakrát"
 
-#: src/conf.c:553 src/locate.c:716
+#: src/conf.c:559 src/locate.c:716
 msgid ""
 "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n"
 "This software is distributed under the GPL v.2.\n"
@@ -155,31 +156,31 @@ msgstr ""
 "\n"
 "Tento program je poskutován BEZ ZÁRUKY, je-li to povoleno zákonem."
 
-#: src/conf.c:600
+#: src/conf.c:610
 msgid "unexpected operand on command line"
 msgstr "neočekávaný parametr na příkazovém řádku"
 
-#: src/lib.c:172
+#: src/lib.c:176
 #, c-format
 msgid "`%s' does not seem to be a mlocate database"
 msgstr "`%s' zřejmě není databáze mlocate"
 
-#: src/lib.c:179
+#: src/lib.c:183
 #, c-format
 msgid "`%s' has unknown version %u"
 msgstr "`%s' má neznámou verzi %u"
 
-#: src/lib.c:186
+#: src/lib.c:190
 #, c-format
 msgid "`%s' has unknown visibility flag %u"
 msgstr "`%s' má neznámý příznak viditelnosti %u"
 
-#: src/lib.c:240
+#: src/lib.c:246
 #, c-format
 msgid "unexpected EOF reading `%s'"
 msgstr "neočekávaný konec souboru při čtení `%s'"
 
-#: src/lib.c:331
+#: src/lib.c:337
 #, c-format
 msgid "I/O error seeking in `%s'"
 msgstr "chyba I/O při posouvání v `%s'"
@@ -310,7 +311,7 @@ msgstr "neplatná regexp `%s': %s"
 msgid "can not read two databases from standard input"
 msgstr "nemohu číst dvě databáze ze standardního vstupu"
 
-#: src/locate.c:952 src/updatedb.c:972
+#: src/locate.c:952 src/updatedb.c:1015
 #, c-format
 msgid "can not stat () `%s'"
 msgstr "nemohu stat () `%s'"
@@ -319,50 +320,50 @@ msgstr "nemohu stat () `%s'"
 msgid "can not drop privileges"
 msgstr "nemohu se vzdát oprávnění"
 
-#: src/locate.c:1015 src/updatedb.c:1014
+#: src/locate.c:1015 src/updatedb.c:1058
 msgid "I/O error while writing to standard output"
 msgstr "chyba I/O při zápisu na standardní výstup"
 
-#: src/updatedb.c:636 src/updatedb.c:734
+#: src/updatedb.c:662 src/updatedb.c:760
 #, c-format
 msgid "file name length %zu is too large"
 msgstr "délka názvu souboru %zu je příliš velká"
 
-#: src/updatedb.c:930
+#: src/updatedb.c:971
 #, c-format
 msgid "can not open a temporary file for `%s'"
 msgstr "nemohu otevřít dočasný soubor pro `%s'"
 
-#: src/updatedb.c:941
+#: src/updatedb.c:984
 msgid "configuration is too large"
 msgstr "nastavení je příliš velké"
 
-#: src/updatedb.c:969
+#: src/updatedb.c:1012
 #, c-format
 msgid "can not change directory to `%s'"
 msgstr "nemohu změnit adresář na `%s'"
 
-#: src/updatedb.c:978
+#: src/updatedb.c:1021
 #, c-format
 msgid "I/O error while writing to `%s'"
 msgstr "chyba I/O při zápisu do `%s'"
 
-#: src/updatedb.c:986
+#: src/updatedb.c:1029
 #, c-format
 msgid "can not find group `%s'"
 msgstr "nemohu najít skupinu `%s'"
 
-#: src/updatedb.c:988
+#: src/updatedb.c:1032
 #, c-format
-msgid "can not change group of file `%s'"
-msgstr "nemohu změnit skupinu souboru `%s'"
+msgid "can not change group of file `%s' to `%s'"
+msgstr "nemohu změnit skupinu souboru `%s' na `%s'"
 
-#: src/updatedb.c:1002
+#: src/updatedb.c:1046
 #, c-format
 msgid "can not change permissions of file `%s'"
 msgstr "nemohu změnit oprávnění souboru `%s'"
 
-#: src/updatedb.c:1005
+#: src/updatedb.c:1049
 #, c-format
 msgid "error replacing `%s'"
 msgstr "chyba při nahrazování `%s'"
diff --git a/po/mlocate.pot b/po/mlocate.pot
index e59f90f..ebbc300 100644
--- a/po/mlocate.pot
+++ b/po/mlocate.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: <mitr@redhat.com>\n"
-"POT-Creation-Date: 2007-08-25 00:48+0200\n"
+"Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n"
+"POT-Creation-Date: 2008-03-03 04:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/conf.c:232
+#: src/conf.c:235
 msgid "warning: Line number overflow"
 msgstr ""
 
-#: src/conf.c:250
+#: src/conf.c:253
 msgid "missing closing `\"'"
 msgstr ""
 
-#: src/conf.c:298 src/locate.c:946 src/updatedb.c:936
+#: src/conf.c:301 src/locate.c:946 src/updatedb.c:977
 #, c-format
 msgid "can not open `%s'"
 msgstr ""
 
-#: src/conf.c:337
+#: src/conf.c:340
 #, c-format
 msgid "unknown variable `%s'"
 msgstr ""
 
-#: src/conf.c:342
+#: src/conf.c:345
 msgid "variable name expected"
 msgstr ""
 
-#: src/conf.c:348
+#: src/conf.c:351
 #, c-format
 msgid "variable `%s' was already defined"
 msgstr ""
 
-#: src/conf.c:357
+#: src/conf.c:360
 msgid "`=' expected after variable name"
 msgstr ""
 
-#: src/conf.c:364
+#: src/conf.c:367
 msgid "value in quotes expected after `='"
 msgstr ""
 
-#: src/conf.c:372
+#: src/conf.c:375
 #, c-format
 msgid "invalid value `%s' of PRUNE_BIND_MOUNTS"
 msgstr ""
 
-#: src/conf.c:387
+#: src/conf.c:390
 msgid "unexpected data after variable value"
 msgstr ""
 
-#: src/conf.c:401 src/lib.c:238
+#: src/conf.c:404 src/lib.c:244
 #, c-format
 msgid "I/O error reading `%s'"
 msgstr ""
 
-#: src/conf.c:419
+#: src/conf.c:422
 #, c-format
 msgid ""
 "Usage: updatedb [OPTION]...\n"
@@ -91,34 +91,34 @@ msgid ""
 "`%s'.\n"
 msgstr ""
 
-#: src/conf.c:443 src/locate.c:636
+#: src/conf.c:446 src/locate.c:636
 #, c-format
 msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
 
-#: src/conf.c:461
+#: src/conf.c:464
 msgid "can not get current working directory"
 msgstr ""
 
-#: src/conf.c:513 src/conf.c:524 src/conf.c:534 src/locate.c:691
+#: src/conf.c:519 src/conf.c:530 src/conf.c:540 src/locate.c:691
 #: src/locate.c:700 src/locate.c:726 src/locate.c:784
 #, c-format
 msgid "--%s would override earlier command-line argument"
 msgstr ""
 
-#: src/conf.c:517 src/conf.c:547 src/conf.c:580 src/locate.c:763
+#: src/conf.c:523 src/conf.c:553 src/conf.c:586 src/locate.c:763
 #, c-format
 msgid "invalid value `%s' of --%s"
 msgstr ""
 
-#: src/conf.c:543 src/conf.c:576 src/conf.c:586 src/locate.c:757
+#: src/conf.c:549 src/conf.c:582 src/conf.c:592 src/locate.c:757
 #, c-format
 msgid "--%s specified twice"
 msgstr ""
 
-#: src/conf.c:553 src/locate.c:716
+#: src/conf.c:559 src/locate.c:716
 msgid ""
 "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n"
 "This software is distributed under the GPL v.2.\n"
@@ -126,31 +126,31 @@ msgid ""
 "This program is provided with NO WARRANTY, to the extent permitted by law."
 msgstr ""
 
-#: src/conf.c:600
+#: src/conf.c:610
 msgid "unexpected operand on command line"
 msgstr ""
 
-#: src/lib.c:172
+#: src/lib.c:176
 #, c-format
 msgid "`%s' does not seem to be a mlocate database"
 msgstr ""
 
-#: src/lib.c:179
+#: src/lib.c:183
 #, c-format
 msgid "`%s' has unknown version %u"
 msgstr ""
 
-#: src/lib.c:186
+#: src/lib.c:190
 #, c-format
 msgid "`%s' has unknown visibility flag %u"
 msgstr ""
 
-#: src/lib.c:240
+#: src/lib.c:246
 #, c-format
 msgid "unexpected EOF reading `%s'"
 msgstr ""
 
-#: src/lib.c:331
+#: src/lib.c:337
 #, c-format
 msgid "I/O error seeking in `%s'"
 msgstr ""
@@ -248,7 +248,7 @@ msgstr ""
 msgid "can not read two databases from standard input"
 msgstr ""
 
-#: src/locate.c:952 src/updatedb.c:972
+#: src/locate.c:952 src/updatedb.c:1015
 #, c-format
 msgid "can not stat () `%s'"
 msgstr ""
@@ -257,50 +257,50 @@ msgstr ""
 msgid "can not drop privileges"
 msgstr ""
 
-#: src/locate.c:1015 src/updatedb.c:1014
+#: src/locate.c:1015 src/updatedb.c:1058
 msgid "I/O error while writing to standard output"
 msgstr ""
 
-#: src/updatedb.c:636 src/updatedb.c:734
+#: src/updatedb.c:662 src/updatedb.c:760
 #, c-format
 msgid "file name length %zu is too large"
 msgstr ""
 
-#: src/updatedb.c:930
+#: src/updatedb.c:971
 #, c-format
 msgid "can not open a temporary file for `%s'"
 msgstr ""
 
-#: src/updatedb.c:941
+#: src/updatedb.c:984
 msgid "configuration is too large"
 msgstr ""
 
-#: src/updatedb.c:969
+#: src/updatedb.c:1012
 #, c-format
 msgid "can not change directory to `%s'"
 msgstr ""
 
-#: src/updatedb.c:978
+#: src/updatedb.c:1021
 #, c-format
 msgid "I/O error while writing to `%s'"
 msgstr ""
 
-#: src/updatedb.c:986
+#: src/updatedb.c:1029
 #, c-format
 msgid "can not find group `%s'"
 msgstr ""
 
-#: src/updatedb.c:988
+#: src/updatedb.c:1032
 #, c-format
-msgid "can not change group of file `%s'"
+msgid "can not change group of file `%s' to `%s'"
 msgstr ""
 
-#: src/updatedb.c:1002
+#: src/updatedb.c:1046
 #, c-format
 msgid "can not change permissions of file `%s'"
 msgstr ""
 
-#: src/updatedb.c:1005
+#: src/updatedb.c:1049
 #, c-format
 msgid "error replacing `%s'"
 msgstr ""
diff --git a/src/conf.c b/src/conf.c
index 26a0973..4643ad3 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,6 +1,6 @@
 /* updatedb configuration.
 
-Copyright (C) 2005, 2007 Red Hat, Inc. All rights reserved.
+Copyright (C) 2005, 2007, 2008 Red Hat, Inc. All rights reserved.
 This copyrighted material is made available to anyone wishing to use, modify,
 copy, or redistribute it subject to the terms and conditions of the GNU General
 Public License v.2.
@@ -47,6 +47,9 @@ struct string_list conf_prunepaths;
 /* true if bind mounts should be skipped */
 bool conf_prune_bind_mounts; /* = false; */
 
+/* true if pruning debug output was requested */
+bool conf_debug_pruning; /* = false; */
+
 /* Root of the directory tree to store in the database (canonical) */
 char *conf_scan_root; /* = NULL; */
 
@@ -471,11 +474,14 @@ prepend_cwd (const char *path)
 static void
 parse_arguments (int argc, char *argv[])
 {
+  enum { OPT_DEBUG_PRUNING = CHAR_MAX + 1 };
+
   static const struct option options[] =
     {
       { "add-prunefs", required_argument, NULL, 'f' },
       { "add-prunepaths", required_argument, NULL, 'e' },
       { "database-root", required_argument, NULL, 'U' },
+      { "debug-pruning", no_argument, NULL, OPT_DEBUG_PRUNING },
       { "help", no_argument, NULL, 'h' },
       { "output", required_argument, NULL, 'o' },
       { "prune-bind-mounts", required_argument, NULL, 'B' },
@@ -591,6 +597,10 @@ parse_arguments (int argc, char *argv[])
 	  conf_verbose = true;
 	  break;
 
+	case OPT_DEBUG_PRUNING:
+	  conf_debug_pruning = true;
+	  break;
+
 	default:
 	  abort ();
 	}
@@ -674,4 +684,27 @@ conf_prepare (int argc, char *argv[])
   var_finish (&conf_prunepaths);
   gen_conf_block ();
   string_list_dir_path_sort (&conf_prunepaths);
+  if (conf_debug_pruning != false)
+    {
+      const char *p;
+
+      /* This is debuging output, don't mark anything for translation */
+      fprintf (stderr, "conf_block:\n");
+      for (p = conf_block; p < conf_block + conf_block_size; p++)
+	{
+	  char c;
+
+	  c = *p;
+	  if (isascii ((unsigned char)c) && isprint ((unsigned char)c)
+	      && c != '\\')
+	    putc (c, stderr);
+	  else
+	    {
+	      fprintf (stderr, "\\%03o", (unsigned)(unsigned char)c);
+	      if (c == 0)
+		putc ('\n', stderr);
+	    }
+	}
+      fprintf (stderr, "\n-----------------------\n");
+    }
 }
diff --git a/src/conf.h b/src/conf.h
index db5c767..a2ce54f 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,6 +1,6 @@
 /* updatedb configuration.
 
-Copyright (C) 2005, 2007 Red Hat, Inc. All rights reserved.
+Copyright (C) 2005, 2007, 2008 Red Hat, Inc. All rights reserved.
 This copyrighted material is made available to anyone wishing to use, modify,
 copy, or redistribute it subject to the terms and conditions of the GNU General
 Public License v.2.
@@ -36,6 +36,9 @@ extern struct string_list conf_prunepaths;
 /* true if bind mounts should be skipped */
 extern bool conf_prune_bind_mounts;
 
+/* true if pruning debug output was requested */
+extern bool conf_debug_pruning;
+
 /* Root of the directory tree to store in the database (canonical) */
 extern char *conf_scan_root;
 
diff --git a/src/config.h.in b/src/config.h.in
index 669b62a..68c590a 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -179,6 +179,9 @@
 /* Define to 1 if you have the `strchrnul' function. */
 #undef HAVE_STRCHRNUL
 
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
 /* Define to 1 if you have the `strerror_r' function. */
 #undef HAVE_STRERROR_R
 
@@ -295,6 +298,9 @@
    'ptrdiff_t'. */
 #undef PTRDIFF_T_SUFFIX
 
+/* Define this to 1 if strerror is broken. */
+#undef REPLACE_STRERROR
+
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'sig_atomic_t'. */
 #undef SIG_ATOMIC_T_SUFFIX
@@ -329,21 +335,9 @@
    'wint_t'. */
 #undef WINT_T_SUFFIX
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
@@ -357,16 +351,27 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
 #endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+/* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
 
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
diff --git a/src/lib.c b/src/lib.c
index cee9c26..4c96c7a 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -42,10 +42,10 @@ htonll (uint64_t val)
 {
   uint32_t low, high;
   uint64_t ret;
+  verify (sizeof (ret) == sizeof (high) + sizeof (low));
 
   low = htonl ((uint32_t)val);
   high = htonl (val >> 32);
-  verify (sizeof (ret) == sizeof (high) + sizeof (low));
   memcpy (&ret, &high, sizeof (high));
   memcpy ((unsigned char *)&ret + sizeof (high), &low, sizeof (low));
   return ret;
@@ -56,8 +56,8 @@ uint64_t
 ntohll (uint64_t val)
 {
   uint32_t low, high;
-
   verify (sizeof (high) + sizeof (low) == sizeof (val));
+
   memcpy (&high, &val, sizeof (high));
   memcpy (&low, (unsigned char *)&val + sizeof (high), sizeof (low));
   return (uint64_t)ntohl (high) << 32 | ntohl (low);
@@ -95,7 +95,9 @@ dir_path_cmp (const char *a, const char *b)
       a++;
       b++;
     }
-  verify (sizeof (int) > sizeof (unsigned char)); /* To rule out overflow */
+  {
+    verify (sizeof (int) > sizeof (unsigned char)); /* To rule out overflow */
+  }
   return ((int)dir_path_cmp_table[(unsigned char)*a]
 	  - (int)dir_path_cmp_table[(unsigned char)*b]);
 }
@@ -165,7 +167,9 @@ db_open (struct db *db, struct db_header *header, int fd, const char *filename,
       db_report_error (db);
       goto err_fd;
     }
-  verify (sizeof (magic) == sizeof (header->magic));
+  {
+    verify (sizeof (magic) == sizeof (header->magic));
+  }
   if (memcmp (header->magic, magic, sizeof (magic)) != 0)
     {
       if (quiet == 0)
@@ -208,7 +212,9 @@ db_refill (struct db *db)
 {
   ssize_t size;
 
-  verify (sizeof (db->buffer) <= SSIZE_MAX);
+  {
+    verify (sizeof (db->buffer) <= SSIZE_MAX);
+  }
   size = safe_read (db->fd, db->buffer, sizeof (db->buffer));
   switch (size)
     {
diff --git a/src/lib.h b/src/lib.h
index 9bbe0d5..9a8e538 100644
--- a/src/lib.h
+++ b/src/lib.h
@@ -25,17 +25,11 @@ Author: Miloslav Trmac <mitr@redhat.com> */
 #include <stdint.h>
 #include <sys/types.h>
 
+#include "gettext.h"
 #include "obstack.h"
 
 #include "db.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#else
-#define gettext(X) (X)
-#define ngettext(S, P, N) ((N) != 1 ? (P) : (S))
-#endif
-
 #ifdef __GNUC__
 #define attribute__(X) __attribute__ (X)
 #else
diff --git a/src/updatedb.c b/src/updatedb.c
index a6f70c4..e2da177 100644
--- a/src/updatedb.c
+++ b/src/updatedb.c
@@ -1,6 +1,6 @@
 /* updatedb(8).
 
-Copyright (C) 2005, 2007 Red Hat, Inc. All rights reserved.
+Copyright (C) 2005, 2007, 2008 Red Hat, Inc. All rights reserved.
 This copyrighted material is made available to anyone wishing to use, modify,
 copy, or redistribute it subject to the terms and conditions of the GNU General
 Public License v.2.
@@ -343,6 +343,9 @@ rebuild_bind_mount_paths (void)
   FILE *f;
   struct mntent *me;
 
+  if (conf_debug_pruning != false)
+    /* This is debuging output, don't mark anything for translation */
+    fprintf (stderr, "Rebuilding bind_mount_paths:\n");
   obstack_free (&bind_mount_paths_obstack, bind_mount_paths_mark);
   bind_mount_paths_mark = obstack_alloc (&bind_mount_paths_obstack, 0);
   bind_mount_paths.len = 0;
@@ -351,6 +354,9 @@ rebuild_bind_mount_paths (void)
     goto err;
   while ((me = getmntent (f)) != NULL)
     {
+      if (conf_debug_pruning != false)
+	/* This is debuging output, don't mark anything for translation */
+	fprintf (stderr, " `%s', opts `%s'\n", me->mnt_dir, me->mnt_opts);
       if (hasmntopt (me, "bind") != NULL)
 	{
 	  char dbuf[PATH_MAX], *dir;
@@ -358,6 +364,9 @@ rebuild_bind_mount_paths (void)
 	  dir = realpath (me->mnt_dir, dbuf);
 	  if (dir == NULL)
 	    dir = me->mnt_dir;
+	  if (conf_debug_pruning != false)
+	    /* This is debuging output, don't mark anything for translation */
+	    fprintf (stderr, " => adding `%s'\n", dir);
 	  dir = obstack_copy (&bind_mount_paths_obstack, dir, strlen (dir) + 1);
 	  string_list_append (&bind_mount_paths, dir);
 	}
@@ -365,6 +374,9 @@ rebuild_bind_mount_paths (void)
   endmntent (f);
   /* Fall through */
  err:
+  if (conf_debug_pruning != false)
+    /* This is debuging output, don't mark anything for translation */
+    fprintf (stderr, "...done\n");
   string_list_dir_path_sort (&bind_mount_paths);
 }
 
@@ -431,6 +443,9 @@ filesystem_is_excluded (const char *path)
   struct mntent *me;
   bool res;
 
+  if (conf_debug_pruning != false)
+    /* This is debuging output, don't mark anything for translation */
+    fprintf (stderr, "Checking whether filesystem `%s' is excluded:\n", path);
   res = false;
   f = setmntent (MOUNT_TABLE_PATH, "r");
   if (f == NULL)
@@ -440,6 +455,9 @@ filesystem_is_excluded (const char *path)
       char *p;
       size_t size;
 
+      if (conf_debug_pruning != false)
+	/* This is debuging output, don't mark anything for translation */
+	fprintf (stderr, " `%s', type `%s'\n", me->mnt_dir, me->mnt_type);
       size = strlen (me->mnt_type) + 1;
       while (size > type_size)
 	type = x2realloc (type, &type_size);
@@ -462,6 +480,9 @@ filesystem_is_excluded (const char *path)
 	     if the filesystem is unavailable hard-mounted NFS. */
 	  dir = me->mnt_dir;
 #endif
+	  if (conf_debug_pruning != false)
+	    /* This is debuging output, don't mark anything for translation */
+	    fprintf (stderr, " => type matches, dir `%s'\n", dir);
 	  if (strcmp (path, dir) == 0)
 	    {
 	      res = true;
@@ -472,6 +493,9 @@ filesystem_is_excluded (const char *path)
  err_f:
   endmntent (f);
  err:
+  if (conf_debug_pruning != false)
+    /* This is debuging output, don't mark anything for translation */
+    fprintf (stderr, "...done\n");
   return res;
 }
 
@@ -523,7 +547,7 @@ write_directory (const struct directory *dir)
    entries in DIR, and write results to new_db.  The current working directory
    is not guaranteed to be preserved on return from this function. */
 static void
-scan_subdirs (const const struct directory *dir, const struct stat *st)
+scan_subdirs (const struct directory *dir, const struct stat *st)
 {
   char *path;
   int cwd_fd;
@@ -623,7 +647,9 @@ copy_old_dir (struct directory *dest)
 	default:
 	  goto err_obstack;
 	}
-      verify (offsetof (struct entry, name) <= OBSTACK_SIZE_MAX);
+      {
+	verify (offsetof (struct entry, name) <= OBSTACK_SIZE_MAX);
+      }
       obstack_blank (&scan_dir_state.data_obstack,
 		     offsetof (struct entry, name));
       if (db_read_name (&old_db, &scan_dir_state.data_obstack) != 0)
@@ -784,13 +810,28 @@ scan (char *path, int *cwd_fd, const struct stat *st_parent,
   bool have_subdir, did_chdir;
 
   if (path_is_in_list (&conf_prunepaths, &conf_prunepaths_index, path))
-    goto err;
+    {
+      if (conf_debug_pruning != false)
+	/* This is debuging output, don't mark anything for translation */
+	fprintf (stderr, "Skipping `%s': in prunepaths\n", path);
+      goto err;
+    }
   if (conf_prune_bind_mounts != false && is_bind_mount (path))
-    goto err;
+    {
+      if (conf_debug_pruning != false)
+	/* This is debuging output, don't mark anything for translation */
+	fprintf (stderr, "Skipping `%s': bind mount\n", path);
+      goto err;
+    }
   if (lstat (relative, &st) != 0)
     goto err;
   if (st.st_dev != st_parent->st_dev && filesystem_is_excluded (path))
-    goto err;
+    {
+      if (conf_debug_pruning != false)
+	/* This is debuging output, don't mark anything for translation */
+	fprintf (stderr, "Skipping `%s': in prunefs\n", path);
+      goto err;
+    }
   /* "relative" may now become a symlink to somewhere else.  So we use it only
      in safe_chdir (). */
   entries_mark = obstack_alloc (&scan_dir_state.data_obstack, 0);
@@ -935,7 +976,9 @@ new_db_open (void)
   if (new_db == NULL)
     error (EXIT_FAILURE, errno, _("can not open `%s'"), new_db_filename);
   memset (&db_header, 0, sizeof (db_header));
-  verify (sizeof (db_header.magic) == sizeof (magic));
+  {
+    verify (sizeof (db_header.magic) == sizeof (magic));
+  }
   memcpy (db_header.magic, &magic, sizeof (magic));
   if (conf_block_size > UINT32_MAX)
     error (EXIT_FAILURE, 0, _("configuration is too large"));
@@ -980,13 +1023,14 @@ main (int argc, char *argv[])
   if (conf_check_visibility != false)
     {
       struct group *grp;
-      
+
       grp = getgrnam (GROUPNAME);
       if (grp == NULL)
 	error (EXIT_FAILURE, errno, _("can not find group `%s'"), GROUPNAME);
       if (chown (new_db_filename, (uid_t)-1, grp->gr_gid) != 0)
-	error (EXIT_FAILURE, errno, _("can not change group of file `%s'"),
-	       new_db_filename);
+	error (EXIT_FAILURE, errno,
+	       _("can not change group of file `%s' to `%s'"), new_db_filename,
+	       GROUPNAME);
       mode = S_IRUSR | S_IWUSR | S_IRGRP;
     }
   else /* Permissions as if open (..., O_CREAT | O_WRONLY, 0666) */
diff --git a/tests/config.at b/tests/config.at
index 2666094..4e55824 100644
--- a/tests/config.at
+++ b/tests/config.at
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2006, 2007, 2008 Red Hat, Inc. All rights reserved.
 # This copyrighted material is made available to anyone wishing to use, modify,
 # copy, or redistribute it subject to the terms and conditions of the GNU
 # General Public License v.2.
@@ -195,6 +195,10 @@ This program is provided with NO WARRANTY, to the extent permitted by law.
 AT_CLEANUP
 
 
+# Output depends on the local system configuration too much
+M_CONF_UNTESTED([config: --debug-pruning])
+
+
 AT_SETUP([config: --prune-bind-mounts])
 AT_KEYWORDS([updatedb])
 
diff --git a/tests/locate.at b/tests/locate.at
index 7483aee..f2aa68d 100644
--- a/tests/locate.at
+++ b/tests/locate.at
@@ -390,7 +390,8 @@ touch d/f
 
 AT_CHECK([updatedb -U "$(pwd)/d" -o db -l 0])
 
-AT_CHECK([[locate -d db -S | sed 's/[0123456789]* bytes\?/BYTES bytes/']], ,
+AT_CHECK([[locate -d db -S | sed 's/[0123456789]* bytes\{0,1\}/BYTES bytes/']],
+	 ,
 [Database db:
 	1 directory
 	2 files
@@ -399,7 +400,7 @@ AT_CHECK([[locate -d db -S | sed 's/[0123456789]* bytes\?/BYTES bytes/']], ,
 ])
 
 AT_CHECK([[locate -d - --statistics < db \
-	| sed 's/[0123456789]* bytes\?/BYTES bytes/']], ,
+	| sed 's/[0123456789]* bytes\{0,1\}/BYTES bytes/']], ,
 [Database -:
 	1 directory
 	2 files
@@ -567,14 +568,14 @@ AT_CLEANUP
 AT_SETUP([locate: LOCATE_PATH])
 
 mkdir d1 d2
-touch d1/f d2/f
+touch d1/foo d2/foo
 
 AT_CHECK([updatedb -U "$(pwd)/d1" -o db1 -l 0])
 AT_CHECK([updatedb -U "$(pwd)/d2" -o db2 -l 0])
 
-AT_CHECK([LOCATE_PATH=db1 locate -d db2 /f | sed "s,$(pwd)/,,"], ,
-[d2/f
-d1/f
+AT_CHECK([LOCATE_PATH=db1 locate -d db2 /foo | sed "s,$(pwd)/,,"], ,
+[d2/foo
+d1/foo
 ])
 
 AT_CLEANUP
diff --git a/tests/package.m4 b/tests/package.m4
index d5e66bd..9f2da33 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -1,6 +1,6 @@
 # Signature of the current package.
 m4_define([AT_PACKAGE_NAME],      [mlocate])
 m4_define([AT_PACKAGE_TARNAME],   [mlocate])
-m4_define([AT_PACKAGE_VERSION],   [0.18])
-m4_define([AT_PACKAGE_STRING],    [mlocate 0.18])
+m4_define([AT_PACKAGE_VERSION],   [0.19])
+m4_define([AT_PACKAGE_STRING],    [mlocate 0.19])
 m4_define([AT_PACKAGE_BUGREPORT], [mitr@redhat.com])
diff --git a/tests/testsuite b/tests/testsuite
index 6a83529..c582099 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -636,7 +636,7 @@ at_times_file=$at_suite_dir/at-times
 # List of the tested programs.
 at_tested='locate updatedb'
 # List of the all the test groups.
-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39'
+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40'
 # As many question marks as there are digits in the last test group number.
 # Used to normalize the test group numbers so that `ls' lists them in
 # numerical order.
@@ -651,36 +651,37 @@ at_help_all="1;config.at:26;config: updatedb.conf;updatedb;
 7;config.at:114;config: -U;updatedb;
 8;config.at:149;config: -v;updatedb;
 9;config.at:176;config: -V;updatedb;
-10;config.at:198;config: --prune-bind-mounts;updatedb;
-11;config.at:214;config: --prunefs;updatedb;
-12;config.at:230;config: --prunepaths;updatedb;
-13;locate.at:17;locate: Basic;locate;
-14;locate.at:60;locate: -b;locate;
-15;locate.at:89;locate: -c;locate;
-16;locate.at:112;locate: -d;locate;
-17;locate.at:156;locate: -e;locate;
-18;locate.at:192;locate: -h;locate;
-19;locate.at:231;locate: -i;locate;
-20;locate.at:259;locate: -l, -n;;
-21;locate.at:291;locate: -L;locate;
-22;locate.at:333;locate: -P;locate;
-23;locate.at:381;locate: -S;locate;
-24;locate.at:413;locate: -q;locate;
-25;locate.at:425;locate: -r;locate;
-26;locate.at:462;locate: -V;locate;
-27;locate.at:484;locate: -w;locate;
-28;locate.at:519;locate: -0;locate;
-29;locate.at:536;locate: --regex;locate;
-30;locate.at:567;locate: LOCATE_PATH;;
-31;locate.at:583;locate: Invalid source database;locate;
-32;updatedb.at:17;updatedb: File types;updatedb;
-33;updatedb.at:49;updatedb: Output sorting;updatedb;
-34;updatedb.at:82;updatedb: Permissions;updatedb;
-35;updatedb.at:127;updatedb: Invalid source database;updatedb;
-36;updatedb.at:158;updatedb: Change detection;updatedb;
-37;updatedb.at:217;updatedb: Concurrent modification;updatedb;
-38;updatedb.at:239;updatedb: Very deep hierarchy;updatedb;
-39;updatedb.at:266;updatedb: Output creation;;
+10;config.at:199;config: --debug-pruning;updatedb;
+11;config.at:202;config: --prune-bind-mounts;updatedb;
+12;config.at:218;config: --prunefs;updatedb;
+13;config.at:234;config: --prunepaths;updatedb;
+14;locate.at:17;locate: Basic;locate;
+15;locate.at:60;locate: -b;locate;
+16;locate.at:89;locate: -c;locate;
+17;locate.at:112;locate: -d;locate;
+18;locate.at:156;locate: -e;locate;
+19;locate.at:192;locate: -h;locate;
+20;locate.at:231;locate: -i;locate;
+21;locate.at:259;locate: -l, -n;;
+22;locate.at:291;locate: -L;locate;
+23;locate.at:333;locate: -P;locate;
+24;locate.at:381;locate: -S;locate;
+25;locate.at:414;locate: -q;locate;
+26;locate.at:426;locate: -r;locate;
+27;locate.at:463;locate: -V;locate;
+28;locate.at:485;locate: -w;locate;
+29;locate.at:520;locate: -0;locate;
+30;locate.at:537;locate: --regex;locate;
+31;locate.at:568;locate: LOCATE_PATH;;
+32;locate.at:584;locate: Invalid source database;locate;
+33;updatedb.at:17;updatedb: File types;updatedb;
+34;updatedb.at:49;updatedb: Output sorting;updatedb;
+35;updatedb.at:82;updatedb: Permissions;updatedb;
+36;updatedb.at:127;updatedb: Invalid source database;updatedb;
+37;updatedb.at:158;updatedb: Change detection;updatedb;
+38;updatedb.at:217;updatedb: Concurrent modification;updatedb;
+39;updatedb.at:239;updatedb: Very deep hierarchy;updatedb;
+40;updatedb.at:266;updatedb: Output creation;;
 "
 
 at_prev=
@@ -904,7 +905,7 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF
-mlocate 0.18 test suite test groups:
+mlocate 0.19 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -928,7 +929,7 @@ _ATEOF
   exit 0
 fi
 if $at_version_p; then
-  echo "$as_me (mlocate 0.18)"
+  echo "$as_me (mlocate 0.19)"
   cat <<\_ACEOF
 
 Copyright (C) 2006 Red Hat, Inc. All rights reserved.
@@ -1028,13 +1029,13 @@ exec 5>>"$at_suite_log"
 # Banners and logs.
 cat <<\_ASBOX
 ## ------------------------ ##
-## mlocate 0.18 test suite. ##
+## mlocate 0.19 test suite. ##
 ## ------------------------ ##
 _ASBOX
 {
   cat <<\_ASBOX
 ## ------------------------ ##
-## mlocate 0.18 test suite. ##
+## mlocate 0.19 test suite. ##
 ## ------------------------ ##
 _ASBOX
   echo
@@ -2343,21 +2344,75 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  10 ) # 10. config.at:198: config: --prune-bind-mounts
-    at_setup_line='config.at:198'
+  10 ) # 10. config.at:199: config: --debug-pruning
+    at_setup_line='config.at:199'
+    at_desc="config: --debug-pruning"
+    $at_quiet $ECHO_N " 10: config: --debug-pruning                        $ECHO_C"
+    at_xfail=no
+    echo "#                             -*- compilation -*-" >> "$at_group_log"
+    (
+      echo "10. config.at:199: testing ..."
+      $at_traceon
+
+
+$at_traceoff
+echo "$at_srcdir/config.at:199: exit 77"
+echo config.at:199 >"$at_check_line_file"
+
+at_trace_this=
+if test -n "$at_traceon"; then
+    at_trace_this=yes
+fi
+
+if test -n "$at_trace_this"; then
+    ( $at_traceon; exit 77 ) >"$at_stdout" 2>"$at_stder1"
+    at_status=$?
+    grep '^ *+' "$at_stder1" >&2
+    grep -v '^ *+' "$at_stder1" >"$at_stderr"
+else
+    ( :; exit 77 ) >"$at_stdout" 2>"$at_stderr"
+    at_status=$?
+fi
+
+at_failed=false
+$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+$at_diff "$at_devnull" "$at_stdout" || at_failed=:
+case $at_status in
+   77) echo 77 > "$at_status_file"; exit 77;;
+   0) ;;
+   *) echo "$at_srcdir/config.at:199: exit code was $at_status, expected 0"
+      at_failed=:;;
+esac
+if $at_failed; then
+
+
+  echo 1 > "$at_status_file"
+  exit 1
+fi
+
+$at_traceon
+
+      $at_traceoff
+      $at_times_p && times >"$at_times_file"
+    ) 5>&1 2>&1 | eval $at_tee_pipe
+    at_status=`cat "$at_status_file"`
+    ;;
+
+  11 ) # 11. config.at:202: config: --prune-bind-mounts
+    at_setup_line='config.at:202'
     at_desc="config: --prune-bind-mounts"
-    $at_quiet $ECHO_N " 10: config: --prune-bind-mounts                    $ECHO_C"
+    $at_quiet $ECHO_N " 11: config: --prune-bind-mounts                    $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "10. config.at:198: testing ..."
+      echo "11. config.at:202: testing ..."
       $at_traceon
 
 
 
 $at_traceoff
-echo "$at_srcdir/config.at:201: updatedb --prune-bind-mounts no --prune-bind-mounts yes"
-echo config.at:201 >"$at_check_line_file"
+echo "$at_srcdir/config.at:205: updatedb --prune-bind-mounts no --prune-bind-mounts yes"
+echo config.at:205 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -2381,7 +2436,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/config.at:201: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/config.at:205: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -2395,8 +2450,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/config.at:205: updatedb --prune-bind-mounts maybe"
-echo config.at:205 >"$at_check_line_file"
+echo "$at_srcdir/config.at:209: updatedb --prune-bind-mounts maybe"
+echo config.at:209 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -2420,7 +2475,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/config.at:205: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/config.at:209: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -2441,21 +2496,21 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  11 ) # 11. config.at:214: config: --prunefs
-    at_setup_line='config.at:214'
+  12 ) # 12. config.at:218: config: --prunefs
+    at_setup_line='config.at:218'
     at_desc="config: --prunefs"
-    $at_quiet $ECHO_N " 11: config: --prunefs                              $ECHO_C"
+    $at_quiet $ECHO_N " 12: config: --prunefs                              $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "11. config.at:214: testing ..."
+      echo "12. config.at:218: testing ..."
       $at_traceon
 
 
 
 $at_traceoff
-echo "$at_srcdir/config.at:217: updatedb --prunefs foo --prunefs bar"
-echo config.at:217 >"$at_check_line_file"
+echo "$at_srcdir/config.at:221: updatedb --prunefs foo --prunefs bar"
+echo config.at:221 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -2479,7 +2534,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/config.at:217: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/config.at:221: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -2493,8 +2548,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/config.at:221: updatedb -f foo --prunefs bar"
-echo config.at:221 >"$at_check_line_file"
+echo "$at_srcdir/config.at:225: updatedb -f foo --prunefs bar"
+echo config.at:225 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -2518,7 +2573,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/config.at:221: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/config.at:225: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -2539,21 +2594,21 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  12 ) # 12. config.at:230: config: --prunepaths
-    at_setup_line='config.at:230'
+  13 ) # 13. config.at:234: config: --prunepaths
+    at_setup_line='config.at:234'
     at_desc="config: --prunepaths"
-    $at_quiet $ECHO_N " 12: config: --prunepaths                           $ECHO_C"
+    $at_quiet $ECHO_N " 13: config: --prunepaths                           $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "12. config.at:230: testing ..."
+      echo "13. config.at:234: testing ..."
       $at_traceon
 
 
 
 $at_traceoff
-echo "$at_srcdir/config.at:233: updatedb --prunepaths foo --prunepaths bar"
-echo config.at:233 >"$at_check_line_file"
+echo "$at_srcdir/config.at:237: updatedb --prunepaths foo --prunepaths bar"
+echo config.at:237 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -2577,7 +2632,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/config.at:233: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/config.at:237: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -2591,8 +2646,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/config.at:237: updatedb -e foo --prunepaths bar"
-echo config.at:237 >"$at_check_line_file"
+echo "$at_srcdir/config.at:241: updatedb -e foo --prunepaths bar"
+echo config.at:241 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -2616,7 +2671,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/config.at:237: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/config.at:241: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -2636,9 +2691,9 @@ for i in 1 2 3; do
 done
 
 $at_traceoff
-echo "$at_srcdir/config.at:247: updatedb -U \"\$(pwd)/d\" -o db -l 0 \\
+echo "$at_srcdir/config.at:251: updatedb -U \"\$(pwd)/d\" -o db -l 0 \\
 	--prunepaths \"\$(pwd)/d/d3 \$(pwd)/d/d1 \$(pwd)/this_doesnt_exist\""
-echo config.at:247 >"$at_check_line_file"
+echo config.at:251 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -2663,7 +2718,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/config.at:247: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/config.at:251: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -2676,8 +2731,8 @@ fi
 $at_traceon
 
 $at_traceoff
-echo "$at_srcdir/config.at:249: locate -d db / | sed \"s,\$(pwd)/,,\""
-echo config.at:249 >"$at_check_line_file"
+echo "$at_srcdir/config.at:253: locate -d db / | sed \"s,\$(pwd)/,,\""
+echo config.at:253 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -2705,7 +2760,7 @@ d/d2/f
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/config.at:249: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/config.at:253: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -2724,14 +2779,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  13 ) # 13. locate.at:17: locate: Basic
+  14 ) # 14. locate.at:17: locate: Basic
     at_setup_line='locate.at:17'
     at_desc="locate: Basic"
-    $at_quiet $ECHO_N " 13: locate: Basic                                  $ECHO_C"
+    $at_quiet $ECHO_N " 14: locate: Basic                                  $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "13. locate.at:17: testing ..."
+      echo "14. locate.at:17: testing ..."
       $at_traceon
 
 
@@ -3096,14 +3151,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  14 ) # 14. locate.at:60: locate: -b
+  15 ) # 15. locate.at:60: locate: -b
     at_setup_line='locate.at:60'
     at_desc="locate: -b"
-    $at_quiet $ECHO_N " 14: locate: -b                                     $ECHO_C"
+    $at_quiet $ECHO_N " 15: locate: -b                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "14. locate.at:60: testing ..."
+      echo "15. locate.at:60: testing ..."
       $at_traceon
 
 
@@ -3349,14 +3404,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  15 ) # 15. locate.at:89: locate: -c
+  16 ) # 16. locate.at:89: locate: -c
     at_setup_line='locate.at:89'
     at_desc="locate: -c"
-    $at_quiet $ECHO_N " 15: locate: -c                                     $ECHO_C"
+    $at_quiet $ECHO_N " 16: locate: -c                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "15. locate.at:89: testing ..."
+      echo "16. locate.at:89: testing ..."
       $at_traceon
 
 
@@ -3525,14 +3580,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  16 ) # 16. locate.at:112: locate: -d
+  17 ) # 17. locate.at:112: locate: -d
     at_setup_line='locate.at:112'
     at_desc="locate: -d"
-    $at_quiet $ECHO_N " 16: locate: -d                                     $ECHO_C"
+    $at_quiet $ECHO_N " 17: locate: -d                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "16. locate.at:112: testing ..."
+      echo "17. locate.at:112: testing ..."
       $at_traceon
 
 
@@ -3863,14 +3918,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  17 ) # 17. locate.at:156: locate: -e
+  18 ) # 18. locate.at:156: locate: -e
     at_setup_line='locate.at:156'
     at_desc="locate: -e"
-    $at_quiet $ECHO_N " 17: locate: -e                                     $ECHO_C"
+    $at_quiet $ECHO_N " 18: locate: -e                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "17. locate.at:156: testing ..."
+      echo "18. locate.at:156: testing ..."
       $at_traceon
 
 
@@ -4052,14 +4107,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  18 ) # 18. locate.at:192: locate: -h
+  19 ) # 19. locate.at:192: locate: -h
     at_setup_line='locate.at:192'
     at_desc="locate: -h"
-    $at_quiet $ECHO_N " 18: locate: -h                                     $ECHO_C"
+    $at_quiet $ECHO_N " 19: locate: -h                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "18. locate.at:192: testing ..."
+      echo "19. locate.at:192: testing ..."
       $at_traceon
 
 
@@ -4184,14 +4239,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  19 ) # 19. locate.at:231: locate: -i
+  20 ) # 20. locate.at:231: locate: -i
     at_setup_line='locate.at:231'
     at_desc="locate: -i"
-    $at_quiet $ECHO_N " 19: locate: -i                                     $ECHO_C"
+    $at_quiet $ECHO_N " 20: locate: -i                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "19. locate.at:231: testing ..."
+      echo "20. locate.at:231: testing ..."
       $at_traceon
 
 
@@ -4365,14 +4420,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  20 ) # 20. locate.at:259: locate: -l, -n
+  21 ) # 21. locate.at:259: locate: -l, -n
     at_setup_line='locate.at:259'
     at_desc="locate: -l, -n"
-    $at_quiet $ECHO_N " 20: locate: -l, -n                                 $ECHO_C"
+    $at_quiet $ECHO_N " 21: locate: -l, -n                                 $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "20. locate.at:259: testing ..."
+      echo "21. locate.at:259: testing ..."
       $at_traceon
 
 
@@ -4656,14 +4711,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  21 ) # 21. locate.at:291: locate: -L
+  22 ) # 22. locate.at:291: locate: -L
     at_setup_line='locate.at:291'
     at_desc="locate: -L"
-    $at_quiet $ECHO_N " 21: locate: -L                                     $ECHO_C"
+    $at_quiet $ECHO_N " 22: locate: -L                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "21. locate.at:291: testing ..."
+      echo "22. locate.at:291: testing ..."
       $at_traceon
 
 
@@ -4921,14 +4976,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  22 ) # 22. locate.at:333: locate: -P
+  23 ) # 23. locate.at:333: locate: -P
     at_setup_line='locate.at:333'
     at_desc="locate: -P"
-    $at_quiet $ECHO_N " 22: locate: -P                                     $ECHO_C"
+    $at_quiet $ECHO_N " 23: locate: -P                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "22. locate.at:333: testing ..."
+      echo "23. locate.at:333: testing ..."
       $at_traceon
 
 
@@ -5227,14 +5282,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  23 ) # 23. locate.at:381: locate: -S
+  24 ) # 24. locate.at:381: locate: -S
     at_setup_line='locate.at:381'
     at_desc="locate: -S"
-    $at_quiet $ECHO_N " 23: locate: -S                                     $ECHO_C"
+    $at_quiet $ECHO_N " 24: locate: -S                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "23. locate.at:381: testing ..."
+      echo "24. locate.at:381: testing ..."
       $at_traceon
 
 
@@ -5320,7 +5375,7 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:393: locate -d db -S | sed 's/[0123456789]* bytes\\?/BYTES bytes/'"
+echo "$at_srcdir/locate.at:393: locate -d db -S | sed 's/[0123456789]* bytes\\{0,1\\}/BYTES bytes/'"
 echo locate.at:393 >"$at_check_line_file"
 
 at_trace_this=
@@ -5329,12 +5384,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; locate -d db -S | sed 's/[0123456789]* bytes\?/BYTES bytes/' ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; locate -d db -S | sed 's/[0123456789]* bytes\{0,1\}/BYTES bytes/' ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; locate -d db -S | sed 's/[0123456789]* bytes\?/BYTES bytes/' ) >"$at_stdout" 2>"$at_stderr"
+    ( :; locate -d db -S | sed 's/[0123456789]* bytes\{0,1\}/BYTES bytes/' ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -5363,9 +5418,9 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:401: locate -d - --statistics < db \\
-	| sed 's/[0123456789]* bytes\\?/BYTES bytes/'"
-echo locate.at:401 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:402: locate -d - --statistics < db \\
+	| sed 's/[0123456789]* bytes\\{0,1\\}/BYTES bytes/'"
+echo locate.at:402 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5374,13 +5429,13 @@ fi
 
 if test -n "$at_trace_this"; then
     ( $at_traceon; locate -d - --statistics < db \
-	| sed 's/[0123456789]* bytes\?/BYTES bytes/' ) >"$at_stdout" 2>"$at_stder1"
+	| sed 's/[0123456789]* bytes\{0,1\}/BYTES bytes/' ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
     ( :; locate -d - --statistics < db \
-	| sed 's/[0123456789]* bytes\?/BYTES bytes/' ) >"$at_stdout" 2>"$at_stderr"
+	| sed 's/[0123456789]* bytes\{0,1\}/BYTES bytes/' ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -5395,7 +5450,7 @@ echo >>"$at_stdout"; echo "Database -:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:401: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:402: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5414,21 +5469,21 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  24 ) # 24. locate.at:413: locate: -q
-    at_setup_line='locate.at:413'
+  25 ) # 25. locate.at:414: locate: -q
+    at_setup_line='locate.at:414'
     at_desc="locate: -q"
-    $at_quiet $ECHO_N " 24: locate: -q                                     $ECHO_C"
+    $at_quiet $ECHO_N " 25: locate: -q                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "24. locate.at:413: testing ..."
+      echo "25. locate.at:414: testing ..."
       $at_traceon
 
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:416: locate -d this_doesnt_exist -q '*'"
-echo locate.at:416 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:417: locate -d this_doesnt_exist -q '*'"
+echo locate.at:417 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5451,7 +5506,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:416: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:417: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5464,8 +5519,8 @@ fi
 $at_traceon
 
 $at_traceoff
-echo "$at_srcdir/locate.at:417: locate -d this_doesnt_exist --quiet '*'"
-echo locate.at:417 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:418: locate -d this_doesnt_exist --quiet '*'"
+echo locate.at:418 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5488,7 +5543,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:417: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:418: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5503,8 +5558,8 @@ $at_traceon
 
 printf '\000mlocate\000\000\000\000\000\377xx-' > db
 $at_traceoff
-echo "$at_srcdir/locate.at:420: locate -d db -q '*'"
-echo locate.at:420 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:421: locate -d db -q '*'"
+echo locate.at:421 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5527,7 +5582,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:420: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:421: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5546,21 +5601,21 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  25 ) # 25. locate.at:425: locate: -r
-    at_setup_line='locate.at:425'
+  26 ) # 26. locate.at:426: locate: -r
+    at_setup_line='locate.at:426'
     at_desc="locate: -r"
-    $at_quiet $ECHO_N " 25: locate: -r                                     $ECHO_C"
+    $at_quiet $ECHO_N " 26: locate: -r                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "25. locate.at:425: testing ..."
+      echo "26. locate.at:426: testing ..."
       $at_traceon
 
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:428: locate -d db -r '.*' '*'"
-echo locate.at:428 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:429: locate -d db -r '.*' '*'"
+echo locate.at:429 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5584,7 +5639,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:428: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:429: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5601,8 +5656,8 @@ mkdir d
 touch d/foo d/Foo d/bar
 
 $at_traceoff
-echo "$at_srcdir/locate.at:435: updatedb -U \"\$(pwd)/d\" -o db -l 0"
-echo locate.at:435 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:436: updatedb -U \"\$(pwd)/d\" -o db -l 0"
+echo locate.at:436 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5625,7 +5680,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:435: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:436: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5640,8 +5695,8 @@ $at_traceon
 
 # Default is not to use regexps
 $at_traceoff
-echo "$at_srcdir/locate.at:438: locate -d db '.*f.o'"
-echo locate.at:438 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:439: locate -d db '.*f.o'"
+echo locate.at:439 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5664,7 +5719,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:438: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:439: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5678,8 +5733,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:440: locate -d db -r '.*foo' | sed \"s,\$(pwd)/,,\""
-echo locate.at:440 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:441: locate -d db -r '.*foo' | sed \"s,\$(pwd)/,,\""
+echo locate.at:441 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5703,7 +5758,7 @@ echo >>"$at_stdout"; echo "d/foo
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:440: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:441: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5717,8 +5772,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:444: locate -d db --regexp '.*foo' -r '.*d/bar' | sed \"s,\$(pwd)/,,\""
-echo locate.at:444 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:445: locate -d db --regexp '.*foo' -r '.*d/bar' | sed \"s,\$(pwd)/,,\""
+echo locate.at:445 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5743,7 +5798,7 @@ d/foo
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:444: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:445: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5757,8 +5812,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:449: locate -d db --regexp '.*foo' -i | sed \"s,\$(pwd)/,,\""
-echo locate.at:449 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:450: locate -d db --regexp '.*foo' -i | sed \"s,\$(pwd)/,,\""
+echo locate.at:450 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5783,7 +5838,7 @@ d/foo
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:449: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:450: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5797,8 +5852,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:454: locate -d db --regexp '\\(' 2> err"
-echo locate.at:454 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:455: locate -d db --regexp '\\(' 2> err"
+echo locate.at:455 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5821,7 +5876,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:454: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:455: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5834,8 +5889,8 @@ fi
 $at_traceon
 
 $at_traceoff
-echo "$at_srcdir/locate.at:455: sed \"s/': .*/': /\" < err"
-echo locate.at:455 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:456: sed \"s/': .*/': /\" < err"
+echo locate.at:456 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5859,7 +5914,7 @@ echo >>"$at_stdout"; echo "locate: invalid regexp \`\\(':
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:455: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:456: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5878,21 +5933,21 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  26 ) # 26. locate.at:462: locate: -V
-    at_setup_line='locate.at:462'
+  27 ) # 27. locate.at:463: locate: -V
+    at_setup_line='locate.at:463'
     at_desc="locate: -V"
-    $at_quiet $ECHO_N " 26: locate: -V                                     $ECHO_C"
+    $at_quiet $ECHO_N " 27: locate: -V                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "26. locate.at:462: testing ..."
+      echo "27. locate.at:463: testing ..."
       $at_traceon
 
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:465: locate -V | sed '1s/ .*/ /'"
-echo locate.at:465 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:466: locate -V | sed '1s/ .*/ /'"
+echo locate.at:466 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5920,7 +5975,7 @@ This program is provided with NO WARRANTY, to the extent permitted by law.
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:465: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:466: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5934,8 +5989,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:473: locate --version | sed '1s/ .*/ /'"
-echo locate.at:473 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:474: locate --version | sed '1s/ .*/ /'"
+echo locate.at:474 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -5963,7 +6018,7 @@ This program is provided with NO WARRANTY, to the extent permitted by law.
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:473: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:474: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -5982,21 +6037,21 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  27 ) # 27. locate.at:484: locate: -w
-    at_setup_line='locate.at:484'
+  28 ) # 28. locate.at:485: locate: -w
+    at_setup_line='locate.at:485'
     at_desc="locate: -w"
-    $at_quiet $ECHO_N " 27: locate: -w                                     $ECHO_C"
+    $at_quiet $ECHO_N " 28: locate: -w                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "27. locate.at:484: testing ..."
+      echo "28. locate.at:485: testing ..."
       $at_traceon
 
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:487: locate -w --wholename"
-echo locate.at:487 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:488: locate -w --wholename"
+echo locate.at:488 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6020,7 +6075,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:487: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:488: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6034,8 +6089,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:491: locate -b -w"
-echo locate.at:491 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:492: locate -b -w"
+echo locate.at:492 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6059,7 +6114,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:491: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:492: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6076,8 +6131,8 @@ mkdir d
 touch d/f
 
 $at_traceoff
-echo "$at_srcdir/locate.at:498: updatedb -U \"\$(pwd)/d\" -o db -l 0"
-echo locate.at:498 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:499: updatedb -U \"\$(pwd)/d\" -o db -l 0"
+echo locate.at:499 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6100,7 +6155,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:498: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:499: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6115,8 +6170,8 @@ $at_traceon
 
 # -w is the default
 $at_traceoff
-echo "$at_srcdir/locate.at:501: locate -d db '/d' | sed \"s,\$(pwd)/,,\""
-echo locate.at:501 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:502: locate -d db '/d' | sed \"s,\$(pwd)/,,\""
+echo locate.at:502 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6141,7 +6196,7 @@ d/f
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:501: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:502: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6155,8 +6210,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:506: locate -d db -w '/d' | sed \"s,\$(pwd)/,,\""
-echo locate.at:506 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:507: locate -d db -w '/d' | sed \"s,\$(pwd)/,,\""
+echo locate.at:507 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6181,7 +6236,7 @@ d/f
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:506: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:507: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6195,8 +6250,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:511: locate -d db --wholename '/d' | sed \"s,\$(pwd)/,,\""
-echo locate.at:511 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:512: locate -d db --wholename '/d' | sed \"s,\$(pwd)/,,\""
+echo locate.at:512 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6221,7 +6276,7 @@ d/f
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:511: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:512: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6240,14 +6295,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  28 ) # 28. locate.at:519: locate: -0
-    at_setup_line='locate.at:519'
+  29 ) # 29. locate.at:520: locate: -0
+    at_setup_line='locate.at:520'
     at_desc="locate: -0"
-    $at_quiet $ECHO_N " 28: locate: -0                                     $ECHO_C"
+    $at_quiet $ECHO_N " 29: locate: -0                                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "28. locate.at:519: testing ..."
+      echo "29. locate.at:520: testing ..."
       $at_traceon
 
 
@@ -6256,8 +6311,8 @@ mkdir d
 touch d/bar d/baz
 
 $at_traceoff
-echo "$at_srcdir/locate.at:525: updatedb -U \"\$(pwd)/d\" -o db -l 0"
-echo locate.at:525 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:526: updatedb -U \"\$(pwd)/d\" -o db -l 0"
+echo locate.at:526 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6280,7 +6335,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:525: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:526: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6296,8 +6351,8 @@ $at_traceon
 printf 'd/bar\000d/baz\000' > expout
 
 $at_traceoff
-echo "$at_srcdir/locate.at:529: locate -d db -0 d/b | sed \"s,\$(pwd)/,,g\""
-echo locate.at:529 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:530: locate -d db -0 d/b | sed \"s,\$(pwd)/,,g\""
+echo locate.at:530 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6320,7 +6375,7 @@ $at_diff expout "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:529: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:530: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6334,8 +6389,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:531: locate -d db --null d/b | sed \"s,\$(pwd)/,,g\""
-echo locate.at:531 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:532: locate -d db --null d/b | sed \"s,\$(pwd)/,,g\""
+echo locate.at:532 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6358,7 +6413,7 @@ $at_diff expout "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:531: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:532: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6377,14 +6432,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  29 ) # 29. locate.at:536: locate: --regex
-    at_setup_line='locate.at:536'
+  30 ) # 30. locate.at:537: locate: --regex
+    at_setup_line='locate.at:537'
     at_desc="locate: --regex"
-    $at_quiet $ECHO_N " 29: locate: --regex                                $ECHO_C"
+    $at_quiet $ECHO_N " 30: locate: --regex                                $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "29. locate.at:536: testing ..."
+      echo "30. locate.at:537: testing ..."
       $at_traceon
 
 
@@ -6393,8 +6448,8 @@ mkdir d
 touch d/foo d/Foo d/fOo d/bar d/baz
 
 $at_traceoff
-echo "$at_srcdir/locate.at:542: updatedb -U \"\$(pwd)/d\" -o db -l 0"
-echo locate.at:542 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:543: updatedb -U \"\$(pwd)/d\" -o db -l 0"
+echo locate.at:543 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6417,7 +6472,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:542: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:543: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6431,8 +6486,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:544: locate -d db --regex '.*d/baz' '.*d/bar' | sed \"s,\$(pwd)/,,\""
-echo locate.at:544 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:545: locate -d db --regex '.*d/baz' '.*d/bar' | sed \"s,\$(pwd)/,,\""
+echo locate.at:545 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6457,7 +6512,7 @@ d/baz
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:544: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:545: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6471,8 +6526,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:549: locate -d db --regex '.*d/foo' | sed \"s,\$(pwd)/,,\""
-echo locate.at:549 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:550: locate -d db --regex '.*d/foo' | sed \"s,\$(pwd)/,,\""
+echo locate.at:550 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6496,7 +6551,7 @@ echo >>"$at_stdout"; echo "d/foo
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:549: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:550: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6510,8 +6565,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:553: locate -d db --regex -i '.*d/foo' | sed \"s,\$(pwd)/,,\""
-echo locate.at:553 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:554: locate -d db --regex -i '.*d/foo' | sed \"s,\$(pwd)/,,\""
+echo locate.at:554 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6537,7 +6592,7 @@ d/foo
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:553: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:554: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6551,8 +6606,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:559: locate -d db --regex '(' 2> err"
-echo locate.at:559 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:560: locate -d db --regex '(' 2> err"
+echo locate.at:560 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6575,7 +6630,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:559: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:560: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6588,8 +6643,8 @@ fi
 $at_traceon
 
 $at_traceoff
-echo "$at_srcdir/locate.at:560: sed \"s/': .*/': /\" < err"
-echo locate.at:560 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:561: sed \"s/': .*/': /\" < err"
+echo locate.at:561 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6613,7 +6668,7 @@ echo >>"$at_stdout"; echo "locate: invalid regexp \`(':
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:560: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:561: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6632,23 +6687,23 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  30 ) # 30. locate.at:567: locate: LOCATE_PATH
-    at_setup_line='locate.at:567'
+  31 ) # 31. locate.at:568: locate: LOCATE_PATH
+    at_setup_line='locate.at:568'
     at_desc="locate: LOCATE_PATH"
-    $at_quiet $ECHO_N " 30: locate: LOCATE_PATH                            $ECHO_C"
+    $at_quiet $ECHO_N " 31: locate: LOCATE_PATH                            $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "30. locate.at:567: testing ..."
+      echo "31. locate.at:568: testing ..."
       $at_traceon
 
 
 mkdir d1 d2
-touch d1/f d2/f
+touch d1/foo d2/foo
 
 $at_traceoff
-echo "$at_srcdir/locate.at:572: updatedb -U \"\$(pwd)/d1\" -o db1 -l 0"
-echo locate.at:572 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:573: updatedb -U \"\$(pwd)/d1\" -o db1 -l 0"
+echo locate.at:573 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6671,7 +6726,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:572: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:573: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6684,8 +6739,8 @@ fi
 $at_traceon
 
 $at_traceoff
-echo "$at_srcdir/locate.at:573: updatedb -U \"\$(pwd)/d2\" -o db2 -l 0"
-echo locate.at:573 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:574: updatedb -U \"\$(pwd)/d2\" -o db2 -l 0"
+echo locate.at:574 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6708,7 +6763,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:573: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:574: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6722,8 +6777,8 @@ $at_traceon
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:575: LOCATE_PATH=db1 locate -d db2 /f | sed \"s,\$(pwd)/,,\""
-echo locate.at:575 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:576: LOCATE_PATH=db1 locate -d db2 /foo | sed \"s,\$(pwd)/,,\""
+echo locate.at:576 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6731,24 +6786,24 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; LOCATE_PATH=db1 locate -d db2 /f | sed "s,$(pwd)/,," ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; LOCATE_PATH=db1 locate -d db2 /foo | sed "s,$(pwd)/,," ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; LOCATE_PATH=db1 locate -d db2 /f | sed "s,$(pwd)/,," ) >"$at_stdout" 2>"$at_stderr"
+    ( :; LOCATE_PATH=db1 locate -d db2 /foo | sed "s,$(pwd)/,," ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
 at_failed=false
 $at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; echo "d2/f
-d1/f
+echo >>"$at_stdout"; echo "d2/foo
+d1/foo
 " | $at_diff - "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:575: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:576: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6767,21 +6822,21 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  31 ) # 31. locate.at:583: locate: Invalid source database
-    at_setup_line='locate.at:583'
+  32 ) # 32. locate.at:584: locate: Invalid source database
+    at_setup_line='locate.at:584'
     at_desc="locate: Invalid source database"
-    $at_quiet $ECHO_N " 31: locate: Invalid source database                $ECHO_C"
+    $at_quiet $ECHO_N " 32: locate: Invalid source database                $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "31. locate.at:583: testing ..."
+      echo "32. locate.at:584: testing ..."
       $at_traceon
 
 
 
 $at_traceoff
-echo "$at_srcdir/locate.at:586: locate -d db '*' 2>err"
-echo locate.at:586 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:587: locate -d db '*' 2>err"
+echo locate.at:587 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6804,7 +6859,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:586: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:587: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6817,8 +6872,8 @@ fi
 $at_traceon
 
 $at_traceoff
-echo "$at_srcdir/locate.at:587: sed \"s/': .*/': /\" < err"
-echo locate.at:587 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:588: sed \"s/': .*/': /\" < err"
+echo locate.at:588 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6842,7 +6897,7 @@ echo >>"$at_stdout"; echo "locate: can not open \`db':
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    0) ;;
-   *) echo "$at_srcdir/locate.at:587: exit code was $at_status, expected 0"
+   *) echo "$at_srcdir/locate.at:588: exit code was $at_status, expected 0"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6857,8 +6912,8 @@ $at_traceon
 
 > db
 $at_traceoff
-echo "$at_srcdir/locate.at:592: locate -d db '*'"
-echo locate.at:592 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:593: locate -d db '*'"
+echo locate.at:593 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6882,7 +6937,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:592: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:593: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6897,8 +6952,8 @@ $at_traceon
 
 echo '0123456789abcdef-' > db
 $at_traceoff
-echo "$at_srcdir/locate.at:597: locate -d db '*'"
-echo locate.at:597 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:598: locate -d db '*'"
+echo locate.at:598 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6922,7 +6977,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:597: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:598: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6937,8 +6992,8 @@ $at_traceon
 
 printf '\000mlocate\000\000\000\000\377\000xx-' > db
 $at_traceoff
-echo "$at_srcdir/locate.at:602: locate -d db '*'"
-echo locate.at:602 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:603: locate -d db '*'"
+echo locate.at:603 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -6962,7 +7017,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:602: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:603: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -6977,8 +7032,8 @@ $at_traceon
 
 printf '\000mlocate\000\000\000\000\000\377xx-' > db
 $at_traceoff
-echo "$at_srcdir/locate.at:607: locate -d db '*'"
-echo locate.at:607 >"$at_check_line_file"
+echo "$at_srcdir/locate.at:608: locate -d db '*'"
+echo locate.at:608 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
@@ -7002,7 +7057,7 @@ $at_diff "$at_devnull" "$at_stdout" || at_failed=:
 case $at_status in
    77) echo 77 > "$at_status_file"; exit 77;;
    1) ;;
-   *) echo "$at_srcdir/locate.at:607: exit code was $at_status, expected 1"
+   *) echo "$at_srcdir/locate.at:608: exit code was $at_status, expected 1"
       at_failed=:;;
 esac
 if $at_failed; then
@@ -7021,14 +7076,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  32 ) # 32. updatedb.at:17: updatedb: File types
+  33 ) # 33. updatedb.at:17: updatedb: File types
     at_setup_line='updatedb.at:17'
     at_desc="updatedb: File types"
-    $at_quiet $ECHO_N " 32: updatedb: File types                           $ECHO_C"
+    $at_quiet $ECHO_N " 33: updatedb: File types                           $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "32. updatedb.at:17: testing ..."
+      echo "33. updatedb.at:17: testing ..."
       $at_traceon
 
 
@@ -7136,14 +7191,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  33 ) # 33. updatedb.at:49: updatedb: Output sorting
+  34 ) # 34. updatedb.at:49: updatedb: Output sorting
     at_setup_line='updatedb.at:49'
     at_desc="updatedb: Output sorting"
-    $at_quiet $ECHO_N " 33: updatedb: Output sorting                       $ECHO_C"
+    $at_quiet $ECHO_N " 34: updatedb: Output sorting                       $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "33. updatedb.at:49: testing ..."
+      echo "34. updatedb.at:49: testing ..."
       $at_traceon
 
 
@@ -7289,14 +7344,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  34 ) # 34. updatedb.at:82: updatedb: Permissions
+  35 ) # 35. updatedb.at:82: updatedb: Permissions
     at_setup_line='updatedb.at:82'
     at_desc="updatedb: Permissions"
-    $at_quiet $ECHO_N " 34: updatedb: Permissions                          $ECHO_C"
+    $at_quiet $ECHO_N " 35: updatedb: Permissions                          $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "34. updatedb.at:82: testing ..."
+      echo "35. updatedb.at:82: testing ..."
       $at_traceon
 
 
@@ -7417,14 +7472,14 @@ rm -rf d
     at_status=`cat "$at_status_file"`
     ;;
 
-  35 ) # 35. updatedb.at:127: updatedb: Invalid source database
+  36 ) # 36. updatedb.at:127: updatedb: Invalid source database
     at_setup_line='updatedb.at:127'
     at_desc="updatedb: Invalid source database"
-    $at_quiet $ECHO_N " 35: updatedb: Invalid source database              $ECHO_C"
+    $at_quiet $ECHO_N " 36: updatedb: Invalid source database              $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "35. updatedb.at:127: testing ..."
+      echo "36. updatedb.at:127: testing ..."
       $at_traceon
 
 
@@ -7749,14 +7804,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  36 ) # 36. updatedb.at:158: updatedb: Change detection
+  37 ) # 37. updatedb.at:158: updatedb: Change detection
     at_setup_line='updatedb.at:158'
     at_desc="updatedb: Change detection"
-    $at_quiet $ECHO_N " 36: updatedb: Change detection                     $ECHO_C"
+    $at_quiet $ECHO_N " 37: updatedb: Change detection                     $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "36. updatedb.at:158: testing ..."
+      echo "37. updatedb.at:158: testing ..."
       $at_traceon
 
 
@@ -8175,14 +8230,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  37 ) # 37. updatedb.at:217: updatedb: Concurrent modification
+  38 ) # 38. updatedb.at:217: updatedb: Concurrent modification
     at_setup_line='updatedb.at:217'
     at_desc="updatedb: Concurrent modification"
-    $at_quiet $ECHO_N " 37: updatedb: Concurrent modification              $ECHO_C"
+    $at_quiet $ECHO_N " 38: updatedb: Concurrent modification              $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "37. updatedb.at:217: testing ..."
+      echo "38. updatedb.at:217: testing ..."
       $at_traceon
 
 
@@ -8316,14 +8371,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  38 ) # 38. updatedb.at:239: updatedb: Very deep hierarchy
+  39 ) # 39. updatedb.at:239: updatedb: Very deep hierarchy
     at_setup_line='updatedb.at:239'
     at_desc="updatedb: Very deep hierarchy"
-    $at_quiet $ECHO_N " 38: updatedb: Very deep hierarchy                  $ECHO_C"
+    $at_quiet $ECHO_N " 39: updatedb: Very deep hierarchy                  $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "38. updatedb.at:239: testing ..."
+      echo "39. updatedb.at:239: testing ..."
       $at_traceon
 
 
@@ -8426,14 +8481,14 @@ $at_traceon
     at_status=`cat "$at_status_file"`
     ;;
 
-  39 ) # 39. updatedb.at:266: updatedb: Output creation
+  40 ) # 40. updatedb.at:266: updatedb: Output creation
     at_setup_line='updatedb.at:266'
     at_desc="updatedb: Output creation"
-    $at_quiet $ECHO_N " 39: updatedb: Output creation                      $ECHO_C"
+    $at_quiet $ECHO_N " 40: updatedb: Output creation                      $ECHO_C"
     at_xfail=no
     echo "#                             -*- compilation -*-" >> "$at_group_log"
     (
-      echo "39. updatedb.at:266: testing ..."
+      echo "40. updatedb.at:266: testing ..."
       $at_traceon
 
 
@@ -9014,7 +9069,7 @@ _ASBOX
   echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:"
   echo
   echo "   To: <mitr@redhat.com>"
-  echo "   Subject: [mlocate 0.18] $as_me:$at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}$at_xpass_list${at_xpass_list:+ passed unexpectedly}"
+  echo "   Subject: [mlocate 0.19] $as_me:$at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}$at_xpass_list${at_xpass_list:+ passed unexpectedly}"
   echo
   if test $at_debug_p = false; then
     echo