*** empty log message ***

(dd_copy): When using sync with either block or unblock,
pad with spaces.
2025-09-10 07:59:52 +02:00 · 2001-04-23 07:38:44 +00:00 · 2001-04-23 07:38:33 +00:00 · 2001-04-23 07:33:37 +00:00 · 2001-04-23 07:31:17 +00:00 · 2001-04-22 21:37:36 +00:00
235 changed files with 7724 additions and 4840 deletions
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -17,11 +17,12 @@ THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
 PREV_VERSION := $(shell cat $(prev_version_file))
 PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')

-tag-package = $(shell echo "$(PACKAGE)" | tr a-z A-Z)
+tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
 tag-this-version = $(subst .,_,$(VERSION))
 tag-prev-version = $(subst .,_,$(PREV_VERSION))
 this-cvs-tag = $(tag-package)-$(tag-this-version)
 prev-cvs-tag = $(tag-package)-$(tag-prev-version)
+my_distdir = $(PACKAGE)-$(VERSION)

 # Verify that all source files using _() are listed in po/POTFILES.in.
 po-check:
@@ -91,8 +92,8 @@ real_dir = fetish-ftp

 url_dir_list = $(foreach x,a b,ftp://$($(x)_host)/$($(x)_url_dir))

-md5 = $(shell md5sum < $(distdir).tar.gz|sed 's/  -//')
-sha1 = $(shell sha1sum < $(distdir).tar.gz|sed 's/  -//')
+md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/  -//')
+sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/  -//')

 rel-check:
 	tarz=/tmp/rel-check-tarz-$$$$; \
@@ -109,12 +110,12 @@ xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta

 announcement: NEWS ChangeLog $(distdir).tar.gz
 	@( \
-	  echo Subject: $(distdir) released; \
+	  echo Subject: $(my_distdir) released; \
 	  echo; \
 	  echo FIXME: put comments here; \
 	  echo; \
 	  for url in $(url_dir_list); do \
-	    echo "  $$url/$(distdir).tar.gz"; \
+	    echo "  $$url/$(my_distdir).tar.gz"; \
 	  done; \
 	  echo; \
 	  echo And here are xdelta-style diffs; \
@@ -125,8 +126,8 @@ announcement: NEWS ChangeLog $(distdir).tar.gz
 	  echo; \
 	  echo "Here are the MD5 and SHA1 signatures for the .tar.gz file"; \
 	  echo; \
-	  echo "$(md5)  $(distdir).tar.gz"; \
-	  echo "$(sha1)  $(distdir).tar.gz"; \
+	  echo "$(md5)  $(my_distdir).tar.gz"; \
+	  echo "$(sha1)  $(my_distdir).tar.gz"; \
 	  echo; \
 	  echo NEWS:; \
 	  sed -n "/$(THIS_VERSION_REGEXP)/,/^\[$(PREV_VERSION_REGEXP)/p" NEWS \
@@ -156,24 +157,34 @@ automake_repo=:pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake
 .PHONY: wget-update
 wget-update:
 	$(WGET) $(ftp-gnu)/texinfo/texinfo.tex -O $(srcdir)/doc/texinfo.tex
-	$(WGET) $(ftp-gnu)/config/config.guess -O $(srcdir)/config.guess
-	$(WGET) $(ftp-gnu)/config/config.sub -O $(srcdir)/config.sub
-	cvs -d $(automake_repo) co -p automake/depcomp > depcomp
+	for f in config.guess config.sub; do \
+	  $(WGET) $(ftp-gnu)/config/$$f -O $(srcdir)/$$f; \
+	done
+	for f in depcomp missing; do \
+	  echo checking out $$f...; \
+	  cvs -d $(automake_repo) co -p automake/$$f > t$$$$ \
+	    && mv t$$$$ $$f; \
+	done

 define emit-rsync-commands
 	echo =====================================
 	echo =====================================
 	echo 'for host in $(a_host) $(b_host); do \'
-	echo '  rsync -e ssh --pro -av $(xd-delta) $(distdir).tar.gz \'
+	echo '  rsync -e ssh --pro -av $(xd-delta) $(my_distdir).tar.gz \'
 	echo '    $$host:$(real_dir); done'
 	echo '# send the /tmp/announcement e-mail'
 	echo =====================================
 	echo =====================================
 endef

-alpha: writable-files po-check
+# Make sure that the copyright date in lib/version-etc.c is up to date.
+check-copyright: lib/version-etc.c
+	@grep 'N_("Copyright (C) $(shell date +%Y) Free' $< > /dev/null \
+	  || { echo 'out of date copyright in $<; update it' 1>&2; exit 1; }
+
+alpha: writable-files po-check check-copyright
 	$(MAKE) cvs-dist
-	$(MAKE) -s announcement > /tmp/announce-$(distdir)
+	$(MAKE) -s announcement > /tmp/announce-$(my_distdir)
 	ln $(distdir).tar.gz ../release
 	chmod a-w $(distdir).tar.gz
 	cd $(release-archive-dir) \
--- a/6
+++ b/6
@@ -64,6 +64,7 @@ Chuck Hedrick                       hedrick@klinzhai.rutgers.edu
 Clark Morgan                        cmorgan@aracnet.com
 Colin Plumb                         colin@nyx.net
 Collin Rogowski                     collin@rogowski.de
+Dale Scheetz                        dwarf@polaris.net
 Dan Hagerty                         hag@gnu.ai.it.edu
 Dan Pascu                           dan@services.iiruc.ro
 Daniel Bergstrom                    noa@melody.se
@@ -76,6 +77,7 @@ Derek Clegg                         dclegg@next.com
 Dick Streefland                     dick_streefland@tasking.com
 Dirk Lattermann                     dlatt@t-online.de
 Dirk-Jan Faber                      djfaber@snow.nl
+Dan Jacobson                        http://www.geocities.com/jidani
 Don Parsons                         dparsons@synapse.kent.edu
 Donni Erpel                         donald@appc11.gsi.de
 Doug McLaren                        dougmc@comco.com
@@ -117,6 +119,7 @@ Hans Verkuil                        hans@wyst.hobby.nl
 Harry Liu                           rliu@lek.ugcs.caltech.edu
 Herbert Xu                          herbert@gondor.apana.org.au
 Holger Berger                       hberger@ess.nec.de
+Hon-Yin Kok                         hkok@yoda.unl.edu
 Hugh Daniel                         hugh@xanadu.com
 Ian Jackson                         ijackson@chiark.greenend.org.uk
 Ian Lance Taylor                    ian@cygnus.com
@@ -232,6 +235,7 @@ Niklas Edmundsson                   nikke@acc.umu.se
 Noah Friedman                       friedman@splode.com
 Noel Cragg                          noel@red-bean.com
 Olav Morkrid                        olav@funcom.com
+Ole Laursen                         olau@hardworking.dk
 Oskar Liljeblad                     osk@hem.passagen.se
 Ørn E. Hansen                       oehansen@daimi.aau.dk
 Paul Eggert                         eggert@twinsun.com
@@ -255,6 +259,7 @@ Ralf W. Stephan                     stephan@tmt.de
 Ralph Loader                        loader@maths.ox.ac.uk
 Raul Miller                         moth@magenta.com
 Richard Braakman                    dark@xs4all.nl
+Richard Dawe                        richdawe@bigfoot.com
 Richard J. Rauenzahn                rrauenza@hairball.cup.hp.com
 Richard Sharman                     rsharman@magmacom.com
 Rick Sladkey                        jrs@world.std.com
@@ -272,6 +277,7 @@ Sander van Malssen                  svm@kozmix.ow.nl
 Santiago Vila Doncel                sanvila@unex.es
 Savochkin Andrey Vladimirovich      saw@msu.ru
 Scott Lurndal                       slurn@griffin.engr.sgi.com
+Stéphane Chazelas                   Stephane_CHAZELAS@yahoo.fr
 Stephen Gildea                      gildea@x.org
 Stephen Smoogen                     ??????????
 Steve McConnel                      steve@acadcomp.sil.org
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -106,11 +107,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -128,32 +131,33 @@ EXTRA_DIST = perm.texi getdate.texi
 # and those names all map to one 14-byte name (<package>.info-) on some crufty
 # old systems.
 MAKEINFO = makeinfo --no-split
+EXEEXT =
+OBJEXT = o
 subdir = doc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
 TEXI2DVI = texi2dvi
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
-DIST_COMMON =  Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
+DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
 version.texi

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  doc/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status

 $(srcdir)/version.texi: $(srcdir)/stamp-vti
 	@:
@@ -173,19 +177,12 @@ $(srcdir)/stamp-vti: fileutils.texi $(top_srcdir)/configure.in
 mostlyclean-vti:
 	-rm -f vti.tmp

-clean-vti:
-
-distclean-vti:
-
 maintainer-clean-vti:
 	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi

 fileutils.info: fileutils.texi $(srcdir)/version.texi
 fileutils.dvi: fileutils.texi $(srcdir)/version.texi

-
-DVIPS = dvips
-
 .texi.info:
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 	cd $(srcdir) \
@@ -200,59 +197,11 @@ DVIPS = dvips
 	cd $(srcdir) \
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`

-.texinfo.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.txi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+DVIPS = dvips
 .dvi.ps:
 	$(DVIPS) $< -o $@

-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  d=$(srcdir); \
-	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $$d/$$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
-	    else : ; fi; \
-	  done; \
-	done
-	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
-	  done; \
-	else : ; fi
-
-uninstall-info:
+uninstall-info-am:
 	$(PRE_UNINSTALL)
 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
@@ -281,19 +230,13 @@ dist-info: $(INFO_DEPS)
 	done

 mostlyclean-aminfo:
-	-rm -f fileutils.aux fileutils.cp fileutils.cps fileutils.dvi \
-	  fileutils.fn fileutils.fns fileutils.pgs fileutils.ky \
-	  fileutils.kys fileutils.ps fileutils.log fileutils.pg \
-	  fileutils.toc fileutils.tp fileutils.tps fileutils.vr \
-	  fileutils.vrs fileutils.op fileutils.tr fileutils.cv \
-	  fileutils.cn fileutils.cm fileutils.ov
-
-clean-aminfo:
-
-distclean-aminfo:
+	-rm -f fileutils.aux fileutils.cp fileutils.cps fileutils.dvi fileutils.fn \
+	  fileutils.ky fileutils.log fileutils.op fileutils.pg \
+	  fileutils.ps fileutils.toc fileutils.tp fileutils.vr

 maintainer-clean-aminfo:
-	cd $(srcdir) && for i in $(INFO_DEPS); do \
+	cd $(srcdir) && \
+	for i in $(INFO_DEPS); do \
 	  rm -f $$i; \
 	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
 	    rm -f $$i-[0-9]*; \
@@ -303,7 +246,10 @@ tags: TAGS
 TAGS:


-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -317,33 +263,29 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
-info-am: $(INFO_DEPS)
-info: info-am
-dvi-am: $(DVIS)
-dvi: dvi-am
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
+	  dist-info
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(INFO_DEPS)

-install-data-am: install-info-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-info
-uninstall: uninstall-am
-all-am: Makefile $(INFO_DEPS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(infodir)

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -354,34 +296,78 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-vti clean-aminfo clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-vti distclean-aminfo distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-vti maintainer-clean-aminfo \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am: $(DVIS)
+
+info: info-am
+
+info-am: $(INFO_DEPS)
+
+install-data-am: install-info-am
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-info-am: $(INFO_DEPS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  d=$(srcdir); \
+	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    if test -f $$d/$$ifile; then \
+	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+	    else : ; fi; \
+	  done; \
+	done
+	@$(POST_INSTALL)
+	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+	  done; \
+	else : ; fi
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: mostlyclean-vti distclean-vti clean-vti maintainer-clean-vti \
-install-info-am uninstall-info mostlyclean-aminfo distclean-aminfo \
-clean-aminfo maintainer-clean-aminfo tags distdir info-am info dvi-am \
-dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all install-strip \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+	maintainer-clean-generic maintainer-clean-vti
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic dist-info \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-aminfo \
+	maintainer-clean-generic maintainer-clean-vti mostlyclean \
+	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti \
+	uninstall uninstall-am uninstall-info-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/doc/sh-utils.texi
+++ b/doc/sh-utils.texi
@@ -427,9 +427,10 @@ pipeline.
@dfn{failure}.  It can be used as a place holder in shell scripts
 where an unsuccessful command is needed.

-@code{false} ignores @emph{all} command line arguments, even @samp{--help}
-and @samp{--version}, since to do otherwise would change expected
-behavior that some programmers may be relying on.
+By default, @code{false} honors the @samp{--help} and @samp{--version}
+options.  However, that is contrary to @sc{POSIX}, so when the environment
+variable @env{POSIXLY_CORRECT} is set, @code{false} ignores @emph{all}
+command line arguments, including @samp{--help} and @samp{--version}.

 This version of @code{false} is implemented as a C program, and is thus
 more secure and faster than a shell script implementation, and may safely
@@ -448,11 +449,15 @@ be used as a dummy shell for the purpose of disabling accounts.
@code{true} does nothing except return an exit status of 0, meaning
@dfn{success}.  It can be used as a place holder in shell scripts
 where a successful command is needed, although the shell built-in
-command @code{:} (colon) does the same thing faster.
+command @code{:} (colon) may do the same thing faster.
+In most modern shells, @code{true} is built-in command, so when
+you use @samp{true} in a script, you're probably using the built-in
+command, not the one documented here.

-@code{true} ignores @emph{all} command line arguments, even @samp{--help}
-and @samp{--version}, since to do otherwise would change expected
-behavior that some programmers may be relying on.
+By default, @code{true} honors the @samp{--help} and @samp{--version}
+options.  However, that is contrary to @sc{POSIX}, so when the environment
+variable @env{POSIXLY_CORRECT} is set, @code{true} ignores @emph{all}
+command line arguments, including @samp{--help} and @samp{--version}.

 This version of @code{true} is implemented as a C program, and is thus
 more secure and faster than a shell script implementation, and may safely
@@ -2198,8 +2203,7 @@ information.
@cindex time, printing or setting
@cindex printing the current time

-@code{date} with no arguments prints the current time and date, in the
-format of the @samp{%c} directive (described below).  Synopses:
+Synopses:

@example
 date [@var{option}]@dots{} [+@var{format}]
@@ -2207,6 +2211,9 @@ date [-u|--utc|--universal] @c this avoids a newline in the output
 [ MMDDhhmm[[CC]YY][.ss] ]
@end example

+Invoking @code{date} with no @var{format} argument is equivalent to invoking
+@samp{date '+%a %b %e %H:%M:%S %Z %Y'}.
+
@findex strftime @r{and @code{date}}
@cindex time formats
@cindex formatting times
@@ -2296,6 +2303,8 @@ locale's abbreviated month name (Jan@dots{}Dec)
 locale's full month name, variable length (January@dots{}December)
@item %c
 locale's date and time (Sat Nov 04 12:02:33 EST 1989)
+@item %C
+century (year divided by 100 and truncated to an integer) (00@dots{}99)
@item %d
 day of month (01@dots{}31)
@item %D
@@ -2566,7 +2575,7 @@ To print a date without the leading zero for one-digit days
 of the month, you can use the (GNU extension) @code{-} modifier to suppress
 the padding altogether.
@example
-date -d=1may '+%B %-d'
+date -d 1may '+%B %-d'
@end example

@item
@@ -2595,31 +2604,31 @@ To convert a date string to the number of seconds since the epoch
 (which is 1970-01-01 00:00:00 UTC), use the @samp{--date} option with
 the @samp{%s} format.  That can be useful in sorting and/or graphing
 and/or comparing data by date.  The following command outputs the
-number of the seconds since the epoch for the time one second later
-than the epoch, but in a time zone five hours later (Cambridge, Massachusetts),
-thus a total of five hours and one second after the epoch:
+number of the seconds since the epoch for the time two minutes after the
+epoch:

@example
-date --date='1970-01-01 00:00:01 UTC +5 hours' +%s
-18001
+date --date='1970-01-01 00:02:00 +0000' +%s
+120
@end example

-Suppose you had @emph{not} specified time zone information in the example above.
-Then, @code{date} would have used your computer's idea of the time zone when
-interpreting the string.  Here's what you would get if you were in
-Greenwich, England:
+If you do not specify time zone information in the date string,
+@command{date} uses your computer's idea of the time zone when
+interpreting the string.  For example, if your computer's time zone is
+that of Cambridge, Massachusetts, which was then 5 hours (i.e., 18,000
+seconds) behind UTC:

@example
 # local time zone used
-date --date='1970-01-01 00:00:01' +%s
-1
+date --date='1970-01-01 00:02:00' +%s
+18120
@end example

@item
 If you're sorting or graphing dated data, your raw date values may be
 represented as seconds since the epoch.  But few people can look at
 the date @samp{946684800} and casually note ``Oh, that's the first second
-of the year 2000.''
+of the year 2000 in Greenwich, England.''

@example
 date --date='2000-01-01 UTC' +%s
@@ -2630,8 +2639,9 @@ To convert such an unwieldy number of seconds back to
 a more readable form, use a command like this:

@smallexample
-date -d '1970-01-01 946684800 sec' +"%Y-%m-%d %T %z"
-2000-01-01 00:00:00 +0000
+# local time zone used
+date -d '1970-01-01 UTC 946684800 seconds' +"%Y-%m-%d %T %z"
+1999-12-31 19:00:00 -0500
@end smallexample

@end itemize
--- a/doc/textutils.texi
+++ b/doc/textutils.texi
@@ -237,6 +237,14 @@ writing identical descriptions for each of the programs, they are
 described here.  (In fact, every @sc{gnu} program accepts (or should accept)
 these options.)

+@vindex POSIXLY_CORRECT
+Normally options and operands can appear in any order, and programs act
+as if all the options appear before any operands.  For example,
+@samp{sort -r passwd -t :} acts like @samp{sort -r -t : passwd}, since
+@samp{:} is an option-argument of @option{-t}.  However, if the
+@env{POSIXLY_CORRECT} environment variable is set, options must appear
+before operands, unless otherwise specified for a particular command.
+
 Some of these programs recognize the @samp{--help} and @samp{--version}
 options only when one of them is the sole command line argument.

@@ -252,8 +260,24 @@ Print a usage message listing all available options, then exit successfully.
@cindex version number, finding
 Print the version number, then exit successfully.

+@item --
+@opindex --
+@cindex option delimiter
+Delimit the option list.  Later arguments, if any, are treated as
+operands even if they begin with @samp{-}.  For example, @samp{sort --
+-r} reads from the file named @file{-r}.
+
@end table

+@cindex standard input
+@cindex standard output
+A single @samp{-} is not really an option, though it looks like one.  It
+stands for standard input, or for standard output if that is clear from
+the context, and it can be used either as an operand or as an
+option-argument.  For example, @samp{sort -o - -} outputs to standard
+output and reads from standard input, and is equivalent to plain
+@samp{sort}.  Unless otherwise specified, @samp{-} can appear in any
+context that requires a file name.

@node Output of entire files
@chapter Output of entire files
@@ -948,15 +972,22 @@ optionally outputting in multicolumn format; optionally merges all
 pr [@var{option}]@dots{} [@var{file}]@dots{}
@end example

+@vindex LC_MESSAGES
 By default, a 5-line header is printed at each page: two blank lines;
 a line with the date, the filename, and the page count; and two more
 blank lines.  A footer of five blank lines is also printed.  With the @samp{-F}
 option, a 3-line header is printed: the leading two blank lines are
 omitted; no footer is used.  The default @var{page_length} in both cases is 66
 lines.  The default number of text lines changes from 56 (without @samp{-F})
-to 63 (with @samp{-F}).  The text line of the header takes up the full
-@var{page_width} in the form @samp{yyyy-mm-dd HH:MM string Page nnnn}.
-String is a centered header string.
+to 63 (with @samp{-F}).  The text line of the header takes the form
+@samp{@var{date} @var{string} @var{page}}, with spaces inserted around
+@var{string} so that the line takes up the full @var{page_width}.  Here,
+@var{date} is the date (see the @option{-D} or @option{--date-format}
+option for details), @var{string} is the centered header string, and
+@var{page} identifies the page number.  The @env{LC_MESSAGES} locale
+category affects the spelling of @var{page}; in the default C locale, it
+is @samp{Page @var{number}} where @var{number} is the decimal page
+number.

 Form feeds in the input cause page breaks in the output.  Multiple form
 feeds produce empty pages.
@@ -1044,8 +1075,8 @@ If a line is too long to fit in a column, it is truncated.
@opindex -c
@opindex --show-control-chars
 Print control characters using hat notation (e.g., @samp{^G}); print
-other unprintable characters in octal backslash notation.  By default,
-unprintable characters are not changed.
+other nonprinting characters in octal backslash notation.  By default,
+nonprinting characters are not changed.

@item -d
@itemx --double-space
@@ -1054,6 +1085,25 @@ unprintable characters are not changed.
@cindex double spacing
 Double space the output.

+@item -D @var{format}
+@itemx --date-format=@var{format}
+@cindex time formats
+@cindex formatting times
+Format header dates using @var{format}, using the same conventions as
+for the the command @samp{date +@var{format}}; @xref{date invocation, ,
+,sh-utils,GNU shell utilities}.  Except for directives, which start with
+@samp{%}, characters in @var{format} are printed unchanged.  You can use
+this option to specify an arbitrary string in place of the header date,
+e.g., @samp{--date-format="Monday morning"}.
+
+@vindex POSIXLY_CORRECT
+@vindex LC_TIME
+If the @env{POSIXLY_CORRECT} environment variable is not set, the date
+format defaults to @samp{%Y-%m-%d %H:%M} (for example, @samp{2001-12-04
+23:59}); otherwise, the format depends on the @env{LC_TIME} locale
+category, with the default being @samp{%b %e %H:%M %Y} (for example,
+@samp{Dec@ @ 4 23:59 2001}.
+
@item -e[@var{in-tabchar}[@var{in-tabwidth}]]
@itemx --expand-tabs[=@var{in-tabchar}[@var{in-tabwidth}]]
@opindex -e
@@ -1079,12 +1129,8 @@ per page changes from default 56 to 63 lines.
@opindex -h
@opindex --header
 Replace the filename in the header with the centered string @var{header}.
-Left-hand-side truncation (marked by a @samp{*}) may occur if the total
-header line @samp{yyyy-mm-dd HH:MM HEADER Page nnnn} becomes larger than
-@var{page_width}.  @samp{-h ""} prints a blank line header.  Don't use
-@samp{-h""}.
-A space between the @samp{-h} option and the argument is always
-indispensable.
+When using the shell, @var{header} should be quoted and should be
+separated from @option{-h} by a space.

@item -i[@var{out-tabchar}[@var{out-tabwidth}]]
@itemx --output-tabs[=@var{out-tabchar}[@var{out-tabwidth}]]
@@ -1130,8 +1176,9 @@ some @var{file}s (form feeds set) produce empty columns, still marked
 by @var{string}.  The result is a continuous line numbering and column
 marking throughout the whole merged file.  Completely empty merged pages
 show no separators or line numbers.  The default header becomes
-@samp{yyyy-mm-dd HH:MM <blanks> Page nnnn}; may be used with
-@samp{-h @var{header}} to fill up the middle blank part.
+@samp{@var{date} @var{page}} with spaces inserted in the middle; this
+may be used with the @option{-h} or @option{--header} option to fill up
+the middle blank part.

@item -n[@var{number-separator}[@var{digits}]]
@itemx --number-lines[=@var{number-separator}[@var{digits}]]
@@ -1235,7 +1282,7 @@ set in the input files.
@itemx --show-nonprinting
@opindex -v
@opindex --show-nonprinting
-Print unprintable characters in octal backslash notation.
+Print nonprinting characters in octal backslash notation.

@item -w @var{page_width}
@itemx --width=@var{page_width}
@@ -1260,9 +1307,8 @@ alignment is always used.  The separator options @samp{-S} or @samp{-s}
 don't affect the @samp{-W} option.  Default is 72 characters.  Without
@samp{-W @var{page_width}} and without any of the column options NO line
 truncation is used (defined to keep downward compatibility and to meet
-most frequent tasks).  That's equivalent to @samp{-W 72 -J}.  With and
-without @samp{-W @var{page_width}} the header line is always truncated
-to avoid line overflow.
+most frequent tasks).  That's equivalent to @samp{-W 72 -J}.  The header
+line is never truncated.

@end table

@@ -1417,7 +1463,7 @@ when given a @var{file} of @samp{-}.  Synopses:
@example
 tail [@var{option}]@dots{} [@var{file}]@dots{}
 tail -@var{number} [@var{option}]@dots{} [@var{file}]@dots{}
-tail +@var{number} [@var{option}]@dots{} [@var{file}]@dots{}
+tail +@var{number} [@var{option}]@dots{} [@var{file}]@dots{} # obsolescent
@end example

 If more than one @var{file} is specified, @code{tail} prints a
@@ -1438,8 +1484,10 @@ typically 32k.  A more reliable and versatile way to reverse files is
 the @sc{gnu} @code{tac} command.

@code{tail} accepts two option formats: the new one, in which numbers
-are arguments to the options (@samp{-n 1}), and the old one, in which
-the number precedes any option letters (@samp{-1} or @samp{+1}).
+are arguments to the options (@samp{-n 1}), and the obsolescent one, in
+which the number precedes any option letters (@samp{-1} or @samp{+1}).
+Warning: support for the @samp{+1} form will be withdrawn, as future
+versions of @sc{posix} will not allow it.

 If any option-argument is a number @var{n} starting with a @samp{+},
@code{tail} begins printing with the @var{n}th item from the start of
@@ -1458,6 +1506,10 @@ a decimal number optionally followed by a size letter (@samp{b},
@samp{k}, @samp{m}) as in @code{-c}, or @samp{l} to mean count by lines,
 or other option letters (@samp{cfqv}).

+Warning: the @samp{+@var{count}} usage is obsolescent.  Future versions
+of @sc{posix} will require that support for it be withdrawn.  Use
+@samp{-n +@var{count}} instead.
+
@item -c @var{bytes}
@itemx --bytes=@var{bytes}
@opindex -c
@@ -2081,14 +2133,18 @@ mode:
@table @samp

@item -c
+@itemx --check
@opindex -c
+@opindex --check
@cindex checking for sortedness
 Check whether the given files are already sorted: if they are not all
 sorted, print an error message and exit with a status of 1.
 Otherwise, exit successfully.

@item -m
+@itemx --merge
@opindex -m
+@opindex --merge
@cindex merging sorted files
 Merge the given files by sorting them as a group.  Each input file must
 always be individually sorted.  It always works to sort instead of
@@ -2105,17 +2161,19 @@ options, until a difference is found or no fields are left.
 Unless otherwise specified, all comparisons use the character
 collating sequence specified by the @env{LC_COLLATE} locale.

-If any of the global options @samp{Mbdfinr} are given but no key fields
+If any of the global options @samp{bdfgiMnr} are given but no key fields
 are specified, @code{sort} compares the entire lines according to the
 global options.

 Finally, as a last resort when all keys compare equal (or if no
 ordering options were specified at all), @code{sort} compares the entire
 lines.  The last resort comparison
-honors the @samp{-r} global option.  The @samp{-s} (stable) option
+honors the @option{--reverse} (@option{-r}) global option.
+The @option{--stable} (@option{-s}) option
 disables this last-resort comparison so that lines in which all fields
 compare equal are left in their original relative order.  If no fields
-or global options are specified, @samp{-s} has no effect.
+or global options are specified, @option{--stable} (@option{-s}) has no
+effect.

@sc{gnu} @code{sort} (as specified for all @sc{gnu} utilities) has no limits on
 input line length or restrictions on bytes allowed within lines.  In
@@ -2132,8 +2190,8 @@ Upon any error, @code{sort} exits with a status of @samp{2}.
@vindex TMPDIR
 If the environment variable @env{TMPDIR} is set, @code{sort} uses its
 value as the directory for temporary files instead of @file{/tmp}.  The
-@samp{-T @var{tempdir}} option in turn overrides the environment
-variable.
+@option{--temporary-directory} (@option{-T}) option in turn overrides
+the environment variable.

 The following options affect the ordering of output lines.  They may be
 specified globally or as part of a specific key field.  If no key
@@ -2146,14 +2204,19 @@ so portable shell scripts should specify global options first.
@table @samp

@item -b
+@itemx --ignore-leading-blanks
@opindex -b
+@opindex --ignore-leading-blanks
@cindex blanks, ignoring leading
@vindex LC_CTYPE
 Ignore leading blanks when finding sort keys in each line.
 The @env{LC_CTYPE} locale determines character types.

@item -d
+@itemx --dictionary-order
@opindex -d
+@opindex --dictionary-order
+@cindex dictionary order
@cindex phone directory order
@cindex telephone directory order
@vindex LC_CTYPE
@@ -2162,15 +2225,20 @@ letters, digits and blanks when sorting.
 The @env{LC_CTYPE} locale determines character types.

@item -f
+@itemx --ignore-case
@opindex -f
+@opindex --ignore-case
+@cindex ignoring case
@cindex case folding
@vindex LC_CTYPE
 Fold lowercase characters into the equivalent uppercase characters when
-sorting so that, for example, @samp{b} and @samp{B} sort as equal.
+comparing so that, for example, @samp{b} and @samp{B} sort as equal.
 The @env{LC_CTYPE} locale determines character types.

@item -g
+@itemx --general-numeric-sort
@opindex -g
+@opindex --general-numeric-sort
@cindex general numeric sort
@vindex LC_NUMERIC
 Sort numerically, using the standard C function @code{strtod} to convert
@@ -2196,17 +2264,23 @@ Plus infinity.
@end itemize

 Use this option only if there is no alternative; it is much slower than
-@samp{-n} and it can lose information when converting to floating point.
+@option{--numeric-sort} (@option{-n}) and it can lose information when
+converting to floating point.

@item -i
+@itemx --ignore-nonprinting
@opindex -i
+@opindex --ignore-nonprinting
+@cindex nonprinting characters, ignoring
@cindex unprintable characters, ignoring
@vindex LC_CTYPE
-Ignore unprintable characters.
+Ignore nonprinting characters.
 The @env{LC_CTYPE} locale determines character types.

@item -M
+@itemx --month-sort
@opindex -M
+@opindex --month-sort
@cindex months, sorting by
@vindex LC_TIME
 An initial string, consisting of any amount of whitespace, followed
@@ -2216,7 +2290,9 @@ Invalid names compare low to valid names.  The @env{LC_TIME} locale
 determines the month spellings.

@item -n
+@itemx --numeric-sort
@opindex -n
+@opindex --numeric-sort
@cindex numeric sort
@vindex LC_NUMERIC
 Sort numerically: the number begins each line; specifically, it consists
@@ -2225,10 +2301,11 @@ digits possibly separated by thousands separators, optionally followed
 by a decimal-point character and zero or more digits.  The @env{LC_NUMERIC}
 locale specifies the decimal-point character and thousands separator.

-@code{sort -n} uses what might be considered an unconventional method
+Numeric sort uses what might be considered an unconventional method
 to compare strings representing floating point numbers.  Rather than
 first converting each string to the C @code{double} type and then
-comparing those values, sort aligns the decimal-point characters in the two
+comparing those values, @command{sort} aligns the decimal-point
+characters in the two
 strings and compares the strings a character at a time.  One benefit
 of using this approach is its speed.  In practice this is much more
 efficient than performing the two corresponding string-to-double (or even
@@ -2238,10 +2315,13 @@ there is no corresponding loss of precision.  Converting each string to
 on most systems.

 Neither a leading @samp{+} nor exponential notation is recognized.
-To compare such strings numerically, use the @samp{-g} option.
+To compare such strings numerically, use the
+@option{--general-numeric-sort} (@option{-g}) option.

@item -r
+@itemx --reverse
@opindex -r
+@opindex --reverse
@cindex reverse sorting
 Reverse the result of comparison, so that lines with greater key values
 appear earlier in the output instead of later.
@@ -2253,15 +2333,26 @@ Other options are:
@table @samp

@item -o @var{output-file}
+@itemx --output=@var{output-file}
@opindex -o
+@opindex --output
@cindex overwriting of input, allowed
 Write output to @var{output-file} instead of standard output.
-If @var{output-file} is one of the input files, @code{sort} copies
-it to a temporary file before sorting and writing the output to
-@var{output-file}.
+If necessary, @command{sort} reads input before opening
+@var{output-file}, so you can safely sort a file in place by using
+commands like @code{sort -o F F} and @code{cat F | sort -o F}.
+
+@vindex POSIXLY_CORRECT
+If @option{-c} is not also specified, @option{-o} may appear after an
+input file even if @env{POSIXLY_CORRECT} is set, e.g., @samp{sort F -o
+F}.  Warning: this usage is obsolescent.  Future versions of @sc{posix}
+will require that support for it be withdrawn.  Portable scripts should
+specify @samp{-o @var{output-file}} before any input files.

@item -S @var{size}
+@itemx --buffer-size=@var{size}
@opindex -S
+@opindex --buffer-size
@cindex size for main memory sorting
 Use a main-memory sort buffer of the given @var{size}.  By default,
@var{size} is in units of 1,024 bytes.  Appending @samp{%} causes
@@ -2279,7 +2370,9 @@ grows beyond @var{size} if @command{sort} encounters input lines larger
 than @var{size}.

@item -t @var{separator}
+@itemx --field-separator=@var{separator}
@opindex -t
+@opindex --field-separator
@cindex field separator character
 Use character @var{separator} as the field separator when finding the
 sort keys in each line.  By default, fields are separated by the empty
@@ -2292,7 +2385,9 @@ as @samp{-k 2}, or sort fields consisting of a range, as @samp{-k 2,3},
 retain the field separators present between the endpoints of the range.

@item -T @var{tempdir}
+@itemx --temporary-directory=@var{tempdir}
@opindex -T
+@opindex --temporary-directory
@cindex temporary directory
@vindex TMPDIR
 Use directory @var{tempdir} to store temporary files, overriding the
@@ -2303,24 +2398,31 @@ performance by using this option to specify directories on different
 disks and controllers.

@item -u
+@itemx --unique
@opindex -u
+@opindex --unique
@cindex uniquifying output
-For the default case or the @samp{-m} option, only output the first
-of a sequence of lines that compare equal.  For the @samp{-c} option,
+
+Normally, output only the first of a sequence of lines that compare
+equal.  For the @option{--check} (@option{-c}) option,
 check that no pair of consecutive lines compares equal.

@item -k @var{pos1}[,@var{pos2}]
+@itemx --key=@var{pos1}[,@var{pos2}]
@opindex -k
+@opindex --key
@cindex sort field
-The recommended, @sc{posix}, option for specifying a sort field.  The field
+Specify a sort field that
 consists of the part of the line between @var{pos1} and @var{pos2} (or the
 end of the line, if @var{pos2} is omitted), @emph{inclusive}.
 Fields and character positions are numbered starting with 1.
-So to sort on the second field, you'd use @samp{-k 2,2}
+So to sort on the second field, you'd use @samp{--key=2,2} (@samp{-k 2,2}).
 See below for more examples.

@item -z
+@itemx --zero-terminated
@opindex -z
+@opindex --zero-terminated
@cindex sort zero-terminated lines
 Treat the input as a set of lines, each terminated by a zero byte (@sc{ascii}
@sc{nul} (Null) character) instead of an @sc{ascii} @sc{lf} (Line Feed).
@@ -2329,17 +2431,17 @@ This option can be useful in conjunction with @samp{perl -0} or
 reliably handle arbitrary pathnames (even those which contain Line Feed
 characters.)

-@item +@var{pos1}[-@var{pos2}]
-The obsolete, traditional option for specifying a sort field.  The field
+@item +@var{pos1} [-@var{pos2}]
+The obsolescent, traditional option for specifying a sort field.  The field
 consists of the line between @var{pos1} and up to but @emph{not including}
@var{pos2} (or the end of the line if @var{pos2} is omitted).  Fields
 and character positions are numbered starting with 0.  See below.

-@end table
+Warning: the @samp{+@var{pos1}} usage is obsolescent.  Future versions of
+@sc{posix} will require that support for it be withdrawn.  Use
+@option{--key} (@option{-k}) instead.

-In addition, when @sc{gnu} @code{sort} is invoked with exactly one argument,
-options @samp{--help} and @samp{--version} are recognized.  @xref{Common
-options}.
+@end table

 Historical (BSD and System V) implementations of @code{sort} have
 differed in their interpretation of some options, particularly
@@ -2371,7 +2473,7 @@ Keys may span multiple fields.

 Here are some examples to illustrate various combinations of options.
 In them, the @sc{posix} @samp{-k} option is used to specify sort keys rather
-than the obsolete @samp{+@var{pos1}-@var{pos2}} syntax.
+than the obsolescent @samp{+@var{pos1}-@var{pos2}} syntax.

@itemize @bullet

@@ -2515,6 +2617,10 @@ each other by at least one space or tab.
 Skip @var{n} characters before checking for uniqueness.  If you use both
 the field and character skipping options, fields are skipped over first.

+Warning: the @samp{+@var{n}} usage is obsolescent.  Future versions of
+@sc{posix} will require that support for it be withdrawn.  Use @samp{-s
+@var{n}} instead.
+
@item -c
@itemx --count
@opindex -c
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,89 @@
+2001-04-08  Jim Meyering  <meyering@lucent.com>
+
+	* getdate.y (get_date): Set tm_isdst to -1 to ensure that it is
+	recomputed; that's necessary when the offset spans a DST transition.
+	Patch by David J. MacKenzie.  Reported by Hon-Yin Kok.
+
+2001-04-02  Jim Meyering  <meyering@lucent.com>
+
+	* regex.h, regex.c: Update from GNU libc.
+
+2001-03-19  Paul Eggert  <eggert@twinsun.com>
+
+	* lib/version-etc.c (version_etc_copyright): Update to 2001.
+
+2001-03-16  Paul Eggert  <eggert@twinsun.com>
+
+	* tempname.c (uint64_t): Define to uintmax_t if
+	not defined, and if UINT64_MAX is not defined.
+	Required at least for Vax Ultrix4.3, which doesn't define uint64_t.
+	Reported by John David Anglin.
+
+2001-03-10  Bruno Haible  <haible@clisp.cons.org>
+
+	* localcharset.c (locale_charset): Allow wildcard syntax. Also resolve
+	alias if codeset is empty.
+	* config.charset (BeOS): Use wildcard syntax.
+
+2001-03-13  Jim Meyering  <meyering@lucent.com>
+
+	* path-concat.c (path_concat) [FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX]:
+	Don't insert a backslash when concatenating e.g., `C:' and `foo'.
+	From Bruno Haible.
+
+2001-03-06  Bruno Haible  <haible@clisp.cons.org>
+
+	* localcharset.c (locale_charset): Don't use setlocale(LC_CTYPE,NULL).
+	Don't return NULL.
+	* unicodeio.c (print_unicode_char): Simplify accordingly.
+
+2001-03-06  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Update for FreeBSD 4.2 and OSF/1 5.1. Add
+	support for DOS/DJGPP.
+
+2001-02-28  Paul Eggert  <eggert@twinsun.com>
+
+	* Makefile.am (libfetish_a_SOURCES):
+	Add dup-safer.c, fopen-safer.c.
+	(noinst_HEADERS): Add stdio-safer.h, unistd-safer.h.
+
+	* dup-safer.c, fopen-safer.c, stdio-safer.h,
+	lib/unistd-safer.h: New files.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	The mkstemp replacement is taken from glibc 2.2.2, with some
+	portability fixes for use outside glibc, as follows:
+
+	* tempname.c (struct_stat64): New macro.
+	(direxists, __gen_tempname): Use it.
+	This avoids a portability problem with Solaris 8.
+
+	* tempname.c (<config.h>): Include if HAVE_CONFIG_H.
+	(<stddef.h>, <stdint.h>, <string.h>):
+	Include only if STDC_HEADERS || _LIBC.
+	(<fcntl.h>): Include only if HAVE_FCNTL_H || _LIBC.
+	(<unistd.h>): Include only if HAVE_UNISTD_H || _LIBC.
+	(<sys/time.h>): Include only if HAVE_SYS_TIME_H || _LIBC.
+	(__set_errno): Define this macro if <errno.h> doesn't.
+	(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
+	Define these macros if <stdio.h> doesn't.
+	(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
+	Define these macros if <sys/stat.h>
+	doesn't.  Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
+	(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64, lxstat64,
+	__xstat64): Define if not _LIBC.
+	(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
+	(__gen_tempname): Invoke gettimeofday only if
+	HAVE_GETTIMEOFDAY || _LIBC;
+	otherwise, fall back on plain "time".
+	Use macros like S_IRUSR | S_IWUSR rather than octal values like 0600.
+
+	* mkstemp.c (__GT_FILE): Define to zero if not defined.
+
+	* mkstemp.c, tempname.c: New files, taken from glibc 2.2.2.
+
 2001-02-17  Jim Meyering  <meyering@lucent.com>

 	* strtoul.c: Sync from GNU libc.  Use double quotes, not <...>
@@ -24,7 +110,7 @@

 2001-02-16  Paul Eggert  <eggert@twinsun.com>

-	* lib/alloca.c (malloc): Undef before defining, since stdlib.h
+	* alloca.c (malloc): Undef before defining, since stdlib.h
 	may have defined it.  Needed for Encore Umax-3.0.9.16b systems.
 	Reported by Mark Hounschell via Paul Eggert.

@@ -61,7 +147,7 @@

 2001-01-03  Paul Eggert  <eggert@twinsun.com>

-	* lib/strftime.c: Sync with glibc time/strftime.c 1.81.
+	* strftime.c: Sync with glibc time/strftime.c 1.81.

 2001-01-03  Jim Meyering  <meyering@lucent.com>

@@ -70,7 +156,7 @@

 2000-12-29  Paul Eggert  <eggert@twinsun.com>

-	* lib/modechange.c: Do not assume that mode_t uses the
+	* modechange.c: Do not assume that mode_t uses the
 	traditional octal encoding.  E.g. "chmod 1 FOO" should set
 	the other-execute bit of FOO even if S_IXOTH != 1.

@@ -170,11 +256,11 @@

 2000-12-01  Paul Eggert  <eggert@twinsun.com>

-	* lib/memrchr.c: Include <config.h> before any system include file.
+	* memrchr.c: Include <config.h> before any system include file.

 2000-11-29  Paul Eggert  <eggert@twinsun.com>

-	* lib/dirname.c (dir_name_r): Fix typo: int -> size_t.
+	* dirname.c (dir_name_r): Fix typo: int -> size_t.

 2000-11-26  Jim Meyering  <meyering@lucent.com>

@@ -182,12 +268,12 @@

 2000-11-22  Paul Eggert  <eggert@twinsun.com>

-	* lib/strftime.c (my_strftime): Do not invoke mbrlen with a
+	* strftime.c (my_strftime): Do not invoke mbrlen with a
 	size of (size_t) -1; it's not portable.

 2000-11-17  Akim Demaille  <akim@epita.fr>

-	* lib/obstack.h: Formatting changes.
+	* obstack.h: Formatting changes.
 	(obstack_grow, obstack_grow0): Don't cast WHERE at all: that would
 	prevent type checking.
 	(obstack_ptr_grow, obstack_ptr_grow_fast): When assigning, don't
@@ -567,7 +653,7 @@

 	* quotearg.h (enum quoting style): New enum clocale_quoting_style.

-	* quotearg.c: (quoting_style_args, quoting_style_vals,
+	* quotearg.c (quoting_style_args, quoting_style_vals,
 	quotearg_buffer_restyled): Add support for
 	clocale_quoting_style.  Undo previous change to
 	locale_quoting_style behavior, and undo the "{LEFT QUOTATION MARK}"
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,7 +9,8 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@

 libfetish_a_SOURCES = \
  getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
-  canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
+  canon-host.c closeout.c diacrit.c dirname.c dup-safer.c \
+  exclude.c filemode.c fopen-safer.c \
  full-write.c getopt.c getopt1.c getstr.c getugroups.c hard-locale.c hash.c \
  human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
  makepath.c mbswidth.c md5.c memcasecmp.c memcoll.c modechange.c \
@@ -32,7 +33,8 @@ noinst_HEADERS = \
  path-concat.h pathmax.h physmem.h posixtm.h \
  quote.h quotearg.h readtokens.h \
  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h sha.h \
-  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h
+  stdio-safer.h strverscmp.h unicodeio.h unistd-safer.h version-etc.h \
+  xalloc.h xstrtod.h xstrtol.h

 BUILT_SOURCES = getdate.c lstat.c stat.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -125,7 +128,8 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@

 libfetish_a_SOURCES = \
  getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
-  canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
+  canon-host.c closeout.c diacrit.c dirname.c dup-safer.c \
+  exclude.c filemode.c fopen-safer.c \
  full-write.c getopt.c getopt1.c getstr.c getugroups.c hard-locale.c hash.c \
  human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
  makepath.c mbswidth.c md5.c memcasecmp.c memcoll.c modechange.c \
@@ -149,7 +153,8 @@ noinst_HEADERS = \
  path-concat.h pathmax.h physmem.h posixtm.h \
  quote.h quotearg.h readtokens.h \
  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h sha.h \
-  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h
+  stdio-safer.h strverscmp.h unicodeio.h unistd-safer.h version-etc.h \
+  xalloc.h xstrtod.h xstrtol.h


 BUILT_SOURCES = getdate.c lstat.c stat.c
@@ -164,142 +169,147 @@ charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 SUFFIXES = .sed .sin

 CLEANFILES = charset.alias ref-add.sed ref-del.sed
+EXEEXT =
+OBJEXT = o
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)

 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ANSI2KNR = ../src/ansi2knr
 libfetish_a_AR = $(AR) cru
-am_libfetish_a_OBJECTS =  getdate$U.o posixtm$U.o addext$U.o \
-argmatch$U.o backupfile$U.o basename$U.o canon-host$U.o closeout$U.o \
-diacrit$U.o dirname$U.o exclude$U.o filemode$U.o full-write$U.o \
-getopt$U.o getopt1$U.o getstr$U.o getugroups$U.o hard-locale$U.o \
-hash$U.o human$U.o idcache$U.o isdir$U.o linebuffer$U.o \
-localcharset$U.o long-options$U.o makepath$U.o mbswidth$U.o md5$U.o \
-memcasecmp$U.o memcoll$U.o modechange$U.o path-concat$U.o physmem$U.o \
-quote$U.o quotearg$U.o readtokens$U.o safe-read$U.o same$U.o \
-save-cwd$U.o savedir$U.o sha$U.o stripslash$U.o unicodeio$U.o \
-userspec$U.o version-etc$U.o xgetcwd$U.o xgethostname$U.o xmalloc$U.o \
-xstrdup$U.o xstrtod$U.o xstrtol$U.o xstrtoul$U.o xstrtoumax$U.o \
-yesno$U.o
-libfetish_a_OBJECTS =  $(am_libfetish_a_OBJECTS)
+am_libfetish_a_OBJECTS = getdate$U.$(OBJEXT) posixtm$U.$(OBJEXT) \
+addext$U.$(OBJEXT) argmatch$U.$(OBJEXT) backupfile$U.$(OBJEXT) \
+basename$U.$(OBJEXT) canon-host$U.$(OBJEXT) closeout$U.$(OBJEXT) \
+diacrit$U.$(OBJEXT) dirname$U.$(OBJEXT) dup-safer$U.$(OBJEXT) \
+exclude$U.$(OBJEXT) filemode$U.$(OBJEXT) fopen-safer$U.$(OBJEXT) \
+full-write$U.$(OBJEXT) getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) \
+getstr$U.$(OBJEXT) getugroups$U.$(OBJEXT) hard-locale$U.$(OBJEXT) \
+hash$U.$(OBJEXT) human$U.$(OBJEXT) idcache$U.$(OBJEXT) \
+isdir$U.$(OBJEXT) linebuffer$U.$(OBJEXT) localcharset$U.$(OBJEXT) \
+long-options$U.$(OBJEXT) makepath$U.$(OBJEXT) mbswidth$U.$(OBJEXT) \
+md5$U.$(OBJEXT) memcasecmp$U.$(OBJEXT) memcoll$U.$(OBJEXT) \
+modechange$U.$(OBJEXT) path-concat$U.$(OBJEXT) physmem$U.$(OBJEXT) \
+quote$U.$(OBJEXT) quotearg$U.$(OBJEXT) readtokens$U.$(OBJEXT) \
+safe-read$U.$(OBJEXT) same$U.$(OBJEXT) save-cwd$U.$(OBJEXT) \
+savedir$U.$(OBJEXT) sha$U.$(OBJEXT) stripslash$U.$(OBJEXT) \
+unicodeio$U.$(OBJEXT) userspec$U.$(OBJEXT) version-etc$U.$(OBJEXT) \
+xgetcwd$U.$(OBJEXT) xgethostname$U.$(OBJEXT) xmalloc$U.$(OBJEXT) \
+xstrdup$U.$(OBJEXT) xstrtod$U.$(OBJEXT) xstrtol$U.$(OBJEXT) \
+xstrtoul$U.$(OBJEXT) xstrtoumax$U.$(OBJEXT) yesno$U.$(OBJEXT)
+libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
 AR = ar
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CFLAGS = @CFLAGS@
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES =  $(libfetish_a_SOURCES)
-HEADERS =  $(noinst_HEADERS)
+DIST_SOURCES = $(libfetish_a_SOURCES)
+HEADERS = $(noinst_HEADERS)

 depcomp = $(SHELL) $(top_srcdir)/depcomp
-DEP_FILES =  @AMDEP@ $(DEPDIR)/__fpending.Po $(DEPDIR)/addext$U.Po \
-$(DEPDIR)/alloca.Po $(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po \
-$(DEPDIR)/backupfile$U.Po $(DEPDIR)/basename$U.Po \
-$(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po $(DEPDIR)/closeout$U.Po \
-$(DEPDIR)/diacrit$U.Po $(DEPDIR)/dirname$U.Po $(DEPDIR)/dup2.Po \
-$(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po $(DEPDIR)/exclude$U.Po \
-$(DEPDIR)/fileblocks.Po $(DEPDIR)/filemode$U.Po $(DEPDIR)/fnmatch.Po \
-$(DEPDIR)/fsusage.Po $(DEPDIR)/ftruncate.Po $(DEPDIR)/full-write$U.Po \
-$(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po $(DEPDIR)/gethostname.Po \
-$(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po $(DEPDIR)/getopt$U.Po \
-$(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po $(DEPDIR)/getstr$U.Po \
-$(DEPDIR)/getugroups$U.Po $(DEPDIR)/getusershell.Po \
-$(DEPDIR)/group-member.Po $(DEPDIR)/hard-locale$U.Po \
-$(DEPDIR)/hash$U.Po $(DEPDIR)/human$U.Po $(DEPDIR)/idcache$U.Po \
-$(DEPDIR)/isdir$U.Po $(DEPDIR)/lchown.Po $(DEPDIR)/linebuffer$U.Po \
-$(DEPDIR)/localcharset$U.Po $(DEPDIR)/long-options$U.Po \
-$(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po $(DEPDIR)/malloc.Po \
-$(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po $(DEPDIR)/memcasecmp$U.Po \
-$(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po \
-$(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po \
-$(DEPDIR)/memset.Po $(DEPDIR)/mktime.Po $(DEPDIR)/modechange$U.Po \
-$(DEPDIR)/mountlist.Po $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
-$(DEPDIR)/path-concat$U.Po $(DEPDIR)/physmem$U.Po \
-$(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po $(DEPDIR)/quote$U.Po \
-$(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po $(DEPDIR)/readutmp.Po \
-$(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po $(DEPDIR)/rename.Po \
-$(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po $(DEPDIR)/safe-read$U.Po \
-$(DEPDIR)/same$U.Po $(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po \
-$(DEPDIR)/sha$U.Po $(DEPDIR)/stat.Po $(DEPDIR)/stime.Po \
-$(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
-$(DEPDIR)/strdup.Po $(DEPDIR)/strftime.Po $(DEPDIR)/stripslash$U.Po \
-$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
-$(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \
-$(DEPDIR)/strtol.Po $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
-$(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po $(DEPDIR)/unicodeio$U.Po \
-$(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po $(DEPDIR)/version-etc$U.Po \
-$(DEPDIR)/xgetcwd$U.Po $(DEPDIR)/xgethostname$U.Po \
-$(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
-$(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
-$(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
-DIST_COMMON =  README $(noinst_HEADERS) ChangeLog Makefile.am \
-Makefile.in TODO __fpending.c alloca.c atexit.c chown.c dup2.c error.c \
-error.h euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c \
-getdate.c getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
+@AMDEP@DEP_FILES = $(DEPDIR)/__fpending.Po $(DEPDIR)/addext$U.Po \
+@AMDEP@ $(DEPDIR)/alloca.Po $(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po \
+@AMDEP@ $(DEPDIR)/backupfile$U.Po $(DEPDIR)/basename$U.Po \
+@AMDEP@ $(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po \
+@AMDEP@ $(DEPDIR)/closeout$U.Po $(DEPDIR)/diacrit$U.Po \
+@AMDEP@ $(DEPDIR)/dirname$U.Po $(DEPDIR)/dup-safer$U.Po \
+@AMDEP@ $(DEPDIR)/dup2.Po $(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \
+@AMDEP@ $(DEPDIR)/exclude$U.Po $(DEPDIR)/fileblocks.Po \
+@AMDEP@ $(DEPDIR)/filemode$U.Po $(DEPDIR)/fnmatch.Po \
+@AMDEP@ $(DEPDIR)/fopen-safer$U.Po $(DEPDIR)/fsusage.Po \
+@AMDEP@ $(DEPDIR)/ftruncate.Po $(DEPDIR)/full-write$U.Po \
+@AMDEP@ $(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po \
+@AMDEP@ $(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po \
+@AMDEP@ $(DEPDIR)/getloadavg.Po $(DEPDIR)/getopt$U.Po \
+@AMDEP@ $(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po \
+@AMDEP@ $(DEPDIR)/getstr$U.Po $(DEPDIR)/getugroups$U.Po \
+@AMDEP@ $(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \
+@AMDEP@ $(DEPDIR)/hard-locale$U.Po $(DEPDIR)/hash$U.Po \
+@AMDEP@ $(DEPDIR)/human$U.Po $(DEPDIR)/idcache$U.Po $(DEPDIR)/isdir$U.Po \
+@AMDEP@ $(DEPDIR)/lchown.Po $(DEPDIR)/linebuffer$U.Po \
+@AMDEP@ $(DEPDIR)/localcharset$U.Po $(DEPDIR)/long-options$U.Po \
+@AMDEP@ $(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po $(DEPDIR)/malloc.Po \
+@AMDEP@ $(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po \
+@AMDEP@ $(DEPDIR)/memcasecmp$U.Po $(DEPDIR)/memchr.Po \
+@AMDEP@ $(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po $(DEPDIR)/memcpy.Po \
+@AMDEP@ $(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \
+@AMDEP@ $(DEPDIR)/mkstemp.Po $(DEPDIR)/mktime.Po \
+@AMDEP@ $(DEPDIR)/modechange$U.Po $(DEPDIR)/mountlist.Po \
+@AMDEP@ $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
+@AMDEP@ $(DEPDIR)/path-concat$U.Po $(DEPDIR)/physmem$U.Po \
+@AMDEP@ $(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po $(DEPDIR)/quote$U.Po \
+@AMDEP@ $(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po \
+@AMDEP@ $(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
+@AMDEP@ $(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po \
+@AMDEP@ $(DEPDIR)/safe-read$U.Po $(DEPDIR)/same$U.Po \
+@AMDEP@ $(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po \
+@AMDEP@ $(DEPDIR)/sha$U.Po $(DEPDIR)/stat.Po $(DEPDIR)/stime.Po \
+@AMDEP@ $(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
+@AMDEP@ $(DEPDIR)/strdup.Po $(DEPDIR)/strftime.Po \
+@AMDEP@ $(DEPDIR)/stripslash$U.Po $(DEPDIR)/strncasecmp.Po \
+@AMDEP@ $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po \
+@AMDEP@ $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po $(DEPDIR)/strtol.Po \
+@AMDEP@ $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
+@AMDEP@ $(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \
+@AMDEP@ $(DEPDIR)/tempname.Po $(DEPDIR)/unicodeio$U.Po \
+@AMDEP@ $(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po \
+@AMDEP@ $(DEPDIR)/version-etc$U.Po $(DEPDIR)/xgetcwd$U.Po \
+@AMDEP@ $(DEPDIR)/xgethostname$U.Po $(DEPDIR)/xmalloc$U.Po \
+@AMDEP@ $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
+@AMDEP@ $(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
+@AMDEP@ $(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
+DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \
+TODO __fpending.c alloca.c atexit.c chown.c dup2.c error.c error.h \
+euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c \
+getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
 getusershell.c group-member.c lchown.c malloc.c memchr.c memcmp.c \
-memcpy.c memmove.c memrchr.c memset.c mktime.c mountlist.c nanosleep.c \
-obstack.c obstack.h putenv.c readutmp.c realloc.c regex.c rename.c \
-rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c strcspn.c strdup.c \
-strftime.c strncasecmp.c strndup.c strnlen.c strpbrk.c strstr.c \
-strtod.c strtol.c strtoul.c strtoull.c strtoumax.c strverscmp.c utime.c
+memcpy.c memmove.c memrchr.c memset.c mkstemp.c mktime.c mountlist.c \
+nanosleep.c obstack.c obstack.h putenv.c readutmp.c realloc.c regex.c \
+rename.c rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c strcspn.c \
+strdup.c strftime.c strncasecmp.c strndup.c strnlen.c strpbrk.c \
+strstr.c strtod.c strtol.c strtoul.c strtoull.c strtoumax.c \
+strverscmp.c tempname.c utime.c

-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
 SOURCES = $(libfetish_a_SOURCES)
 OBJECTS = $(am_libfetish_a_OBJECTS)

-all: all-redirect
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
 .SUFFIXES:
-.SUFFIXES: .sed .sin .c .o .y
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile
+.SUFFIXES: .sed .sin .c .o .obj .y
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  lib/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status

 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)

-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
 mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core

 distclean-compile:
 	-rm -f *.tab.c
-
-maintainer-clean-compile:
-../src/ansi2knr: ../src/ansi2knr.o
+../src/ansi2knr: ../src/ansi2knr.$(OBJEXT)
 	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr

-../src/ansi2knr.o:
-	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o
+../src/ansi2knr.$(OBJEXT):
+	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)


 mostlyclean-kr:
 	-rm -f *_.c

-clean-kr:
-
-distclean-kr:
-
-maintainer-clean-kr:
-
 libfetish.a: $(libfetish_a_OBJECTS) $(libfetish_a_DEPENDENCIES)
 	-rm -f libfetish.a
 	$(libfetish_a_AR) libfetish.a $(libfetish_a_OBJECTS) $(libfetish_a_LIBADD)
@@ -328,6 +338,8 @@ diacrit_.c: diacrit.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/diacrit.c; then echo $(srcdir)/diacrit.c; else echo diacrit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > diacrit_.c
 dirname_.c: dirname.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dirname.c; then echo $(srcdir)/dirname.c; else echo dirname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dirname_.c
+dup-safer_.c: dup-safer.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dup-safer.c; then echo $(srcdir)/dup-safer.c; else echo dup-safer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dup-safer_.c
 dup2_.c: dup2.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dup2.c; then echo $(srcdir)/dup2.c; else echo dup2.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dup2_.c
 error_.c: error.c $(ANSI2KNR)
@@ -342,6 +354,8 @@ filemode_.c: filemode.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/filemode.c; then echo $(srcdir)/filemode.c; else echo filemode.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > filemode_.c
 fnmatch_.c: fnmatch.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fnmatch.c; then echo $(srcdir)/fnmatch.c; else echo fnmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fnmatch_.c
+fopen-safer_.c: fopen-safer.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fopen-safer.c; then echo $(srcdir)/fopen-safer.c; else echo fopen-safer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fopen-safer_.c
 fsusage_.c: fsusage.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fsusage.c; then echo $(srcdir)/fsusage.c; else echo fsusage.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fsusage_.c
 ftruncate_.c: ftruncate.c $(ANSI2KNR)
@@ -416,6 +430,8 @@ memrchr_.c: memrchr.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memrchr.c; then echo $(srcdir)/memrchr.c; else echo memrchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memrchr_.c
 memset_.c: memset.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memset.c; then echo $(srcdir)/memset.c; else echo memset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memset_.c
+mkstemp_.c: mkstemp.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(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) > mkstemp_.c
 mktime_.c: mktime.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(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) > mktime_.c
 modechange_.c: modechange.c $(ANSI2KNR)
@@ -500,6 +516,8 @@ strtoumax_.c: strtoumax.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoumax.c; then echo $(srcdir)/strtoumax.c; else echo strtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoumax_.c
 strverscmp_.c: strverscmp.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strverscmp.c; then echo $(srcdir)/strverscmp.c; else echo strverscmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strverscmp_.c
+tempname_.c: tempname.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tempname.c; then echo $(srcdir)/tempname.c; else echo tempname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tempname_.c
 unicodeio_.c: unicodeio.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/unicodeio.c; then echo $(srcdir)/unicodeio.c; else echo unicodeio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > unicodeio_.c
 userspec_.c: userspec.c $(ANSI2KNR)
@@ -526,26 +544,44 @@ xstrtoumax_.c: xstrtoumax.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoumax.c; then echo $(srcdir)/xstrtoumax.c; else echo xstrtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoumax_.c
 yesno_.c: yesno.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/yesno.c; then echo $(srcdir)/yesno.c; else echo yesno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > yesno_.c
-__fpending_.o addext_.o alloca_.o argmatch_.o atexit_.o backupfile_.o \
-basename_.o canon-host_.o chown_.o closeout_.o diacrit_.o dirname_.o \
-dup2_.o error_.o euidaccess_.o exclude_.o fileblocks_.o filemode_.o \
-fnmatch_.o fsusage_.o ftruncate_.o full-write_.o getdate_.o \
-getgroups_.o gethostname_.o getline_.o getloadavg_.o getopt_.o \
-getopt1_.o getpass_.o getstr_.o getugroups_.o getusershell_.o \
-group-member_.o hard-locale_.o hash_.o human_.o idcache_.o isdir_.o \
-lchown_.o linebuffer_.o localcharset_.o long-options_.o lstat_.o \
-makepath_.o malloc_.o mbswidth_.o md5_.o memcasecmp_.o memchr_.o \
-memcmp_.o memcoll_.o memcpy_.o memmove_.o memrchr_.o memset_.o \
-mktime_.o modechange_.o mountlist_.o nanosleep_.o obstack_.o \
-path-concat_.o physmem_.o posixtm_.o putenv_.o quote_.o quotearg_.o \
-readtokens_.o readutmp_.o realloc_.o regex_.o rename_.o rmdir_.o \
-rpmatch_.o safe-read_.o same_.o save-cwd_.o savedir_.o sha_.o stat_.o \
-stime_.o stpcpy_.o strcasecmp_.o strcspn_.o strdup_.o strftime_.o \
-stripslash_.o strncasecmp_.o strndup_.o strnlen_.o strpbrk_.o strstr_.o \
-strtod_.o strtol_.o strtoul_.o strtoull_.o strtoumax_.o strverscmp_.o \
-unicodeio_.o userspec_.o utime_.o version-etc_.o xgetcwd_.o \
-xgethostname_.o xmalloc_.o xstrdup_.o xstrtod_.o xstrtol_.o xstrtoul_.o \
-xstrtoumax_.o yesno_.o : $(ANSI2KNR)
+__fpending_.$(OBJEXT) addext_.$(OBJEXT) alloca_.$(OBJEXT) \
+argmatch_.$(OBJEXT) atexit_.$(OBJEXT) backupfile_.$(OBJEXT) \
+basename_.$(OBJEXT) canon-host_.$(OBJEXT) chown_.$(OBJEXT) \
+closeout_.$(OBJEXT) diacrit_.$(OBJEXT) dirname_.$(OBJEXT) \
+dup-safer_.$(OBJEXT) dup2_.$(OBJEXT) error_.$(OBJEXT) \
+euidaccess_.$(OBJEXT) exclude_.$(OBJEXT) fileblocks_.$(OBJEXT) \
+filemode_.$(OBJEXT) fnmatch_.$(OBJEXT) fopen-safer_.$(OBJEXT) \
+fsusage_.$(OBJEXT) ftruncate_.$(OBJEXT) full-write_.$(OBJEXT) \
+getdate_.$(OBJEXT) getgroups_.$(OBJEXT) gethostname_.$(OBJEXT) \
+getline_.$(OBJEXT) getloadavg_.$(OBJEXT) getopt_.$(OBJEXT) \
+getopt1_.$(OBJEXT) getpass_.$(OBJEXT) getstr_.$(OBJEXT) \
+getugroups_.$(OBJEXT) getusershell_.$(OBJEXT) group-member_.$(OBJEXT) \
+hard-locale_.$(OBJEXT) hash_.$(OBJEXT) human_.$(OBJEXT) \
+idcache_.$(OBJEXT) isdir_.$(OBJEXT) lchown_.$(OBJEXT) \
+linebuffer_.$(OBJEXT) localcharset_.$(OBJEXT) long-options_.$(OBJEXT) \
+lstat_.$(OBJEXT) makepath_.$(OBJEXT) malloc_.$(OBJEXT) \
+mbswidth_.$(OBJEXT) md5_.$(OBJEXT) memcasecmp_.$(OBJEXT) \
+memchr_.$(OBJEXT) memcmp_.$(OBJEXT) memcoll_.$(OBJEXT) \
+memcpy_.$(OBJEXT) memmove_.$(OBJEXT) memrchr_.$(OBJEXT) \
+memset_.$(OBJEXT) mkstemp_.$(OBJEXT) mktime_.$(OBJEXT) \
+modechange_.$(OBJEXT) mountlist_.$(OBJEXT) nanosleep_.$(OBJEXT) \
+obstack_.$(OBJEXT) path-concat_.$(OBJEXT) physmem_.$(OBJEXT) \
+posixtm_.$(OBJEXT) putenv_.$(OBJEXT) quote_.$(OBJEXT) \
+quotearg_.$(OBJEXT) readtokens_.$(OBJEXT) readutmp_.$(OBJEXT) \
+realloc_.$(OBJEXT) regex_.$(OBJEXT) rename_.$(OBJEXT) rmdir_.$(OBJEXT) \
+rpmatch_.$(OBJEXT) safe-read_.$(OBJEXT) same_.$(OBJEXT) \
+save-cwd_.$(OBJEXT) savedir_.$(OBJEXT) sha_.$(OBJEXT) stat_.$(OBJEXT) \
+stime_.$(OBJEXT) stpcpy_.$(OBJEXT) strcasecmp_.$(OBJEXT) \
+strcspn_.$(OBJEXT) strdup_.$(OBJEXT) strftime_.$(OBJEXT) \
+stripslash_.$(OBJEXT) strncasecmp_.$(OBJEXT) strndup_.$(OBJEXT) \
+strnlen_.$(OBJEXT) strpbrk_.$(OBJEXT) strstr_.$(OBJEXT) \
+strtod_.$(OBJEXT) strtol_.$(OBJEXT) strtoul_.$(OBJEXT) \
+strtoull_.$(OBJEXT) strtoumax_.$(OBJEXT) strverscmp_.$(OBJEXT) \
+tempname_.$(OBJEXT) unicodeio_.$(OBJEXT) userspec_.$(OBJEXT) \
+utime_.$(OBJEXT) version-etc_.$(OBJEXT) xgetcwd_.$(OBJEXT) \
+xgethostname_.$(OBJEXT) xmalloc_.$(OBJEXT) xstrdup_.$(OBJEXT) \
+xstrtod_.$(OBJEXT) xstrtol_.$(OBJEXT) xstrtoul_.$(OBJEXT) \
+xstrtoumax_.$(OBJEXT) yesno_.$(OBJEXT) : $(ANSI2KNR)
 .y.c:
 	$(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c
 	if test -f y.tab.h; then \
@@ -564,7 +600,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)

-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -582,136 +618,128 @@ GTAGS:
 	  && cd $(top_srcdir) \
 	  && gtags -i $$here

-mostlyclean-tags:
-
-clean-tags:
-
 distclean-tags:
 	-rm -f TAGS ID

-maintainer-clean-tags:
-
-@AMDEP@include $(DEPDIR)/__fpending.Po
-@AMDEP@include $(DEPDIR)/addext$U.Po
-@AMDEP@include $(DEPDIR)/alloca.Po
-@AMDEP@include $(DEPDIR)/argmatch$U.Po
-@AMDEP@include $(DEPDIR)/atexit.Po
-@AMDEP@include $(DEPDIR)/backupfile$U.Po
-@AMDEP@include $(DEPDIR)/basename$U.Po
-@AMDEP@include $(DEPDIR)/canon-host$U.Po
-@AMDEP@include $(DEPDIR)/chown.Po
-@AMDEP@include $(DEPDIR)/closeout$U.Po
-@AMDEP@include $(DEPDIR)/diacrit$U.Po
-@AMDEP@include $(DEPDIR)/dirname$U.Po
-@AMDEP@include $(DEPDIR)/dup2.Po
-@AMDEP@include $(DEPDIR)/error.Po
-@AMDEP@include $(DEPDIR)/euidaccess.Po
-@AMDEP@include $(DEPDIR)/exclude$U.Po
-@AMDEP@include $(DEPDIR)/fileblocks.Po
-@AMDEP@include $(DEPDIR)/filemode$U.Po
-@AMDEP@include $(DEPDIR)/fnmatch.Po
-@AMDEP@include $(DEPDIR)/fsusage.Po
-@AMDEP@include $(DEPDIR)/ftruncate.Po
-@AMDEP@include $(DEPDIR)/full-write$U.Po
-@AMDEP@include $(DEPDIR)/getdate$U.Po
-@AMDEP@include $(DEPDIR)/getgroups.Po
-@AMDEP@include $(DEPDIR)/gethostname.Po
-@AMDEP@include $(DEPDIR)/getline.Po
-@AMDEP@include $(DEPDIR)/getloadavg.Po
-@AMDEP@include $(DEPDIR)/getopt$U.Po
-@AMDEP@include $(DEPDIR)/getopt1$U.Po
-@AMDEP@include $(DEPDIR)/getpass.Po
-@AMDEP@include $(DEPDIR)/getstr$U.Po
-@AMDEP@include $(DEPDIR)/getugroups$U.Po
-@AMDEP@include $(DEPDIR)/getusershell.Po
-@AMDEP@include $(DEPDIR)/group-member.Po
-@AMDEP@include $(DEPDIR)/hard-locale$U.Po
-@AMDEP@include $(DEPDIR)/hash$U.Po
-@AMDEP@include $(DEPDIR)/human$U.Po
-@AMDEP@include $(DEPDIR)/idcache$U.Po
-@AMDEP@include $(DEPDIR)/isdir$U.Po
-@AMDEP@include $(DEPDIR)/lchown.Po
-@AMDEP@include $(DEPDIR)/linebuffer$U.Po
-@AMDEP@include $(DEPDIR)/localcharset$U.Po
-@AMDEP@include $(DEPDIR)/long-options$U.Po
-@AMDEP@include $(DEPDIR)/lstat.Po
-@AMDEP@include $(DEPDIR)/makepath$U.Po
-@AMDEP@include $(DEPDIR)/malloc.Po
-@AMDEP@include $(DEPDIR)/mbswidth$U.Po
-@AMDEP@include $(DEPDIR)/md5$U.Po
-@AMDEP@include $(DEPDIR)/memcasecmp$U.Po
-@AMDEP@include $(DEPDIR)/memchr.Po
-@AMDEP@include $(DEPDIR)/memcmp.Po
-@AMDEP@include $(DEPDIR)/memcoll$U.Po
-@AMDEP@include $(DEPDIR)/memcpy.Po
-@AMDEP@include $(DEPDIR)/memmove.Po
-@AMDEP@include $(DEPDIR)/memrchr.Po
-@AMDEP@include $(DEPDIR)/memset.Po
-@AMDEP@include $(DEPDIR)/mktime.Po
-@AMDEP@include $(DEPDIR)/modechange$U.Po
-@AMDEP@include $(DEPDIR)/mountlist.Po
-@AMDEP@include $(DEPDIR)/nanosleep.Po
-@AMDEP@include $(DEPDIR)/obstack.Po
-@AMDEP@include $(DEPDIR)/path-concat$U.Po
-@AMDEP@include $(DEPDIR)/physmem$U.Po
-@AMDEP@include $(DEPDIR)/posixtm$U.Po
-@AMDEP@include $(DEPDIR)/putenv.Po
-@AMDEP@include $(DEPDIR)/quote$U.Po
-@AMDEP@include $(DEPDIR)/quotearg$U.Po
-@AMDEP@include $(DEPDIR)/readtokens$U.Po
-@AMDEP@include $(DEPDIR)/readutmp.Po
-@AMDEP@include $(DEPDIR)/realloc.Po
-@AMDEP@include $(DEPDIR)/regex.Po
-@AMDEP@include $(DEPDIR)/rename.Po
-@AMDEP@include $(DEPDIR)/rmdir.Po
-@AMDEP@include $(DEPDIR)/rpmatch.Po
-@AMDEP@include $(DEPDIR)/safe-read$U.Po
-@AMDEP@include $(DEPDIR)/same$U.Po
-@AMDEP@include $(DEPDIR)/save-cwd$U.Po
-@AMDEP@include $(DEPDIR)/savedir$U.Po
-@AMDEP@include $(DEPDIR)/sha$U.Po
-@AMDEP@include $(DEPDIR)/stat.Po
-@AMDEP@include $(DEPDIR)/stime.Po
-@AMDEP@include $(DEPDIR)/stpcpy.Po
-@AMDEP@include $(DEPDIR)/strcasecmp.Po
-@AMDEP@include $(DEPDIR)/strcspn.Po
-@AMDEP@include $(DEPDIR)/strdup.Po
-@AMDEP@include $(DEPDIR)/strftime.Po
-@AMDEP@include $(DEPDIR)/stripslash$U.Po
-@AMDEP@include $(DEPDIR)/strncasecmp.Po
-@AMDEP@include $(DEPDIR)/strndup.Po
-@AMDEP@include $(DEPDIR)/strnlen.Po
-@AMDEP@include $(DEPDIR)/strpbrk.Po
-@AMDEP@include $(DEPDIR)/strstr.Po
-@AMDEP@include $(DEPDIR)/strtod.Po
-@AMDEP@include $(DEPDIR)/strtol.Po
-@AMDEP@include $(DEPDIR)/strtoul.Po
-@AMDEP@include $(DEPDIR)/strtoull.Po
-@AMDEP@include $(DEPDIR)/strtoumax.Po
-@AMDEP@include $(DEPDIR)/strverscmp.Po
-@AMDEP@include $(DEPDIR)/unicodeio$U.Po
-@AMDEP@include $(DEPDIR)/userspec$U.Po
-@AMDEP@include $(DEPDIR)/utime.Po
-@AMDEP@include $(DEPDIR)/version-etc$U.Po
-@AMDEP@include $(DEPDIR)/xgetcwd$U.Po
-@AMDEP@include $(DEPDIR)/xgethostname$U.Po
-@AMDEP@include $(DEPDIR)/xmalloc$U.Po
-@AMDEP@include $(DEPDIR)/xstrdup$U.Po
-@AMDEP@include $(DEPDIR)/xstrtod$U.Po
-@AMDEP@include $(DEPDIR)/xstrtol$U.Po
-@AMDEP@include $(DEPDIR)/xstrtoul$U.Po
-@AMDEP@include $(DEPDIR)/xstrtoumax$U.Po
-@AMDEP@include $(DEPDIR)/yesno$U.Po
-
-mostlyclean-depend:
-
-clean-depend:
+@AMDEP@@_am_include@ $(DEPDIR)/__fpending.Po
+@AMDEP@@_am_include@ $(DEPDIR)/addext$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/alloca.Po
+@AMDEP@@_am_include@ $(DEPDIR)/argmatch$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/atexit.Po
+@AMDEP@@_am_include@ $(DEPDIR)/backupfile$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/basename$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/canon-host$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/chown.Po
+@AMDEP@@_am_include@ $(DEPDIR)/closeout$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/diacrit$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dirname$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dup-safer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dup2.Po
+@AMDEP@@_am_include@ $(DEPDIR)/error.Po
+@AMDEP@@_am_include@ $(DEPDIR)/euidaccess.Po
+@AMDEP@@_am_include@ $(DEPDIR)/exclude$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fileblocks.Po
+@AMDEP@@_am_include@ $(DEPDIR)/filemode$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fnmatch.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fopen-safer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fsusage.Po
+@AMDEP@@_am_include@ $(DEPDIR)/ftruncate.Po
+@AMDEP@@_am_include@ $(DEPDIR)/full-write$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getdate$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getgroups.Po
+@AMDEP@@_am_include@ $(DEPDIR)/gethostname.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getline.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getloadavg.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getopt$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getopt1$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getpass.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getstr$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getugroups$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getusershell.Po
+@AMDEP@@_am_include@ $(DEPDIR)/group-member.Po
+@AMDEP@@_am_include@ $(DEPDIR)/hard-locale$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/hash$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/human$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/idcache$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/isdir$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/lchown.Po
+@AMDEP@@_am_include@ $(DEPDIR)/linebuffer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/localcharset$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/long-options$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/lstat.Po
+@AMDEP@@_am_include@ $(DEPDIR)/makepath$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/malloc.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mbswidth$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/md5$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcasecmp$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memchr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcoll$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcpy.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memmove.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memrchr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memset.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mkstemp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mktime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/modechange$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mountlist.Po
+@AMDEP@@_am_include@ $(DEPDIR)/nanosleep.Po
+@AMDEP@@_am_include@ $(DEPDIR)/obstack.Po
+@AMDEP@@_am_include@ $(DEPDIR)/path-concat$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/physmem$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/posixtm$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/putenv.Po
+@AMDEP@@_am_include@ $(DEPDIR)/quote$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/quotearg$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/readtokens$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/readutmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/realloc.Po
+@AMDEP@@_am_include@ $(DEPDIR)/regex.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rename.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rmdir.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rpmatch.Po
+@AMDEP@@_am_include@ $(DEPDIR)/safe-read$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/same$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/save-cwd$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/savedir$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/sha$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stat.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stpcpy.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strcasecmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strcspn.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strdup.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strftime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stripslash$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strncasecmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strndup.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strnlen.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strpbrk.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strstr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtod.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtol.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoul.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoull.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoumax.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strverscmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/tempname.Po
+@AMDEP@@_am_include@ $(DEPDIR)/unicodeio$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/userspec$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/utime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/version-etc$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xgetcwd$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xgethostname$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xmalloc$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrdup$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtod$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtol$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtoul$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtoumax$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/yesno$U.Po

 distclean-depend:
 	-rm -rf $(DEPDIR)

-maintainer-clean-depend:
-
@AMDEP@CCDEPMODE = @CCDEPMODE@

 .c.o:
@@ -720,8 +748,17 @@ maintainer-clean-depend:
@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<

+.c.obj:
+@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c -o $@ `cygpath -w $<`

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -735,34 +772,25 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-all-recursive-am: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+all-am: Makefile $(LIBRARIES) $(HEADERS) all-local

-install-exec-am: install-exec-local
+installdirs:
+
+install: install-am
 install-exec: install-exec-am
-
-install-data-am:
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(HEADERS) all-local
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -775,47 +803,57 @@ distclean-generic:
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
 	-test -z "getdate.c$(BUILT_SOURCES)$(MAINTAINERCLEANFILES)" || rm -f getdate.c $(BUILT_SOURCES) $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-kr mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-kr clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-noinstLIBRARIES distclean-compile distclean-kr \
-		distclean-tags distclean-depend distclean-generic \
-		clean-am
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-kr \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-exec-local
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
-maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck all-recursive-am install-exec-local \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-local uninstall-am uninstall all-local all-redirect \
-all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+
+uninstall-am: uninstall-local
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-noinstLIBRARIES distclean distclean-compile \
+	distclean-depend distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-exec-local \
+	install-info install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-local

 lstat.c: xstat.in
 	sed \
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -33,27 +33,37 @@
 #       name                         used by which systems         a MIME name?
 #   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
 #   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-2                glibc aix hpux irix solaris freebsd       yes
+#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
 #   ISO-8859-3                glibc                                     yes
-#   ISO-8859-4                solaris                                   yes
-#   ISO-8859-5                glibc aix hpux irix solaris               yes
+#   ISO-8859-4                osf solaris freebsd                       yes
+#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
 #   ISO-8859-6                glibc aix hpux solaris                    yes
 #   ISO-8859-7                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-8                glibc aix hpux solaris                    yes
+#   ISO-8859-8                glibc aix hpux osf solaris                yes
 #   ISO-8859-9                glibc aix hpux irix osf solaris           yes
 #   ISO-8859-13               glibc
-#   ISO-8859-15               glibc aix solaris freebsd
+#   ISO-8859-15               glibc aix osf solaris freebsd
 #   KOI8-R                    glibc solaris freebsd                     yes
-#   KOI8-U                    glibc                                     yes
-#   CP850                     aix osf
+#   KOI8-U                    glibc freebsd                             yes
+#   CP437                     dos
+#   CP775                     dos
+#   CP850                     aix osf dos
+#   CP852                     dos
+#   CP855                     dos
 #   CP856                     aix
-#   CP866                     freebsd
-#   CP874                     win32
+#   CP857                     dos
+#   CP861                     dos
+#   CP862                     dos
+#   CP864                     dos
+#   CP865                     dos
+#   CP866                     freebsd dos
+#   CP869                     dos
+#   CP874                     win32 dos
 #   CP922                     aix
-#   CP932                     aix win32
+#   CP932                     aix win32 dos
 #   CP943                     aix
-#   CP949                     win32
-#   CP950                     win32
+#   CP949                     osf win32 dos
+#   CP950                     win32 dos
 #   CP1046                    aix
 #   CP1124                    aix
 #   CP1129                    aix
@@ -65,17 +75,17 @@
 #   CP1255                    win32
 #   CP1256                    win32
 #   CP1257                    win32
-#   GB2312                    glibc aix hpux irix solaris               yes
-#   EUC-JP                    glibc aix hpux irix solaris               yes
-#   EUC-KR                    glibc aix hpux irix solaris               yes
-#   EUC-TW                    glibc aix hpux irix solaris
-#   BIG5                      glibc aix hpux solaris                    yes
+#   GB2312                    glibc aix hpux irix solaris freebsd       yes
+#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
+#   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
+#   EUC-TW                    glibc aix hpux irix osf solaris
+#   BIG5                      glibc aix hpux osf solaris freebsd        yes
 #   BIG5HKSCS                 glibc
-#   GBK                       aix win32
+#   GBK                       aix osf win32 dos
 #   GB18030                   glibc
-#   SJIS                      hpux solaris
+#   SJIS                      hpux osf solaris freebsd
 #   JOHAB                     glibc win32
-#   TIS-620                   glibc aix hpux solaris
+#   TIS-620                   glibc aix hpux osf solaris
 #   VISCII                    glibc                                     yes
 #   HP-ROMAN8                 hpux
 #   HP-ARABIC8                hpux
@@ -83,7 +93,9 @@
 #   HP-HEBREW8                hpux
 #   HP-TURKISH8               hpux
 #   HP-KANA8                  hpux
-#   UTF-8                     glibc aix hpux solaris                    yes
+#   DEC-KANJI                 osf
+#   DEC-HANYU                 osf
+#   UTF-8                     glibc aix hpux osf solaris                yes
 #
 # Note: Names which are not marked as being a MIME name should not be used in
 # Internet protocols for information interchange (mail, news, etc.).
@@ -178,9 +190,28 @@ case "$os" in
 	;;
    osf*)
 	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
 	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
 	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
 	echo "cp850 CP850"
+	echo "big5 BIG5"
+	echo "dechanyu DEC-HANYU"
+	echo "dechanzi GB2312"
+	echo "deckanji DEC-KANJI"
+	echo "deckorean EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "GBK GBK"
+	echo "KSC5601 CP949"
+	echo "sdeckanji EUC-JP"
+	echo "SJIS SJIS"
+	echo "TACTIS TIS-620"
+	echo "UTF-8 UTF-8"
 	;;
    solaris*)
 	echo "646 ASCII"
@@ -214,8 +245,8 @@ case "$os" in
 	  echo "$l.ASCII ASCII"
 	done
 	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-                 fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
-                 lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
 	  echo "$l.ISO_8859-1 ISO-8859-1"
 	  echo "$l.DIS_8859-15 ISO-8859-15"
 	done
@@ -241,6 +272,167 @@ case "$os" in
 	;;
    beos*)
 	# BeOS has a single locale, and it has UTF-8 encoding.
-	echo "C UTF-8"
+	echo "* UTF-8"
+	;;
+    msdosdjgpp*)
+	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "#"
+	echo "# The encodings given here may not all be correct."
+	echo "# If you find that the encoding given for your language and"
+	echo "# country is not the one your DOS machine actually uses, just"
+	echo "# correct it in this file, and send a mail to"
+	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
+	echo "# and Bruno Haible <haible@clisp.cons.org>."
+	echo "#"
+	echo "C ASCII"
+	# ISO-8859-1 languages
+	echo "ca CP850"
+	echo "ca_ES CP850"
+	echo "da CP865"    # not CP850 ??
+	echo "da_DK CP865" # not CP850 ??
+	echo "de CP850"
+	echo "de_AT CP850"
+	echo "de_CH CP850"
+	echo "de_DE CP850"
+	echo "en CP850"
+	echo "en_AU CP850" # not CP437 ??
+	echo "en_CA CP850"
+	echo "en_GB CP850"
+	echo "en_NZ CP437"
+	echo "en_US CP437"
+	echo "en_ZA CP850" # not CP437 ??
+	echo "es CP850"
+	echo "es_AR CP850"
+	echo "es_BO CP850"
+	echo "es_CL CP850"
+	echo "es_CO CP850"
+	echo "es_CR CP850"
+	echo "es_CU CP850"
+	echo "es_DO CP850"
+	echo "es_EC CP850"
+	echo "es_ES CP850"
+	echo "es_GT CP850"
+	echo "es_HN CP850"
+	echo "es_MX CP850"
+	echo "es_NI CP850"
+	echo "es_PA CP850"
+	echo "es_PY CP850"
+	echo "es_PE CP850"
+	echo "es_SV CP850"
+	echo "es_UY CP850"
+	echo "es_VE CP850"
+	echo "et CP850"
+	echo "et_EE CP850"
+	echo "eu CP850"
+	echo "eu_ES CP850"
+	echo "fi CP850"
+	echo "fi_FI CP850"
+	echo "fr CP850"
+	echo "fr_BE CP850"
+	echo "fr_CA CP850"
+	echo "fr_CH CP850"
+	echo "fr_FR CP850"
+	echo "ga CP850"
+	echo "ga_IE CP850"
+	echo "gd CP850"
+	echo "gd_GB CP850"
+	echo "gl CP850"
+	echo "gl_ES CP850"
+	echo "id CP850"    # not CP437 ??
+	echo "id_ID CP850" # not CP437 ??
+	echo "is CP861"    # not CP850 ??
+	echo "is_IS CP861" # not CP850 ??
+	echo "it CP850"
+	echo "it_CH CP850"
+	echo "it_IT CP850"
+	echo "lt CP775"
+	echo "lt_LT CP775"
+	echo "lv CP775"
+	echo "lv_LV CP775"
+	echo "nb CP865"    # not CP850 ??
+	echo "nb_NO CP865" # not CP850 ??
+	echo "nl CP850"
+	echo "nl_BE CP850"
+	echo "nl_NL CP850"
+	echo "nn CP865"    # not CP850 ??
+	echo "nn_NO CP865" # not CP850 ??
+	echo "no CP865"    # not CP850 ??
+	echo "no_NO CP865" # not CP850 ??
+	echo "pt CP850"
+	echo "pt_BR CP850"
+	echo "pt_PT CP850"
+	echo "sv CP850"
+	echo "sv_SE CP850"
+	# ISO-8859-2 languages
+	echo "cs CP852"
+	echo "cs_CZ CP852"
+	echo "hr CP852"
+	echo "hr_HR CP852"
+	echo "hu CP852"
+	echo "hu_HU CP852"
+	echo "pl CP852"
+	echo "pl_PL CP852"
+	echo "ro CP852"
+	echo "ro_RO CP852"
+	echo "sk CP852"
+	echo "sk_SK CP852"
+	echo "sl CP852"
+	echo "sl_SI CP852"
+	echo "sq CP852"
+	echo "sq_AL CP852"
+	echo "sr CP852"    # CP852 or CP866 or CP855 ??
+	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+	# ISO-8859-3 languages
+	echo "mt CP850"
+	echo "mt_MT CP850"
+	# ISO-8859-5 languages
+	echo "be CP866"
+	echo "be_BE CP866"
+	echo "bg CP866"    # not CP855 ??
+	echo "bg_BG CP866" # not CP855 ??
+	echo "mk CP866"    # not CP855 ??
+	echo "mk_MK CP866" # not CP855 ??
+	echo "ru KOI8-R"    # not CP866 ??
+	echo "ru_RU KOI8-R" # not CP866 ??
+	# ISO-8859-6 languages
+	echo "ar CP864"
+	echo "ar_AE CP864"
+	echo "ar_DZ CP864"
+	echo "ar_EG CP864"
+	echo "ar_IQ CP864"
+	echo "ar_IR CP864"
+	echo "ar_JO CP864"
+	echo "ar_KW CP864"
+	echo "ar_MA CP864"
+	echo "ar_OM CP864"
+	echo "ar_QA CP864"
+	echo "ar_SA CP864"
+	echo "ar_SY CP864"
+	# ISO-8859-7 languages
+	echo "el CP869"
+	echo "el_GR CP869"
+	# ISO-8859-8 languages
+	echo "he CP862"
+	echo "he_IL CP862"
+	# ISO-8859-9 languages
+	echo "tr CP857"
+	echo "tr_TR CP857"
+	# Japanese
+	echo "ja CP932"
+	echo "ja_JP CP932"
+	# Chinese
+	echo "zh_CN GBK"
+	echo "zh_TW CP950" # not CP938 ??
+	# Korean
+	echo "kr CP949"    # not CP934 ??
+	echo "kr_KR CP949" # not CP934 ??
+	# Thai
+	echo "th CP874"
+	echo "th_TH CP874"
+	# Other
+	echo "eo CP850"
+	echo "eo_EO CP850"
 	;;
 esac
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -0,0 +1,62 @@
+/* Invoke dup, but avoid some glitches.
+   Copyright (C) 2001 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#if HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifndef STDERR_FILENO
+# define STDERR_FILENO 2
+#endif
+
+#include <unistd-safer.h>
+
+/* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
+   STDERR_FILENO.  */
+
+int
+dup_safer (int fd)
+{
+#ifdef F_DUPFD
+  return fcntl (fd, F_DUPFD, STDERR_FILENO + 1);
+#else
+  int f = dup (fd);
+  if (0 <= f && f <= STDERR_FILENO)
+    {
+      int f1 = dup_safer (f);
+      int e = errno;
+      close (f);
+      errno = e;
+      f = f1;
+    }
+  return f;
+#endif
+}
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -0,0 +1,76 @@
+/* Invoke fopen, but avoid some glitches.
+   Copyright (C) 2001 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <unistd-safer.h>
+
+#ifndef STDERR_FILENO
+# define STDERR_FILENO 2
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#include <stdio.h>
+#include <stdio-safer.h>
+
+/* Like fopen, but do not return stdin, stdout, or stderr.  */
+
+FILE *
+fopen_safer (char const *file, char const *mode)
+{
+  FILE *fp = fopen (file, mode);
+
+  if (fp)
+    {
+      int fd = fileno (fp);
+
+      if (0 <= fd && fd <= STDERR_FILENO)
+	{
+	  int f = dup_safer (fd);
+
+	  if (f < 0)
+	    {
+	      int e = errno;
+	      fclose (fp);
+	      errno = e;
+	      return NULL;
+	    }
+
+	  if (fclose (fp) != 0
+	      || ! (fp = fdopen (f, mode)))
+	    {
+	      int e = errno;
+	      close (f);
+	      errno = e;
+	      return NULL;
+	    }
+	}
+    }
+
+  return fp;
+}
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -990,7 +990,8 @@ get_date (const char *p, const time_t *now)

  /* Let mktime deduce tm_isdst if we have an absolute time stamp,
     or if the relative time stamp mentions days, months, or years.  */
-  if (pc.dates_seen | pc.days_seen | pc.times_seen | pc.rel_day | pc.rel_month | pc.rel_year)
+  if (pc.dates_seen | pc.days_seen | pc.times_seen | pc.rel_day
+      | pc.rel_month | pc.rel_year)
    tm.tm_isdst = -1;

  /* But if the input explicitly specifies local time with or without
@@ -1037,6 +1038,7 @@ get_date (const char *p, const time_t *now)
    {
      tm.tm_mday += ((pc.day_number - tm.tm_wday + 7) % 7
 		     + 7 * (pc.day_ordinal - (0 < pc.day_ordinal)));
+      tm.tm_isdst = -1;
      Start = mktime (&tm);
      if (Start == (time_t) -1)
 	return Start;
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.

-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU Library General Public License as published
@@ -191,7 +191,7 @@ get_charset_aliases ()
   into one of the canonical names listed in config.charset.
   The result must not be freed; it is statically allocated.
   If the canonical name cannot be determined, the result is a non-canonical
-   name or NULL.  */
+   name.  */

 #ifdef STATIC
 STATIC
@@ -211,10 +211,14 @@ locale_charset ()

 # else

-  /* On old systems which lack it, use setlocale and getenv.  */
+  /* On old systems which lack it, use setlocale or getenv.  */
  const char *locale = NULL;

-#  if HAVE_SETLOCALE
+  /* But most old systems don't have a complete set of locales.  Some
+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
+     use setlocale here; it would return "C" when it doesn't support the
+     locale name the user has set.  */
+#  if HAVE_SETLOCALE && 0
  locale = setlocale (LC_CTYPE, NULL);
 #  endif
  if (locale == NULL || locale[0] == '\0')
@@ -245,18 +249,20 @@ locale_charset ()

 #endif

-  if (codeset != NULL && codeset[0] != '\0')
-    {
-      /* Resolve alias. */
-      for (aliases = get_charset_aliases ();
-	   *aliases != '\0';
-	   aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-	if (!strcmp (codeset, aliases))
-	  {
-	    codeset = aliases + strlen (aliases) + 1;
-	    break;
-	  }
-    }
+  if (codeset == NULL)
+    /* The canonical name cannot be determined.  */
+    codeset = "";
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+	|| (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+	codeset = aliases + strlen (aliases) + 1;
+	break;
+      }

  return codeset;
 }
--- a/lib/mkstemp.c
+++ b/lib/mkstemp.c
@@ -0,0 +1,37 @@
+/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __GT_FILE
+# define __GT_FILE 0
+#endif
+
+int __gen_tempname ();
+
+/* Generate a unique temporary file name from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the filename unique.
+   Then open the file and return a fd. */
+int
+mkstemp (template)
+     char *template;
+{
+  return __gen_tempname (template, __GT_FILE);
+}
--- a/lib/path-concat.c
+++ b/lib/path-concat.c
@@ -1,5 +1,5 @@
 /* path-concat.c -- concatenate two arbitrary pathnames
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 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
@@ -59,6 +59,10 @@ char *strdup ();
 # define DIRECTORY_SEPARATOR '/'
 #endif

+#ifndef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
+#endif
+
 #ifndef ISSLASH
 # define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
 #endif
@@ -105,11 +109,11 @@ path_concat (const char *dir, const char *base, char **base_in_result)

  p = mempcpy (p_concat, dir, dir_len);

-  if (dir_len > 0)
+  if (dir_len > FILESYSTEM_PREFIX_LEN (dir))
    {
-      if (ISSLASH (*(p - 1)) && ISSLASH(*base))
+      if (ISSLASH (*(p - 1)) && ISSLASH (*base))
 	--p;
-      else if (!ISSLASH (*(p - 1)) && !ISSLASH(*base))
+      else if (!ISSLASH (*(p - 1)) && !ISSLASH (*base))
 	*p++ = DIRECTORY_SEPARATOR;
    }

--- a/lib/regex.c
+++ b/lib/regex.c
@@ -65,7 +65,7 @@
 # define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CHAR_TYPE)+1)
 # define PUT_CHAR(c) \
  do {									      \
-    if (MC_CUR_MAX == 1)						      \
+    if (MB_CUR_MAX == 1)						      \
      putchar (c);							      \
    else								      \
      printf ("%C", (wint_t) c); /* Should we use wide stream??  */	      \
@@ -2137,21 +2137,21 @@ typedef struct


 /* Get the next unsigned number in the uncompiled pattern.  */
-#define GET_UNSIGNED_NUMBER(num) 					\
-  { if (p != pend)							\
-     {									\
-       PATFETCH (c); 							\
-       while ('0' <= c && c <= '9')					\
-         { 								\
-           if (num < 0)							\
-              num = 0;							\
-           num = num * 10 + c - '0'; 					\
-           if (p == pend) 						\
-              break; 							\
-           PATFETCH (c);						\
-         } 								\
-       } 								\
-    }
+#define GET_UNSIGNED_NUMBER(num) \
+  {									\
+    while (p != pend)							\
+      {									\
+	PATFETCH (c);							\
+	if (c < '0' || c > '9')						\
+	  break;							\
+	if (num <= RE_DUP_MAX)						\
+	  {								\
+	    if (num < 0)						\
+	      num = 0;							\
+	    num = num * 10 + c - '0';					\
+	  }								\
+      }									\
+  }

 #if defined _LIBC || WIDE_CHAR_SUPPORT
 /* The GNU C library provides support for user-defined character classes
@@ -2325,14 +2325,6 @@ regex_compile (pattern, size, syntax, bufp)
  /* Address of beginning of regexp, or inside of last group.  */
  US_CHAR_TYPE *begalt;

-  /* Place in the uncompiled pattern (i.e., the {) to
-     which to go back if the interval is invalid.  */
-#ifdef MBS_SUPPORT
-  const US_CHAR_TYPE *beg_interval;
-#else
-  const char *beg_interval;
-#endif /* MBS_SUPPORT */
-
  /* Address of the place where a forward jump should go to the end of
     the containing expression.  Each alternative of an `or' -- except the
     last -- ends with a forward jump of this sort.  */
@@ -2345,23 +2337,24 @@ regex_compile (pattern, size, syntax, bufp)

 #ifdef MBS_SUPPORT
  /* Initialize the wchar_t PATTERN and offset_buffer.  */
-  p = pend = pattern = TALLOC(csize, CHAR_TYPE);
+  p = pend = pattern = TALLOC(csize + 1, CHAR_TYPE);
  mbs_offset = TALLOC(csize + 1, int);
  is_binary = TALLOC(csize + 1, char);
  if (pattern == NULL || mbs_offset == NULL || is_binary == NULL)
    {
-      if (pattern) free(pattern);
-      if (mbs_offset) free(mbs_offset);
-      if (is_binary) free(is_binary);
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
      return REG_ESPACE;
    }
+  pattern[csize] = L'\0';	/* sentinel */
  size = convert_mbs_to_wcs(pattern, cpattern, csize, mbs_offset, is_binary);
  pend = p + size;
  if (size < 0)
    {
-      if (pattern) free(pattern);
-      if (mbs_offset) free(mbs_offset);
-      if (is_binary) free(is_binary);
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
      return REG_BADPAT;
    }
 #endif
@@ -2383,9 +2376,9 @@ regex_compile (pattern, size, syntax, bufp)
  if (compile_stack.stack == NULL)
    {
 #ifdef MBS_SUPPORT
-      if (pattern) free(pattern);
-      if (mbs_offset) free(mbs_offset);
-      if (is_binary) free(is_binary);
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
 #endif
      return REG_ESPACE;
    }
@@ -3826,25 +3819,19 @@ regex_compile (pattern, size, syntax, bufp)

                /* At least (most) this many matches must be made.  */
                int lower_bound = -1, upper_bound = -1;
-                beg_interval = p - 1;
+
+		/* Place in the uncompiled pattern (i.e., just after
+		   the '{') to go back to if the interval is invalid.  */
+		const CHAR_TYPE *beg_interval = p;

                if (p == pend)
-                  {
-                    if (!(syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
-                      goto unfetch_interval;
-                    else
-                      FREE_STACK_RETURN (REG_EBRACE);
-                  }
+		  goto invalid_interval;

                GET_UNSIGNED_NUMBER (lower_bound);

                if (c == ',')
                  {
                    GET_UNSIGNED_NUMBER (upper_bound);
-		    if ((!(syntax & RE_NO_BK_BRACES) && c != '\\')
-			|| ((syntax & RE_NO_BK_BRACES) && c != '}'))
-		      FREE_STACK_RETURN (REG_BADBR);
-
 		    if (upper_bound < 0)
 		      upper_bound = RE_DUP_MAX;
                  }
@@ -3852,36 +3839,24 @@ regex_compile (pattern, size, syntax, bufp)
                  /* Interval such as `{1}' => match exactly once. */
                  upper_bound = lower_bound;

-                if (lower_bound < 0 || upper_bound > RE_DUP_MAX
-                    || lower_bound > upper_bound)
-                  {
-                    if (!(syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
-                      goto unfetch_interval;
-                    else
-                      FREE_STACK_RETURN (REG_BADBR);
-                  }
+                if (! (0 <= lower_bound && lower_bound <= upper_bound))
+		  goto invalid_interval;

                if (!(syntax & RE_NO_BK_BRACES))
                  {
-                    if (c != '\\') FREE_STACK_RETURN (REG_EBRACE);
-
+		    if (c != '\\' || p == pend)
+		      goto invalid_interval;
                    PATFETCH (c);
                  }

                if (c != '}')
-                  {
-                    if (!(syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
-                      goto unfetch_interval;
-                    else
-                      FREE_STACK_RETURN (REG_BADBR);
-                  }
-
-                /* We just parsed a valid interval.  */
+		  goto invalid_interval;

                /* If it's invalid to have no preceding re.  */
                if (!laststart)
                  {
-                    if (syntax & RE_CONTEXT_INVALID_OPS)
+		    if (syntax & RE_CONTEXT_INVALID_OPS
+			&& !(syntax & RE_INVALID_INTERVAL_ORD))
                      FREE_STACK_RETURN (REG_BADRPT);
                    else if (syntax & RE_CONTEXT_INDEP_OPS)
                      laststart = b;
@@ -3889,6 +3864,11 @@ regex_compile (pattern, size, syntax, bufp)
                      goto unfetch_interval;
                  }

+                /* We just parsed a valid interval.  */
+
+                if (RE_DUP_MAX < upper_bound)
+		  FREE_STACK_RETURN (REG_BADBR);
+
                /* If the upper bound is zero, don't want to succeed at
                   all; jump from `laststart' to `b + 3', which will be
 		   the end of the buffer after we insert the jump.  */
@@ -3974,25 +3954,20 @@ regex_compile (pattern, size, syntax, bufp)
                       }
                   }
                pending_exact = 0;
-                beg_interval = NULL;
-              }
-              break;
+		break;

-            unfetch_interval:
-              /* If an invalid interval, match the characters as literals.  */
-               assert (beg_interval);
-               p = beg_interval;
-               beg_interval = NULL;
-
-               /* normal_char and normal_backslash need `c'.  */
-               PATFETCH (c);
-
-               if (!(syntax & RE_NO_BK_BRACES))
-                 {
-                   if (p > pattern  &&  p[-1] == '\\')
-                     goto normal_backslash;
-                 }
-               goto normal_char;
+	      invalid_interval:
+		if (!(syntax & RE_INVALID_INTERVAL_ORD))
+		  FREE_STACK_RETURN (p == pend ? REG_EBRACE : REG_BADBR);
+	      unfetch_interval:
+		/* Match the characters as literals.  */
+		p = beg_interval;
+		c = '{';
+		if (syntax & RE_NO_BK_BRACES)
+		  goto normal_char;
+		else
+		  goto normal_backslash;
+	      }

 #ifdef emacs
            /* There is no way to specify the before_dot and after_dot
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -160,6 +160,11 @@ typedef unsigned long int reg_syntax_t;
   this bit set, and it won't affect anything in the normal case. */
 #define RE_DEBUG (RE_NO_GNU_OPS << 1)

+/* If this bit is set, a syntactically invalid interval is treated as
+   a string of ordinary characters.  For example, the ERE 'a{1' is
+   treated as 'a\{1'.  */
+#define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
+
 /* This global variable defines the particular regexp syntax to use (for
   some interfaces).  When a regexp is compiled, the syntax used is
   stored in the pattern buffer, so changing this does not affect
@@ -199,7 +204,8 @@ extern reg_syntax_t re_syntax_options;
   | RE_NO_BK_VBAR)

 #define RE_SYNTAX_POSIX_EGREP						\
-  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
+  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES			\
+   | RE_INVALID_INTERVAL_ORD)

 /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
 #define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
--- a/lib/stdio-safer.h
+++ b/lib/stdio-safer.h
@@ -0,0 +1,9 @@
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+FILE *fopen_safer PARAMS ((char const *, char const *));
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -0,0 +1,306 @@
+/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <assert.h>
+
+#include <errno.h>
+#ifndef __set_errno
+# define __set_errno(Val) errno = (Val)
+#endif
+
+#include <stdio.h>
+#ifndef P_tmpdir
+# define P_tmpdir "/tmp"
+#endif
+#ifndef TMP_MAX
+# define TMP_MAX 238328
+#endif
+#ifndef __GT_FILE
+# define __GT_FILE	0
+# define __GT_BIGFILE	1
+# define __GT_DIR	2
+# define __GT_NOCREATE	3
+#endif
+
+#if STDC_HEADERS || _LIBC
+# include <stddef.h>
+# include <stdlib.h>
+# include <string.h>
+#endif
+
+#if HAVE_FCNTL_H || _LIBC
+# include <fcntl.h>
+#endif
+
+#if HAVE_SYS_TIME_H || _LIBC
+# include <sys/time.h>
+#endif
+
+#if HAVE_STDINT_H || _LIBC
+# include <stdint.h>
+#endif
+
+#if HAVE_UNISTD_H || _LIBC
+# include <unistd.h>
+#endif
+
+#include <sys/stat.h>
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
+#endif
+#if !defined S_ISDIR && defined S_IFDIR
+# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
+#if !S_IRUSR && S_IREAD
+# define S_IRUSR S_IREAD
+#endif
+#if !S_IRUSR
+# define S_IRUSR 00400
+#endif
+#if !S_IWUSR && S_IWRITE
+# define S_IWUSR S_IWRITE
+#endif
+#if !S_IWUSR
+# define S_IWUSR 00200
+#endif
+#if !S_IXUSR && S_IEXEC
+# define S_IXUSR S_IEXEC
+#endif
+#if !S_IXUSR
+# define S_IXUSR 00100
+#endif
+
+#if _LIBC
+# define struct_stat64 struct stat64
+#else
+# define struct_stat64 struct stat
+# define __getpid getpid
+# define __gettimeofday gettimeofday
+# define __mkdir mkdir
+# define __open open
+# define __open64 open
+# define __lxstat64(version, path, buf) lstat (path, buf)
+# define __xstat64(version, path, buf) stat (path, buf)
+#endif
+
+#if ! (HAVE___SECURE_GETENV || _LIBC)
+# define __secure_getenv getenv
+#endif
+
+/* Use the widest available unsigned type if uint64_t is not
+   available.  The algorithm below extracts a number less than 62**6
+   (approximately 2**35.725) from uint64_t, so ancient hosts where
+   uintmax_t is only 32 bits lose about 3.725 bits of randomness,
+   which is better than not having mkstemp at all.  */
+#if !defined UINT64_MAX && !defined uint64_t
+# define uint64_t uintmax_t
+#endif
+
+/* Return nonzero if DIR is an existent directory.  */
+static int
+direxists (const char *dir)
+{
+  struct_stat64 buf;
+  return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
+}
+
+/* Path search algorithm, for tmpnam, tmpfile, etc.  If DIR is
+   non-null and exists, uses it; otherwise uses the first of $TMPDIR,
+   P_tmpdir, /tmp that exists.  Copies into TMPL a template suitable
+   for use with mk[s]temp.  Will fail (-1) if DIR is non-null and
+   doesn't exist, none of the searched dirs exists, or there's not
+   enough space in TMPL. */
+int
+__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
+	       int try_tmpdir)
+{
+  const char *d;
+  size_t dlen, plen;
+
+  if (!pfx || !pfx[0])
+    {
+      pfx = "file";
+      plen = 4;
+    }
+  else
+    {
+      plen = strlen (pfx);
+      if (plen > 5)
+	plen = 5;
+    }
+
+  if (try_tmpdir)
+    {
+      d = __secure_getenv ("TMPDIR");
+      if (d != NULL && direxists (d))
+	dir = d;
+      else if (dir != NULL && direxists (dir))
+	/* nothing */ ;
+      else
+	dir = NULL;
+    }
+  if (dir == NULL)
+    {
+      if (direxists (P_tmpdir))
+	dir = P_tmpdir;
+      else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
+	dir = "/tmp";
+      else
+	{
+	  __set_errno (ENOENT);
+	  return -1;
+	}
+    }
+
+  dlen = strlen (dir);
+  while (dlen > 1 && dir[dlen - 1] == '/')
+    dlen--;			/* remove trailing slashes */
+
+  /* check we have room for "${dir}/${pfx}XXXXXX\0" */
+  if (tmpl_len < dlen + 1 + plen + 6 + 1)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
+  return 0;
+}
+
+/* These are the characters used in temporary filenames.  */
+static const char letters[] =
+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+/* Generate a temporary file name based on TMPL.  TMPL must match the
+   rules for mk[s]temp (i.e. end in "XXXXXX").  The name constructed
+   does not exist at the time of the call to __gen_tempname.  TMPL is
+   overwritten with the result.
+
+   KIND may be one of:
+   __GT_NOCREATE:	simply verify that the name does not exist
+			at the time of the call.
+   __GT_FILE:		create the file using open(O_CREAT|O_EXCL)
+			and return a read-write fd.  The file is mode 0600.
+   __GT_BIGFILE:	same as __GT_FILE but use open64().
+   __GT_DIR:		create a directory, which will be mode 0700.
+
+   We use a clever algorithm to get hard-to-predict names. */
+int
+__gen_tempname (char *tmpl, int kind)
+{
+  int len;
+  char *XXXXXX;
+  static uint64_t value;
+  uint64_t random_time_bits;
+  int count, fd = -1;
+  int save_errno = errno;
+  struct_stat64 st;
+
+  len = strlen (tmpl);
+  if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  /* This is where the Xs start.  */
+  XXXXXX = &tmpl[len - 6];
+
+  /* Get some more or less random data.  */
+#if HAVE_GETTIMEOFDAY || _LIBC
+  {
+    struct timeval tv;
+    __gettimeofday (&tv, NULL);
+    random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
+  }
+#else
+  random_time_bits = time (NULL);
+#endif
+  value += random_time_bits ^ __getpid ();
+
+  for (count = 0; count < TMP_MAX; value += 7777, ++count)
+    {
+      uint64_t v = value;
+
+      /* Fill in the random bits.  */
+      XXXXXX[0] = letters[v % 62];
+      v /= 62;
+      XXXXXX[1] = letters[v % 62];
+      v /= 62;
+      XXXXXX[2] = letters[v % 62];
+      v /= 62;
+      XXXXXX[3] = letters[v % 62];
+      v /= 62;
+      XXXXXX[4] = letters[v % 62];
+      v /= 62;
+      XXXXXX[5] = letters[v % 62];
+
+      switch (kind)
+	{
+	case __GT_FILE:
+	  fd = __open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+	  break;
+
+	case __GT_BIGFILE:
+	  fd = __open64 (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+	  break;
+
+	case __GT_DIR:
+	  fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
+	  break;
+
+	case __GT_NOCREATE:
+	  /* This case is backward from the other three.  __gen_tempname
+	     succeeds if __xstat fails because the name does not exist.
+	     Note the continue to bypass the common logic at the bottom
+	     of the loop.  */
+	  if (__lxstat64 (_STAT_VER, tmpl, &st) < 0)
+	    {
+	      if (errno == ENOENT)
+		{
+		  __set_errno (save_errno);
+		  return 0;
+		}
+	      else
+		/* Give up now. */
+		return -1;
+	    }
+	  continue;
+
+	default:
+	  assert (! "invalid KIND in __gen_tempname");
+	}
+
+      if (fd >= 0)
+	{
+	  __set_errno (save_errno);
+	  return fd;
+	}
+      else if (errno != EEXIST)
+	return -1;
+    }
+
+  /* We got out of the loop because we ran out of combinations to try.  */
+  __set_errno (EEXIST);
+  return -1;
+}
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -1,6 +1,6 @@
 /* Unicode character output to streams with locale dependent encoding.

-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU Library General Public License as published
@@ -124,13 +124,11 @@ print_unicode_char (FILE *stream, unsigned int code)
      extern const char *locale_charset PARAMS ((void));
      const char *charset = locale_charset ();

-      is_utf8 = (charset != NULL && !strcmp (charset, UTF8_NAME));
+      is_utf8 = !strcmp (charset, UTF8_NAME);
 #if HAVE_ICONV
      if (!is_utf8)
 	{
-	  utf8_to_local = (charset != NULL
-			   ? iconv_open (charset, UTF8_NAME)
-			   : (iconv_t)(-1));
+	  utf8_to_local = iconv_open (charset, UTF8_NAME);
 	  if (utf8_to_local == (iconv_t)(-1))
 	    {
 	      /* For an unknown encoding, assume ASCII.  */
--- a/lib/unistd-safer.h
+++ b/lib/unistd-safer.h
@@ -0,0 +1,9 @@
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+int dup_safer PARAMS ((int));
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -1,5 +1,5 @@
 /* Utility to help print --version output in a consistent format.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 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
@@ -35,7 +35,7 @@
 /* Default copyright goes to the FSF. */

 char* version_etc_copyright =
-  N_("Copyright (C) 2000 Free Software Foundation, Inc.");
+  N_("Copyright (C) 2001 Free Software Foundation, Inc.");


 /* Display the --version information the standard way.
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,49 @@
+2001-04-21  Jim Meyering  <meyering@lucent.com>
+
+	* rmdir-errno.m4: Write to a new file, so that a restrictive umask
+	doesn't interfere.
+
+2001-04-21  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* ftruncate.m4: Check for chsize.
+	Link with ftruncate.o unconditionally if ftruncate is missing.
+	This was required when cross-compiling to i586-mingw32msvc.
+
+2001-03-24  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4: Require autoconf-2.49d.
+
+2001-03-20  Bruno Haible  <haible@clisp.cons.org>
+
+        * iconv.m4 (jm_ICONV): Recommend GNU libiconv.
+
+2001-03-17  Jim Meyering  <meyering@lucent.com>
+
+	* memcmp.m4 (jm_AC_FUNC_MEMCMP): Remove my copy of AC_FUNC_MEMCMP,
+	now that the version in autoconf is equivalent.
+	(jm_FUNC_MEMCMP): Adjust to use AC_FUNC_MEMCMP.
+
+	* error.m4 (jm_PREREQ_ERROR): Invoke AC_FUNC_STRERROR_R.
+	Suggestion from Akim Demaille.
+
+	* prereq.m4 (jm_PREREQ): Add jm_PREREQ_TEMPNAME.
+	(jm_PREREQ_TEMPNAME): New function.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	* jm-macros.m4 (jm_MACROS): Use mkstemp replacement if the system
+	lacks mkstemp.  Compile our own tempname.c if we compile our own
+	mkstemp.c, as mkstemp relies on tempname.
+
+2001-03-01  Jim Meyering  <meyering@lucent.com>
+
+	* dos.m4 (jm_AC_DOS): Remove extra backslashes, now that
+	AH_VERBATIM really does output its argument verbatim.
+
+2001-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	* jm-macros.m4 (jm_CHECK_ALL_HEADERS): Check for sys/resource.h.
+
 2001-02-17  Jim Meyering  <meyering@lucent.com>

 	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Don't check for
@@ -405,7 +451,7 @@
 2000-05-26  Bruno Haible  <haible@clisp.cons.org>

 	* glibc21.m4: New file.
-	* jm-macros.m4: (jm_MACROS): Call jm_GLIBC21.
+	* jm-macros.m4 (jm_MACROS): Call jm_GLIBC21.

 2000-05-28  Jim Meyering  <meyering@lucent.com>

@@ -456,7 +502,7 @@
 	* rmdir-errno.m4 (fetish_FUNC_RMDIR_NOTEMPTY): New macro and file.
 	* jm-macros.m4: Require fetish_FUNC_RMDIR_NOTEMPTY.

-	* nanosleep.m4: (jm_FUNC_NANOSLEEP): Save and restore LIBS around
+	* nanosleep.m4 (jm_FUNC_NANOSLEEP): Save and restore LIBS around
 	AC_SEARCH_LIBS call for nanosleep.
 	(LIB_NANOSLEEP): Set and AC_SUBST.

@@ -505,13 +551,13 @@
 2000-04-17  Jim Meyering  <meyering@lucent.com>

 	Get it right :-)
-	* jm-macros.m4: (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Emit the
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Emit the
 	actual #define via AH_VERBATIM.  Don't need separate AC_DEFINE.
 	Suggestion from Akim Demaille.

 2000-04-14  Jim Meyering  <meyering@lucent.com>

-	* jm-macros.m4: (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Use the one-arg form
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Use the one-arg form
 	of AC_DEFINE.  Otherwise, the #ifndef in AH_VERBATIM gets clobbered.

 2000-04-13  Jim Meyering  <meyering@lucent.com>
@@ -640,7 +686,7 @@

 2000-02-05  Jim Meyering  <meyering@lucent.com>

-	* jm-macros.m4: (jm_CHECK_ALL_TYPES): Require most macros.
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES): Require most macros.
 	Remove explicit use of AC_HEADER_TIME.  It is required by
 	jm_CHECK_TYPE_STRUCT_TIMESPEC.  Using AC_HEADER_TIME and
 	`AC_REQUIRE'ing jm_CHECK_TYPE_STRUCT_TIMESPEC provoked a but
@@ -701,10 +747,10 @@
 	(jm_FILE_SYSTEM_USAGE): Take two parameters.

 	* ftruncate.m4: New file (derived from part of fileutils/configure.in).
-	* jm-macros.m4: (jm_FUNC_FTRUNCATE): AC_REQUIRE it.
+	* jm-macros.m4 (jm_FUNC_FTRUNCATE): AC_REQUIRE it.
 	(jm_CHECK_ALL_TYPES): Require AC_HEADER_MAJOR and AC_HEADER_DIRENT.

-	* jm-macros.m4: (OPTIONAL_BIN_PROGS, OPTIONAL_BIN_ZCRIPTS, MAN):
+	* jm-macros.m4 (OPTIONAL_BIN_PROGS, OPTIONAL_BIN_ZCRIPTS, MAN):
 	AC_SUBST these here, rather than just in sh-util/configure.in, so
 	that the now-shared-by-fileutils-and-textutils lib/Makefile.am are
 	all the same.
@@ -794,7 +840,7 @@

 	* d-type.m4 (jm_CHECK_TYPE_STRUCT_DIRENT_D_TYPE): Rename from
 	jm_STRUCT_DIRENT_D_TYPE.
-	* d-ino.m4: (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Rename from
+	* d-ino.m4 (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Rename from
 	jm_STRUCT_DIRENT_D_INO.
 	* utimbuf.m4 (jm_CHECK_TYPE_STRUCT_UTIMBUF): Rename from
 	jm_STRUCT_UTIMBUF.
@@ -983,7 +1029,7 @@

 1999-07-15  Jim Meyering  <meyering@ascend.com>

-	* jm-macros.m4: (AC_CHECK_FUNCS): Check for getpagesize.
+	* jm-macros.m4 (AC_CHECK_FUNCS): Check for getpagesize.

 1999-05-22  Jim Meyering  <meyering@ascend.com>

--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -186,31 +189,35 @@ utime.m4 \
 utimes.m4 \
 xstrtoumax.m4

+EXEEXT =
+OBJEXT = o
 subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  README ChangeLog Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = README ChangeLog Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  m4/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:


-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -224,31 +231,25 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -259,31 +260,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 Makefile.am: Makefile.am.in
--- a/m4/dos.m4
+++ b/m4/dos.m4
@@ -1,4 +1,4 @@
-# serial 2
+# serial 3

 # Define some macros required for proper operation of code in lib/*.c
 # on MSDOS/Windows systems.
@@ -28,7 +28,7 @@ else

    AH_VERBATIM(ISSLASH,
    [#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
-# define ISSLASH(C) ((C) == '/' || (C) == '\\\\')
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #else
 # define ISSLASH(C) ((C) == '/')
 #endif])
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2

 dnl FIXME: put these prerequisite-only *.m4 files in a separate
 dnl directory -- otherwise, they'll conflict with existing files.
@@ -7,5 +7,6 @@ dnl These are the prerequisite macros for GNU's error.c file.
 AC_DEFUN(jm_PREREQ_ERROR,
 [
  AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
+  AC_FUNC_STRERROR_R
  AC_HEADER_STDC
 ])
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -1,27 +1,14 @@
-#serial 2
+#serial 3

-# See if we need to emulate a missing ftruncate function using fcntl.
+# See if we need to emulate a missing ftruncate function using fcntl or chsize.

 AC_DEFUN(jm_FUNC_FTRUNCATE,
 [
  AC_CHECK_FUNCS(ftruncate, , [ftruncate_missing=yes])

  if test "$ftruncate_missing" = yes; then
-    AC_CHECK_HEADERS(unistd.h)
-    AC_MSG_CHECKING([fcntl emulation of ftruncate])
-    AC_CACHE_VAL(fu_cv_sys_ftruncate_emulation,
-    [AC_TRY_LINK([
-#include <sys/types.h>
-#include <fcntl.h>], [
-#if !defined(F_CHSIZE) && !defined(F_FREESP)
-  chsize();
-#endif
-  ],
-      fu_cv_sys_ftruncate_emulation=yes,
-      fu_cv_sys_ftruncate_emulation=no)])
-    AC_MSG_RESULT($fu_cv_sys_ftruncate_emulation)
-    if test $fu_cv_sys_ftruncate_emulation = yes; then
-      AC_LIBOBJ(ftruncate)
-    fi
+    AC_CHECK_HEADERS([unistd.h])
+    AC_CHECK_FUNCS([chsize])
+    AC_LIBOBJ(ftruncate)
  fi
 ])
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,13 +1,13 @@
-#serial 2
+#serial 3

 dnl From Bruno Haible.

 AC_DEFUN(jm_ICONV,
 [
  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable libiconv installed).
+  dnl those with the standalone portable GNU libiconv installed).
  AC_CACHE_CHECK(for iconv, jm_cv_func_iconv, [
-    jm_cv_func_iconv="no, consider installing libiconv"
+    jm_cv_func_iconv="no, consider installing GNU libiconv"
    jm_cv_lib_iconv=no
    AC_TRY_LINK([#include <stdlib.h>
 #include <iconv.h>],
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,10 +1,10 @@
-#serial 32   -*- autoconf -*-
+#serial 35   -*- autoconf -*-

 dnl Misc type-related macros for fileutils, sh-utils, textutils.

 AC_DEFUN(jm_MACROS,
 [
-  AC_PREREQ(2.14d)
+  AC_PREREQ(2.49d)

  GNU_PACKAGE="GNU $PACKAGE"
  AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
@@ -83,6 +83,11 @@ AC_DEFUN(jm_MACROS,
  AC_REPLACE_FUNCS(memchr memcpy memmove memrchr memset)
  AC_CHECK_FUNCS(getpagesize)

+  AC_REPLACE_FUNCS(mkstemp)
+  if test $ac_cv_func_mkstemp != yes; then
+    AC_LIBOBJ(tempname)
+  fi
+
  # By default, argmatch should fail calling usage (1).
  AC_DEFINE(ARGMATCH_DIE, [usage (1)],
 	    [Define to the function xargmatch calls on failures.])
@@ -219,6 +224,7 @@ AC_DEFUN(jm_CHECK_ALL_HEADERS,
    sys/mntent.h \
    sys/mount.h \
    sys/param.h \
+    sys/resource.h \
    sys/socket.h \
    sys/statfs.h \
    sys/statvfs.h \
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,47 +1,8 @@
-#serial 5
-
-dnl A replacement for autoconf's AC_FUNC_MEMCMP that detects
-dnl the losing memcmp on some x86 Next systems.
-AC_DEFUN(jm_AC_FUNC_MEMCMP,
-[AC_CACHE_CHECK([for working memcmp], jm_cv_func_memcmp_working,
-[AC_TRY_RUN(
-[int
-main ()
-{
-  /* Some versions of memcmp are not 8-bit clean.  */
-  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-    exit (1);
-
-  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-     or more and with at least one buffer not starting on a 4-byte boundary.
-     William Lewis provided this test program.   */
-  {
-    char foo[21];
-    char bar[21];
-    int i;
-    for (i = 0; i < 4; i++)
-      {
-	char *a = foo + i;
-	char *b = bar + i;
-	strcpy (a, "--------01111111");
-	strcpy (b, "--------10000000");
-	if (memcmp (a, b, 16) >= 0)
-	  exit (1);
-      }
-    exit (0);
-  }
-}],
-   jm_cv_func_memcmp_working=yes,
-   jm_cv_func_memcmp_working=no,
-   jm_cv_func_memcmp_working=no)])
-test $jm_cv_func_memcmp_working = no \
-  && AC_LIBOBJ(memcmp)
-])
+#serial 6

 AC_DEFUN(jm_FUNC_MEMCMP,
-[AC_REQUIRE([jm_AC_FUNC_MEMCMP])dnl
- if test $jm_cv_func_memcmp_working = no; then
+[AC_REQUIRE([AC_FUNC_MEMCMP])dnl
+ if test $ac_cv_func_memcmp_working = no; then
   AC_DEFINE_UNQUOTED(memcmp, rpl_memcmp,
     [Define to rpl_memcmp if the replacement function should be used.])
 fi
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 17
+#serial 18

 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -17,6 +17,7 @@ AC_DEFUN(jm_PREREQ,
  jm_PREREQ_QUOTEARG
  jm_PREREQ_READUTMP
  jm_PREREQ_REGEX
+  jm_PREREQ_TEMPNAME # called by mkstemp
 ])

 AC_DEFUN(jm_PREREQ_ADDEXT,
@@ -122,3 +123,11 @@ AC_DEFUN(jm_PREREQ_REGEX,
  AC_HEADER_STDC
  AC_FUNC_ALLOCA
 ])
+
+AC_DEFUN(jm_PREREQ_TEMPNAME,
+[
+  AC_HEADER_STDC
+  AC_HEADER_STAT
+  AC_CHECK_HEADERS(fcntl.h sys/time.h stdint.h unistd.h)
+  AC_CHECK_FUNCS(__secure_getenv gettimeofday)
+])
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2

 # When rmdir fails because the specified directory is not empty, it sets
 # errno to some value, usually ENOTEMPTY.  However, on some AIX systems,
@@ -25,12 +25,12 @@ extern int errno;
 	  int val;
 	  rmdir ("confdir2");
 	  val = errno;
-	  s = fopen ("confdir2/file", "w");
+	  s = fopen ("confdir2/errno", "w");
 	  fprintf (s, "%d\n", val);
 	  exit (0);
 	}
 	],
-      fetish_cv_func_rmdir_errno_not_empty=`cat confdir2/file`,
+      fetish_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`,
      fetish_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4',
      fetish_cv_func_rmdir_errno_not_empty=ENOTEMPTY
      )
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,5 +1,173 @@
+2001-04-23  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0.45.
+
+2001-04-22  Jim Meyering  <meyering@lucent.com>
+
+	* src/ls.c (decode_switches): Ensure that -1 has no effect when it
+	follows -l.  Reported by Ulrich Drepper.
+
+	* src/dd.c (usage): Mention that sync makes dd pad with spaces (rather
+	than NULs) when used with block or unblock.
+	(dd_copy): When using sync with either block or unblock,
+	pad with spaces.  Reported by Dale Scheetz.
+	* tests/dd/skip-seek (block-sync-1): New test, for this.  Based on
+	report from Dale Scheetz.
+	* doc/fileutils.texi (dd invocation): Document it here, too.
+
+	* configure: Regenerate using a patched copy of autoconf-2.49e to
+	work around a bug in its test for a working memcmp function.
+
+	* tests/ls/no-arg: New file.
+	* tests/ls/Makefile.am (TESTS): Add no-arg.
+	* src/ls.c (main): Fix off-by-one error introduced with last change.
+
+2001-04-21  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0.44.
+
+	* configure, aclocal.m4, etc.: Regenerate using autoconf-2.49e.
+
+	* doc/fileutils.texi (touch invocation): Discuss ctime.
+	Based on suggestions and contributions from Aharon Robbins
+	and Dan Jacobson.
+
+	* src/ls.c (main): When given two or more arguments but the only one
+	that exists is a directory, don't treat it as if it were the only
+	argument.  Before, `mkdir d; ls no-dir d 2>/dev/null' would act like
+	`ls d' and produce no output.  Now, it prints `d:'.
+	Report and patch from Stéphane Chazelas.
+	* tests/ls-2/tests: New tests, for the above fix.
+
+2001-04-08  Jim Meyering  <meyering@lucent.com>
+
+	* depcomp: New version, from automake.
+
+2000-10-31  Bruno Haible  <haible@clisp.cons.org>
+
+	* ls.c: Don't inspect MB_LEN_MAX. Paul Eggert says it's
+	not always defined correctly.
+
+2001-04-03  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* tests/chgrp/basic: Ensure that initial group id's are properly set
+	for `d' and `d/f3'.
+
+2001-04-02  Jim Meyering  <meyering@lucent.com>
+
+	* tests/mv/setup: Skip nonexistent directories so we don't get
+	diagnostics from df about e.g., `/usr/tmp not found'.
+
+2001-03-24  Jim Meyering  <meyering@lucent.com>
+
+	* configure.in: Don't require autoconf version here -- it's done in m4/.
+
+2001-03-23  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0.43.
+
+	* configure, aclocal.m4, etc.: Regenerate using autoconf-2.49d.
+
+	* Makefile.maint (check-copyright): New target and rule.
+	(alpha): Depend on it.
+
+	* missing: Handle shell built-ins (only `:' and `cd' for now) to work
+	around brain damage in Ultrix's /bin/sh.
+
+2001-03-18  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0.42.
+
+	* tests/Fetish.pm: If the $DJDIR envvar is defined, set SHELL
+	to $DJDIR/bin/bash.exe.  Patch from Richard Dawe, based on a
+	suggestion from Eli Zaretskii.
+
+2001-03-17  Paul Eggert  <eggert@twinsun.com>
+
+	* doc/fileutils.texi: Warn that touch DATE FILE will be withdrawn.
+
+2001-03-17  Jim Meyering  <meyering@lucent.com>
+
+	* tests/install/basic-1: Add the standard $VERBOSE-handling hook.
+	This test currently fails for mips-dec-ultrix4.4.
+
+	* tests/install/create-leading: Use ../envvar-check rather than
+	open-coding the same tests.
+
+	* tests/envvar-check: Set/use $as_unset, for those shells
+	(like Ultrix4's /bin/sh) that don't accept `unset'.
+
+	* missing (--run): Use `eval' to run `"$@"'.  Otherwise, Ultrix4.4's
+	/bin/sh fails and outputs garbage.
+
+	* src/touch.c (usage): Tweak the obsolescent usage line so that
+	help2man recognizes it as such.  Reported by Dan Jacobson.
+
+2001-03-16  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.maint (wget-update): Also get `missing'.
+	Use for-loops.
+
+	* missing: Update from automake.
+
+2001-03-11  Jim Meyering  <meyering@lucent.com>
+
+	* tests/rm/isatty: Disable this test, for now.
+	It would block when run in the background.
+
+2001-03-09  Jim Meyering  <meyering@lucent.com>
+
+	* config.guess: Update from master repository.
+
+	* Makefile.maint (my_distdir): Define new variable, and use this
+	in place of most old uses of $(distdir).
+
+	* src/Makefile.am (Makefile): Don't depend on $(BUILT_SOURCES).
+	Reported by Akim Demaille.
+
+	* tests/help-version: Ensure that /dev/full is a character device
+	(using test -c) as well as being writable, before trying to write to it.
+	Otherwise, the test could mistakenly append a newline to an existing,
+	regular, writable, /dev/full file.
+	Suggested by Ulrich Drepper.
+
+2001-03-06  Jim Meyering  <meyering@lucent.com>
+
+	* src/dd.c (S_TYPEISSHM): Rename parameter to reflect its type.
+	(main): Pass a `struct stat *', not stat.st_mode to S_TYPEISSHM.
+	Patch by Alain Magloire.
+
+2001-03-04  Jim Meyering  <meyering@lucent.com>
+
+	* src/dd.c (output_char): Reformat so each statement is on a
+	separate line.
+
+2001-02-21  Jim Meyering  <meyering@lucent.com>
+
+	* src/mkdir.c (main): Remove assignment-in-if-expression.
+	In fact, remove t_errno altogether.  Reported by Nelson Beebe.
+
+	* tests/ls-2/tests: Add two tests of existing behavior -- both will
+	have to be changed (soon after release), once ls is fixed.
+
+2001-02-20  Paul Eggert  <eggert@twinsun.com>
+
+	* src/ls.c (FULL_TIME_OPTION): Renamed from FULL_TIME, for
+	consistency with the other enum values.
+
+2001-02-20  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, doc/fileutils.texi: ls -H is now obsolescent.
+	* src/ls.c (SI_OPTION): New enum value.
+	(long_options): Use it instead of 'H' for --si.
+	(decode_switches): Warn that -H will change soon.
+	(usage): Likewise.
+
 2001-02-18  Jim Meyering  <meyering@lucent.com>

+	* tests/rm/Makefile.am (TESTS): Add isatty.
+	* tests/rm/isatty: New test, for the bug fixed below.
+
 	* Version 4.0.41.

 	* depcomp: New version, from automake.
@@ -1648,7 +1816,7 @@
 	Round negative numbers correctly.
 	(show_dev): Round disk usage up and disk free space down.

-	* src/ls.c: (print_dir, gobble_file, print_long_format,
+	* src/ls.c (print_dir, gobble_file, print_long_format,
 	print_file_name_and_frills): Round disk usage up.
 	* src/du.c (print_size): Likewise.

@@ -1968,7 +2136,7 @@
 2000-03-12  Jim Meyering  <meyering@lucent.com>

 	Merge from textutils.
-	* src/system.h: (O_BINARY, O_TEXT): Define if necessary.
+	* src/system.h (O_BINARY, O_TEXT): Define if necessary.
 	(SET_BINARY, SET_BINARY2): Define.
 	(DEV_BSIZE): Define to BBSIZE if appropriate.

@@ -2259,7 +2427,7 @@

 	* lib/euidaccess.c: Sync with the GNU C library.

-	* tests/dir/Makefile.am: (TESTS_ENVIRONMENT): Add `pwd`/ prefix
+	* tests/dir/Makefile.am (TESTS_ENVIRONMENT): Add `pwd`/ prefix
 	to exported PATH value (though not strictly necessary, here).
 	* tests/dd/Makefile.am: Likewise.
 	* tests/dircolors/Makefile.am: Likewise.
@@ -3162,7 +3330,7 @@
 	create directory' rather than `cannot make directory'.  The former
 	also matches the one in makepath.c.

-	* src/dd.c: (apply_translations): Use TOUPPER and TOLOWER,
+	* src/dd.c (apply_translations): Use TOUPPER and TOLOWER,
 	not toupper and tolower.

 1999-05-05  Jim Meyering  <meyering@ascend.com>
@@ -4196,7 +4364,7 @@
 	(base_name): Declare.
 	Mostly from Akim Demaille.

-	* lib/addext.c: (base_name): Declare.
+	* lib/addext.c (base_name): Declare.
 	* src/sys2.h: Add prototype for base_name.

 	* lib/argmatch.c: s/argmatch_exit_failure/argmatch_die/
@@ -4842,7 +5010,7 @@

 	* configure.in (AC_STRUCT_ST_MTIM_NSEC): Renamed from AC_STRUCT_ST_MTIM.
 	* acconfig.h (ST_MTIM_NSEC): New #undef.
-	* src/system.h: (ST_TIME_CMP_NS, ATIME_CMP, CTIME_CMP, MTIME_CMP):
+	* src/system.h (ST_TIME_CMP_NS, ATIME_CMP, CTIME_CMP, MTIME_CMP):
 	Use new ST_MTIM_NSEC macro.

 1998-08-16  Jim Meyering  <meyering@ascend.com>
@@ -4927,7 +5095,7 @@
 	rev_cmp_mtime, compare_atime, rev_cmp_atime): Compare time
 	stamps with subsecond resolution if available.

-	* src/system.h: (ST_TIME_CMP_NS, ST_TIME_CMP, ATIME_CMP,
+	* src/system.h (ST_TIME_CMP_NS, ST_TIME_CMP, ATIME_CMP,
 	CTIME_CMP, MTIME_CMP): New macros.

 1998-08-01  Jim Meyering  <meyering@ascend.com>
@@ -5102,7 +5270,7 @@

 1998-06-30  Paul Eggert  <eggert@shade.twinsun.com>

-	* lib/mountlist.c: (read_filesystem_list):
+	* lib/mountlist.c (read_filesystem_list):
 	Don't leak memory on failure.
 	Don't create a dummy struct mount_entry entry;
 	use the address-of-the-tail-address method instead.
@@ -5168,7 +5336,7 @@

 1998-06-29  Paul Eggert  <eggert@twinsun.com>

-	* lib/mountlist.c: (read_filesystem_list): If SVR4, lock
+	* lib/mountlist.c (read_filesystem_list): If SVR4, lock
 	/etc/.mnttab.lock if available, to avoid race conditions
 	(e.g. with the automounter on Solaris 2.6).

@@ -5825,7 +5993,7 @@
 	* src/copy.c (copy_internal): Use x->backup_type, not the global.
 	(valid_options): Use VALID_BACKUP_TYPE and VALID_SPARSE_MODE.

-	* src/copy.h: (VALID_SPARSE_MODE): Define.
+	* src/copy.h (VALID_SPARSE_MODE): Define.
 	[struct cp_options] (backup_type): New member.

 	* src/cp.c [NDEBUG]: Comment out definition.
--- a/old/fileutils/NEWS
+++ b/old/fileutils/NEWS
@@ -1,4 +1,26 @@
-Changes in release 4.01:
+Changes in release 4.1.0:
+[4.0.45]
+* dd conv=sync,block now pads only with spaces
+* ls's -1 option no longer cancels the effect of a preceding -l
+* regenerate configure using a patched version of autoconf-2.49e to work
+    around a bug in its test for a working memcmp function
+* ls: fix off-by-one error introduced with the previous change
+[4.0.44]
+* ls: When given two or more arguments but the only one that exists is a
+    directory, don't treat it as if it were the only argument.  Before,
+    `mkdir d; ls no-dir d 2>/dev/null' would act like `ls d' and produce
+    no output.  Now, it prints `d:'.
+* touch -d 'last friday' would use a time stamp that was one hour off
+    (e.g., 23:00 on *thursday* rather than 00:00 of the preceding friday)
+    when run such that the current time and the target date/time fall on
+    opposite sides of a daylight savings time transition.
+    This problem arises only with relative date strings like `last monday'.
+    It is not a problem with strings that include absolute dates.
+[4.0.43]
+* regenerate configure-related files using autoconf-2.49d
+[4.0.42]
+* Using ls's short-named `-H' option evokes the warning that the
+   meaning of `-H' will soon change.  Use `--si' instead.
 [4.0.41]
 * fix bug in rm introduced in 4.0.38: `chmod 0 f; rm f' would no longer prompt
    before removal.
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,49 @@
+2001-04-20  Jim Meyering  <meyering@lucent.com>
+
+	* doc/sh-utils.texi (false invocation): Describe how --help and
+	--version are treated with and without POSIXLY_CORRECT.
+	(true invocation): Likewise.  Forwarded by Michael Stone.
+
+2001-03-18  Jim Meyering  <meyering@lucent.com>
+
+	* tests/Fetish.pm: If the $DJDIR envvar is defined, set SHELL
+	to $DJDIR/bin/bash.exe.  Patch from Richard Dawe, based on a
+	suggestion from Eli Zaretskii.
+
+2001-03-10  Jim Meyering  <meyering@lucent.com>
+
+	* doc/sh-utils.texi (date invocation): Correct the description of how
+	date works when given no format.  Reported by Ole Laursen.
+
+2001-03-09  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.maint (my_distdir): Define new variable, and use this
+	in place of most old uses of $(distdir).
+
+	* src/date.c (usage): Describe %C.
+	* doc/sh-utils.texi (Date directives): Likewise.
+
+	* tests/help-version: Ensure that /dev/full is a character device
+	(using test -c) as well as being writable, before trying to write to it.
+	Otherwise, the test could mistakenly append a newline to an existing,
+	regular, writable, /dev/full file.
+	Suggested by Ulrich Drepper.
+
+2001-03-07  Jim Meyering  <meyering@lucent.com>
+
+	* tests/stty/Makefile.am (EXTRA_DIST): Remove input-tty.
+	* tests/Makefile.am (EXTRA_DIST): Add input-tty.
+
+	* tests/stty/basic-1: Reflect change in location of input-tty.
+	* tests/stty/row-col: Likewise.
+	* tests/stty/input-tty: Move this file...
+	* tests/input-tty: ... to here.
+
+2001-02-24  Paul Eggert  <eggert@twinsun.com>
+
+	* doc/sh-utils.texi: Fix typo: '-d=1may' -> '-d 1may'.
+	Fix and clarify time zone usage in 'date' examples.
+
 2001-02-04  Jim Meyering  <meyering@lucent.com>

 	* src/factor.c (usage): Tweak --help output: it prints the _prime_
@@ -448,7 +494,7 @@
 2000-03-12  Jim Meyering  <meyering@lucent.com>

 	Merge from textutils.
-	* src/system.h: (O_BINARY, O_TEXT): Define if necessary.
+	* src/system.h (O_BINARY, O_TEXT): Define if necessary.
 	(SET_BINARY, SET_BINARY2): Define.
 	(DEV_BSIZE): Define to BBSIZE if appropriate.

@@ -959,7 +1005,7 @@
 	* src/false.c: New file.
 	* src/true.sh: Removed.
 	* src/false.sh: Removed.
-	* src/Makefile.am: (bin_PROGRAMS): Add true and false.
+	* src/Makefile.am (bin_PROGRAMS): Add true and false.
 	(bin_SCRIPTS): Remove true and false.
 	(EXTRA_DIST): Remove false.sh and true.sh.
 	* man/true.1in: New file.
@@ -1254,7 +1300,7 @@

 	Running `id USER' doesn't report any groups if there is no entry
 	for USER in /etc/group.  Always include the one from /etc/passwd.
-	* src/id.c: (xgetgroups): Take new parameter, gid, and pass
+	* src/id.c (xgetgroups): Take new parameter, gid, and pass
 	it to getugroups.
 	(print_group_list): Call getpwuid and adjust calls to xgetgroups
 	to include new parameter.
@@ -1590,7 +1636,7 @@
 	* configure.in (jm_MACROS): New wrapper macro.
 	Remove uses of most jm_* macros.

-	* acconfig.h: (chown): Add undef.
+	* acconfig.h (chown): Add undef.
 	(D_INO_IN_DIRENT): Likewise.
 	(D_TYPE_IN_DIRENT): Likewise.
 	(ssize_t): Likewise.
@@ -2168,7 +2214,7 @@ Thu May  1 00:10:11 1997  Jim Meyering  <meyering@na-net.ornl.gov>

 Sun Apr 27 18:30:53 1997  Jim Meyering  <meyering@na-net.ornl.gov>

-	* src/printf.c: (cfcc_msg): File-scope constant.
+	* src/printf.c (cfcc_msg): File-scope constant.
 	(STRTOX): Use new constant as error message format string in macro.
 	Suggestion from Andreas Schwab.
 	(STRTOX): Don't fail because of extra character(s) following a
@@ -2182,7 +2228,7 @@ Sun Apr  6 14:29:14 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 	(xstrtod, xstrtol, xstrtoul): Remove functions.
 	Use the STRTOX instead.

-	* src/printf.c: (STRTOX): Interpret arguments like 'a and "a
+	* src/printf.c (STRTOX): Interpret arguments like 'a and "a
 	as POSIX requires.  Derived from a patch by Dennis Henriksen.

 Sun Mar 23 15:20:17 1997  Jim Meyering  <meyering@na-net.ornl.gov>
@@ -2234,7 +2280,7 @@ Tue Mar 18 06:46:54 1997  Jim Meyering  <meyering@na-net.ornl.gov>

 Thu Mar 13 21:27:36 1997  Jim Meyering  <meyering@na-net.ornl.gov>

-	* lib/mktime.c: (TIME_T_MIN): Work around a bug in Cray C 5.0.3.0.
+	* lib/mktime.c (TIME_T_MIN): Work around a bug in Cray C 5.0.3.0.

 Wed Feb 19 23:06:46 1997  Jim Meyering  <meyering@na-net.ornl.gov>

@@ -2326,7 +2372,7 @@ Wed Jan 22 20:12:31 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 	* lib/strftime.c (_strftime_copytm):
 	New function, to work around Solaris 2.5 tzset bug.

-	* m4/mktime.m4: (AM_FUNC_MKTIME): Fix bug in mktime test -- don't
+	* m4/mktime.m4 (AM_FUNC_MKTIME): Fix bug in mktime test -- don't
 	test now, test a couple of thousand times.

 	* m4/strftime.m4 (main): Use TZ=GMT0, not TZ=GMT, since only GMT0 is
@@ -3845,7 +3891,7 @@ Mon Aug  7 23:27:54 1995  Jim Meyering  (meyering@comco.com)

 Fri Jun 23 23:04 1995  Jim Meyering  (meyering@comco.com)

-	* configure.in: (AC_REPLACE_FUNCS): Add memcpy and memset.
+	* configure.in (AC_REPLACE_FUNCS): Add memcpy and memset.
 	Add checks for floor, modf, and rint -- all used by seq.c.

 Mon Jun 12 00:26:54 1995  Jim Meyering  (meyering@comco.com)
@@ -3895,7 +3941,7 @@ Fri May 12 21:25:50 1995  Jim Meyering  (meyering@comco.com)

 Tue Apr 18 22:57:43 1995  Jim Meyering  (meyering@comco.com)

-	* configure.in: (AC_OUTPUT): Use echo, not date, to avoid creating
+	* configure.in (AC_OUTPUT): Use echo, not date, to avoid creating
 	unnecessary conflicts for people using version control software
 	like RCS and CVS.
 	(AC_ARG_PROGRAM): Use it.
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -1,4 +1,11 @@
 Changes in release 2.1
+ [2.0.12]
+* date -d 'last friday' print a date/time that was one hour off
+    (e.g., 23:00 on *thursday* rather than 00:00 of the preceding friday)
+    when run such that the current time and the target date/time fall on
+    opposite sides of a daylight savings time transition.
+    This problem arises only with relative date strings like `last monday'.
+    It is not a problem with strings that include absolute dates.
 [2.0.11]
 * setting the date now works properly, even when using -u
 * `date -f - < /dev/null' no longer dumps core
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -1,3 +1,415 @@
+2001-04-22  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0.14.
+
+	* configure: Regenerate using a patched copy of autoconf-2.49e to
+	work around a bug in its test for a working memcmp function.
+
+2001-03-28  Paul Eggert  <eggert@twinsun.com>
+
+	* src/cksum.c: Fix bugs when computing length of large files.
+	Add overflow and write error checks.  Use uint_fast32_t, not
+	unsigned long, to do checksum calculation, as C99 says
+	uint_fast32_t should be no slower and might be faster.
+
+	Include <stdio.h> and "system.h" even if CRCTAB is defined,
+	so that the code will compile if CRCTAB is defined.
+	Include "human.h" if CRCTAB is not defined.
+	(uint_fast32_t): Define if it appears that stdint.h didn't.
+	(BIT, remainder, main, crctab): Use uint_fast32_t, not unsigned long,
+	for checksums.
+	(fill_r, remainder, main): Use ANSI prototypes.
+	(fill_r, remainder, main): Omit duplicate code.
+	(main): Use uintmax_t, not unsigned long, for file lengths.
+	Use size_t, not long, for result of fread.
+	Check for overflow when computing file lengths.
+	Check for write error immediately after printing a line, so that
+	we don't write to stdout indefinitely after an error.
+
+2001-04-14  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (default_sort_size): Leave a 1/16 margin for RSS.
+	Suggestion from Solar Designer.
+
+2001-04-14  Jim Meyering  <meyering@lucent.com>
+
+	* src/wc.c (usage): Tweak --help output: s/line,/newline,/
+
+2001-04-13  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (main): Add a comment justifying the use of
+	`multi-character' rather than `multibyte' in a diagnostic.
+	From Paul Eggert.
+
+2001-04-12  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (RLIMIT_AS): Do not define; just use conditional
+	code, since RLIMIT_RSS is similar (and is not standardized).
+	(default_sort_size): Don't allocate more than the RSS limit,
+	if this host has such a limit.
+
+2001-03-20  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, doc/textutils.texi: sort now accepts long options and
+        checks POSIX option syntax.
+
+	* doc/textutils.texi: Document --, -, sort long options, and
+	sort -o after files.
+
+	* src/sort.c: Include <getopt.h>.
+	(usage, main): Add support for long options, and check option
+	syntax as POSIX requires, though (as usual for GNU apps)
+	options can follow file names unless POSIXLY_CORRECT is set.
+	Many diagnostic revamped.
+	(long_options): New constant.
+	(badfieldspec): New arg MSGID.  Mark as noreturn.
+	(parse_field_count): New arg MSGID; if null, just return null on error.
+	(new_key): Renamed from key_init.  All callers changed.  Now allocates
+	the new key.
+
+2001-03-18  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0.13.
+
+	* tests/Fetish.pm: If the $DJDIR envvar is defined, set SHELL
+	to $DJDIR/bin/bash.exe.  Patch from Richard Dawe, based on a
+	suggestion from Eli Zaretskii.
+
+2001-03-17  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c, src/tail.c, src/uniq.c (usage):
+	Warn that the +N form will be withdrawn.
+	* doc/textutils.texi: Likewise.
+
+2001-03-08  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, doc/textutils.texi: Document pr changes.
+
+	* src/pr.c: Include mbswidth.h.
+	(standard_header, header, test_suite): Remove.
+	(date_format, date_text, file_text, header_width_available): New vars.
+	(long_options, main, init_header, usage):
+	Add new -D or --date-format option.
+	(CHARS_FOR_DATE_AND_PAGE, T_BUF_FMT, T_BUF_SIZE, NO_DATE): Remove.
+	(init_header): Allow arbitrary width for date format.  Change
+	"Page %5d" to "Page %d", since the code no longer assumes fixed width.
+	Do not assume that localtime succeeds.
+	(init_header, print_header, usage): Do not truncate headers.
+	(init_header, print_header): Defer width calculations until
+	page is printed, since "Page 100000" is wider than "Page 1".
+	Count columns, not bytes, in page headers.
+	Custom headers take up only the center, not the whole header.
+	(print_header): Use printf rather than fprintf(stdout).
+
+	* po/Makefile.in.in (install-data-yes): Install LC_TIME locale
+	for all packages, not just for fileutils.
+	(uninstall): Remove LC_TIME locale too.
+
+	* src/sys2.h (INT_STRLEN_BOUND): New macro.
+
+	* tests/pr/0F, tests/pr/0FF, tests/pr/2-S_f-t_notab,
+          tests/pr/2-Sf-t_notab, tests/pr/2f-t_notab,
+          tests/pr/2s_f-t_notab, tests/pr/2s_w60f-t_nota,
+          tests/pr/2sf-t_notab, tests/pr/2sw60f-t_notab,
+          tests/pr/2w60f-t_notab, tests/pr/3-0F, tests/pr/3-5l17f-t,
+          tests/pr/3-FF, tests/pr/3a2l17-FF, tests/pr/3a3f-0F,
+          tests/pr/3a3l15-t, tests/pr/3a3l8f-t, tests/pr/3b2l17-FF,
+          tests/pr/3b3f-0F, tests/pr/3b3f-0FF, tests/pr/3b3f-FF,
+          tests/pr/3b3l15-t, tests/pr/3b3l8f-t, tests/pr/3f-0F,
+          tests/pr/3f-FF, tests/pr/3l17f-t, tests/pr/3l24-t,
+          tests/pr/3ml17f-t, tests/pr/3ml24-FF, tests/pr/3ml24-t,
+          tests/pr/3ml24-t-FF, tests/pr/4-7l24-FF, tests/pr/4l24-FF,
+          tests/pr/a2l15-FF, tests/pr/a2l17-FF, tests/pr/a3-0F,
+          tests/pr/a3f-0F, tests/pr/a3f-0FF, tests/pr/a3f-FF,
+          tests/pr/a3l15-t, tests/pr/a3l17f-lm, tests/pr/a3l8f-t,
+          tests/pr/b2l15-FF, tests/pr/b2l17-FF, tests/pr/b3-0F,
+          tests/pr/b3f-0F, tests/pr/b3f-0FF, tests/pr/b3f-FF,
+          tests/pr/b3l15-t, tests/pr/b3l17f-lm, tests/pr/b3l8f-t,
+          tests/pr/FF, tests/pr/Ja3l17f-lm, tests/pr/Jb3l17f-lm,
+          tests/pr/Jml17f-lm-lo, tests/pr/l17f-t, tests/pr/l24-FF,
+          tests/pr/l24-t, tests/pr/ml17f-0F, tests/pr/ml17f-lm-lo,
+          tests/pr/ml17f-t, tests/pr/ml17f-t-0F, tests/pr/ml20-FF-t,
+          tests/pr/ml24-FF, tests/pr/ml24-t, tests/pr/ml24-t-FF,
+          tests/pr/n+2-5l17f-0FF, tests/pr/n+2l17f-0FF,
+          tests/pr/n+2l17f-bl, tests/pr/n+3-7l24-FF,
+          tests/pr/n+3l17f-0FF, tests/pr/n+3l17f-bl,
+          tests/pr/n+3ml13f-bl-FF, tests/pr/n+3ml17f-bl-tn,
+          tests/pr/n+3ml17f-tn-bl, tests/pr/n+4-8a2l17-FF,
+          tests/pr/n+4b2l10f-0FF, tests/pr/n+5-8b3l10f-FF,
+          tests/pr/n+5a3l6f-0FF, tests/pr/n+6a2l17-FF,
+          tests/pr/n+6b3l6f-FF, tests/pr/n+7l24-FF,
+          tests/pr/n+8l20-FF, tests/pr/nJml17f-lmlmlo,
+          tests/pr/nJml17f-lmlolm, tests/pr/nl17f-bl,
+          tests/pr/nN1+3l17f-bl, tests/pr/nN15l17f-bl,
+          tests/pr/nSml13-bl-FF, tests/pr/nSml13-t-t-FF,
+          tests/pr/nSml13-t-tFFFF, tests/pr/nSml17-bl-FF,
+          tests/pr/nSml17-t-t-FF, tests/pr/nSml17-t-tFFFF,
+          tests/pr/o3a3l17f-tn, tests/pr/o3a3Sl17f-tn,
+          tests/pr/o3a3Snl17f-tn, tests/pr/o3b3l17f-tn,
+          tests/pr/o3b3Sl17f-tn, tests/pr/o3b3Snl17f-tn,
+          tests/pr/o3Jml17f-lm-lo, tests/pr/o3ml17f-bl-tn,
+          tests/pr/o3mSl17f-bl-tn, tests/pr/o3mSnl17fbltn,
+          tests/pr/Test.pm, tests/pr/W-72l17f-ll, tests/pr/W20l17f-ll,
+          tests/pr/W26l17f-ll, tests/pr/W27l17f-ll,
+          tests/pr/W28l17f-ll, tests/pr/W35a3l17f-lm,
+          tests/pr/W35b3l17f-lm, tests/pr/W35Ja3l17f-lm,
+          tests/pr/W35Jb3l17f-lm, tests/pr/W35Jml17f-lmlo,
+          tests/pr/W35ml17f-lm-lo, tests/pr/W72Jl17f-ll,
+          tests/pr/w72l17f-ll:
+	Adjust to minor spacing changes in pr headers.
+
+2001-03-11  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (die): New message arg, to describe failures
+	better.  All callers changed.
+
+2001-03-11  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c: Decrease buffer size when only merging or checking.
+	(sort_size): Now the user-specified sort size.
+	(MIN_MERGE_BUFFER_SIZE): New macro.
+	(MIN_SORT_SIZE): Use it.
+	(merge_buffer_size): New variable.
+	(fillbuf): Increase merge_buffer_size if a longer line is encountered.
+	(checkfp, mergefps): Do not allocate a buffer smaller than
+	merge_buffer_size.
+	(sort): Use the default_sort_size if sort_size is zero.
+	(main): Do not set sort_size to default_sort_size.
+
+2001-03-06  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (sort): If all the input files are empty, create
+	an empty output file.
+	* tests/sort/Test.pm: Test for this.
+
+2001-03-13  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (merge): Move declarations of local variables into
+	the inner scope where they're used.
+	(sort): Likewise.
+
+2001-03-06  Paul Eggert  <eggert@sic.twinsun.com>
+
+	Avoid the need for a copy of the input file when the input and
+	output overlap, e.g. 'sort F -o F'.  With -m, though, a copy
+	is still needed sometimes.
+
+	* doc/textutils.texi: 'sort F -o F' no longer needs to copy F.
+
+	* src/sort.c: Do not include closeout.h.
+	(xfopen): Use stdout if *how != 'r'.
+	(mergefps): Remove FPS arg.
+	Open all input files, and close all files when done.
+	If OFP is null, open the output file (but after opening input files).
+	All callers changed.
+	(first_same_file): New function.
+	(sort, merge): Remove arg OFP; we now open the output file as needed.
+	All callers changed.
+	(merge): New arg MAX_MERGE.  All callers changed.
+	(sort):	For "sort F -o F", close the input before opening the output.
+	(main): Do not use close_stdout; 'sort' and 'merge' now close stdout.
+	(This also fixes a close-stdout-twice bug.)
+	Remove test for overlapping input and output files, as 'sort' no longer
+	needs to worry about overlap, and 'merge' checks for overlap itself.
+	Use first_same_file to inform 'merge' about how much to merge at
+	the top level, to avoid overlap.
+
+2001-03-12  Jim Meyering  <meyering@lucent.com>
+
+	`fmt --prefix=S' would not work properly for any string S containing
+	a byte with the high bit set.
+	* src/fmt.c (prefix): Declare to be of type unsigned char, not `char'.
+	(get_prefix): Likewise for local, `p'.
+	Reported by François Pinard.
+
+	Add a test for the above-fixed problem.
+	* tests/fmt: New directory/files.
+	* configure.in (AC_OUTPUT): Add tests/fmt/Makefile.
+	* tests/Makefile.am (SUBDIRS): Add fmt.
+
+2001-03-05  Andreas Schwab  <schwab@suse.de>
+
+	* src/tac.c (save_stdin): Use mkstemp to create temporary file.
+
+2001-03-09  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.maint (my_distdir): Define new variable, and use this
+	in place of most old uses of $(distdir).
+
+	* tests/help-version: Ensure that /dev/full is a character device
+	(using test -c) as well as being writable, before trying to write to it.
+	Otherwise, the test could mistakenly append a newline to an existing,
+	regular, writable, /dev/full file.
+	Suggested by Ulrich Drepper.
+
+2001-03-08  Jim Meyering  <meyering@lucent.com>
+
+	* tests/sha1sum/sample-vec: Insert the `--text' argument for each test.
+	Reported by Matthew Smith.
+
+2001-03-04  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.maint (my_distdir): Define.
+	Use it in place of $(distdir) almost everywhere.
+
+	* Version 2.0.12.
+
+	* Makefile.maint (alpha): Use $(PACKAGE)-$(VERSION), not $(distdir),
+	since the latter now has a `$(top_distdir)/' prefix.
+
+2001-03-01  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (die): New function.
+	(create_temp_file, xfopen, xfclose, write_bytes, sort_buffer_size,
+	fillbuf, main): Use it to regularize error messages.  The only change
+	in behavior is that write_bytes and the final close used to say "write
+	error" but now give just the output file name, which should be enough.
+
+2001-03-01  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (xfclose): Add FILE arg, and report the file name
+	on error.  All callers changed.
+
+2001-03-01  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (main): When fclose (stdin) fails, do not mention
+	the output file in the error message; mention "-" instead.
+
+2001-02-28  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (xfopen): Set have_read_stdin to 1 only if file is "-".
+	Use fopen_safer, not fopen, to avoid subtle bugs when fopen returns
+	stdin, stdout, or stderr.
+	(xfclose): stdout is no longer a special case.
+	(main): Close output file, don't just flush it; there might be
+	an error on the close.
+
+2001-02-27  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (initbuf): If the desired size cannot be
+	allocated, repeatedly halve it until allocation succeeds.
+	Reported by Solar Designer.
+
+2001-02-26  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (parse_field_count): Comment fix.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c: Tune allocation and comparison of nodes
+	representing temp files.  This improved CPU performance of
+	'sort -S 1 *.[ch]' by 17% on my host.
+
+	(struct tempnode): name member now uses struct hack.
+	(temphead): Now a pointer, not a structure.  All uses changed.
+	(create_temp_file): Allocate node using struct hack.
+	(zaptemp): Free node using struct hack.  Use pointer comparison, not
+	string comparison.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (eolchar, trim_trailing_blanks): Now static.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	'sort' race condition fixes.
+
+	Defend against a DoS attack where someone else creates a
+	temporary file with the same name as ours.  Use mkstemp to do
+	this, supplying our own mkstemp if the system doesn't have one.
+
+	Also, fix a race condition during cleanup on hosts without
+	sigaction.
+
+	* src/sort.c (NAME_MAX_IN_DIR): Remove.
+	(sigprocmask, sigset_t): New macros, defined only on older hosts.
+	(caught_signals): New var.
+	(xtmpfopen, tempname): Removed.
+	(create_temp_file): New function, combining the functions of the old
+	xtmpfopen and tempname.  All callers changed.
+	Use mkstemp to create the file.
+	(sighandler): On hosts without sigaction, ignore signals while
+	cleaning up, instead of letting them interrupt cleanup.
+	(main): Initialize caught_signals.  On hosts with sigaction, block all
+	caught signals while handling one.  Remove duplicate code.
+
+2001-02-22  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (keycompare): Move declarations of locals, lena and lenb,
+	into the inner scope where they are used.
+
+2001-02-19  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (AUTHORS): Add Paul Eggert.
+
+	* src/wc.c (wc): Rename innermost `buf' to avoid shadowing warning.
+	(wc): Rename local `wc' to avoid shadowing function name.
+
+2001-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	Fix a race condition: freed storage accessed during a signal handler.
+
+	* src/sort.c (struct tempnode.next): Now volatile.
+	(zaptemp): Free the file name after removing it from the temp list,
+	not before, because a signal can arrive between the two actions
+	and cleanup () traverses the list.
+
+2001-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	Check for input size, and do not overallocate memory.
+	Also check for memory quotas.
+
+	Revamp storage management so that line tables and character data are
+	taken from the same buffer.  Line tables are now in reverse order,
+	since they grow down while the character data grow up.
+
+	* src/sort.c:
+	(<sys/resource.h>): Include if HAVE_SYS_RESOURCE_H.
+	(struct rlimit, getrlimit): Define a replacement if RLIMIT_DATA
+	is not defined.
+	(RLIMIT_AS): Define to RLIMIT_DATA if not defined.
+	(struct lines): Remove.
+	(struct buffer): New members nlines, line_bytes, eof.
+	Remove member newline_free; no longer needed, since the code no longer
+	runs out of line table space.
+	(SORTALLOC_MIN, SORTALLOC_DEFAULT_MIN): Remove.
+	(sort_size): Renamed from sortalloc; now applies to the sum of the
+	character data and the line table, not just the character data.
+	(MIN_SORT_SIZE, INPUT_FILE_SIZE_GUESS): New macros.
+	(linelength): remove.
+	(specify_sort_size): Don't worry about the distinction between the
+	character data and the line table; that is now the caller's
+	responsibility.
+	(default_sort_size): Return the value, instead of being executed for
+	side effect.  Return half of available memory, or 1/16 of total memory,
+	whichever is greater; except do not exceed 1/2 of quota.
+	(sort_buffer_size): New function.
+	(initbuf): New arg LINE_BYTES.  Ensure that the line array is properly
+	aligned.  Initialize the new set of struct buffer members.
+	(buffer_linelim): New function.
+	(fillbuf): Return int, not size_t, since the callers merely care
+	whether the result is nonzero.  New arg FILE so that error messages
+	can report the file name.  Keep track of eof.  Initialize the line
+	table too, taking its memory from the input buffer's memory; this
+	subsumes the old findlines function and removes the need for worrying
+	about running out of line table entries.
+	(checkfp, mergefps, sortlines, merge, sort): Adjust to the new storage
+	management regime, in particular the fact that line tables are now
+	filled in by fillbuf and are in reverse order.
+	(checkfp): Now takes char *, not const char *, since subroutines
+	require that now.  Rewrite to avoid lint and duplicate code.
+	If line length alloc calculation overflows,
+	simply allocate enough memory to hold the line.
+	(mergefps): New arg FILES, used for buffer size calculation and error
+	messages.  Rewrite to avoid lint.  Do not loop if savealloc*2
+	overflows.
+	(mergefps, merge): Zap temporary files eagerly rather than lazily;
+	this is needed because we now pass FILES to mergefps.
+	(sortlines): Args now point at end of arrays, not at beginnings.
+	(sort): Do not allocate temporary line array for sortlines;
+	instead, take the space from the same buffer.
+	(main): Adjust to sort_size and default_sort_size changes.
+
 2001-02-18  Jim Meyering  <meyering@lucent.com>

 	Rename test input files to avoid conflicts on case-insensitive
@@ -824,7 +1236,7 @@
 	(squeeze_filter, set_initialize, main): Use size_t and ssize_t in
 	place of long and int in several decls.
 	(read_and_delete, read_and_xlate): Likewise, and remove assertion.
-	* tests/tr/Test.pm: (o-rep-1, o-rep-2): New tests.
+	* tests/tr/Test.pm (o-rep-1, o-rep-2): New tests.

 	* src/cut.c: Correct copying notice to use GPL, per author's request.
 	* src/paste.c: Likewise.
@@ -1021,7 +1433,7 @@

 	* lib/linebuffer.c (readline): Do not leave room for an extra
 	byte after the newline; it's no longer needed.
-	* src/sort.c: (sortalloc, mergealloc, fillbuf, checkfp, mergefps):
+	* src/sort.c (sortalloc, mergealloc, fillbuf, checkfp, mergefps):
 	Likewise.

 	* lib/memcoll.c (memcoll): The two arguments cannot be
@@ -1624,7 +2036,7 @@
 	* src/sys2.h (TOLOWER): Define.
 	(TOUPPER): Define.
 	* src/join.c (TOLOWER): Remove definition.
-	* src/md5sum.c: (TOLOWER): Remove definition.
+	* src/md5sum.c (TOLOWER): Remove definition.

 1999-04-30  Jim Meyering  <meyering@ascend.com>

@@ -1776,7 +2188,7 @@

 1999-03-13  Jim Meyering  <meyering@ascend.com>

-	* src/tac.c: (tac_mem): `#if-0'-out this unused function.
+	* src/tac.c (tac_mem): `#if-0'-out this unused function.
 	(tac_stdin_to_mem): Likewise.

 	* doc/textutils.texi (cut invocation): Describe --output-delimiter.
@@ -2606,7 +3018,7 @@

 1998-01-16  Jim Meyering  <meyering@na-net.ornl.gov>

-	* src/sort.c: (mergefps): Add braces to avoid ambiguous `else' stmt.
+	* src/sort.c (mergefps): Add braces to avoid ambiguous `else' stmt.
 	(nls_set_fraction): Likewise.

 	* src/sort.c: Guard inclusion of langinfo.h also with HAVE_LANGINFO_H,
@@ -2898,7 +3310,7 @@

 1997-10-14  Jim Meyering  <meyering@na-net.ornl.gov>

-	* src/sort.c: (_NL_ITEM) [!defined]: Define.
+	* src/sort.c (_NL_ITEM) [!defined]: Define.
 	From from Ørn E. Hansen.

 	* src/sort.c: Use STREQ in place of most uses of strcmp.
@@ -4337,7 +4749,7 @@ Wed Feb 28 20:32:48 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	(noinst_HEADERS): Rename from HEADERS.
 	(INCLUDES): Remove -I.. and -I$(srcdir).  automake-0.30 adds these
 	to DEFS automatically.
-	* lib/Makefile.am: (noinst_HEADERS): Rename from HEADERS.
+	* lib/Makefile.am (noinst_HEADERS): Rename from HEADERS.

 Wed Feb 21 18:56:27 1996  Jim Meyering  (meyering@na-net.ornl.gov)

@@ -4606,7 +5018,7 @@ Tue Nov 14 23:10:54 1995  Jim Meyering  (meyering@comco.com)
 	(cleanup_fatal): Renamed from cleanup.  Call cleanup, then exit.
 	Update callers.

-	* tac.c: (cleanup): Don't exit.
+	* tac.c (cleanup): Don't exit.
 	(cleanup_fatal): New function.  Call cleanup, then exit.
 	(sighandler): New function.
 	(cleanup_fatal): Renamed from cleanup.  Call cleanup, then exit.
@@ -4866,7 +5278,7 @@ Sat Sep 23 15:43:46 1995  Jim Meyering  (meyering@comco.com)

 	* Makefile.in (DISTFILES): Add README.alpha.

-	* lib/Makfile.in: (GETOPT, MEMCHR, REGEX): New variables.
+	* lib/Makfile.in (GETOPT, MEMCHR, REGEX): New variables.
 	(OBJECTS): Use them instead of hardcoding object file names.
 	Suggested by Ulrich Drepper.

@@ -4943,7 +5355,7 @@ Sun Jul 30 00:01:58 1995  Jim Meyering  (meyering@comco.com)

 	* md5sum.c (md5_check): Use getline instead of fgets.

-	* lib/Makefile.in: (SOURCES): Add getline.c.
+	* lib/Makefile.in (SOURCES): Add getline.c.
 	(OBJECTS): Add getline.o.
 	(DISTFILES): Add getline.h.
 	(getline.o): Depend on getline.h.
@@ -5016,7 +5428,7 @@ Fri Jul 21 01:21:49 1995  Jim Meyering  (meyering@comco.com)
 	(split_3): No longer parse the `new format.'  There is only one
 	valid format now: the compatible one.

-	* lib/Makefile.in: (SOURCES): Add md5.c.
+	* lib/Makefile.in (SOURCES): Add md5.c.
 	(OBJECTS): Add md5.o.
 	(DISTFILES): Add md5.h.
 	(md5.o): Depend on md5.h.
@@ -5216,10 +5628,10 @@ Sun Jun 11 00:39:50 1995  Jim Meyering  (meyering@comco.com)

 	* md5sum.c: New file.  From Ulrich Drepper.
 	* md5-test.rfc: New file.
-	* Makefile.in: (PROGS): Add md5sum.
+	* Makefile.in (PROGS): Add md5sum.
 	(check): Run a recursive make in each subdirectory.
-	* man/Makefile.in: (MANFILES): Add md5sum.1.
-	* src/Makefile.in: (SOURCES): Add md5sum.c.
+	* man/Makefile.in (MANFILES): Add md5sum.1.
+	* src/Makefile.in (SOURCES): Add md5sum.c.
 	(OBJECTS): Add md5sum.o.
 	(PROGS): Add md5sum.
 	(check): Add basic checks for md5sum.
@@ -5340,7 +5752,7 @@ Thu Apr 20 23:09:33 1995  Jim Meyering  (meyering@comco.com)

 Tue Apr 18 22:57:43 1995  Jim Meyering  (meyering@comco.com)

-	* configure.in: (AC_OUTPUT): Use echo, not date, to avoid creating
+	* configure.in (AC_OUTPUT): Use echo, not date, to avoid creating
 	unnecessary conflicts for people using version control software
 	like RCS and CVS.
 	(AC_ARG_PROGRAM): Use it.
--- a/old/textutils/NEWS
+++ b/old/textutils/NEWS
@@ -1,4 +1,29 @@
 Changes in release 2.1
+[2.0.14]
+* sort now accepts long options like "--reverse" and "--".
+* sort now checks option syntax as POSIX requires, except that (as usual
+  for GNU) options can follow file names unless POSIXLY_CORRECT is set.
+  For example, invalid positional combinations like "sort +1 -r -2" are
+  now rejected as per POSIX.
+* The next POSIX standard will require that obsolescent 'sort'
+  positional options like +1 be treated as file names, not options.
+  Please use 'sort -k' instead.
+[2.0.13]
+* pr accepts new -D or --date option, to specify date format.
+* The following changes are required by POSIX:
+  - If POSIXLY_CORRECT is set, dates in pr headers now look something like
+    'Dec  4 23:59 2001', with the exact appearance affected by LC_TIME.
+  - pr -h now affects only the center header string, not the entire header.
+  - pr no longer truncates headers.
+* Spacing in pr headers has been adjusted slightly.
+* `fmt --prefix=S' now works when S contains a byte with the high bit set
+[2.0.12]
+* sort has improved performance when using very little main memory
+* sort has improved memory management
+* sort is no longer susceptible to certain denial of service attacks
+* sort no longer suffers from a race condition whereby an interrupt received
+    during cleanup could cause it to fail to remove temporary files.
+    This problem could arise only on hosts without sigaction.
 [2.0.11]
 * sort accepts new -S SIZE option, to specify main-memory usage.
 [2.0.10]
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -150,13 +150,11 @@ install-data-yes: all
 	      true; \
 	    fi; \
 	  fi; \
-	  if test "$(PACKAGE)" = "fileutils"; then \
-	    timedir=$$destdir/$$lang/LC_TIME; \
-	    rm -fr $$timedir; \
-	    ln -s LC_MESSAGES $$timedir \
-	    || (mkdir $$timedir && ln $$dir/* $$timedir); \
-	    echo "installing $$timedir as an alias for $$dir"; \
-	  fi; \
+	  timedir=$$destdir/$$lang/LC_TIME; \
+	  rm -fr $$timedir; \
+	  ln -s LC_MESSAGES $$timedir \
+	  || (mkdir $$timedir && ln $$dir/* $$timedir); \
+	  echo "installing $$timedir as an alias for $$dir"; \
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
 	  if test -x "$(MKINSTALLDIRS)"; then \
@@ -178,10 +176,13 @@ uninstall:
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  for dir in $(localedir) $(gnulocaledir); do \
+	    for lc in LC_MESSAGES LC_TIME; do \
+	      for x in '' .m; do \
+		rm -f $(DESTDIR)$$dir/$$lang/$$lc/$(PACKAGE)$(INSTOBJEXT)$$x; \
+	      done; \
+	    done; \
+	  done; \
 	done

 check: all
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -47,12 +47,17 @@

 #define AUTHORS "Q. Frank Xia"

+#include <stdio.h>
+#include "system.h"
+
+#if !defined UINT_FAST32_MAX && !defined uint_fast32_t
+# define uint_fast32_t unsigned int
+#endif
+
 #ifdef CRCTAB

-# include <stdio.h>
-
-# define BIT(x)	( (unsigned long)1 << (x) )
-# define SBIT	BIT(31)
+# define BIT(x)	((uint_fast32_t) 1 << (x))
+# define SBIT	BIT (31)

 /* The generating polynomial is

@@ -61,47 +66,48 @@

  The i bit in GEN is set if X^i is a summand of G(X) except X^32.  */

-# define GEN     (BIT(26)|BIT(23)|BIT(22)|BIT(16)|BIT(12)|BIT(11)|BIT(10)\
-                |BIT(8) |BIT(7) |BIT(5) |BIT(4) |BIT(2) |BIT(1) |BIT(0));
+# define GEN	(BIT (26) | BIT (23) | BIT (22) | BIT (16) | BIT (12) \
+		 | BIT (11) | BIT (10) | BIT (8) | BIT (7) | BIT (5) \
+		 | BIT (4) | BIT (2) | BIT (1) | BIT (0))

-static unsigned long r[8];
+static uint_fast32_t r[8];

 static void
-fill_r ()
+fill_r (void)
 {
  int i;

  r[0] = GEN;
  for (i = 1; i < 8; i++)
-    r[i] = (r[i - 1] & SBIT) ? (r[i - 1] << 1) ^ r[0] : r[i - 1] << 1;
+    r[i] = (r[i - 1] << 1) ^ ((r[i - 1] & SBIT) ? GEN : 0);
 }

-static unsigned long
-remainder (m)
-     int m;
+static uint_fast32_t
+remainder (int m)
 {
-  unsigned long rem = 0;
+  uint_fast32_t rem = 0;
  int i;

  for (i = 0; i < 8; i++)
    if (BIT (i) & m)
-      rem = rem ^ r[i];
+      rem ^= r[i];

  return rem & 0xFFFFFFFF;	/* Make it run on 64-bit machine.  */
 }

 int
-main ()
+main (void)
 {
  int i;

  fill_r ();
-  printf ("unsigned long crctab[256] = {\n  0x0");
+  printf ("static uint_fast32_t crctab[256] =\n{\n  0x0");
  for (i = 0; i < 51; i++)
    {
      printf (",\n  0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X",
-	remainder (i * 5 + 1), remainder (i * 5 + 2), remainder (i * 5 + 3),
-	      remainder (i * 5 + 4), remainder (i * 5 + 5));
+	      remainder (i * 5 + 1), remainder (i * 5 + 2),
+	      remainder (i * 5 + 3), remainder (i * 5 + 4),
+	      remainder (i * 5 + 5));
    }
  printf ("\n};\n");
  exit (EXIT_SUCCESS);
@@ -109,13 +115,12 @@ main ()

 #else /* !CRCTAB */

-# include <stdio.h>
 # include <getopt.h>
 # include <sys/types.h>
-# include "system.h"
 # include "closeout.h"
 # include "long-options.h"
 # include "error.h"
+# include "human.h"

 /* Number of bytes to read at once.  */
 # define BUFLEN (1 << 16)
@@ -128,7 +133,7 @@ static struct option const long_options[] =
  {0, 0, 0, 0}
 };

-static unsigned long const crctab[256] =
+static uint_fast32_t crctab[256] =
 {
  0x0,
  0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B,
@@ -196,10 +201,12 @@ static int
 cksum (const char *file, int print_name)
 {
  unsigned char buf[BUFLEN];
-  unsigned long crc = 0;
-  long length = 0;
-  long bytes_read;
+  uint_fast32_t crc = 0;
+  uintmax_t length = 0;
+  size_t bytes_read;
  register FILE *fp;
+  char hbuf[LONGEST_HUMAN_READABLE + 1];
+  char *hp;

  if (STREQ (file, "-"))
    {
@@ -223,9 +230,11 @@ cksum (const char *file, int print_name)
    {
      unsigned char *cp = buf;

+      if (length + bytes_read < length)
+	error (EXIT_FAILURE, 0, _("%s: file too long"), file);
      length += bytes_read;
      while (bytes_read--)
-	crc = (crc << 8) ^ crctab[((crc >> 24) ^ *(cp++)) & 0xFF];
+	crc = (crc << 8) ^ crctab[((crc >> 24) ^ *cp++) & 0xFF];
    }

  if (ferror (fp))
@@ -242,19 +251,20 @@ cksum (const char *file, int print_name)
      return -1;
    }

-  bytes_read = length;
-  while (bytes_read > 0)
-    {
-      crc = (crc << 8) ^ crctab[((crc >> 24) ^ bytes_read) & 0xFF];
-      bytes_read >>= 8;
-    }
+  hp = human_readable (length, hbuf, 1, 1);
+
+  for (; length; length >>= 8)
+    crc = (crc << 8) ^ crctab[((crc >> 24) ^ length) & 0xFF];

  crc = ~crc & 0xFFFFFFFF;

-  printf ("%lu %ld", crc, length);
  if (print_name)
-    printf (" %s", file);
-  putchar ('\n');
+    printf ("%u %s %s\n", (unsigned) crc, hp, file);
+  else
+    printf ("%u %s\n", (unsigned) crc, hp);
+
+  if (ferror (stdout))
+    error (EXIT_FAILURE, errno, "-: %s", _("write error"));

  return 0;
 }
@@ -313,16 +323,12 @@ main (int argc, char **argv)
 	}
    }

-  if (optind >= argc)
-    {
-      if (cksum ("-", 0) < 0)
-	errors = 1;
-    }
+  if (optind == argc)
+    errors |= cksum ("-", 0);
  else
    {
      for (i = optind; i < argc; i++)
-	if (cksum (argv[i], 1) < 0)
-	  errors = 1;
+	errors |= cksum (argv[i], 1);
    }

  if (have_read_stdin && fclose (stdin) == EOF)
--- a/src/date.c
+++ b/src/date.c
@@ -147,6 +147,7 @@ specifies Coordinated Universal Time.  Interpreted sequences are:\n\
  %%b   locale's abbreviated month name (Jan..Dec)\n\
  %%B   locale's full month name, variable length (January..December)\n\
  %%c   locale's date and time (Sat Nov 04 12:02:33 EST 1989)\n\
+  %%C   century (year divided by 100 and truncated to an integer) [00-99]\n\
  %%d   day of month (01..31)\n\
  %%D   date (mm/dd/yy)\n\
  %%e   day of month, blank padded ( 1..31)\n\
--- a/src/dd.c
+++ b/src/dd.c
@@ -49,7 +49,7 @@
 #endif

 #ifndef S_TYPEISSHM
-# define S_TYPEISSHM(Mode) 0
+# define S_TYPEISSHM(Stat_ptr) 0
 #endif

 #define ROUND_UP_OFFSET(X, M) ((M) - 1 - (((X) + (M) - 1) % (M)))
@@ -57,10 +57,14 @@
 			   + ROUND_UP_OFFSET ((char *)(Ptr) - (char *)0, (M)))

 #define max(a, b) ((a) > (b) ? (a) : (b))
-#define output_char(c) \
-  do { \
-  obuf[oc++] = (c); if (oc >= output_blocksize) write_output (); \
-  } while (0)
+#define output_char(c)				\
+  do						\
+    {						\
+      obuf[oc++] = (c);				\
+      if (oc >= output_blocksize)		\
+	write_output ();			\
+    }						\
+  while (0)

 /* Default input and output blocksize. */
 #define DEFAULT_BLOCKSIZE 512
@@ -317,7 +321,8 @@ Each KEYWORD may be:\n\
  ucase     change lower case to upper case\n\
  swab      swap every pair of input bytes\n\
  noerror   continue after read errors\n\
-  sync      pad every input block with NULs to ibs-size\n\
+  sync      pad every input block with NULs to ibs-size; when used\n\
+              with block or unblock, pad with spaces rather than NULs\n\
 "));
      puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
    }
@@ -941,7 +946,7 @@ dd_copy (void)
    {
      /* FIXME: this loses for
 	 % ./dd if=dd seek=1 |:
-	 ./dd: standard output: Bad file number
+	 ./dd: standard output: Bad file descriptor
 	 0+0 records in
 	 0+0 records out
 	 */
@@ -961,7 +966,9 @@ dd_copy (void)
 	 whatever data we are able to read is followed by zeros.
 	 This minimizes data loss. */
      if ((conversions_mask & C_SYNC) && (conversions_mask & C_NOERROR))
-	memset ((char *) ibuf, 0, input_blocksize);
+	memset ((char *) ibuf,
+		(conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0',
+		input_blocksize);

      nread = safe_read (STDIN_FILENO, ibuf, input_blocksize);

@@ -1000,7 +1007,8 @@ dd_copy (void)
 	    {
 	      if (!(conversions_mask & C_NOERROR))
 		/* If C_NOERROR, we zeroed the block before reading. */
-		memset ((char *) (ibuf + n_bytes_read), 0,
+		memset ((char *) (ibuf + n_bytes_read),
+			(conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0',
 			input_blocksize - n_bytes_read);
 	      n_bytes_read = input_blocksize;
 	    }
@@ -1168,7 +1176,7 @@ main (int argc, char **argv)
 	  if (ftruncate (STDOUT_FILENO, o) != 0
 	      && (S_ISREG (stdout_stat.st_mode)
 		  || S_ISDIR (stdout_stat.st_mode)
-		  || S_TYPEISSHM (stdout_stat.st_mode)))
+		  || S_TYPEISSHM (&stdout_stat)))
 	    {
 	      char buf[LONGEST_HUMAN_READABLE + 1];
 	      error (1, errno, _("advancing past %s bytes in output file %s"),
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -1,5 +1,5 @@
 /* GNU fmt -- simple text formatter.
-   Copyright (C) 1994-2000 Free Software Foundation, Inc.
+   Copyright (C) 1994-2001 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
@@ -185,7 +185,7 @@ static bool split;
 static bool uniform;

 /* Prefix minus leading and trailing spaces (default "").  */
-static const char *prefix;
+static const unsigned char *prefix;

 /* User-supplied maximum line width (default WIDTH).  The only output
   lines
@@ -652,7 +652,7 @@ static int
 get_prefix (FILE *f)
 {
  register int c;
-  register const char *p;
+  register const unsigned char *p;

  in_column = 0;
  c = get_space (f, getc (f));
--- a/src/ls.c
+++ b/src/ls.c
@@ -70,11 +70,6 @@
 #include <pwd.h>
 #include <getopt.h>

-/* Get MB_LEN_MAX.  */
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
 /* Get MB_CUR_MAX.  */
 #if HAVE_STDLIB_H
 # include <stdlib.h>
@@ -345,16 +340,13 @@ char *program_name;
   `files_index' is the number actually in use.  */

 /* Address of block containing the files that are described.  */
-
-static struct fileinfo *files;
+static struct fileinfo *files;  /* FIXME: rename this to e.g. cwd_file */

 /* Length of block that `files' points to, measured in files.  */
-
-static int nfiles;
+static int nfiles;  /* FIXME: rename this to e.g. cwd_n_alloc */

 /* Index of first unused in `files'.  */
-
-static int files_index;
+static int files_index;  /* FIXME: rename this to e.g. cwd_n_used */

 /* When nonzero, in a color listing, color each symlink name according to the
   type of file it points to.  Otherwise, color them according to the `ln'
@@ -665,10 +657,11 @@ enum
  BLOCK_SIZE_OPTION = CHAR_MAX + 1,
  COLOR_OPTION,
  FORMAT_OPTION,
-  FULL_TIME,
+  FULL_TIME_OPTION,
  INDICATOR_STYLE_OPTION,
  QUOTING_STYLE_OPTION,
  SHOW_CONTROL_CHARS_OPTION,
+  SI_OPTION,
  SORT_OPTION,
  TIME_OPTION
 };
@@ -679,7 +672,7 @@ static struct option const long_options[] =
  {"escape", no_argument, 0, 'b'},
  {"directory", no_argument, 0, 'd'},
  {"dired", no_argument, 0, 'D'},
-  {"full-time", no_argument, 0, FULL_TIME},
+  {"full-time", no_argument, 0, FULL_TIME_OPTION},
  {"human-readable", no_argument, 0, 'h'},
  {"inode", no_argument, 0, 'i'},
  {"kilobytes", no_argument, 0, 'k'},
@@ -693,7 +686,7 @@ static struct option const long_options[] =
  {"ignore-backups", no_argument, 0, 'B'},
  {"classify", no_argument, 0, 'F'},
  {"file-type", no_argument, 0, 'p'},
-  {"si", no_argument, 0, 'H'},
+  {"si", no_argument, 0, SI_OPTION},
  {"ignore", required_argument, 0, 'I'},
  {"indicator-style", required_argument, 0, INDICATOR_STYLE_OPTION},
  {"dereference", no_argument, 0, 'L'},
@@ -853,6 +846,7 @@ main (int argc, char **argv)
 {
  register int i;
  register struct pending *thispend;
+  unsigned int n_files;

  program_name = argv[0];
  setlocale (LC_ALL, "");
@@ -900,8 +894,10 @@ main (int argc, char **argv)

  clear_files ();

-  if (i < argc)
+  n_files = argc - i;
+  if (0 < n_files)
    dir_defaulted = 0;
+
  for (; i < argc; i++)
    {
      gobble_file (argv[i], unknown, 1, "");
@@ -928,7 +924,7 @@ main (int argc, char **argv)
      if (pending_dirs)
 	DIRED_PUTCHAR ('\n');
    }
-  else if (pending_dirs && pending_dirs->next == 0)
+  else if (n_files <= 1 && pending_dirs && pending_dirs->next == 0)
    print_dir_name = 0;

  while (pending_dirs)
@@ -1127,6 +1123,12 @@ decode_switches (int argc, char **argv)
 	  break;

 	case 'H':
+	  error (0, 0,
+		 _("\
+Warning: the meaning of `-H' will change in the future to conform to POSIX.\n\
+Use `--si' for the old meaning."));
+	  /* Fall through.  */
+	case SI_OPTION:
 	  output_block_size = -1000;
 	  break;

@@ -1267,7 +1269,9 @@ decode_switches (int argc, char **argv)
 	  break;

 	case '1':
-	  format = one_per_line;
+	  /* -1 has no effect after -l.  */
+	  if (format != long_format)
+	    format = one_per_line;
 	  break;

 	case SORT_OPTION:
@@ -1283,7 +1287,7 @@ decode_switches (int argc, char **argv)
 	  format = XARGMATCH ("--format", optarg, format_args, format_types);
 	  break;

-	case FULL_TIME:
+	case FULL_TIME_OPTION:
 	  format = long_format;
 	  full_time = 1;
 	  break;
@@ -2637,7 +2641,7 @@ quote_name (FILE *out, const char *name, struct quoting_options const *options)

  if (qmark_funny_chars)
    {
-#if HAVE_MBRTOWC && (MB_LEN_MAX > 1)
+#if HAVE_MBRTOWC
      if (MB_CUR_MAX > 1)
 	{
 	  const char *p = buf;
@@ -2758,7 +2762,7 @@ quote_name (FILE *out, const char *name, struct quoting_options const *options)
  else
    {
      /* Assume unprintable characters have a displayed_width of 1.  */
-#if HAVE_MBRTOWC && (MB_LEN_MAX > 1)
+#if HAVE_MBRTOWC
      if (MB_CUR_MAX > 1)
 	displayed_width = mbsnwidth (buf, len,
 				     (MBSW_ACCEPT_INVALID
@@ -3274,7 +3278,9 @@ Sort entries alphabetically if none of -cftuSUX nor --sort.\n\
  -g                         (ignored)\n\
  -G, --no-group             inhibit display of group information\n\
  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M 2G)\n\
-  -H, --si                   likewise, but use powers of 1000 not 1024\n\
+      --si                   likewise, but use powers of 1000 not 1024\n\
+  -H                         same as `--si' for now; soon to change\n\
+                               to conform to POSIX\n\
      --indicator-style=WORD append indicator with style WORD to entry names:\n\
                               none (default), classify (-F), file-type (-p)\n\
  -i, --inode                print index number of each file\n\
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -1,5 +1,5 @@
 /* mkdir -- make directories
-   Copyright (C) 90, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 90, 1995-2001 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
@@ -162,19 +162,17 @@ main (int argc, char **argv)
 	{
 	  const char *dir = argv[optind];
 	  int dir_created;
-	  int t_errno;
 	  fail = make_dir (dir, dir, newmode, &dir_created);
-	  t_errno = errno;
 	  if (fail)
 	    {
 	      /* make_dir already gave a diagnostic.  */
 	    }
-	  else if (!create_parents && !dir_created && (t_errno = EEXIST))
+	  else if (!create_parents && !dir_created)
 	    {
 	      /* make_dir `succeeds' when DIR already exists.
 		 In that case, mkdir must fail, unless --parents (-p)
 		 was specified.  */
-	      error (0, t_errno, _("cannot create directory %s"),
+	      error (0, EEXIST, _("cannot create directory %s"),
 		     quote (dir));
 	      fail = 1;
 	    }
--- a/src/pr.c
+++ b/src/pr.c
@@ -1,5 +1,5 @@
 /* pr -- convert text files for printing.
-   Copyright (C) 88, 91, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 88, 91, 1995-2001 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
@@ -150,6 +150,8 @@

   -d, --double-space	Double space the output.

+   -D FORMAT, --date-format=FORMAT  Use FORMAT for the header date.
+
   -e[CHAR[WIDTH]], --expand-tabs[=CHAR[WIDTH]]
 		Expand tabs to spaces on input.  Optional argument CHAR
 		is the input TAB character. (Default is TAB).  Optional
@@ -162,12 +164,7 @@

   -h HEADER, --header=HEADER
 		Replace the filename in the header with the string HEADER.
-		Checking and left-hand-side truncation of the length of the
-		standard and custom header string. A centered header is used.
-		The format of date and time has been shortened
-		to  yyyy-mm-dd HH:MM  to give place to a maximal filename
-		information.
-		-h ""  now prints a blank line header. -h"" shows an error.
+		A centered header is used.

   -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]
 		Replace spaces with tabs on output.  Optional argument
@@ -320,6 +317,7 @@
 #include "system.h"
 #include "closeout.h"
 #include "error.h"
+#include "mbswidth.h"
 #include "xstrtol.h"

 /* The official name of this program (e.g., no `g' prefix).  */
@@ -506,10 +504,6 @@ static int print_a_FF = FALSE;
   to print after it. */
 static int print_a_header;

-/* (-h) True means we're using the standard header rather than a
-   customized one specified by the -h flag. */
-static int standard_header = TRUE;
-
 /* (-f) True means use formfeeds instead of newlines to separate pages. */
 static int use_form_feed = FALSE;

@@ -711,8 +705,15 @@ static int pad_vertically;
 /* (-h) String of characters used in place of the filename in the header. */
 static char *custom_header;

-/* String containing the date, filename or custom header, and "Page ". */
-static char *header;
+/* (-D) Date format for the header.  */
+static char const *date_format;
+
+/* Date and file name for the header.  */
+static char *date_text;
+static char const *file_text;
+
+/* Output columns available, not counting the date and file name.  */
+static int header_width_available;

 static int *clump_buff;

@@ -722,10 +723,6 @@ static int *clump_buff;
   structure COLUMN. */
 static int last_line = FALSE;

-/* If nonzero, print a non-variable date and time with the header
-   -h HEADER using pr test-suite */
-static int test_suite;
-
 /* For long options that have no equivalent short option, use a
   non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
 enum
@@ -736,12 +733,12 @@ enum

 static struct option const long_options[] =
 {
-  {"test", no_argument, &test_suite, 1},
  {"pages", required_argument, NULL, PAGES_OPTION},
  {"columns", required_argument, NULL, COLUMNS_OPTION},
  {"across", no_argument, NULL, 'a'},
  {"show-control-chars", no_argument, NULL, 'c'},
  {"double-space", no_argument, NULL, 'd'},
+  {"date-format", required_argument, NULL, 'D'},
  {"expand-tabs", optional_argument, NULL, 'e'},
  {"form-feed", no_argument, NULL, 'f'},
  {"header", required_argument, NULL, 'h'},
@@ -862,7 +859,7 @@ main (int argc, char **argv)
 		: NULL);

  while ((c = getopt_long (argc, argv,
-			   "-0123456789abcde::fFh:i::Jl:mn::N:o:rs::S::tTvw:W:",
+			   "-0123456789abcdD:e::fFh:i::Jl:mn::N:o:rs::S::tTvw:W:",
 			   long_options, NULL))
 	 != -1)
    {
@@ -932,6 +929,9 @@ main (int argc, char **argv)
 	case 'd':
 	  double_space = TRUE;
 	  break;
+	case 'D':
+	  date_format = optarg;
+	  break;
 	case 'e':
 	  if (optarg)
 	    getoptarg (optarg, 'e', &input_tab_char,
@@ -945,7 +945,6 @@ main (int argc, char **argv)
 	  break;
 	case 'h':
 	  custom_header = optarg;
-	  standard_header = FALSE;
 	  break;
 	case 'i':
 	  if (optarg)
@@ -1065,6 +1064,11 @@ main (int argc, char **argv)
 	}
    }

+  if (! date_format)
+    date_format = (getenv ("POSIXLY_CORRECT")
+		   ? dcgettext (NULL, "%b %e %H:%M %Y", LC_TIME)
+		   : "%Y-%m-%d %H:%M");
+
  /* Now we can set a reasonable initial value: */
  if (first_page_number == 0)
    first_page_number = 1;
@@ -1624,90 +1628,47 @@ print_files (int number_of_files, char **av)
    ;
 }

-/* Estimate the number of characters taken up by a short format date and
-   time:  "yy-mm-dd HH:MM"  and:  "Page NNNN". */
-#define CHARS_FOR_DATE_AND_PAGE	25
-
-#define T_BUF_FMT "%Y-%m-%d %H:%M"	/* date/time short format */
-
-/* Add `2' because the expansion of %Y occupies 4 bytes, which is two more
-   than the length of `%Y'.  Each of the other formats expand to two bytes.  */
-#define T_BUF_SIZE (2 + sizeof T_BUF_FMT)
-
-/* This string is exactly the same length as the expansion of T_BUF_FMT.  */
-#define NO_DATE "-- Date/Time -- "
-
 /* Initialize header information.
   If DESC is non-negative, it is a file descriptor open to
-   FILENAME for reading.
-
-   Allocate space for a header string,
-   Determine the time, insert file name or user-specified string.
-   Make use of a centered header with left-hand-side truncation marked by
-   a '*` in front, if necessary. */
+   FILENAME for reading.  */

 static void
 init_header (char *filename, int desc)
 {
-  char *f = filename;
+  char *buf;
+  char initbuf[MAX (256, INT_STRLEN_BOUND (long) + 1)];
  struct stat st;
-  size_t header_buf_size;
+  struct tm *tm;

-  if (filename == NULL)
-    f = "";
+  /* If parallel files or standard input, use current date. */
+  if (STREQ (filename, "-"))
+    desc = -1;
+  if (desc < 0 || fstat (desc, &st) != 0)
+    st.st_mtime = time (NULL);

-  if (header != NULL)
-    free (header);
-
-  /* Allow a space on each side of the the filename-or-header.  */
-  header_buf_size = MAX (chars_per_line, CHARS_FOR_DATE_AND_PAGE + 2) + 1;
-  header = (char *) xmalloc (header_buf_size);
-
-  if (!standard_header && *custom_header == '\0')
-    *header = '\0';			/* blank line header */
+  buf = initbuf;
+  tm = localtime (&st.st_mtime);
+  if (! tm)
+    sprintf (buf, "%ld", (long) st.st_mtime);
  else
    {
-      int chars_per_middle, lhs_blanks, rhs_blanks;
-      struct tm *tmptr;
-      char t_buf[T_BUF_SIZE];
-      char *header_text;
-
-      /* If parallel files or standard input, use current time. */
-      if (desc < 0 || STREQ (filename, "-") || fstat (desc, &st))
-	st.st_mtime = time (NULL);
-
-      tmptr = localtime (&st.st_mtime);
-      strftime (t_buf, T_BUF_SIZE, T_BUF_FMT, tmptr);
-
-      chars_per_middle = header_buf_size - 1 - CHARS_FOR_DATE_AND_PAGE;
-      if (chars_per_middle < 3)
+      size_t bufsize = sizeof initbuf;
+      for (;;)
 	{
-	  header_text = "";	/* Nothing free for a heading */
-	  lhs_blanks = 1;
-	  rhs_blanks = 1;
+	  *buf = '\1';
+	  if (strftime (buf, bufsize, date_format, tm) || ! *buf)
+	    break;
+	  buf = alloca (bufsize *= 2);
 	}
-      else
-	{
-	  int chars_free;
-	  header_text = standard_header ? f : custom_header;
-	  chars_free = chars_per_middle - (int) strlen (header_text);
-	  if (chars_free > 1)
-	    {
-	      lhs_blanks = chars_free / 2;	/* text not truncated */
-	      rhs_blanks = chars_free - lhs_blanks;
-	    }
-	  else
-	    {			/* lhs truncation */
-	      header_text = header_text - chars_free + 2;
-	      *header_text = '*';
-	      lhs_blanks = 1;
-	      rhs_blanks = 1;
-	    }
-	}
-
-      sprintf (header, _("%s%*s%s%*sPage"), (test_suite ? NO_DATE : t_buf),
-	       lhs_blanks, " ", header_text, rhs_blanks, " ");
    }
+
+  if (date_text)
+    free (date_text);
+  date_text = xstrdup (buf);
+  file_text = custom_header ? custom_header : desc < 0 ? "" : filename;
+  header_width_available = (chars_per_line
+			    - mbswidth (date_text, 0)
+			    - mbswidth (file_text, 0));
 }

 /* Set things up for printing a page
@@ -2404,20 +2365,29 @@ skip_to_page (int page)
 static void
 print_header (void)
 {
+  char page_text[256 + INT_STRLEN_BOUND (int)];
+  int available_width;
+  int lhs_spaces;
+  int rhs_spaces;
+
  if (!use_form_feed)
-    fprintf (stdout, "\n\n");
+    printf ("\n\n");

  output_position = 0;
  pad_across_to (chars_per_margin);
  print_white_space ();

-  if (!standard_header && *custom_header == '\0')
-    {
-      fprintf (stdout, "%s\n\n\n", header);
-      page_number++;
-    }
-  else
-    fprintf (stdout, "%s%5d\n\n\n", header, page_number++);
+  /* The translator must ensure that formatting the translation of
+     "Page %d" does not generate more than (sizeof page_text - 1)
+     bytes.  */
+  sprintf (page_text, _("Page %d"), page_number++);
+  available_width = header_width_available - mbswidth (page_text, 0);
+  available_width = MAX (0, available_width);
+  lhs_spaces = available_width >> 1;
+  rhs_spaces = available_width - lhs_spaces;
+
+  printf ("%s%*s%s%*s%s\n\n\n",
+	  date_text, lhs_spaces, " ", file_text, rhs_spaces, " ", page_text);

  print_a_header = FALSE;
  output_position = 0;
@@ -2791,6 +2761,8 @@ Paginate or columnate FILE(s) for printing.\n\
                    use hat notation (^G) and octal backslash notation\n\
  -d, --double-space\n\
                    double space the output\n\
+  -D, --date-format=FORMAT\n\
+                    use FORMAT for the header date\n\
  -e[CHAR[WIDTH]], --expand-tabs[=CHAR[WIDTH]]\n\
                    expand input CHARs (TABs) to tab WIDTH (8)\n\
  -F, -f, --form-feed\n\
@@ -2801,7 +2773,6 @@ Paginate or columnate FILE(s) for printing.\n\
      printf (_("\
  -h HEADER, --header=HEADER\n\
                    use a centered HEADER instead of filename in page header,\n\
-                    with long headers left-hand-side truncation may occur,\n\
                    -h \"\" prints a blank line, don't use -h\"\"\n\
  -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]\n\
                    replace spaces with CHARs (TABs) to tab WIDTH (8)\n\
--- a/src/sort.c
+++ b/src/sort.c
--- a/src/sys2.h
+++ b/src/sys2.h
@@ -488,6 +488,11 @@ enum
 			      ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
 #define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))

+/* Upper bound on the string length of an integer converted to string.
+   302 / 1000 is ceil (log10 (2.0)).  Subtract 1 for the sign bit;
+   add 1 for integer division truncation; add 1 more for a minus sign.  */
+#define INT_STRLEN_BOUND(t) ((sizeof (t) * CHAR_BIT - 1) * 302 / 1000 + 2)
+
 #ifndef CHAR_MIN
 # define CHAR_MIN TYPE_MINIMUM (char)
 #endif
--- a/src/tac.c
+++ b/src/tac.c
@@ -1,5 +1,5 @@
 /* tac - concatenate and print files in reverse
-   Copyright (C) 1988-1991, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 1988-1991, 1995-2001 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
@@ -72,8 +72,6 @@ tac -r -s '.\|
 /* The number of bytes per atomic write. */
 #define WRITESIZE 8192

-char *mktemp ();
-
 /* The name this program was run with. */
 char *program_name;

@@ -414,7 +412,7 @@ save_stdin (FILE **g_tmp, char **g_tempfile)
 {
  static char *template = NULL;
  static char *tempdir;
-  static char *tempfile;
+  char *tempfile;
  FILE *tmp;
  ssize_t bytes_read;
  int fd;
@@ -427,11 +425,8 @@ save_stdin (FILE **g_tmp, char **g_tempfile)
      template = xmalloc (strlen (tempdir) + 11);
    }
  sprintf (template, "%s/tacXXXXXX", tempdir);
-  tempfile = mktemp (template);
-
-  /*  Open temporary file exclusively, to foil a common
-      denial-of-service attack.  */
-  fd = open (tempfile, O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600);
+  tempfile = template;
+  fd = mkstemp (template);
  if (fd == -1)
    error (EXIT_FAILURE, errno, "%s", tempfile);

--- a/src/tail.c
+++ b/src/tail.c
@@ -274,7 +274,8 @@ print the last N items in the file.  N may have a multiplier suffix:\n\
 b for 512, k for 1024, m for 1048576 (1 Meg).  A first OPTION of -VALUE\n\
 or +VALUE is treated like -n VALUE or -n +VALUE unless VALUE has one of\n\
 the [bkm] suffix multipliers, in which case it is treated like -c VALUE\n\
-or -c +VALUE.\n\
+or -c +VALUE.  Warning: a first option of +VALUE is obsolescent, and support\n\
+for it will be withdrawn.\n\
 \n\
 With --follow (-f), tail defaults to following the file descriptor, which\n\
 means that even if a tail'ed file is renamed, tail will continue to track\n\
--- a/src/touch.c
+++ b/src/touch.c
@@ -1,5 +1,5 @@
 /* touch -- change modification and access times of files
-   Copyright (C) 87, 1989-1991, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 87, 1989-1991, 1995-2001 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
@@ -217,7 +217,7 @@ usage (int status)
  else
    {
      printf (_("Usage: %s [OPTION]... FILE...\n"), program_name);
-      printf (_("  or : %s [-acm] MMDDhhmm[YY] FILE... (obsolescent)\n"),
+      printf (_("  or:  %s [-acm] MMDDhhmm[YY] FILE... (obsolescent)\n"),
 	      program_name);
      printf (_("\
 Update the access and modification times of each FILE to the current time.\n\
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -1,5 +1,5 @@
 /* uniq -- remove duplicate lines from a sorted file
-   Copyright (C) 86, 91, 1995-1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 86, 91, 1995-2001, 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
@@ -121,7 +121,7 @@ standard input), writing to OUTPUT (or standard output).\n\
  -u, --unique          only print unique lines\n\
  -w, --check-chars=N   compare no more than N characters in lines\n\
  -N                    same as -f N\n\
-  +N                    same as -s N\n\
+  +N                    same as -s N (obsolescent; will be withdrawn)\n\
      --help            display this help and exit\n\
      --version         output version information and exit\n\
 \n\
--- a/src/wc.c
+++ b/src/wc.c
@@ -1,5 +1,5 @@
 /* wc - print the number of bytes, words, and lines in files
-   Copyright (C) 85, 91, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 85, 91, 1995-2001 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
@@ -126,7 +126,7 @@ Usage: %s [OPTION]... [FILE]...\n\
 "),
 	      program_name);
      printf (_("\
-Print line, word, and byte counts for each FILE, and a total line if\n\
+Print newline, word, and byte counts for each FILE, and a total line if\n\
 more than one FILE is specified.  With no FILE, or when FILE is -,\n\
 read standard input.\n\
  -c, --bytes            print the byte counts\n\
@@ -306,13 +306,13 @@ wc (int fd, const char *file)
 	  bytes_read += prev;
 	  do
 	    {
-	      wchar_t wc;
+	      wchar_t wide_char;
 	      size_t n;

 # if SUPPORT_OLD_MBRTOWC
 	      backup_state = state;
 # endif
-	      n = mbrtowc (&wc, p, bytes_read, &state);
+	      n = mbrtowc (&wide_char, p, bytes_read, &state);
 	      if (n == (size_t) -2)
 		{
 # if SUPPORT_OLD_MBRTOWC
@@ -326,11 +326,11 @@ wc (int fd, const char *file)
 		  if (!(lines + 1 == last_error_line
 			&& errno == last_error_errno))
 		    {
-		      char buf[LONGEST_HUMAN_READABLE + 1];
+		      char hr_buf[LONGEST_HUMAN_READABLE + 1];
 		      last_error_line = lines + 1;
 		      last_error_errno = errno;
 		      error (0, errno, "%s:%s", file,
-			     human_readable (lines + 1, buf, 1, 1));
+			     human_readable (lines + 1, hr_buf, 1, 1));
 		    }
 		  p++;
 		  bytes_read--;
@@ -339,13 +339,13 @@ wc (int fd, const char *file)
 		{
 		  if (n == 0)
 		    {
-		      wc = 0;
+		      wide_char = 0;
 		      n = 1;
 		    }
 		  p += n;
 		  bytes_read -= n;
 		  chars++;
-		  switch (wc)
+		  switch (wide_char)
 		    {
 		    case '\n':
 		      lines++;
@@ -371,9 +371,9 @@ wc (int fd, const char *file)
 			}
 		      break;
 		    default:
-		      if (iswprint (wc))
+		      if (iswprint (wide_char))
 			{
-			  int width = wcwidth (wc);
+			  int width = wcwidth (wide_char);
 			  if (width > 0)
 			    linepos += width;
 			  in_word = 1;
--- a/tests/Fetish.pm
+++ b/tests/Fetish.pm
@@ -12,7 +12,7 @@ use FileHandle;
 use File::Compare qw(compare);

@ISA = qw(Exporter);
-($VERSION = '$Revision: 1.9 $ ') =~ tr/[0-9].//cd;
+($VERSION = '$Revision: 1.10 $ ') =~ tr/[0-9].//cd;
@EXPORT = qw (run_tests);

 my $debug = $ENV{DEBUG};
@@ -23,6 +23,12 @@ my %Zero_one_type = map {$_ => 1} qw (OUT ERR EXIT PRE POST);
 my $srcdir = $ENV{srcdir};
 my $Global_count = 1;

+# When running in a DJGPP environment, make $ENV{SHELL} point to bash.
+# Otherwise, a bad shell might be used (e.g. command.com) and many
+# tests would fail.
+defined $ENV{DJDIR}
+  and $ENV{SHELL} = "$ENV{DJDIR}/bin/bash.exe";
+
 # A file spec: a scalar or a reference to a single-keyed hash
 # ================
 # 'contents'               contents only (file name is derived from test name)
--- a/tests/basename/Makefile.in
+++ b/tests/basename/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4c from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -48,6 +48,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +58,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -80,6 +82,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -105,11 +109,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -127,23 +133,19 @@ TESTS_ENVIRONMENT = \

 subdir = tests/basename
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = 
 DIST_SOURCES = 
 DIST_COMMON =  Makefile.am Makefile.in

-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
+all: all-am
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/basename/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status

 tags: TAGS
 TAGS:
@@ -204,7 +206,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -239,9 +244,9 @@ install: install-am
 uninstall-am:
 uninstall: uninstall-am
 all-am: Makefile
-all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 installdirs:


@@ -254,31 +259,31 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic

-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic

 maintainer-clean: maintainer-clean-am

-.PHONY: all all-am all-redirect check check-TESTS check-am clean \
-clean-generic distclean distclean-generic distdir dvi dvi-am info \
-info-am install install-am install-data install-data-am install-exec \
-install-exec-am install-strip installcheck installcheck-am installdirs \
-maintainer-clean maintainer-clean-generic mostlyclean \
-mostlyclean-generic uninstall uninstall-am
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean: clean-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/chgrp/Makefile.in
+++ b/tests/chgrp/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -123,29 +126,31 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
  PATH=`pwd`/../../src:$$PATH

+EXEEXT =
+OBJEXT = o
 subdir = tests/chgrp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/chgrp/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/chgrp/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -201,7 +206,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -215,32 +223,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -251,31 +253,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/chgrp/basic
+++ b/tests/chgrp/basic
@@ -34,6 +34,7 @@ touch f f2 d/f3
 chgrp $g1 f || fail=1
 chgrp $g2 f || fail=1
 chgrp $g2 f2 || fail=1
+chgrp -R $g1 d || fail=1

 (
  chgrp -c $g1 f
--- a/tests/chmod/Makefile.in
+++ b/tests/chmod/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -123,29 +126,31 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
  PATH=`pwd`/../../src:$$PATH

+EXEEXT =
+OBJEXT = o
 subdir = tests/chmod
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/chmod/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/chmod/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -201,7 +206,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -215,32 +223,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -251,31 +253,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/cp/Makefile.in
+++ b/tests/cp/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -129,29 +132,31 @@ TESTS_ENVIRONMENT = \
  MAKE=$(MAKE) \
  PATH=`pwd`/../../src:$$PATH

+EXEEXT =
+OBJEXT = o
 subdir = tests/cp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/cp/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/cp/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -207,7 +212,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -221,32 +229,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -257,31 +259,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -149,31 +152,33 @@ mk_script = $(srcdir)/../mk-script

 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
+EXEEXT =
+OBJEXT = o
 subdir = tests/cut
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-SCRIPTS =  $(noinst_SCRIPTS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SCRIPTS = $(noinst_SCRIPTS)

-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/cut/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/cut/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -229,7 +234,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -243,32 +251,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(SCRIPTS)

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(SCRIPTS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -280,32 +282,51 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am

 $(srcdir)/$x-tests: $(mk_script) Test.pm
 	$(PERL) -I$(srcdir) -w -- $(mk_script) ../../src/$x > $@.n
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4c from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -48,6 +48,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +58,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -80,6 +82,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -105,11 +109,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -156,25 +162,21 @@ MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 subdir = tests/date
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = 
 SCRIPTS =  $(noinst_SCRIPTS)

 DIST_SOURCES = 
 DIST_COMMON =  Makefile.am Makefile.in

-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
+all: all-am
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/date/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status

 tags: TAGS
 TAGS:
@@ -235,7 +237,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -270,9 +275,9 @@ install: install-am
 uninstall-am:
 uninstall: uninstall-am
 all-am: Makefile $(SCRIPTS)
-all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 installdirs:


@@ -286,32 +291,32 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic

-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic

 maintainer-clean: maintainer-clean-am

-.PHONY: all all-am all-redirect check check-TESTS check-am clean \
-clean-generic distclean distclean-generic distdir dvi dvi-am info \
-info-am install install-am install-data install-data-am install-exec \
-install-exec-am install-strip installcheck installcheck-am installdirs \
-maintainer-clean maintainer-clean-generic mostlyclean \
-mostlyclean-generic uninstall uninstall-am
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean: clean-am

 $(srcdir)/$x-tests: $(mk_script) Test.pm
 	$(PERL) -I$(srcdir) -w -- $(mk_script) ../../src/$x > $@.n
--- a/tests/dd/Makefile.in
+++ b/tests/dd/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -127,29 +130,31 @@ TESTS_ENVIRONMENT = \


 TESTS = misc not-rewound skip-seek skip-seek2
+EXEEXT =
+OBJEXT = o
 subdir = tests/dd
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/dd/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/dd/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -205,7 +210,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -219,32 +227,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -255,31 +257,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/dd/skip-seek
+++ b/tests/dd/skip-seek
@@ -27,7 +27,7 @@ my $script_name = $ENV{SCRIPT_NAME};
 my @Tests =
    (
     [
-      '1', qw (bs=1 skip=1 seek=2 conv=notrunc count=3 of=@AUX@ < ),
+      'skip-seek-1', qw (bs=1 skip=1 seek=2 conv=notrunc count=3 of=@AUX@ < ),
      {IN=> '0123456789abcdef'},
      {AUX=> 'zyxwvutsrqponmlkji'},
      {OUT=> ''},
@@ -35,7 +35,7 @@ my @Tests =
      {CMP=> ['zy123utsrqponmlkji', {'@AUX@'=> undef}]},
     ],
     [
-      '3', qw (bs=5 skip=1 seek=1 conv=notrunc count=1 of=@AUX@ < ),
+      'skip-seek-2', qw (bs=5 skip=1 seek=1 conv=notrunc count=1 of=@AUX@ < ),
      {IN=> '0123456789abcdef'},
      {AUX=> 'zyxwvutsrqponmlkji'},
      {OUT=> ''},
@@ -43,13 +43,21 @@ my @Tests =
      {CMP=> ['zyxwv56789ponmlkji', {'@AUX@'=> undef}]},
     ],
     [
-      '4', qw (bs=5 skip=1 seek=1 count=1 of=@AUX@ < ),
+      'skip-seek-3', qw (bs=5 skip=1 seek=1 count=1 of=@AUX@ < ),
      {IN=> '0123456789abcdef'},
      {AUX=> 'zyxwvutsrqponmlkji'},
      {OUT=> ''},
      {ERR=> "1+0 records in\n1+0 records out\n"},
      {CMP=> ['zyxwv56789', {'@AUX@'=> undef}]},
     ],
+     [
+      # Before fileutils-4.0.45, the last 10 bytes of output
+      # were these "\0\0\0\0\0\0\0\0  ".
+      'block-sync-1', qw(ibs=10 cbs=10), 'conv=block,sync', '<',
+      {IN=> "01234567\nabcdefghijkl\n"},
+      {OUT=> "01234567  abcdefghij          "},
+      {ERR=> "2+1 records in\n0+1 records out\n1 truncated record\n"},
+     ],
    );

 my $save_temps = $ENV{DEBUG};
--- a/tests/dircolors/Makefile.in
+++ b/tests/dircolors/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -127,29 +130,31 @@ TESTS_ENVIRONMENT = \


 TESTS = simple
+EXEEXT =
+OBJEXT = o
 subdir = tests/dircolors
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/dircolors/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/dircolors/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -205,7 +210,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -219,32 +227,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -255,31 +257,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/du/Makefile.in
+++ b/tests/du/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -123,29 +126,31 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
  PATH=`pwd`/../../src:$$PATH

+EXEEXT =
+OBJEXT = o
 subdir = tests/du
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/du/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/du/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -201,7 +206,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -215,32 +223,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -251,31 +253,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/envvar-check
+++ b/tests/envvar-check
@@ -1,4 +1,10 @@
-unset VERSION_CONTROL SIMPLE_BACKUP_SUFFIX
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+$as_unset VERSION_CONTROL SIMPLE_BACKUP_SUFFIX

 if test "${VERSION_CONTROL+set}" = set; then
  echo "$0: the VERSION_CONTROL envvar is set --" \
--- a/tests/factor/Makefile.in
+++ b/tests/factor/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4c from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -48,6 +48,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +58,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -80,6 +82,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -105,11 +109,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -127,23 +133,19 @@ TESTS_ENVIRONMENT = \

 subdir = tests/factor
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = 
 DIST_SOURCES = 
 DIST_COMMON =  Makefile.am Makefile.in

-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
+all: all-am
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/factor/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status

 tags: TAGS
 TAGS:
@@ -204,7 +206,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -239,9 +244,9 @@ install: install-am
 uninstall-am:
 uninstall: uninstall-am
 all-am: Makefile
-all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 installdirs:


@@ -254,31 +259,31 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic

-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic

 maintainer-clean: maintainer-clean-am

-.PHONY: all all-am all-redirect check check-TESTS check-am clean \
-clean-generic distclean distclean-generic distdir dvi dvi-am info \
-info-am install install-am install-data install-data-am install-exec \
-install-exec-am install-strip installcheck installcheck-am installdirs \
-maintainer-clean maintainer-clean-generic mostlyclean \
-mostlyclean-generic uninstall uninstall-am
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean: clean-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/fmt/.cvsignore
+++ b/tests/fmt/.cvsignore
@@ -0,0 +1 @@
+Makefile
--- a/tests/fmt/Makefile.am
+++ b/tests/fmt/Makefile.am
@@ -0,0 +1,12 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-.
+
+EXTRA_DIST = $(TESTS)
+
+TESTS_ENVIRONMENT = \
+  top_srcdir=$(top_srcdir) \
+  srcdir=$(srcdir) \
+  PERL="@PERL@" \
+  PATH=`pwd`/../../src:$$PATH \
+  PROG=fmt
+
+TESTS = basic
--- a/tests/fmt/Makefile.in
+++ b/tests/fmt/Makefile.in
@@ -0,0 +1,308 @@
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+# This Makefile.in 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 program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+host_alias = @host_alias@
+host_triplet = @host@
+
+@SET_MAKE@
+AMDEP = @AMDEP@
+AMTAR = @AMTAR@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CPP = @CPP@
+DATADIRNAME = @DATADIRNAME@
+DEPDIR = @DEPDIR@
+DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
+GENCAT = @GENCAT@
+GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNU_PACKAGE = @GNU_PACKAGE@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+KMEM_GROUP = @KMEM_GROUP@
+LIBICONV = @LIBICONV@
+LIBOBJS = @LIBOBJS@
+LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
+LIB_CRYPT = @LIB_CRYPT@
+LIB_NANOSLEEP = @LIB_NANOSLEEP@
+MAKEINFO = @MAKEINFO@
+MAN = @MAN@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+NEED_SETGID = @NEED_SETGID@
+OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
+OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
+PACKAGE = @PACKAGE@
+PERL = @PERL@
+POFILES = @POFILES@
+POSUB = @POSUB@
+POW_LIBM = @POW_LIBM@
+RANLIB = @RANLIB@
+SEQ_LIBM = @SEQ_LIBM@
+SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
+U = @U@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+YACC = @YACC@
+_am_include = @_am_include@
+install_sh = @install_sh@
+l = @l@
+
+
+EXTRA_DIST = $(TESTS)
+
+TESTS_ENVIRONMENT = \
+  top_srcdir=$(top_srcdir) \
+  srcdir=$(srcdir) \
+  PERL="@PERL@" \
+  PATH=`pwd`/../../src:$$PATH \
+  PROG=fmt
+
+
+TESTS = basic
+EXEEXT =
+OBJEXT = o
+subdir = tests/fmt
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in
+
+all: all-am
+
+.SUFFIXES:
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/fmt/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+tags: TAGS
+TAGS:
+
+
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
+	  fi; \
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f Makefile.in
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- a/tests/fmt/basic
+++ b/tests/fmt/basic
@@ -0,0 +1,36 @@
+#!/bin/sh
+# -*- perl -*-
+
+: ${PERL=perl}
+: ${srcdir=.}
+
+case "$PERL" in
+  *'missing perl')
+  echo 1>&2 "$0: configure didn't find a usable version of Perl, so can't run this test"
+  exit 77
+  ;;
+esac
+
+exec $PERL -w -I$srcdir/.. -MFetish -- - <<\EOF
+require 5.003;
+use strict;
+
+(my $program_name = $0) =~ s|.*/||;
+
+# Turn off localisation of executable's ouput.
+@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+
+my @Tests =
+    (
+     ['8-bit-pfx', qw (-p 'ç'),
+      {IN=> "ça\nçb\n"},
+      {OUT=>"ça b\n"}],
+    );
+
+my $save_temps = $ENV{DEBUG};
+my $verbose = $ENV{VERBOSE};
+
+my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
+exit $fail;
+EOF
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -146,31 +149,33 @@ mk_script = $(srcdir)/../mk-script

 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
+EXEEXT =
+OBJEXT = o
 subdir = tests/head
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-SCRIPTS =  $(noinst_SCRIPTS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SCRIPTS = $(noinst_SCRIPTS)

-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/head/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/head/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -226,7 +231,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -240,32 +248,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(SCRIPTS)

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(SCRIPTS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -277,32 +279,51 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am

 $(srcdir)/$x-tests: $(mk_script) Test.pm
 	$(PERL) -I$(srcdir) -w -- $(mk_script) ../../src/$x > $@.n
--- a/tests/help-version
+++ b/tests/help-version
@@ -11,7 +11,7 @@ expected_failure_status_sort=2

 case "$all_programs" in
  *nohup*)
-    if test -w /dev/full && echo > /dev/full; then
+    if test -w /dev/full && test -c /dev/full && echo > /dev/full; then
      cat 1>&2 <<\EOF
 ************************************************
 WARNING: On this system, the built-in echo function of /bin/sh
@@ -51,7 +51,7 @@ for i in $all_programs; do
  ./$i --version >/dev/null || fail=1

  # Make sure they fail upon `disk full' error.
-  if test -w /dev/full; then
+  if test -w /dev/full && test -c /dev/full; then
    ./$i --help >/dev/full 2>/dev/null && fail=1
    ./$i --version >/dev/full 2>/dev/null
    status=$?
--- a/tests/stty/input-tty
+++ b/tests/stty/input-tty
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -123,29 +126,31 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
  PATH=`pwd`/../../src:$$PATH

+EXEEXT =
+OBJEXT = o
 subdir = tests/install
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/install/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/install/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -201,7 +206,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -215,32 +223,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -251,31 +253,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/install/basic-1
+++ b/tests/install/basic-1
@@ -1,5 +1,10 @@
 #! /bin/sh

+if test "$VERBOSE" = yes; then
+  set -x
+  ginstall --version
+fi
+
 dir=dir
 file=file

--- a/tests/install/create-leading
+++ b/tests/install/create-leading
@@ -8,26 +8,14 @@ if test "$VERBOSE" = yes; then
  ginstall --version
 fi

+. $srcdir/../envvar-check
+
 pwd=`pwd`
 dir=install-D$$

 trap "cd $pwd; rm -rf $dir" 0 1 2 3 15

 mkdir $dir
-unset VERSION_CONTROL SIMPLE_BACKUP_SUFFIX
-
-if test "${VERSION_CONTROL+set}" = set; then
-  echo '$0: the VERSION_CONTROL envvar is set --' \
-    ' unset it and rerun this test' >&2
-  exit 1
-fi
-
-if test "${SIMPLE_BACKUP_SUFFIX+set}" = set; then
-  echo '$0: the SIMPLE_BACKUP_SUFFIX envvar is set --' \
-    ' unset it and rerun this test' >&2
-    >&2
-  exit 1
-fi

 fail=0
 cd $dir
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -149,31 +152,33 @@ mk_script = $(srcdir)/../mk-script

 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
+EXEEXT =
+OBJEXT = o
 subdir = tests/join
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-SCRIPTS =  $(noinst_SCRIPTS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SCRIPTS = $(noinst_SCRIPTS)

-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in TODO
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in TODO

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/join/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/join/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -229,7 +234,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -243,32 +251,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(SCRIPTS)

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(SCRIPTS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -280,32 +282,51 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am

 $(srcdir)/$x-tests: $(mk_script) Test.pm
 	$(PERL) -I$(srcdir) -w -- $(mk_script) ../../src/$x > $@.n
--- a/tests/ln/Makefile.in
+++ b/tests/ln/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -123,29 +126,31 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
  PATH=`pwd`/../../src:$$PATH

+EXEEXT =
+OBJEXT = o
 subdir = tests/ln
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/ln/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/ln/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -201,7 +206,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -215,32 +223,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -251,31 +253,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/ls-2/Makefile.in
+++ b/tests/ls-2/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -127,29 +130,31 @@ TESTS_ENVIRONMENT = \


 TESTS = tests
+EXEEXT =
+OBJEXT = o
 subdir = tests/ls-2
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/ls-2/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/ls-2/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -205,7 +210,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -219,32 +227,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -255,31 +257,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/ls-2/tests
+++ b/tests/ls-2/tests
@@ -22,6 +22,14 @@ use strict;
 my $mkdir = {PRE => sub {mkdir 'd',0755 or die "d: $!\n"}};
 my $rmdir = {POST => sub {rmdir 'd' or die "d: $!\n"}};

+my $mkdir2 = {PRE => sub {mkdir 'd',0755 or die "d: $!\n";
+			  mkdir 'd/e',0755 or die "d/e: $!\n" }};
+my $rmdir2 = {POST => sub {rmdir 'd/e' or die "d/e: $!\n";
+			   rmdir 'd' or die "d: $!\n" }};
+
+my $slink_d = {PRE => sub {symlink '/', 'd' or die "d: $!\n"}};
+my $unlink_d = {POST => sub {unlink 'd' or die "d: $!\n"}};
+
 my $q_bell = {IN => {"q\a" => ''}};
 my @Tests =
    (
@@ -49,6 +57,20 @@ my @Tests =
     # test `ls -R .' ............................................
     ['R-dot', '--ignore="[a-ce-zA-Z]*" -R .',  {OUT => ".:\nd\n\n\./d:\n"},
      $mkdir, $rmdir],
+
+     # FIXME: change the trailing `/' to be a `@'.
+     ['slink-dir', '-Fd d', {OUT => "d/\n"}, $slink_d, $unlink_d],
+
+     # FIXME: uncomment the following once ls has been fixed
+     # ['slink-dir2', '-F d', {OUT => "d\@/\n"}, $slink_d, $unlink_d],
+
+     # From Stéphane Chazelas.
+     ['no-a-isdir-b', 'no-dir d',
+	 {OUT => "d:\n"},
+	 {ERR => "ls: no-dir: No such file or directory\n"},
+	 $mkdir, $rmdir, {EXIT => 1}],
+
+     ['recursive-2', '-R d', {OUT => "d:\ne\n\nd/e:\n"}, $mkdir2, $rmdir2],
    );

 my $save_temps = $ENV{SAVE_TEMPS};
--- a/tests/ls/Makefile.am
+++ b/tests/ls/Makefile.am
@@ -2,7 +2,7 @@

 AUTOMAKE_OPTIONS = 1.2 gnits

-TESTS = rt-1 time-1 symlink-slash follow-slink
+TESTS = rt-1 time-1 symlink-slash follow-slink no-arg
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
  top_srcdir=$(top_srcdir) \
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,18 +108,20 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@


 AUTOMAKE_OPTIONS = 1.2 gnits

-TESTS = rt-1 time-1 symlink-slash follow-slink
+TESTS = rt-1 time-1 symlink-slash follow-slink no-arg
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
  top_srcdir=$(top_srcdir) \
@@ -126,29 +129,31 @@ TESTS_ENVIRONMENT = \
  PATH=`pwd`/../../src:$$PATH \
  PROG=ls

+EXEEXT =
+OBJEXT = o
 subdir = tests/ls
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/ls/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/ls/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -204,7 +209,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -218,32 +226,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -254,31 +256,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/ls/no-arg
+++ b/tests/ls/no-arg
@@ -0,0 +1,59 @@
+#!/bin/sh
+# make sure ls and `ls -R' do the right thing when invoked with no arguments.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  ls --version
+fi
+
+pwd=`pwd`
+tmp=no-args.$$
+trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
+framework_failure=0
+mkdir $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+mkdir -p dir/subdir || framework_failure=1
+touch dir/subdir/file2 || framework_failure=1
+ln -s f symlink || framework_failure=1
+
+cat > exp <<\EOF || framework_failure=1
+dir
+exp
+out
+symlink
+EOF
+
+if test $framework_failure = 1; then
+  echo 'failure in testing framework'
+  (exit 1); exit
+fi
+
+fail=0
+
+ls > out || fail=1
+
+cmp out exp || fail=1
+test $fail = 1 && diff out exp 2> /dev/null
+
+cat > exp <<\EOF
+.:
+dir
+exp
+out
+symlink
+
+./dir:
+subdir
+
+./dir/subdir:
+file2
+EOF
+
+ls -R > out || fail=1
+
+cmp out exp || fail=1
+test $fail = 1 && diff out exp 2> /dev/null
+
+(exit $fail); exit
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -127,29 +130,31 @@ TESTS_ENVIRONMENT = \


 TESTS = basic-1 newline-1
+EXEEXT =
+OBJEXT = o
 subdir = tests/md5sum
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/md5sum/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/md5sum/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -205,7 +210,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -219,32 +227,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -255,31 +257,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -124,29 +127,31 @@ TESTS_ENVIRONMENT = \
  srcdir=$(srcdir) \
  PATH=`pwd`/../../src:$$PATH

+EXEEXT =
+OBJEXT = o
 subdir = tests/mkdir
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/mkdir/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/mkdir/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -202,7 +207,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -216,32 +224,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -252,31 +254,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/mv/Makefile.in
+++ b/tests/mv/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4b from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@

 NORMAL_INSTALL = :
@@ -57,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -67,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -82,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -107,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@

@@ -130,29 +133,31 @@ TESTS_ENVIRONMENT = \
  PATH=`pwd`/../../src:$$PATH \
  PROG=mv

+EXEEXT =
+OBJEXT = o
 subdir = tests/mv
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in

+all: all-am

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/mv/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  tests/mv/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:

+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -208,7 +213,10 @@ check-TESTS: $(TESTS)
 	  test "$$failed" -eq 0; \
 	fi

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -222,32 +230,26 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:

+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

 mostlyclean-generic:

@@ -258,31 +260,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/tests/mv/setup
+++ b/tests/mv/setup
@@ -17,6 +17,10 @@ other_partition_tmpdir=
 # if the mount point name contains `% '.
 dot_mount_point=`df --no-sync -P . | sed -n '2s/.*%  *//p'`
 for d in $CANDIDATE_TMP_DIRS; do
+
+  # Skip nonexistent directories.
+  test -d $d || continue
+
  d_mount_point=`df --no-sync -P $d | sed -n '2s/.*%  *//p'`

  # Same partition?  Skip it.
--- a/tests/pr/0F
+++ b/tests/pr/0F
@@ -1,6 +1,6 @@


-- Date/Time --                        x                       Page    1
+-- Date/Time --                         x                         Page 1



@@ -66,7 +66,7 @@



-- Date/Time --                        x                       Page    2
+-- Date/Time --                         x                         Page 2


 1   FF-Test: FF's at Start of File             V
@@ -132,7 +132,7 @@



-- Date/Time --                        x                       Page    3
+-- Date/Time --                         x                         Page 3



@@ -198,7 +198,7 @@



-- Date/Time --                        x                       Page    4
+-- Date/Time --                         x                         Page 4


 15 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -264,7 +264,7 @@



-- Date/Time --                        x                       Page    5
+-- Date/Time --                         x                         Page 5


 29 xyzxyzxyz XYZXYZXYZ abcabcab
--- a/tests/pr/0FF
+++ b/tests/pr/0FF
@@ -1,6 +1,6 @@


-- Date/Time --                        x                       Page    1
+-- Date/Time --                         x                         Page 1



@@ -66,7 +66,7 @@



-- Date/Time --                        x                       Page    2
+-- Date/Time --                         x                         Page 2



@@ -132,7 +132,7 @@



-- Date/Time --                        x                       Page    3
+-- Date/Time --                         x                         Page 3


 1   FF-Test: FF's at Start of File             V
@@ -198,7 +198,7 @@



-- Date/Time --                        x                       Page    4
+-- Date/Time --                         x                         Page 4



@@ -264,7 +264,7 @@



-- Date/Time --                        x                       Page    5
+-- Date/Time --                         x                         Page 5


 15 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -330,7 +330,7 @@



-- Date/Time --                        x                       Page    6
+-- Date/Time --                         x                         Page 6


 29 xyzxyzxyz XYZXYZXYZ abcabcab
--- a/tests/pr/2-S_f-t_notab
+++ b/tests/pr/2-S_f-t_notab
@@ -1,4 +1,4 @@
-- Date/Time --                        x                       Page    1
+-- Date/Time --                         x                         Page 1


 aaaa.bcde-fghijklmn-opqrstuvw-xyzzz:dddd.bcde-fghijklmn-opqrstuvw-xyzzz
--- a/tests/pr/2-Sf-t_notab
+++ b/tests/pr/2-Sf-t_notab
@@ -1,4 +1,4 @@
-- Date/Time --                        x                       Page    1
+-- Date/Time --                         x                         Page 1


 aaaa.bcde-fghijklmn-opqrstuvw-xyzzzzdddd.bcde-fghijklmn-opqrstuvw-xyzzzz
--- a/tests/pr/2f-t_notab
+++ b/tests/pr/2f-t_notab
@@ -1,4 +1,4 @@
-- Date/Time --                        x                       Page    1
+-- Date/Time --                         x                         Page 1


 aaaa.bcde-fghijklmn-opqrstuvw-xyzzz dddd.bcde-fghijklmn-opqrstuvw-xyzzz
--- a/tests/pr/2s_f-t_notab
+++ b/tests/pr/2s_f-t_notab
@@ -1,4 +1,4 @@
-- Date/Time --                        x                       Page    1
+-- Date/Time --                         x                         Page 1


 aaaa.bcde-fghijklmn-opqrstuvw-xyzzzzzzz-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:dddd.bcde-fghijklmn-opqrstuvw-xyzzzzzzz-dddddddddddddddddddddddddddddddddddddddd
--- a/tests/pr/2s_w60f-t_nota
+++ b/tests/pr/2s_w60f-t_nota
@@ -1,4 +1,4 @@
-- Date/Time --                  x                 Page    1
+-- Date/Time --                   x                   Page 1


 aaaa.bcde-fghijklmn-opqrstuvw:dddd.bcde-fghijklmn-opqrstuvw
--- a/tests/pr/2sf-t_notab
+++ b/tests/pr/2sf-t_notab
@@ -1,4 +1,4 @@
-- Date/Time --                        x                       Page    1
+-- Date/Time --                         x                         Page 1


 aaaa.bcde-fghijklmn-opqrstuvw-xyzzzzzzz-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	dddd.bcde-fghijklmn-opqrstuvw-xyzzzzzzz-dddddddddddddddddddddddddddddddddddddddd
--- a/tests/pr/2sw60f-t_notab
+++ b/tests/pr/2sw60f-t_notab
@@ -1,4 +1,4 @@
-- Date/Time --                  x                 Page    1
+-- Date/Time --                   x                   Page 1


 aaaa.bcde-fghijklmn-opqrstuvw-dddd.bcde-fghijklmn-opqrstuvw-
--- a/tests/pr/2w60f-t_notab
+++ b/tests/pr/2w60f-t_notab
@@ -1,4 +1,4 @@
-- Date/Time --                  x                 Page    1
+-- Date/Time --                   x                   Page 1


 aaaa.bcde-fghijklmn-opqrstuvw dddd.bcde-fghijklmn-opqrstuvw
--- a/tests/pr/3-0F
+++ b/tests/pr/3-0F
@@ -1,6 +1,6 @@


-- Date/Time --                        x                       Page    3
+-- Date/Time --                         x                         Page 3



@@ -66,7 +66,7 @@



-- Date/Time --                        x                       Page    4
+-- Date/Time --                         x                         Page 4


 15 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -132,7 +132,7 @@



-- Date/Time --                        x                       Page    5
+-- Date/Time --                         x                         Page 5


 29 xyzxyzxyz XYZXYZXYZ abcabcab
--- a/tests/pr/3-5l17f-t
+++ b/tests/pr/3-5l17f-t
@@ -1,4 +1,4 @@
-- Date/Time --                        x                       Page    3
+-- Date/Time --                         x                         Page 3


 29 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -15,7 +15,7 @@
 40 DEFGHI 123456789
 41 yzxyzxyz XYZXYZXYZ abcabcab 
 42 456789 123456789 abcdefghi ABCDEDFHI
-- Date/Time --                        x                       Page    4
+-- Date/Time --                         x                         Page 4


 43 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -32,7 +32,7 @@
 4                                       12345678
 55 yzxyzxyz XYZXYZXYZ abcabcab 
 56 456789 123456789 abcdefghi ABCDEDFHI
-- Date/Time --                        x                       Page    5
+-- Date/Time --                         x                         Page 5


 57 xyzxyzxyz XYZXYZXYZ abcabcab
--- a/Show More
+++ b/Show More