2 files changed, 174 insertions, 1 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 1891d79da43..4a2534ebf84 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * sedlibmk.inp: Adapt to addition of the gnulib stdio module.
+        Add a description of what needs to be done when a new gnulib
+        module is added.
+        (MKDIR_P): Fix replacement command.
+
 2011-02-26  Eli Zaretskii  <eliz@gnu.org>
 
         * sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index b71aef985a9..d7af3681ef9 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -16,6 +16,81 @@
 #
 # ----------------------------------------------------------------------
 #
+# Checklist to add a new gnulib module:
+#
+#  . If the module includes source files that need to be compiled, add
+#    the corresponding .o file names to the list that gets assigned to
+#    the gl_LIBOBJS variable.
+#
+#  . If the module defines functions that need to replace DJGPP
+#    functions, edit the appropriate REPLACE_foo variables to 1;
+#    otherwise edit them to zero:
+#
+#     /^REPLACE_CALLOC *=/s/@REPLACE_CALLOC@/0/
+# 
+#  . If the module is a header or adds headers, edit the corresponding
+#    variable to either an empty value or to the name of the header.
+#    Examples:
+#
+#       /^STDINT_H *=/s/@[^@\n]*@/stdint.h/  -- stdint.h is needed
+#       /^STDDEF_H *=/s/@[^@\n]*@//          -- stddef.h is not needed
+#
+#  . Also edit the NEXT_foo and NEXT_AS_FIRST_DIRECTIVE_foo_H variable
+#    as appropriately: to an empty value if the gnulib header is not
+#    used, and to the corresponding DJGPP header name otherwise.
+#    Examples:
+#
+#     /^NEXT_STDDEF_H *=/s/@[^@\n]*@//
+#     /^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
+#     /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
+#     /^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@//
+#
+#  . Note that some gnulib headers cannot be left unused: those for
+#    which there's no corresponding foo_H variable in
+#    autogen/Makefile.in (example: stdio.h).  For these the "not
+#    needed" path is not applicable.
+#
+#  . If the header is needed, edit all the variables it uses as
+#    appropriate.  In general, if DJGPP has the corresponding feature,
+#    the value of the corresponding HAVE_foo should be set to what
+#    DJGPP has, and the corresponding GNULIB_foo variable should be
+#    edited to zero.  If the feature is not available, the HAVE_foo
+#    variable should be edited to zero and the corresponding
+#    GNULIB_foo variable should be edited to 1 if the gnulib
+#    replacement can work for DJGPP (a rare phenomenon), zero
+#    otherwise.
+#
+#  . Some gnulib header files have more complex recipes in
+#    autogen/Makefile.in than others.  The tell-tale sign of such a
+#    recipe is that the input redirection from the .in.h file is not
+#    present at the end of the command, like this:
+#
+#             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+#       } > $@-t && \
+#       mv $@-t $@
+#
+#    as opposed to this:
+#
+#             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+#             < $(srcdir)/sys_stat.in.h; \
+#       } > $@-t && \
+#       mv $@-t $@
+#
+#    For those recipes that do _not_ have redirection at the end of
+#    the command, add a block of Sed commands like this:
+#
+#     /^stdio\.h:/,/^   [       ]*mv /{
+#       s/'\; \\ *$/' >> $@-t/
+#     }
+#
+# The following Awk script is useful for editing portions of
+# autogen/Makefile.in into Sed commands that define the corresponding
+# variables to zero (which is what is required in the absolute
+# majority of cases):
+#
+#   { printf "/^%s *=/s/%s/0/\n",$1,$3}
+#
+# ----------------------------------------------------------------------
 # Replace @..@ constants.
 /^\# @configure_input@/s!@configure_input@!lib/Makefile.  Generated from Makefile.in by config.bat!
 /^@SET_MAKE@$/s/@SET_MAKE@//
@@ -64,6 +139,7 @@ am__cd = cd
 /^GNULIB_CANONICALIZE_FILE_NAME *=/s/@GNULIB_CANONICALIZE_FILE_NAME@/0/
 /^GNULIB_CHOWN *=/s/@GNULIB_CHOWN@/0/
 /^GNULIB_CLOSE *=/s/@GNULIB_CLOSE@/0/
