.

6 files changed, 149 insertions, 36 deletions

diff --git a/Makefile.in b/Makefile.in
index cdf597598..f452f63bf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -211,7 +211,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.ac m4/acl.m4 m4/afs.m4 m4/assert.m4 m4/bison.m4 m4/boottime.m4 m4/c-stack.m4 m4/canonicalize.m4 m4/check-decl.m4 m4/chown.m4 m4/codeset.m4 m4/d-ino.m4 m4/d-type.m4 m4/dirfd.m4 m4/dos.m4 m4/error.m4 m4/fpending.m4 m4/fstypename.m4 m4/fsusage.m4 m4/ftruncate.m4 m4/ftw.m4 m4/getcwd.m4 m4/getgroups.m4 m4/getline.m4 m4/gettext.m4 m4/gettimeofday.m4 m4/glibc.m4 m4/glibc21.m4 m4/group-member.m4 m4/host-os.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/isc-posix.m4 m4/jm-glibc-io.m4 m4/jm-macros.m4 m4/jm-mktime.m4 m4/jm-winsz1.m4 m4/jm-winsz2.m4 m4/lchown.m4 m4/lcmessage.m4 m4/lib-check.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/link-follow.m4 m4/longlong.m4 m4/ls-mntd-fs.m4 m4/lstat.m4 m4/mbrtowc.m4 m4/mbswidth.m4 m4/memcmp.m4 m4/mkdir-slash.m4 m4/mkstemp.m4 m4/nanosleep.m4 m4/onceonly.m4 m4/open-max.m4 m4/perl.m4 m4/prereq.m4 m4/progtest.m4 m4/putenv.m4 m4/regex.m4 m4/rename.m4 m4/rmdir-errno.m4 m4/search-libs.m4 m4/st_dm_mode.m4 m4/st_mtim.m4 m4/stat.m4 m4/stdbool.m4 m4/strftime.m4 m4/timespec.m4 m4/unlink-busy.m4 m4/uptime.m4 m4/utimbuf.m4 m4/utime.m4 m4/utimes.m4 m4/xstrtoimax.m4 m4/xstrtoumax.m4
+$(ACLOCAL_M4):  configure.ac m4/acl.m4 m4/afs.m4 m4/assert.m4 m4/bison.m4 m4/boottime.m4 m4/c-stack.m4 m4/canonicalize.m4 m4/check-decl.m4 m4/chown.m4 m4/codeset.m4 m4/d-ino.m4 m4/d-type.m4 m4/dirfd.m4 m4/dos.m4 m4/error.m4 m4/fpending.m4 m4/fstypename.m4 m4/fsusage.m4 m4/ftruncate.m4 m4/ftw.m4 m4/getcwd.m4 m4/getgroups.m4 m4/getline.m4 m4/gettext.m4 m4/gettimeofday.m4 m4/glibc.m4 m4/glibc21.m4 m4/group-member.m4 m4/host-os.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/isc-posix.m4 m4/jm-glibc-io.m4 m4/jm-macros.m4 m4/jm-mktime.m4 m4/jm-winsz1.m4 m4/jm-winsz2.m4 m4/lchown.m4 m4/lcmessage.m4 m4/lib-check.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/link-follow.m4 m4/longlong.m4 m4/ls-mntd-fs.m4 m4/lstat.m4 m4/mbrtowc.m4 m4/mbswidth.m4 m4/memcmp.m4 m4/mkdir-slash.m4 m4/mkstemp.m4 m4/mmap-stack.m4 m4/nanosleep.m4 m4/onceonly.m4 m4/open-max.m4 m4/perl.m4 m4/prereq.m4 m4/progtest.m4 m4/putenv.m4 m4/regex.m4 m4/rename.m4 m4/restrict.m4 m4/rmdir-errno.m4 m4/search-libs.m4 m4/st_dm_mode.m4 m4/st_mtim.m4 m4/stat.m4 m4/stdbool.m4 m4/strftime.m4 m4/timespec.m4 m4/unlink-busy.m4 m4/uptime.m4 m4/utimbuf.m4 m4/utime.m4 m4/utimes.m4 m4/xstrtoimax.m4 m4/xstrtoumax.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
diff --git a/TODO b/TODO
index b52fe747d..b377d8fee 100644
--- a/TODO
+++ b/TODO
@@ -13,5 +13,3 @@ doc/coreutils.texi:
   Better still: fix the code so it's *not* system-dependent.
 
 implement --target-directory=DIR for install (per texinfo documentation)