+/^GNULIB_DPRINTF *=/s/@GNULIB_DPRINTF@/0/
 /^GNULIB_DUP2 *=/s/@GNULIB_DUP2@/0/
 /^GNULIB_DUP3 *=/s/@GNULIB_DUP3@/1/
 /^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/0/
@@ -72,15 +148,31 @@ am__cd = cd
 /^GNULIB_FCHDIR *=/s/@GNULIB_FCHDIR@/0/
 /^GNULIB_FCHOWNAT *=/s/@GNULIB_FCHOWNAT@/0/
 /^GNULIB_FCHMODAT *=/s/@GNULIB_FCHMODAT@/0/
+/^GNULIB_FCLOSE *=/s/@GNULIB_FCLOSE@/0/
+/^GNULIB_FFLUSH *=/s/@GNULIB_FFLUSH@/0/
+/^GNULIB_FOPEN *=/s/@GNULIB_FOPEN@/0/
+/^GNULIB_FPRINTF *=/s/@GNULIB_FPRINTF@/0/
+/^GNULIB_FPRINTF_POSIX *=/s/@GNULIB_FPRINTF_POSIX@/0/
+/^GNULIB_FPURGE *=/s/@GNULIB_FPURGE@/0/
+/^GNULIB_FPUTC *=/s/@GNULIB_FPUTC@/0/
+/^GNULIB_FPUTS *=/s/@GNULIB_FPUTS@/0/
+/^GNULIB_FREOPEN *=/s/@GNULIB_FREOPEN@/0/
+/^GNULIB_FSEEK *=/s/@GNULIB_FSEEK@/0/
+/^GNULIB_FSEEKO *=/s/@GNULIB_FSEEKO@/0/
 /^GNULIB_FSTATAT *=/s/@GNULIB_FSTATAT@/0/
 /^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/
+/^GNULIB_FTELL *=/s/@GNULIB_FTELL@/0/
+/^GNULIB_FTELLO *=/s/@GNULIB_FTELLO@/0/
 /^GNULIB_FTRUNCATE *=/s/@GNULIB_FTRUNCATE@/0/
 /^GNULIB_FUTIMENS *=/s/@GNULIB_FUTIMENS@/0/
+/^GNULIB_FWRITE *=/s/@GNULIB_FWRITE@/0/
 /^GNULIB_GETCWD *=/s/@GNULIB_GETCWD@/0/
+/^GNULIB_GETDELIM *=/s/@GNULIB_GETDELIM@/0/
 /^GNULIB_GETDOMAINNAME *=/s/@GNULIB_GETDOMAINNAME@/0/
 /^GNULIB_GETDTABLESIZE *=/s/@GNULIB_GETDTABLESIZE@/0/
 /^GNULIB_GETGROUPS *=/s/@GNULIB_GETGROUPS@/0/
 /^GNULIB_GETHOSTNAME *=/s/@GNULIB_GETHOSTNAME@/0/
+/^GNULIB_GETLINE *=/s/@GNULIB_GETLINE@/0/
 /^GNULIB_GETLOADAVG *=/s/@GNULIB_GETLOADAVG@/1/
 /^GNULIB_GETLOGIN *=/s/@GNULIB_GETLOGIN@/0/
 /^GNULIB_GETLOGIN_R *=/s/@GNULIB_GETLOGIN_R@/0/
@@ -108,22 +200,37 @@ am__cd = cd
 /^GNULIB_MKSTEMPS *=/s/@GNULIB_MKSTEMPS@/0/
 /^GNULIB_MKTIME *=/s/@GNULIB_MKTIME@/0/
 /^GNULIB_NANOSLEEP *=/s/@GNULIB_NANOSLEEP@/0/
+/^GNULIB_OBSTACK_PRINTF *=/s/@GNULIB_OBSTACK_PRINTF@/0/
+/^GNULIB_OBSTACK_PRINTF_POSIX *=/s/@GNULIB_OBSTACK_PRINTF_POSIX@/0/
+/^GNULIB_PERROR *=/s/@GNULIB_PERROR@/0/
 /^GNULIB_PIPE *=/s/@GNULIB_PIPE@/0/
 /^GNULIB_PIPE2 *=/s/@GNULIB_PIPE2@/0/
+/^GNULIB_POPEN *=/s/@GNULIB_POPEN@/0/
 /^GNULIB_PREAD *=/s/@GNULIB_PREAD@/0/