-
-du: make it so du is not stack-limited by depth of hierarchy
diff --git a/aclocal.m4 b/aclocal.m4
index b43abdc52..153fb9a6e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -888,6 +888,7 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_FUNC_GNU_STRFTIME])
   AC_REQUIRE([jm_FUNC_MKTIME])
   AC_REQUIRE([jm_FUNC_FPENDING])
+  AC_REQUIRE([AC_SYS_MMAP_STACK])
 
   # This is for od and stat, and any other program that
   # uses the PRI.MAX macros from inttypes.h.
@@ -988,6 +989,9 @@ AC_DEFUN([jm_MACROS],
     tzset \
   )
 
+  # for test.c
+  AC_CHECK_FUNCS(setreuid setregid)
+
   AM_FUNC_GETLINE
   if test $am_cv_func_working_getline != yes; then
     AC_CHECK_FUNCS(getdelim)
@@ -1168,7 +1172,7 @@ AC_DEFUN([AC_ISC_POSIX],
   ]
 )
 
-#serial 14
+#serial 15
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
@@ -1275,6 +1279,7 @@ AC_DEFUN([jm_PREREQ_REGEX],
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  AC_REQUIRE([ACX_C_RESTRICT])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS_ONCE(limits.h string.h wchar.h wctype.h)
@@ -1282,6 +1287,35 @@ AC_DEFUN([jm_PREREQ_REGEX],
   AC_CHECK_FUNCS(btowc)
 ])
 
+#serial 1001
+dnl based on acx_restrict.m4, from the GNU Autoconf Macro Archive at:
+dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_restrict.html
+
+# Determine whether the C/C++ compiler supports the "restrict" keyword
+# introduced in ANSI C99, or an equivalent.  Do nothing if the compiler
+# accepts it.  Otherwise, if the compiler supports an equivalent (like
+# gcc's __restrict__) define "restrict" to be that.  Otherwise, define
+# "restrict" to be empty.
+
+AC_DEFUN([ACX_C_RESTRICT],
+[AC_CACHE_CHECK([for C/C++ restrict keyword], acx_cv_c_restrict,
+  [acx_cv_c_restrict=no
+   # Try the official restrict keyword, then gcc's __restrict__.
+   for acx_kw in restrict __restrict__; do
+     AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+      [float * $acx_kw x;])],
+      [acx_cv_c_restrict=$acx_kw; break])
+   done
+  ])
+ case $acx_cv_c_restrict in
+   restrict) ;;
+   no) AC_DEFINE(restrict,,
+	[Define to equivalent of C99 restrict keyword, or to nothing if this
+	is not supported.  Do not define if restrict is supported directly.]) ;;
+   *)  AC_DEFINE_UNQUOTED(restrict, $acx_cv_c_restrict) ;;
+ esac
+])
+
 # onceonly.m4 serial 1
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
@@ -1600,7 +1634,7 @@ AC_DEFUN([jm_CHECK_TYPE_STRUCT_DIRENT_D_INO],
   ]
 )
 
-#serial 18
+#serial 19
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
@@ -1654,6 +1688,7 @@ AC_DEFUN([jm_CHECK_DECLS],
 '
 
   AC_CHECK_DECLS([
+    euidaccess,
     free,
     getenv,
     geteuid,
@@ -1791,7 +1826,7 @@ AC_DEFUN([jm_PREREQ_MEMCHR],
 
 AC_DEFUN([jm_PREREQ_PHYSMEM],
 [
-  AC_CHECK_HEADERS(sys/pstat.h unistd.h)
+  AC_CHECK_HEADERS(sys/pstat.h unistd.h sys/sysmp.h)
   AC_CHECK_FUNCS(pstat_getstatic pstat_getdynamic)
 ])
 
@@ -3318,6 +3353,37 @@ AC_DEFUN([jm_FUNC_FPENDING],
   fi
 ])
 
+#serial 1
+# Arrange to define HAVE_MMAP_STACK and to compile mmap-stack.c
+# if there is sufficient support.
+# From Jim Meyering
+
+AC_DEFUN([AC_SYS_MMAP_STACK],
+[
+  # prerequisites
+  AC_REQUIRE([AC_FUNC_MMAP])
+  AC_CHECK_HEADERS_ONCE(sys/mman.h ucontext.h stdarg.h)
+  AC_CHECK_FUNCS_ONCE(getcontext makecontext setcontext)
+
+  # For now, require tmpfile. FIXME: if there's a system with working mmap
+  # and *context functions yet that lacks tmpfile, we can provide a replacement.
+  AC_CHECK_FUNCS_ONCE(tmpfile)
+
+  ac_i=$ac_cv_func_tmpfile
+  ac_i=$ac_i:$ac_cv_func_getcontext
+  ac_i=$ac_i:$ac_cv_func_makecontext
+  ac_i=$ac_i:$ac_cv_func_setcontext
+  ac_i=$ac_i:$ac_cv_func_mmap_fixed_mapped
+
+  if test $ac_i = yes:yes:yes:yes:yes; then
+    AC_LIBOBJ(mmap-stack)
+    AC_DEFINE(HAVE_MMAP_STACK, 1,
+      [Define to 1 if there is sufficient support (mmap, getcontext,
+       makecontext, setcontext) for running a process with mmap'd
+       memory for its stack.])
+  fi
+])
+
 # inttypes-pri.m4 serial 1001 (based on gettext-0.11.4's `serial 1')
 dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
diff --git a/config.hin b/config.hin
index 25c383526..83be28162 100644
--- a/config.hin
+++ b/config.hin
@@ -139,6 +139,10 @@
    */
 #undef HAVE_DECL_DIRFD
 
+/* Define to 1 if you have the declaration of `euidaccess', and to 0 if you
+   don't. */
+#undef HAVE_DECL_EUIDACCESS
+
 /* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
    don't. */
 #undef HAVE_DECL_FEOF_UNLOCKED
@@ -531,6 +535,9 @@
 /* Define to 1 if you have the <mach/mach.h> header file. */
 #undef HAVE_MACH_MACH_H
 
+/* Define to 1 if you have the `makecontext' function. */
+#undef HAVE_MAKECONTEXT
+
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
 #undef HAVE_MALLOC
@@ -583,6 +590,13 @@
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* Define to 1 if there is sufficient support (mmap, getcontext, makecontext,
+   setcontext) for running a process with mmap'd memory for its stack. */
+#undef HAVE_MMAP_STACK
+
 /* Define to 1 if you have the <mntent.h> header file. */
 #undef HAVE_MNTENT_H
 
@@ -653,12 +667,21 @@
 /* Define to 1 if you have the `rpmatch' function. */
 #undef HAVE_RPMATCH
 
+/* Define to 1 if you have the `setcontext' function. */
+#undef HAVE_SETCONTEXT
+
 /* Define to 1 if you have the `sethostname' function. */
 #undef HAVE_SETHOSTNAME
 
 /* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
+/* Define to 1 if you have the `setregid' function. */
+#undef HAVE_SETREGID
+
+/* Define to 1 if you have the `setreuid' function. */
+#undef HAVE_SETREUID
+
 /* Define to 1 if you have the <shadow.h> header file. */
 #undef HAVE_SHADOW_H
 
@@ -682,6 +705,9 @@
    this. */
 #undef HAVE_STAT_EMPTY_STRING_BUG
 
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
 /* Define to 1 if stdbool.h conforms to C99. */
 #undef HAVE_STDBOOL_H
 
@@ -923,6 +949,9 @@
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
 /* Define to 1 if you have the <sys/mntent.h> header file. */
 #undef HAVE_SYS_MNTENT_H
 
@@ -960,6 +989,9 @@
 /* Define to 1 if you have the <sys/sysmacros.h> header file. */
 #undef HAVE_SYS_SYSMACROS_H
 
+/* Define to 1 if you have the <sys/sysmp.h> header file. */
+#undef HAVE_SYS_SYSMP_H
+
 /* Define to 1 if you have the <sys/systeminfo.h> header file. */
 #undef HAVE_SYS_SYSTEMINFO_H
 
@@ -984,6 +1016,9 @@
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
+/* Define to 1 if you have the `tmpfile' function. */
+#undef HAVE_TMPFILE
+
 /* Define if struct tm has the tm_gmtoff member. */
 #undef HAVE_TM_GMTOFF
 
@@ -1391,6 +1426,10 @@
 /* Define to rpl_realloc if the replacement function should be used. */
 #undef realloc
 
+/* Define to equivalent of C99 restrict keyword, or to nothing if this is not
+   supported. Do not define if restrict is supported directly. */
+#undef restrict
+
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 01fe68e51..25b69fb5a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -181,6 +181,7 @@ libfetish_a_SOURCES = \
   dirname.c dirname.h \
   dirfd.h \
   dup-safer.c \
+  euidaccess.h \
   exclude.c exclude.h \
   exitfail.c exitfail.h \
   filemode.c filemode.h \
@@ -212,6 +213,7 @@ libfetish_a_SOURCES = \
   md5.c md5.h \
   memcasecmp.c memcasecmp.h \
   memcoll.c memcoll.h \
+  mmap-stack.h \
   modechange.c modechange.h \
   mountlist.h \
   offtostr.c \
@@ -333,24 +335,25 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	$(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po \
 @AMDEP_TRUE@	$(DEPDIR)/memset.Po $(DEPDIR)/mkdir.Po \
 @AMDEP_TRUE@	$(DEPDIR)/mkstemp.Po $(DEPDIR)/mktime.Po \
-@AMDEP_TRUE@	$(DEPDIR)/mountlist.Po $(DEPDIR)/nanosleep.Po \
-@AMDEP_TRUE@	$(DEPDIR)/obstack.Po $(DEPDIR)/putenv.Po \
-@AMDEP_TRUE@	$(DEPDIR)/raise.Po $(DEPDIR)/readutmp.Po \
-@AMDEP_TRUE@	$(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
-@AMDEP_TRUE@	$(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po \
-@AMDEP_TRUE@	$(DEPDIR)/rpmatch.Po $(DEPDIR)/sig2str.Po \
-@AMDEP_TRUE@	$(DEPDIR)/stat.Po $(DEPDIR)/stpcpy.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strdup.Po $(DEPDIR)/strncasecmp.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strtod.Po $(DEPDIR)/strtoimax.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strtol.Po $(DEPDIR)/strtoll.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \
-@AMDEP_TRUE@	$(DEPDIR)/tempname.Po $(DEPDIR)/tsearch.Po \
-@AMDEP_TRUE@	$(DEPDIR)/utime.Po ./$(DEPDIR)/acl$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/addext$U.Po ./$(DEPDIR)/argmatch$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mmap-stack.Po $(DEPDIR)/mountlist.Po \
+@AMDEP_TRUE@	$(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
+@AMDEP_TRUE@	$(DEPDIR)/putenv.Po $(DEPDIR)/raise.Po \
+@AMDEP_TRUE@	$(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/regex.Po $(DEPDIR)/rename.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po \
+@AMDEP_TRUE@	$(DEPDIR)/sig2str.Po $(DEPDIR)/stat.Po \
+@AMDEP_TRUE@	$(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strcspn.Po $(DEPDIR)/strdup.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtoimax.Po $(DEPDIR)/strtol.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtoll.Po $(DEPDIR)/strtoul.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtoull.Po $(DEPDIR)/strtoumax.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strverscmp.Po $(DEPDIR)/tempname.Po \
+@AMDEP_TRUE@	$(DEPDIR)/tsearch.Po $(DEPDIR)/utime.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/acl$U.Po ./$(DEPDIR)/addext$U.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/argmatch$U.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/backupfile$U.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/basename$U.Po ./$(DEPDIR)/c-stack$U.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/canon-host$U.Po \
@@ -416,12 +419,13 @@ DIST_COMMON = README ChangeLog Makefile.am Makefile.in TODO \
 	getline.c getloadavg.c getpass.c gettimeofday.c getusershell.c \
 	group-member.c lchown.c lstat.c malloc.c memchr.c memcmp.c \
 	memcpy.c memmove.c memrchr.c memset.c mkdir.c mkstemp.c \
-	mktime.c mountlist.c nanosleep.c obstack.c obstack.h putenv.c \
-	raise.c readutmp.c realloc.c regex.c rename.c rmdir.c rpmatch.c \
-	sig2str.c stat.c stpcpy.c strcasecmp.c strcspn.c strdup.c \
-	strncasecmp.c strndup.c strnlen.c strpbrk.c strstr.c strtod.c \
-	strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c strtoumax.c \
-	strverscmp.c tempname.c tsearch.c utime.c
+	mktime.c mmap-stack.c mountlist.c nanosleep.c obstack.c \
+	obstack.h putenv.c raise.c readutmp.c realloc.c regex.c \
+	rename.c rmdir.c rpmatch.c sig2str.c stat.c stpcpy.c \
+	strcasecmp.c strcspn.c strdup.c strncasecmp.c strndup.c \
+	strnlen.c strpbrk.c strstr.c strtod.c strtoimax.c strtol.c \
+	strtoll.c strtoul.c strtoull.c strtoumax.c strverscmp.c \
+	tempname.c tsearch.c utime.c
 SOURCES = $(libfetish_a_SOURCES)
 
 all: $(BUILT_SOURCES)
@@ -491,6 +495,7 @@ mostlyclean-kr:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mktime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mmap-stack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mountlist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nanosleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/obstack.Po@am__quote@
@@ -772,6 +777,8 @@ mkstemp_.c: mkstemp.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkstemp.c; then echo $(srcdir)/mkstemp.c; else echo mkstemp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 mktime_.c: mktime.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
+mmap-stack_.c: mmap-stack.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mmap-stack.c; then echo $(srcdir)/mmap-stack.c; else echo mmap-stack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 modechange_.c: modechange.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/modechange.c; then echo $(srcdir)/modechange.c; else echo modechange.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 mountlist_.c: mountlist.c $(ANSI2KNR)
@@ -932,12 +939,13 @@ mbswidth_.$(OBJEXT) md5_.$(OBJEXT) memcasecmp_.$(OBJEXT) \
 memchr_.$(OBJEXT) memcmp_.$(OBJEXT) memcoll_.$(OBJEXT) \
 memcpy_.$(OBJEXT) memmove_.$(OBJEXT) memrchr_.$(OBJEXT) \
 memset_.$(OBJEXT) mkdir_.$(OBJEXT) mkstemp_.$(OBJEXT) mktime_.$(OBJEXT) \
-modechange_.$(OBJEXT) mountlist_.$(OBJEXT) nanosleep_.$(OBJEXT) \
-obstack_.$(OBJEXT) offtostr_.$(OBJEXT) path-concat_.$(OBJEXT) \
-physmem_.$(OBJEXT) posixtm_.$(OBJEXT) posixver_.$(OBJEXT) \
-putenv_.$(OBJEXT) quote_.$(OBJEXT) quotearg_.$(OBJEXT) raise_.$(OBJEXT) \
-readtokens_.$(OBJEXT) readutmp_.$(OBJEXT) realloc_.$(OBJEXT) \
-regex_.$(OBJEXT) rename_.$(OBJEXT) rmdir_.$(OBJEXT) rpmatch_.$(OBJEXT) \
+mmap-stack_.$(OBJEXT) modechange_.$(OBJEXT) mountlist_.$(OBJEXT) \
+nanosleep_.$(OBJEXT) obstack_.$(OBJEXT) offtostr_.$(OBJEXT) \
+path-concat_.$(OBJEXT) physmem_.$(OBJEXT) posixtm_.$(OBJEXT) \
+posixver_.$(OBJEXT) putenv_.$(OBJEXT) quote_.$(OBJEXT) \
+quotearg_.$(OBJEXT) raise_.$(OBJEXT) readtokens_.$(OBJEXT) \
+readutmp_.$(OBJEXT) realloc_.$(OBJEXT) regex_.$(OBJEXT) \
+rename_.$(OBJEXT) rmdir_.$(OBJEXT) rpmatch_.$(OBJEXT) \
 safe-read_.$(OBJEXT) safe-write_.$(OBJEXT) same_.$(OBJEXT) \
 save-cwd_.$(OBJEXT) savedir_.$(OBJEXT) settime_.$(OBJEXT) \
 sha_.$(OBJEXT) sig2str_.$(OBJEXT) stat_.$(OBJEXT) stpcpy_.$(OBJEXT) \
diff --git a/m4/Makefile.in b/m4/Makefile.in
index da44b4bb3..c372e1e0c 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -203,6 +203,7 @@ mbswidth.m4 \
 memcmp.m4 \
 mkdir-slash.m4 \
 mkstemp.m4 \
+mmap-stack.m4 \
 nanosleep.m4 \
 onceonly.m4 \
 open-max.m4 \
@@ -212,6 +213,7 @@ progtest.m4 \
 putenv.m4 \
 regex.m4 \
 rename.m4 \
+restrict.m4 \
 rmdir-errno.m4 \
 search-libs.m4 \
 st_dm_mode.m4 \