+/^GNULIB_PRINTF *=/s/@GNULIB_PRINTF@/0/
+/^GNULIB_PRINTF_POSIX *=/s/@GNULIB_PRINTF_POSIX@/0/
 /^GNULIB_PTSNAME *=/s/@GNULIB_PTSNAME@/0/
+/^GNULIB_PUTC *=/s/@GNULIB_PUTC@/0/
+/^GNULIB_PUTCHAR *=/s/@GNULIB_PUTCHAR@/0/
 /^GNULIB_PUTENV *=/s/@GNULIB_PUTENV@/0/
+/^GNULIB_PUTS *=/s/@GNULIB_PUTS@/0/
 /^GNULIB_PWRITE *=/s/@GNULIB_PWRITE@/0/
 /^GNULIB_RANDOM_R *=/s/@GNULIB_RANDOM_R@/0/
 /^GNULIB_READLINK *=/s/@GNULIB_READLINK@/0/
 /^GNULIB_READLINKAT *=/s/@GNULIB_READLINKAT@/0/
 /^GNULIB_REALLOC_POSIX *=/s/@GNULIB_REALLOC_POSIX@/0/
 /^GNULIB_REALPATH *=/s/@GNULIB_REALPATH@/0/
+/^GNULIB_REMOVE *=/s/@GNULIB_REMOVE@/0/
+/^GNULIB_RENAME *=/s/@GNULIB_RENAME@/0/
+/^GNULIB_RENAMEAT *=/s/@GNULIB_RENAMEAT@/0/
 /^GNULIB_RMDIR *=/s/@GNULIB_RMDIR@/0/
 /^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/
 /^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/
 /^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/
+/^GNULIB_SNPRINTF *=/s/@GNULIB_SNPRINTF@/0/
+/^GNULIB_SPRINTF_POSIX *=/s/@GNULIB_SPRINTF_POSIX@/0/
 /^GNULIB_STAT *=/s/@GNULIB_STAT@/0/
+/^GNULIB_STDIO_H_SIGPIPE *=/s/@GNULIB_STDIO_H_SIGPIPE@/0/
 /^GNULIB_STRPTIME *=/s/@GNULIB_STRPTIME@/0/
 /^GNULIB_STRTOD *=/s/@GNULIB_STRTOD@/0/
 /^GNULIB_STRTOLL *=/s/@GNULIB_STRTOLL@/0/
@@ -133,6 +240,7 @@ am__cd = cd
 /^GNULIB_SYSTEM_POSIX *=/s/@GNULIB_SYSTEM_POSIX@/0/
 /^GNULIB_TIMEGM *=/s/@GNULIB_TIMEGM@/0/
 /^GNULIB_TIME_R *=/s/@GNULIB_TIME_R@/1/
+/^GNULIB_TMPFILE *=/s/@GNULIB_TMPFILE@/0/
 /^GNULIB_TTYNAME_R *=/s/@GNULIB_TTYNAME_R@/0/
 /^GNULIB_UNISTD_H_GETOPT *=/s/@GNULIB_UNISTD_H_GETOPT@/1/
 /^GNULIB_UNISTD_H_SIGPIPE *=/s/@GNULIB_UNISTD_H_SIGPIPE@/0/
@@ -142,6 +250,14 @@ am__cd = cd
 /^GNULIB_UNSETENV *=/s/@GNULIB_UNSETENV@/1/
 /^GNULIB_USLEEP *=/s/@GNULIB_USLEEP@/0/
 /^GNULIB_UTIMENSAT *=/s/@GNULIB_UTIMENSAT@/0/
+/^GNULIB_VASPRINTF *=/s/@GNULIB_VASPRINTF@/0/
+/^GNULIB_VDPRINTF *=/s/@GNULIB_VDPRINTF@/0/
+/^GNULIB_VFPRINTF *=/s/@GNULIB_VFPRINTF@/0/
+/^GNULIB_VFPRINTF_POSIX *=/s/@GNULIB_VFPRINTF_POSIX@/0/
+/^GNULIB_VPRINTF *=/s/@GNULIB_VPRINTF@/0/
+/^GNULIB_VPRINTF_POSIX *=/s/@GNULIB_VPRINTF_POSIX@/0/
+/^GNULIB_VSNPRINTF *=/s/@GNULIB_VSNPRINTF@/0/
+/^GNULIB_VSPRINTF_POSIX *=/s/@GNULIB_VSPRINTF_POSIX@/0/
 /^GNULIB_WCTOMB *=/s/@GNULIB_WCTOMB@/0/
 /^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/
 /^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/
@@ -150,15 +266,24 @@ am__cd = cd
 /^HAVE_CHOWN *=/s/@HAVE_CHOWN@/1/
 /^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/1/
 /^HAVE_DECL_FCHDIR *=/s/@HAVE_DECL_FCHDIR@/0/
+/^HAVE_DECL_FPURGE *=/s/@HAVE_DECL_FPURGE@//
+/^HAVE_DECL_FSEEKO *=/s/@HAVE_DECL_FSEEKO@/0/
+/^HAVE_DECL_FTELLO *=/s/@HAVE_DECL_FTELLO@/0/
+/^HAVE_DECL_GETDELIM *=/s/@HAVE_DECL_GETDELIM@/0/
 /^HAVE_DECL_GETDOMAINNAME *=/s/@HAVE_DECL_GETDOMAINNAME@/0/
+/^HAVE_DECL_GETLINE *=/s/@HAVE_DECL_GETLINE@/0/
 /^HAVE_DECL_GETLOADAVG *=/s/@HAVE_DECL_GETLOADAVG@/0/
 /^HAVE_DECL_GETLOGIN_R *=/s/@HAVE_DECL_GETLOGIN_R@/0/
 /^HAVE_DECL_GETPAGESIZE *=/s/@HAVE_DECL_GETPAGESIZE@/1/
 /^HAVE_DECL_GETUSERSHELL *=/s/@HAVE_DECL_GETUSERSHELL@/0/
 /^HAVE_DECL_LOCALTIME_R *=/s/@HAVE_DECL_LOCALTIME_R@/0/
+/^HAVE_DECL_OBSTACK_PRINTF *=/s/@HAVE_DECL_OBSTACK_PRINTF@/0/
 /^HAVE_DECL_SETENV *=/s/@HAVE_DECL_SETENV@/1/
+/^HAVE_DECL_SNPRINTF *=/s/@HAVE_DECL_SNPRINTF@/0/
 /^HAVE_DECL_TTYNAME_R *=/s/@HAVE_DECL_TTYNAME_R@/0/
 /^HAVE_DECL_UNSETENV *=/s/@HAVE_DECL_UNSETENV@/0/
+/^HAVE_DECL_VSNPRINTF *=/s/@HAVE_DECL_VSNPRINTF@/0/
+/^HAVE_DPRINTF *=/s/@HAVE_DPRINTF@/0/
 /^HAVE_DUP2 *=/s/@HAVE_DUP2@/1/
 /^HAVE_DUP3 *=/s/@HAVE_DUP3@/0/
 /^HAVE_EUIDACCESS *=/s/@HAVE_EUIDACCESS@/0/
@@ -166,8 +291,10 @@ am__cd = cd
 /^HAVE_FCHDIR *=/s/@HAVE_FCHDIR@/0/
 /^HAVE_FCHMODAT *=/s/@HAVE_FCHMODAT@/0/
 /^HAVE_FCHOWNAT *=/s/@HAVE_FCHOWNAT@/0/
+/^HAVE_FSEEKO *=/s/@HAVE_FSEEKO@/0/
 /^HAVE_FSTATAT *=/s/@HAVE_FSTATAT@/0/
 /^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/
+/^HAVE_FTELLO *=/s/@HAVE_FTELLO@/0/
 /^HAVE_FTRUNCATE *=/s/@HAVE_FTRUNCATE@/1/
 /^HAVE_FUTIMENS *=/s/@HAVE_FUTIMENS@/0/
 /^HAVE_GETDTABLESIZE *=/s/@HAVE_GETDTABLESIZE@/0/
@@ -208,6 +335,7 @@ am__cd = cd
 /^HAVE_READLINK *=/s/@HAVE_READLINK@/0/
 /^HAVE_READLINKAT *=/s/@HAVE_READLINKAT@/0/
 /^HAVE_REALPATH *=/s/@HAVE_REALPATH@/0/
+/^HAVE_RENAMEAT *=/s/@HAVE_RENAMEAT@/0/
 /^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/
 /^HAVE_SETENV *=/s/@HAVE_SETENV@/1/
 /^HAVE_SIGNED_SIG_ATOMIC_T *=/s/@HAVE_SIGNED_SIG_ATOMIC_T@/1/
@@ -234,6 +362,8 @@ am__cd = cd
 /^HAVE_UNSIGNED_LONG_LONG_INT *=/s/@HAVE_UNSIGNED_LONG_LONG_INT@/1/
 /^HAVE_USLEEP *=/s/@HAVE_USLEEP@/1/
 /^HAVE_UTIMENSAT *=/s/@HAVE_UTIMENSAT@/0/
+/^HAVE_VASPRINTF *=/s/@HAVE_VASPRINTF@/0/
+/^HAVE_VDPRINTF *=/s/@HAVE_VDPRINTF@/0/
 /^HAVE_WCHAR_H *=/s/@HAVE_WCHAR_H@/1/
 /^HAVE_WCHAR_T *=/s/@HAVE_WCHAR_T@/1/
 /^HAVE_XSERVER *=/s/@HAVE_XSERVER@/0/
@@ -250,12 +380,14 @@ am__cd = cd
 /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@//
 /^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
+/^NEXT_AS_FIRST_DIRECTIVE_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H *=/s!@[^@\n]*@!<sys/stat.h>!
 /^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@[^@\n]*@/<time.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@/<unistd.h>/
 /^NEXT_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
 /^NEXT_STDDEF_H *=/s/@[^@\n]*@//
+/^NEXT_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/
 /^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
 /^NEXT_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/
 /^NEXT_SYS_STAT_H *=/s!@[^@\n]*@!<sys/stat.h>!
@@ -270,13 +402,27 @@ am__cd = cd
 /^REPLACE_CANONICALIZE_FILE_NAME *=/s/@REPLACE_CANONICALIZE_FILE_NAME@/0/
 /^REPLACE_CHOWN *=/s/@REPLACE_CHOWN@/0/
 /^REPLACE_CLOSE *=/s/@REPLACE_CLOSE@/0/
+/^REPLACE_DPRINTF *=/s/@REPLACE_DPRINTF@/0/
 /^REPLACE_DUP *=/s/@REPLACE_DUP@/0/
 /^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/
 /^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/
+/^REPLACE_FCLOSE *=/s/@REPLACE_FCLOSE@/0/
+/^REPLACE_FFLUSH *=/s/@REPLACE_FFLUSH@/0/
+/^REPLACE_FOPEN *=/s/@REPLACE_FOPEN@/0/
+/^REPLACE_FPRINTF *=/s/@REPLACE_FPRINTF@/0/
+/^REPLACE_FPURGE *=/s/@REPLACE_FPURGE@/0/
+/^REPLACE_FREOPEN *=/s/@REPLACE_FREOPEN@/0/
+/^REPLACE_FSEEK *=/s/@REPLACE_FSEEK@/0/
+/^REPLACE_FSEEKO *=/s/@REPLACE_FSEEKO@/0/
 /^REPLACE_FSTAT *=/s/@REPLACE_FSTAT@/0/
+/^REPLACE_FSTATAT *=/s/@REPLACE_FSTATAT@/0/
+/^REPLACE_FTELL *=/s/@REPLACE_FTELL@/0/
+/^REPLACE_FTELLO *=/s/@REPLACE_FTELLO@/0/
 /^REPLACE_GETCWD *=/s/@REPLACE_GETCWD@/0/
+/^REPLACE_GETDELIM *=/s/@REPLACE_GETDELIM@/0/
 /^REPLACE_GETDOMAINNAME *=/s/@REPLACE_GETDOMAINNAME@/0/
 /^REPLACE_GETGROUPS *=/s/@REPLACE_GETGROUPS@/0/
+/^REPLACE_GETLINE *=/s/@REPLACE_GETLINE@/0/
 /^REPLACE_GETLOGIN_R *=/s/@REPLACE_GETLOGIN_R@/0/
 /^REPLACE_GETPAGESIZE *=/s/@REPLACE_GETPAGESIZE@/0/
 /^REPLACE_LCHOWN *=/s/@REPLACE_LCHOWN@/0/
@@ -294,25 +440,42 @@ am__cd = cd
 /^REPLACE_MKTIME *=/s/@REPLACE_MKTIME@/0/
 /^REPLACE_NANOSLEEP *=/s/@REPLACE_NANOSLEEP@/0/
 /^REPLACE_NULL *=/s/@REPLACE_NULL@/0/
+/^REPLACE_OBSTACK_PRINTF *=/s/@REPLACE_OBSTACK_PRINTF@/0/
+/^REPLACE_PERROR *=/s/@REPLACE_PERROR@/0/
+/^REPLACE_POPEN *=/s/@REPLACE_POPEN@/0/
 /^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/
+/^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/
 /^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/
 /^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/
 /^REPLACE_READLINK *=/s/@REPLACE_READLINK@/0/
 /^REPLACE_REALLOC *=/s/@REPLACE_REALLOC@/0/
 /^REPLACE_REALPATH *=/s/@REPLACE_REALPATH@/0/
+/^REPLACE_REMOVE *=/s/@REPLACE_REMOVE@/0/
+/^REPLACE_RENAME *=/s/@REPLACE_RENAME@/0/
+/^REPLACE_RENAMEAT *=/s/@REPLACE_RENAMEAT@/0/
 /^REPLACE_RMDIR *=/s/@REPLACE_RMDIR@/0/
 /^REPLACE_SETENV *=/s/@REPLACE_SETENV@/0/
 /^REPLACE_SLEEP *=/s/@REPLACE_SLEEP@/0/
+/^REPLACE_SNPRINTF *=/s/@REPLACE_SNPRINTF@/0/
+/^REPLACE_SPRINTF *=/s/@REPLACE_SPRINTF@/0/
 /^REPLACE_STAT *=/s/@REPLACE_STAT@/0/
+/^REPLACE_STDIO_WRITE_FUNCS *=/s/@REPLACE_STDIO_WRITE_FUNCS@/0/
 /^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/
 /^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/
 /^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/
+/^REPLACE_TMPFILE *=/s/@REPLACE_TMPFILE@/0/
 /^REPLACE_TTYNAME_R *=/s/@REPLACE_TTYNAME_R@/0/
 /^REPLACE_UNLINK *=/s/@REPLACE_UNLINK@/0/
 /^REPLACE_UNLINKAT *=/s/@REPLACE_UNLINKAT@/0/
 /^REPLACE_UNSETENV *=/s/@REPLACE_UNSETENV@/0/
 /^REPLACE_USLEEP *=/s/@REPLACE_USLEEP@/0/
 /^REPLACE_UTIMENSAT *=/s/@REPLACE_UTIMENSAT@/0/
+/^REPLACE_VASPRINTF *=/s/@REPLACE_VASPRINTF@/0/
+/^REPLACE_VDPRINTF *=/s/@REPLACE_VDPRINTF@/0/
+/^REPLACE_VFPRINTF *=/s/@REPLACE_VFPRINTF@/0/
+/^REPLACE_VPRINTF *=/s/@REPLACE_VPRINTF@/0/
+/^REPLACE_VSNPRINTF *=/s/@REPLACE_VSNPRINTF@/0/
+/^REPLACE_VSPRINTF *=/s/@REPLACE_VSPRINTF@/0/
 /^REPLACE_WCTOMB *=/s/@REPLACE_WCTOMB@/0/
 /^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/
 /^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@//
@@ -368,10 +531,13 @@ s/^	[ 	]*{ echo \(.*\) && \\/	 djecho \1 > $@-t/
 s/ \&\& \\ *$//
 s/\.in-h\;  *\\$/.in-h >> $@-t/
 /^      [       ]*} /d
+/^stdio\.h:/,/^ [       ]*mv /{
+  s/'\; \\ *$/' >> $@-t/
+}
 /^stdlib\.h:/,/^        [       ]*mv /{
   s/'\; \\ *$/' >> $@-t/
 }
 /^unistd\.h:/,/^        [       ]*mv /{
   s/'\; \\ *$/' >> $@-t/
 }
-s!\$(MKDIR_P)[  ][      ]*sys!command.com /c "if not exist sys\stat.h md sys"!
+s!\$(MKDIR_P)[  ][      ]*sys!command.com /c "if not exist sys\\stat.h md sys"!