.

*** empty log message ***
.
2025-09-10 07:59:52 +02:00 · 2000-09-09 08:58:58 +00:00 · 2000-09-09 08:58:42 +00:00 · 2000-09-09 08:56:38 +00:00 · 2000-09-09 08:55:48 +00:00 · 2000-09-09 08:53:37 +00:00
847 changed files with 120851 additions and 35104 deletions
--- a/166
+++ b/166
@@ -1,16 +1,16 @@
-Notes on the GNU Translation Project
-************************************
+Notes on the Free Translation Project
+*************************************

-   GNU is going international!  The GNU Translation Project is a way to
-get maintainers, translators, and users all together, so that GNU will
-gradually become able to speak many languages.  A few packages already
-provide translations for their messages.
+   Free software is going international!  The Free Translation Project
+is a way to get maintainers of free software, translators, and users all
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.

-   If you found this `ABOUT-NLS' file inside a GNU distribution, you
-may assume that the distributed package does use GNU `gettext'
-internally, itself available at your nearest GNU archive site.  But you
-do *not* need to install GNU `gettext' prior to configuring, installing
-or using this package with messages translated.
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do *not*
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.

   Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
@@ -31,19 +31,23 @@ should configure it using
     ./configure --with-included-gettext

 to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in
-the operating system where this package is being installed.  So far, no
-prior implementation provides as many useful features (such as locale
-alias or message inheritance).  It is also not possible to offer this
-additional functionality on top of a `catgets' implementation.  Future
-versions of GNU `gettext' will very likely convey even more
-functionality.  So it might be a good idea to change to GNU `gettext'
-as soon as possible.
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias or message inheritance) as the
+implementation here.  It is also not possible to offer this additional
+functionality on top of a `catgets' implementation.  Future versions of
+GNU `gettext' will very likely convey even more functionality.  So it
+might be a good idea to change to GNU `gettext' as soon as possible.
+
+   So you need not provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.

 INSTALL Matters
 ===============

-   Some GNU packages are "localizable" when properly installed; the
+   Some packages are "localizable" when properly installed; the
 programs they contain can be made to speak your own native language.
 Most such packages use GNU `gettext'.  Other packages have their own
 ways to internationalization, predating GNU `gettext'.
@@ -113,36 +117,35 @@ shell prompt, merely execute `setenv LANG de' (in `csh'),
 can be done from your `.login' or `.profile' file, once and for all.

   An operating system might already offer message localization for
-many of its programs, while other programs (whether GNU or not) have
-been installed locally with the full capabilities of GNU `gettext'.
-Just using `gettext' extended syntax for `LANG' would break proper
-localization of already available operating system programs.  In this
-case, users should set both `LANGUAGE' and `LANG' variables in their
-environment, as programs using GNU `gettext' give preference to
-`LANGUAGE'.  For example, some Swedish users would rather read
-translations in German than English for when Swedish is not available.
-This is easily accomplished by setting `LANGUAGE' to `sv:de' while
-leaving `LANG' to `sv'.
+many of its programs, while other programs have been installed locally
+with the full capabilities of GNU `gettext'.  Just using `gettext'
+extended syntax for `LANG' would break proper localization of already
+available operating system programs.  In this case, users should set
+both `LANGUAGE' and `LANG' variables in their environment, as programs
+using GNU `gettext' give preference to `LANGUAGE'.  For example, some
+Swedish users would rather read translations in German than English for
+when Swedish is not available.  This is easily accomplished by setting
+`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.

 Translating Teams
 =================

-   For the GNU Translation Project to be a success, we need interested
+   For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list, courtesy of Linux
 International.  You may reach your translation team at the address
 `LL@li.org', replacing LL by the two-letter ISO 639 code for your
 language.  Language codes are *not* the same as the country codes given
-in ISO 3166.  The following translation teams exist, as of May 1996:
+in ISO 3166.  The following translation teams exist, as of December
+1997:

-     Arabic `ar', Chinese `zh', Czech `cs', Danish `da', Dutch `nl',
-     English `en', Esperanto `eo', Finnish `fi', French `fr', German
-     `de', Greek `el', Hebrew `he', Hungarian `hu', Irish `ga', Italian
-     `it', Indonesian `id', Japanese `ja', Korean `ko', Latin `la',
-     Norwegian `no', Persian `fa', Polish `pl', Portuguese `pt',
-     Russian `ru', Slovenian `sl', Spanish `es', Swedish `sv', Telugu
-     `te', Turkish `tr' and Ukrainian `uk'.
+     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
+     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
+     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
+     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
+     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
+     Swedish `sv', and Turkish `tr'.

 For example, you may reach the Chinese translation team by writing to
 `zh@li.org'.
@@ -159,52 +162,53 @@ message to `sv-request@li.org', having this message body:
 *actively* in translations, or at solving translational difficulties,
 rather than merely lurking around.  If your team does not exist yet and
 you want to start one, or if you are unsure about what to do or how to
-get started, please write to `gnu-translation@gnu.ai.mit.edu' to reach
-the GNU coordinator for all translator teams.
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.

   The English team is special.  It works at improving and uniformizing
-the terminology used in GNU.  Proven linguistic skill are praised more
-than programming skill, here.  For the time being, please avoid
-subscribing to the English team unless explicitly invited to do so.
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.

 Available Packages
 ==================

-   Languages are not equally supported in all GNU packages.  The
-following matrix shows the current state of GNU internationalization,
-as of May 1996.  The matrix shows, in regard of each package, for which
-languages PO files have been submitted to translation coordination.
+   Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of December
+1997.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination.

-                       cs de en es fi fr ja ko nl no pl pt sl sv
-                     .-------------------------------------------.
-     bash            |                []                         |  1
-     bison           |                []                         |  1
-     clisp           |    [] []       []                         |  3
-     cpio            |                []                         |  1
-     diffutils       |                []             []       [] |  3
-     enscript        |    []       [] []                   []    |  4
-     fileutils       |    []          []                []    [] |  4
-     findutils       |    []          []                         |  2
-     flex            |                []                         |  1
-     gcal            |    []                                     |  1
-     gettext         |    []          []    [] [] [] []    [] [] |  9
-     glibc           |    []    []          []                   |  3
-     grep            |          []    []    []       []    [] [] |  6
-     hello           |    []          []    []       [] [] []    |  6
-     m4              |    []          [] []                   [] |  4
-     make            |                                           |  0
-     mkid            |    []          []                         |  2
-     music           |                []                         |  1
-     ptx             |    []          []                      [] |  3
-     recode          |    []    []    []                   [] [] |  5
-     sh-utils        |    []          []                         |  2
-     sharutils       |    []          []       []             [] |  4
-     tar             |    []          []    []    []    [] [] [] |  7
-     textutils       |    []          []    [] []                |  4
-     wdiff           | [] []          []                      [] |  4
-                     `-------------------------------------------'
-                       cs de en es fi fr ja ko nl no pl pt sl sv
-                        1 17  1  3  1 22  1  6  3  3  4  3  6 10   81
+     Ready PO files    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
+                     .----------------------------------------------------.
+     bash            |       []          []          []                   |  3
+     bison           |       []          []          []                   |  3
+     clisp           |       [] [] []    []                               |  4
+     cpio            |       []    []    []       [] []    []             |  6
+     diffutils       |       []    []    []                []          [] |  5
+     enscript        |       []    [] [] []          []             []    |  6
+     fileutils       | []    []    []    []       [] []    [] []    [] [] | 10
+     findutils       |       []    []    [] []    [] []    []    []    [] |  9
+     flex            |             []    []       []                   [] |  4
+     gcal            |       []          []          []    []          [] |  5
+     gettext         |    [] []    []    []       [] [] [] [] []    [] [] | 12
+     grep            |       []    []    []       [] [] [] []    [] [] [] | 10
+     hello           |    [] []    []    []       [] [] [] [] []    [] [] | 11
+     id-utils        |       []          []                []             |  3
+     indent          |    [] []                   []       []    []       |  5
+     libc            |       []    []    []       [] []    []          [] |  7
+     m4              |       []          []    []    []          []    [] |  6
+     make            |       []    []    []       [] []    []             |  6
+     music           |                   []                []             |  2
+     ptx             |       []    []    []          [] [] [] []       [] |  8
+     recode          |    [] []    []    []          []    [] []    [] [] |  9
+     sh-utils        |       []    []    []          [] [] [] []       [] |  8
+     sharutils       | []    []    []    []          []                [] |  6
+     tar             | []    []          [] []    [] [] [] [] []    [] [] | 11
+     texinfo         | []    []          []                               |  3
+     textutils       | []    []    []    []       [] [] [] []          [] |  9
+     wdiff           | []    []    []    []          [] [] []          [] |  8
+                     `----------------------------------------------------'
+       17 languages    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
+       27 packages      6  4 25  1 18  1 26  2  1 12 20  9 19  7  4  7 17  179

   Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -215,8 +219,8 @@ dialects.
 which it applies should also have been internationalized and
 distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
-GNU distribution.
+distribution.

-   If May 1996 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.
+   If December 1997 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites.

--- a/13
+++ b/13
@@ -2,7 +2,7 @@
 		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES.

 		     END OF TERMS AND CONDITIONS

-	Appendix: How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>

    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
@@ -304,15 +304,16 @@ the "copyright" line and a pointer to where the full notice is found.
    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.
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
--- a/27
+++ b/27
@@ -0,0 +1,27 @@
+# Having a separate GNUmakefile lets me `include' the dynamically
+# generated rules created via Makefile.maint as well as Makefile.maint itself.
+# This makefile is used only if you run GNU Make.
+# It is necessary if you want to build targets usually of interest
+# only to the maintainer.
+
+# Systems where /bin/sh is not the default shell need this.  The $(shell)
+# command below won't work with e.g. stock DOS/Windows shells.
+SHELL = /bin/sh
+
+have-Makefile := $(shell test -f Makefile && echo yes)
+
+# If the user runs GNU make but has not yet run ./configure,
+# give them a diagnostic.
+ifeq ($(have-Makefile),yes)
+
+include Makefile
+include $(srcdir)/Makefile.maint
+
+else
+
+all:
+	@echo There seems to be no Makefile in this directory.
+	@echo "You must run ./configure before running \`make'."
+	@exit 1
+
+endif
--- a/7
+++ b/7
@@ -31,7 +31,7 @@ The simplest way to compile this package is:
     `sh ./configure' instead to prevent `csh' from trying to execute
     `configure' itself.

-     Running `configure' takes a while.  While running, it prints some
+     Running `configure' takes awhile.  While running, it prints some
     messages telling which features it is checking for.

  2. Type `make' to compile the package.
@@ -167,7 +167,9 @@ operates.
 `--quiet'
 `--silent'
 `-q'
-     Do not print messages saying which checks are being made.
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).

 `--srcdir=DIR'
     Look for the package's source code in directory DIR.  Usually
@@ -178,4 +180,3 @@ operates.
     script, and exit.

 `configure' also accepts some other, not widely useful, options.
-
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -0,0 +1,171 @@
+# -*-Makefile-*-
+# This Makefile fragment is shared between fileutils, sh-utils, textutils.
+
+maintainer-check:
+	if head ChangeLog| grep 'Version $(VERSION)' > /dev/null; then \
+	  :; \
+	else \
+	  echo "$(VERSION) not in ChangeLog; not tagging" 1>&2; \
+	  exit 1; \
+	fi
+	$(MAKE) distcheck
+	$(MAKE) my-distcheck
+
+prev-version := $(shell echo $(VERSION)|tr a-z Xa-y)
+tag-package = $(shell echo "$(PACKAGE)" | tr a-z A-Z)
+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)
+
+# Verify that all source files using _() are listed in po/POTFILES.in.
+po-check:
+	grep -E -v '^(#|$$)' po/POTFILES.in | sort > $@-1
+	grep -E -l '\b_\(' lib/*.c src/*.c | sort > $@-2
+	diff -u $@-1 $@-2
+	rm -f $@-1 $@-2
+
+# Tag before making distribution.  Also, don't make a distribution if
+# checks fail.  Also, make sure the NEWS file is up-to-date.
+# FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
+cvs-dist: maintainer-check
+	echo $(this-cvs-tag); \
+	if cvs -n log -h README| grep -e $(this-cvs-tag): > /dev/null; then \
+	  echo "VERSION not new; not tagging" 1>&2; \
+	  exit 1; \
+	fi; \
+	cvs update po; \
+	cvs tag -c $(this-cvs-tag)
+	$(MAKE) dist
+
+# Use this to make sure we don't run these programs when building
+# from a virgin tgz file, below.
+null_AM_MAKEFLAGS = \
+  ACLOCAL=false \
+  AUTOCONF=false \
+  AUTOMAKE=false \
+  AUTOHEADER=false \
+  MAKEINFO=false
+
+t=./=test
+my-distcheck: writable-files po-check
+	-rm -rf $(t)
+	mkdir $(t)
+	GZIP=$(GZIP) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
+# Removing $(DEPDIR) like this is a gross kludge to work around a bug
+# in automake.  Remove that line once it's fixed.
+	cd $(t)/$(distdir) \
+	  && ./configure --disable-nls \
+	  && $(MAKE) CFLAGS='-Wformat -Werror' \
+	      AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
+	  && $(MAKE) dvi \
+	  && $(MAKE) check \
+	  && $(MAKE) distclean \
+	  && rm -rf $(DEPDIR)
+	cd $(t) && mv $(distdir) $(distdir).old \
+	  && $(AMTAR) -zxf ../$(distdir).tar.gz
+	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
+	-rm -rf $(t)
+	@echo "========================"; \
+	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "========================"
+
+THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
+# FIXME: this works only for Gnits-style test releases.
+PREV_VERSION := $(shell echo $(VERSION)|tr b-z a-y|sed 's/a$$//')
+PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
+v = Version
+
+a_host = alpha.gnu.org
+b_host = tug.org
+
+alpha_subdir = gnu/fetish
+a_url_dir = $(alpha_subdir)
+b_url_dir = $(alpha_subdir)
+
+a_real_dir = /fs/share/ftp/$(alpha_subdir)
+b_real_dir = /home/ftp/pub/$(alpha_subdir)
+
+url_dir_list = $(foreach x,a b,ftp://$($(x)_host)/$($(x)_url_dir))
+
+md5 = $(shell md5sum < $(distdir).tar.gz|sed 's/  -//')
+
+rel-check:
+	tarz=/tmp/rel-check-tarz-$$$$; \
+	md5_tmp=/tmp/rel-check-md5-$$$$; \
+	set -e; \
+	trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \
+	wget -q --output-document=$$tarz $(url); \
+	echo "$(md5)  -" > $$md5_tmp; \
+	md5sum -c $$md5_tmp < $$tarz
+
+release-archive-dir = ../release
+prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
+xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
+
+announcement: NEWS ChangeLog $(distdir).tar.gz
+	@( \
+	  echo Subject: $(distdir) released; \
+	  echo; \
+	  echo FIXME: put comments here; \
+	  echo; \
+	  for url in $(url_dir_list); do \
+	    echo "  $$url/$(distdir).tar.gz"; \
+	  done; \
+	  echo; \
+	  echo And here are xdelta-style diffs; \
+	  echo; \
+	  for url in $(url_dir_list); do \
+	    echo "  $$url/$(xd-delta)"; \
+	  done; \
+	  echo; \
+	  echo "$(md5)  $(distdir).tar.gz"; \
+	  echo; \
+	  echo NEWS:; \
+	  sed -n "/$(THIS_VERSION_REGEXP)/,/$(PREV_VERSION_REGEXP)/p" NEWS \
+	    | grep -v '^\['; \
+	  echo; \
+	  echo ChangeLog entries:; \
+	  find . -name ChangeLog \
+	    | xargs cvs diff -up -r$(prev-cvs-tag) -rHEAD \
+	    | sed -n 's/^+//p' \
+	    | perl -ne 'm!^\+\+ (\./)?! or print,next;'	\
+	      -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
+	)
+
+writable-files:
+	for file in $(distdir).tar.gz $(xd-delta)			\
+	  ../release/$(distdir).tar.gz ../release/$(xd-delta); do	\
+	  test -e $$file || continue;					\
+	  test -w $$file						\
+	    || { echo ERROR: $$file is not writable; fail=1; };		\
+	done;								\
+	test "$$fail" && exit 1 || :
+
+WGET = wget
+ftp-gnu = ftp://ftp.gnu.org/gnu
+
+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
+
+alpha: writable-files po-check
+	$(MAKE) cvs-dist
+	$(MAKE) -s announcement > /tmp/announce-$(distdir)
+	ln $(distdir).tar.gz ../release
+	chmod a-w $(distdir).tar.gz
+	cd $(release-archive-dir) \
+	  && xdelta delta -9 $(prev-tgz) $(distdir).tar.gz $(xd-delta) || :
+	ln $(release-archive-dir)/$(xd-delta) .
+	chmod a-w $(release-archive-dir)/$(xd-delta)
+	@echo =====================================
+	@echo =====================================
+	@echo 'scp $(xd-delta) $(distdir).tar.gz \'
+	@echo '  $(b_host):$(b_real_dir)'
+	@echo '# send the /tmp/announcement e-mail'
+	@echo =====================================
+	@echo =====================================
--- a/278
+++ b/278
@@ -0,0 +1,278 @@
+These people have contributed to the GNU fileutils, textutils,
+and/or sh-utils packages.  Some have reported problems, others have
+contributed improvements to the documentation, actual code, and even
+complete programs.  Those contributions are described in the ChangeLog
+files.  If your name has been left out, if you'd rather not be listed,
+or if you'd prefer a different address be used, please let me know.
+Some old names and addresses are still in the ChangeLog.
+
+Achim Blumensath                    blume@corona.oche.de
+Adam Klein                          aklein@debian.org
+Akim Demaille                       demaille@inf.enst.fr
+Alain Magloire                      alain@qnx.com
+Alan Iwi                            iwi@atm.ox.ac.uk
+Alberto Accomazzi                   alberto@cfa0.harvard.edu
+aldomel                             aldomel@ix.netcom.com
+Alen Muzinic                        zveki@fly.cc.fer.hr
+Alexey Solovyov                     alekso@math.uu.se
+Andre Novaes Cunha                  Andre.Cunha@br.global-one.net
+Andreas Jaeger                      jaeger@gnu.org
+Andreas Luik                        luik@isa.de
+Andreas Schwab                      schwab@suse.de
+Andreas Stolcke                     stolcke@ICSI.Berkeley.EDU
+Andres Soolo                        andres@soolo.matti.ee
+Andrew Burgess                      aab@cichlid.com
+Andrew Dalke                        dalke@bioreason.com
+Andrew Tridgell                     tridge@samba.org
+Andries Brouwer                     Andries.Brouwer@cwi.nl
+Andy Longton                        alongton@metamark.com
+Ariel Faigon                        ariel@cthulhu.engr.sgi.com
+Arne H. Juul                        arnej@solan.unit.no
+Arne Henrik Juul                    arnej@imf.unit.no
+Arthur Pool                         pool@commerce.uq.edu.au
+Austin Donnelly                     Austin.Donnelly@cl.cam.ac.uk
+Bauke Jan Douma                     bjdouma@xs4all.nl
+Bengt Martensson                    bengt@mathematik.uni-Bremen.de
+Bernd Leibing                       bernd.leibing@rz.uni-ulm.de
+Bernhard Rosenkraenzer              bero@redhat.de
+Bill Peters                         peters@gaffel.as.arizona.edu
+Bjorn Helgaas                       helgaas@rsn.hp.com
+Bob McCracken                       kerouac@ravenet.com
+Bob Proulx                          rwp@fc.hp.com
+Branden Robinson                    branden@necrotic.deadbeast.net
+Brendan O'Dea                       bod@compusol.com.au
+Brian Kimball                       bfk@footbag.org
+Brian Youmans                       3diff@gnu.org
+Bruno Haible                        haible@clisp.cons.org
+Carl Johnson                        carlj@cjlinux.home.org
+Carl Lowenstein                     cdl@mpl.UCSD.EDU
+Carlos Canau                        Carlos.Canau@relay.puug.pt
+Charles Karney                      karney@pppl.gov
+Charles Randall                     crandall@matchlogic.com
+Chip Salzenberg                     chip@valinux.com
+Chris Yeo                           cyeo@biking.org
+Christi Alice Scarborough           christi@chiark.greenend.org.uk
+Christian Krackowizer               kra1@technodat.co.at
+Christian von Roques                roques@pond.sub.org
+Chuck Hedrick                       hedrick@klinzhai.rutgers.edu
+Clark Morgan                        cmorgan@aracnet.com
+Colin Plumb                         colin@nyx.net
+Collin Rogowski                     collin@rogowski.de
+Dan Hagerty                         hag@gnu.ai.it.edu
+Daniel Bergstrom                    noa@melody.se
+David Dyck                          dcd@tc.fluke.COM
+David Godfrey                       dave@delta.demon.co.uk
+Dennis Henriksen                    opus@flamingo.osrl.dk
+Derek Clegg                         dclegg@next.com
+Dick Streefland                     dick_streefland@tasking.com
+Dirk Lattermann                     dlatt@t-online.de
+Dirk-Jan Faber                      djfaber@snow.nl
+Don Parsons                         dparsons@synapse.kent.edu
+Donni Erpel                         donald@appc11.gsi.de
+Doug McLaren                        dougmc@comco.com
+Dragos Harabor                      dharabor@us.oracle.com
+Ed Avis                             epa98@doc.ic.ac.uk
+Edzer Pebesma                       Edzer.Pebesma@rivm.nl
+Eirik Fuller                        eirik@netcom.com
+Eivind                              eivindt@multinet.no
+Eli Zaretskii                       eliz@is.elta.co.il
+Emile LeBlanc                       leblanc@math.toronto.edu
+Eric Backus                         ericb@lsid.hp.com
+Eric G. Miller                      egm2@jps.net
+Erik Bennett                        bennett@cvo.oneworld.com
+Erik Corry                          erik@kroete2.freinet.de
+Felix Lee                           flee@teleport.com
+Fletcher Mattox                     fletcher@cs.utexas.edu
+Florin Iucha                        fiucha@hsys.mic.ro
+Frank Adler                         fadler@allesklar.de
+Frank T Lofaro                      ftlofaro@snooks.Egr.UNLV.EDU
+François Pinard                     pinard@iro.umontreal.ca
+Fred Fish                           fnf@ninemoons.com
+Gabor Z. Papp                       gzp@gzp.org.hu
+Galen Hazelwood                     galenh@micron.net
+Gary Anderson                       ganderson@clark.net
+Gaël Quéri                          gqueri@mail.dotcom.fr
+Geoff Kuenning                      geoff@cs.hmc.edu
+Geoff Odhner                        geoff@franklin.com
+Gerhard Poul                        gpoul@gnu.org
+Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
+GOTO Masanori                       gotom@debian.or.jp
+Greg Louis                          glouis@dynamicro.on.ca
+Greg McGary                         gkm@gnu.org
+Greg Troxel                         gdt@bbn.com
+Greg Wooledge                       gawooledge@sherwin.com
+Gregory Leblanc                     gleblanc@cu-portland.edu
+Göran Uddeborg                      goeran@uddeborg.pp.se
+H. J. Lu                            hjl@valinux.com
+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
+Hugh Daniel                         hugh@xanadu.com
+Ian Jackson                         ijackson@chiark.greenend.org.uk
+Ian Lance Taylor                    ian@cygnus.com
+Ian Turner                          vectro@pipeline.com
+James                               james@albion.glarp.com
+James Antill                        jmanti%essex.ac.uk@seralph21.essex.ac.uk
+James Sneeringer                    jvs@ocslink.com
+James Tanis                         jtt@soscorp.com
+James Youngman                      james+usenet@free-lunch.demon.co.uk
+Jamie Lokier                        jamie@imbolc.ucc.ie
+Janos Farkas                        chexum@shadow.banki.hu
+Jarkko Hietaniemi                   jhi@epsilon.hut.fi
+Jeff Moore                          jbm@mordor.com
+Jeff Sheinberg                      jeffsh@erols.com
+Jens Schmidt                        jms@jsds.hamburg.com
+Jerome Abela                        abela@hsc.fr
+Jesse Thilo                         jgt2@eecs.lehigh.edu
+Jie Xu                              xuj@iag.net
+Jim Blandy                          jimb@cyclic.com
+Jim Dennis                          jimd@starshine.org
+Joakim Rosqvist                     dvljrt@cs.umu.se
+Jochen Hein                         jochen@jochen.org
+Joe Orton                           joe@orton.demon.co.uk
+Johan Danielsson                    joda@pdc.kth.se
+John Bley                           jbb6@acpub.duke.edu
+John David Anglin                   dave.anglin@nrc.ca
+John Gatewood Ham                   zappaman@alphabox.compsci.buu.ac.th
+John Gotts                          jgotts@umich.edu
+John Kendall                        kendall@capps.com
+John Kodis                          kodis@acm.org
+John Murphy                         jam@philabs.research.philips.com
+John Roll                           john@panic.harvard.edu
+John Salmon                         johns@mullet.anu.edu.au
+John Summerfield                    summer@OS2.ami.com.au
+Joost van Baal                      joostvb@xs4all.nl
+Joseph S. Myers                     jsm28@cam.ac.uk
+jvogel                              jvogel@linkny.com
+Jürgen Fluk                         louis@dachau.marco.de
+Kai-Uwe Rommel                      rommel@informatik.tu-muenchen.de
+Kalle Olavi Niemitalo               tosi@stekt.oulu.fi
+Kamal Paul Nigam                    Kamal_Paul_Nigam@gs35.sp.cs.cmu.edu
+Karl Heuer                          kwzh@gnu.org
+Karsten Thygesen                    karthy@kom.auc.dk
+Kaveh R. Ghazi                      ghazi@caip.rutgers.edu
+Keith Owens                         kaos@audio.apana.org.au
+Ken Pizzini                         kenp@halcyon.com
+Kjetil Torgrim Homme                kjetilho@ifi.uio.no
+Kristoffer Rose                     kris@diku.dk
+Larry McVoy                         lm@sgi.com
+Lars Hecking                        lhecking@nmrc.ucc.ie
+Lehti Rami                          rammer@cs.tut.fi
+Leonard N. Zubkoff                  lnz@dandelion.com
+Lorne Baker                         lbaker@nitro.avint.net
+Maciej Kwapulinski                  pikpok@univ.gda.pl
+Manas Garg                          manas@cygsoft.com
+Manfred Hollstein                   manfred@s-direktnet.de
+Marc Boucher                        marc@mbsi.ca
+Marc Olzheim                        marcolz@stack.nl
+Marco Franzen                       Marco.Franzen@Thyron.com
+Marcus Daniels                      marcus@ee.pdx.edu
+Mark A. Thomas                      thommark@access.digex.net
+Mark D. Roth                        roth@uiuc.edu
+Mark Harris                         mark@monitor.designacc.com
+Mark Hewitt                         mhewitt@armature.com
+Mark Kettenis                       kettenis@phys.uva.nl
+Mark W. Eichin                      eichin@cygnus.com
+Markus Demleitner                   msdemlei@auriga.ari.uni-heidelberg.de
+Martin                              martin@dresden.nacamar.de
+Martin Gallant                      martyg@goodbit.net
+Martin Hippe                        martin.hippe@schlund.de
+Martin Mitchell                     martin@debian.org
+Martin P.J. Zinser                  zinser@decus.de
+Marty Leisner                       leisner@sdsp.mc.xerox.com
+Masami Takikawa                     takikawm@CS.ORST.EDU
+Mate Wierdl                         mw@moni.msci.memphis.edu
+Matej Vela                          mvela@public.srce.hr
+Matthew Braun                       matthew@ans.net
+Matthew Clarke                      Matthew_Clarke@mindlink.bc.ca
+Matthew S. Levine                   mslevine@theory.lcs.mit.edu
+Matthew Swift                       swift@alum.mit.edu
+Matthias Urlichs                    smurf@noris.de
+Meelis Roos                         mroos@tartu.cyber.ee
+Michael ???                         michael@roka.net
+Michael Deutschmann                 michael@talamasca.ocis.net
+Michael Hasselberg                  mikelh@zonta.ping.de
+Michael Hohn                        hohn@math.utah.edu
+Michael Stone                       mstone@debian.org
+Michael Stutz                       stutz@dsl.org
+Michael Veksler                     mveksler@techunix.technion.ac.il
+Michel Robitaille                   robitail@IRO.UMontreal.CA
+Michiel Bacchiani                   bacchian@raven.bu.edu
+Miles Bader                         miles@gnu.ai.mit.edu
+Minh Tran-Le                        tranle@intellicorp.com
+Morten Welinder                     terra@diku.dk
+Nelson H. F. Beebe                  beebe@math.utah.edu
+Niklas Edmundsson                   nikke@acc.umu.se
+Noah Friedman                       friedman@splode.com
+Noel Cragg                          noel@red-bean.com
+Olav Morkrid                        olav@funcom.com
+Ørn E. Hansen                       oehansen@daimi.aau.dk
+Paul Eggert                         eggert@twinsun.com
+Paul Nevai                          nevai@ops.mps.ohio-state.edu
+Paul Sauer                          paul@alexa.com
+Paul Slootman                       paul@debian.org
+Per Cederqvist                      ceder@lysator.liu.se
+Per Kristian Hove                   perhov@math.ntnu.no
+Peter Eriksson                      peter@ifm.liu.se
+Peter Moulder                       reiter@netspace.net.au
+Peter Samuelson                     psamuels@sampo.creighton.edu
+Peter Seebach                       seebs@taniemarie.solon.com
+Phil Richards                       phil.richards@vf.vodafone.co.uk
+Philippe De Muyter                  phdm@macqel.be
+Philippe Schnoebelen                Philippe.Schnoebelen@imag.fr
+Piergiorgio Sartor                  sartor@sony.de
+Piotr Kwapulinski                   kwap@univ.gda.pl
+Prashant TR                         tr@eth.net
+Rainer Orth                         ro@TechFak.Uni-Bielefeld.DE
+Ralf W. Stephan                     stephan@tmt.de
+Ralph Loader                        loader@maths.ox.ac.uk
+Raul Miller                         moth@magenta.com
+Richard Braakman                    dark@xs4all.nl
+Richard J. Rauenzahn                rrauenza@hairball.cup.hp.com
+Richard Sharman                     rsharman@magmacom.com
+Rick Sladkey                        jrs@world.std.com
+Rik Faith                           faith@cs.unc.edu
+Risto Kankkunen                     kankkune@lingsoft.fi
+Robert H. de Vries                  robert@and.nl
+Rogier Wolff                        R.E.Wolff@BitWizard.nl
+Ronald F. Guilmette                 rfg@netcom.com
+Ross Alexander                      r.alexander@auckland.ac.nz
+Ross Paterson                       rap@doc.ic.ac.uk
+Ross Ridge                          rridge@calum.csclub.uwaterloo.ca
+Sami Farin                          sfarin@ratol.fi
+Samuli Karkkainen                   Samuli.Karkkainen@hut.fi
+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
+Stephen Gildea                      gildea@x.org
+Stephen Smoogen                     ??????????
+Steve McConnel                      steve@acadcomp.sil.org
+Stuart Kemp                         skemp@peter.bmc.com
+Tadayoshi Funaba                    tadf@kt.rim.or.jp
+Theodore Ts'o                       tytso@rsts-11.mit.edu
+Thomas Bushnell                     thomas@gnu.ai.mit.edu
+Thomas Quinot                       thomas@Cuivre.FR.EU.ORG
+Tim Smithers                        mouse@dmouse.com.au
+Tim Waugh                           twaugh@redhat
+Todd A. Jacobs                      tjacobs@codegnome.org
+Tom Quinn                           trq@dionysos.thphys.ox.ac.uk
+Ton Hospel                          thospel@mail.dma.be
+Tony Leneis                         tony@plaza.ds.adp.com
+Tony Robinson                       ajr@eng.cam.ac.uk
+Torbjorn Granlund                   tege@nada.kth.se
+Torbjorn Lindgren                   tl@funcom.no
+Torsten Landschoff                  torsten@pclab.ifg.uni-kiel.de
+Ulrich Drepper                      drepper@gnu.org
+Urs Thuermann                       urs@isnogud.escape.de
+Vin Shelton                         acs@alumni.princeton.edu
+Volker Borchert                     bt@teknon.de
+Wayne Stewart                       wstewa@atl.com
+Wichert Akkerman                    wichert@cistron.nl
+Will Edgington                      wedgingt@acm.org
+William Bader                       william@nscs.fast.net
+William Dowling                     will@franklin.com
+William Lewis                       wiml@omnigroup.com
+Wolfram Kleff                       kleff@cs.uni-bonn.de
+Zvi Har'El                          rl@math.technion.ac.il
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,20 +1,19 @@
 Makefile
-fileutils.info
-version.texi
-fileutils.info*
-fileutils.log
-fileutils.dvi
 fileutils.aux
-fileutils.toc
-fileutils.cp
-fileutils.fn
-fileutils.vr
-fileutils.tp
-fileutils.ky
-fileutils.pg
 fileutils.cm
-fileutils.fl
-fileutils.op
+fileutils.cp
 fileutils.cps
+fileutils.dvi
+fileutils.fl
+fileutils.fn
+fileutils.info
+fileutils.info*
+fileutils.ky
+fileutils.log
+fileutils.op
+fileutils.pg
+fileutils.toc
+fileutils.tp
+fileutils.vr
 stamp-vti
 version.texi
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,14 @@
-## Process this file with automake to produce Makefile.in
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
 info_TEXINFOS = fileutils.texi

-# FIXME: remove texinfo.tex when automake has been fixed to include it
-# automatically
-EXTRA_DIST = perm.texi getdate.texi texinfo.tex
+EXTRA_DIST = perm.texi getdate.texi
+
+# The following is necessary if the package name is 8 characters or longer.
+# If the info documentation would be split into 10 or more separate files,
+# then this is necessary even if the package name is 7 characters long.
+#
+# Tell makeinfo to put everything in a single info file: <package>.info.
+# Otherwise, it would also generate files with names like <package>.info-[123],
+# and those names all map to one 14-byte name (<package>.info-) on some crufty
+# old systems.
+MAKEINFO = makeinfo --no-split
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,11 +1,16 @@
-# Makefile.in generated automatically by automake 1.0 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am

-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# 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 = /bin/sh
+SHELL = @SHELL@

 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -32,177 +37,351 @@ 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_STRIP_FLAG =
 transform = @program_transform_name@

+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+@SET_MAKE@
+host_alias = @host_alias@
+host_triplet = @host@
+AMDEP = @AMDEP@
+AMTAR = @AMTAR@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+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@
+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@
+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@
+U = @U@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+YACC = @YACC@
+install_sh = @install_sh@
+l = @l@
+
+
 info_TEXINFOS = fileutils.texi

-# FIXME: remove texinfo.tex when automake has been fixed to include it
-# automatically
-EXTRA_DIST = perm.texi getdate.texi texinfo.tex
-mkinstalldirs = $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
+EXTRA_DIST = perm.texi getdate.texi

-MAKEINFO = makeinfo
+# The following is necessary if the package name is 8 characters or longer.
+# If the info documentation would be split into 10 or more separate files,
+# then this is necessary even if the package name is 7 characters long.
+#
+# Tell makeinfo to put everything in a single info file: <package>.info.
+# Otherwise, it would also generate files with names like <package>.info-[123],
+# and those names all map to one 14-byte name (<package>.info-) on some crufty
+# old systems.
+MAKEINFO = makeinfo --no-split
+subdir = doc
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../config.h
+CONFIG_CLEAN_FILES = 
+DIST_SOURCES = 
 TEXI2DVI = texi2dvi
-INFOS = fileutils.info*
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
-
-DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti version.texi
+DIST_COMMON =  Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
+version.texi


-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
-	$(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST) $(DATA)
-DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
-	$(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST) $(DATA)
+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

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


-$(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in
-	cd $(top_srcdir) && automake $(subdir)/Makefile
+$(srcdir)/version.texi: stamp-vti
+	@:

-Makefile: $(top_builddir)/config.status Makefile.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-
-version.texi: @MAINT@stamp-vti
-
-stamp-vti: fileutils.texi $(top_srcdir)/configure.in
-	echo "@set UPDATED `cd $(srcdir) \
-	  && $(SHELL) ./mdate-sh fileutils.texi`" > vti.tmp
-	echo "@set EDITION $(VERSION)" >> vti.tmp
-	echo "@set VERSION $(VERSION)" >> vti.tmp
-	if cmp -s vti.tmp $(srcdir)/version.texi; then \
-	  rm vti.tmp;			\
-	else					\
-	  mv vti.tmp $(srcdir)/version.texi; \
-	fi
-	echo timestamp > $(srcdir)/stamp-vti
+$(srcdir)/stamp-vti: fileutils.texi $(top_srcdir)/configure.in
+	@(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/fileutils.texi`; \
+	echo "@set UPDATED $$1 $$2 $$3"; \
+	echo "@set UPDATED-MONTH $$2 $$3"; \
+	echo "@set EDITION $(VERSION)"; \
+	echo "@set VERSION $(VERSION)") > vti.tmp
+	@cmp -s vti.tmp $(srcdir)/version.texi \
+	  || (echo "Updating $(srcdir)/version.texi"; \
+	      cp vti.tmp $(srcdir)/version.texi)
+	-@rm -f vti.tmp
+	@cp $(srcdir)/version.texi $@

 mostlyclean-vti:
-	rm -f vti.tmp
+	-rm -f vti.tmp

 clean-vti:

 distclean-vti:

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

 fileutils.info: fileutils.texi version.texi
+fileutils.dvi: fileutils.texi version.texi


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

 .texi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<

-install-info: $(INFO_DEPS)
-	$(mkinstalldirs) $(infodir)
-	for file in $(INFO_DEPS); do		\
-	  for ifile in `cd $(srcdir) && echo $$file*`; do \
-	    $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
-	  done;					\
+.texi:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	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,.*/,,'`
+.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:
-	cd $(srcdir) && for file in *.info*; do	\
-	  rm -f $(infodir)/$$file; \
+	$(PRE_UNINSTALL)
+	@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) --remove $(DESTDIR)$(infodir)/$$file"; \
+	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
+	  done; \
+	else :; fi
+	@$(NORMAL_UNINSTALL)
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  (if cd $(DESTDIR)$(infodir); then \
+	     echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
+	     rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
+	   else :; fi); \
 	done

-mostlyclean-info:
-	rm -f fileutils.aux fileutils.cp fileutils.cps fileutils.dvi \
-	  fileutils.fn fileutils.fns fileutils.ky fileutils.log \
-	  fileutils.pg fileutils.toc fileutils.tp fileutils.vr \
-	  fileutils.op
+dist-info: $(INFO_DEPS)
+	list='$(INFO_DEPS)'; \
+	for base in $$list; do \
+	  d=$(srcdir); \
+	  for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file; \
+	  done; \
+	done

-clean-info:
+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

-distclean-info:
+clean-aminfo:

-maintainer-clean-info:
-	rm -f $(INFOS)
+distclean-aminfo:
+
+maintainer-clean-aminfo:
+	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]*; \
+	  fi; \
+	done
 tags: TAGS
 TAGS:


-subdir = doc
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-distdir: $(DEP_DISTFILES)
-	@for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
-	  test -f $(distdir)/$$file \
-	  || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \
+
+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
-info: $(INFO_DEPS)
+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
+info-am: $(INFO_DEPS)
+info: info-am
+dvi-am: $(DVIS)
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am

-dvi: $(DVIS)
-
-check: all
-
-installcheck:
-
-install-exec: 
-
-install-data: install-info
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-info
-
-all: $(INFO_DEPS) Makefile
+install-data-am: install-info-am
+install-data: install-data-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) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
-	$(mkinstalldirs)  $(infodir)
+	$(mkinstalldirs)  $(DESTDIR)$(infodir)


 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log $(CONFIG_HEADER) stamp-h
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-vti mostlyclean-info mostlyclean-generic
+	-rm -f Makefile.in
+mostlyclean-am:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic

-clean:  clean-vti clean-info clean-generic mostlyclean 
+mostlyclean: mostlyclean-am

-distclean:  distclean-vti distclean-info distclean-generic clean 
-	rm -f config.status
+clean-am:  clean-vti clean-aminfo clean-generic mostlyclean-am

-maintainer-clean:  maintainer-clean-vti maintainer-clean-info \
-		maintainer-clean-generic distclean 
+clean: clean-am
+
+distclean-am:  distclean-vti distclean-aminfo distclean-generic clean-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."

-.PHONY: default mostlyclean-vti distclean-vti clean-vti \
-maintainer-clean-vti install-info uninstall-info mostlyclean-info \
-distclean-info clean-info maintainer-clean-info tags distdir info dvi \
-check installcheck install-exec install-data install uninstall all \
+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

-.SUFFIXES:
-.SUFFIXES: .texi .info .dvi

 # 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.
--- a/doc/getdate.texi
+++ b/doc/getdate.texi
@@ -1,16 +1,35 @@
-@ifinfo
-@set Francois Franc,ois
-@end ifinfo
-@tex
-@set Francois Fran\noexpand\ptexc cois
-@end tex
-
@node Date input formats
@chapter Date input formats

@cindex date input formats
@findex getdate

+First, a quote:
+
+@quotation
+Our units of temporal measurement, from seconds on up to months, are so
+complicated, asymmetrical and disjunctive so as to make coherent mental
+reckoning in time all but impossible.  Indeed, had some tyrannical god
+contrived to enslave our minds to time, to make it all but impossible
+for us to escape subjection to sodden routines and unpleasant surprises,
+he could hardly have done better than handing down our present system.
+It is like a set of trapezoidal building blocks, with no vertical or
+horizontal surfaces, like a language in which the simplest thought
+demands ornate constructions, useless particles and lengthy
+circumlocutions.  Unlike the more successful patterns of language and
+science, which enable us to face experience boldly or at least
+level-headedly, our system of temporal calculation silently and
+persistently encourages our terror of time.
+
+@dots{}  It is as though architects had to measure length in feet, width
+in meters and height in ells; as though basic instruction manuals
+demanded a knowledge of five different languages.  It is no wonder then
+that we often look into our own immediate past or future, last Tuesday
+or a week from Sunday, with feelings of helpless confusion.  @dots{}
+
+--- Robert Grudin, @cite{Time and the Art of Living}.
+@end quotation
+
 This section describes the textual date representations that GNU
 programs accept.  These are the strings you, as a user, can supply as
 arguments to the various programs.  The C interface (via the
@@ -25,11 +44,11 @@ midnight, 1 January 1970 UCT.

@menu
 * General date syntax::            Common rules.
-* Calendar date item::             19 Dec 1994.
-* Time of day item::               9:20pm.
-* Timezone item::                  EST, DST, BST, UCT, AHST, ...
-* Day of week item::               Monday and others.
-* Relative item in date strings::  next tuesday, 2 years ago.
+* Calendar date items::             19 Dec 1994.
+* Time of day items::               9:20pm.
+* Time zone items::                 EST, DST, BST, UTC, ...
+* Day of week items::               Monday and others.
+* Relative items in date strings::  next tuesday, 2 years ago.
 * Pure numbers in date strings::   19931219, 1440.
 * Authors of getdate::             Bellovin, Salz, Berets, et al.
@end menu
@@ -53,7 +72,7 @@ many flavors of items:
@item time zone items
@item day of the week items
@item relative items
-@item pure numbers.  
+@item pure numbers.
@end itemize

@noindent We describe each of these item types in turn, below.
@@ -84,23 +103,24 @@ nested.  Hyphens not followed by a digit are currently ignored.  Leading
 zeros on numbers are ignored.


-@node Calendar date item
-@section Calendar date item
+@node Calendar date items
+@section Calendar date items

@cindex calendar date item

-A @dfn{calendar date item} specifies a day of the year.  It is 
+A @dfn{calendar date item} specifies a day of the year.  It is
 specified differently, depending on whether the month is specified
 numerically or literally.  All these strings specify the same calendar date:

@example
-1970-09-17           # ISO 8601.
-70-9-17              # This century assumed by default.
-70-09-17             # Leading zeros are ignored.
-9/17/72              # Common U.S. writing.
+1972-09-24     # ISO 8601.
+72-9-24        # Assume 19xx for 69 through 99,
+               # 20xx for 00 through 68.
+72-09-24       # Leading zeros are ignored.
+9/24/72        # Common U.S. writing.
 24 September 1972
-24 Sept 72           # September has a special abbreviation.
-24 Sep 72            # Three-letter abbreviations always allowed.
+24 Sept 72     # September has a special abbreviation.
+24 Sep 72      # Three-letter abbreviations always allowed.
 Sep 24, 1972
 24-sep-72
 24sep72
@@ -110,8 +130,8 @@ The year can also be omitted.  In this case, the last specified year is
 used, or the current year if none.  For example:

@example
-9/17
-sep 17
+9/24
+sep 24
@end example

 Here are the rules.
@@ -122,8 +142,9 @@ For numeric months, the ISO 8601 format
@samp{@var{year}-@var{month}-@var{day}} is allowed, where @var{year} is
 any positive number, @var{month} is a number between 01 and 12, and
@var{day} is a number between 01 and 31.  A leading zero must be present
-if a number is less than ten.  If @var{year} is less than 100, then 1900
-is added to it to force a date in this century.  The construct
+if a number is less than ten.  If @var{year} is 68 or smaller, then 2000
+is added to it; otherwise, if @var{year} is less than 100,
+then 1900 is added to it.  The construct
@samp{@var{month}/@var{day}/@var{year}}, popular in the United States,
 is accepted.  Also @samp{@var{month}/@var{day}}, omitting the year.

@@ -153,8 +174,8 @@ Or, omitting the year:
@end example


-@node Time of day item
-@section Time of day item
+@node Time of day items
+@section Time of day items

@cindex time of day item

@@ -186,167 +207,145 @@ indicates the first half of the day, @samp{pm} indicates the second
 half of the day.  In this notation, 12 is the predecessor of 1:
 midnight is @samp{12am} while noon is @samp{12pm}.

-@cindex timezone correction
-@cindex minutes, timezone correction by
-The time may alternatively be followed by a timezone correction,
+@cindex time zone correction
+@cindex minutes, time zone correction by
+The time may alternatively be followed by a time zone correction,
 expressed as @samp{@var{s}@var{hh}@var{mm}}, where @var{s} is @samp{+}
 or @samp{-}, @var{hh} is a number of zone hours and @var{mm} is a number
-of zone minutes.  When a timezone correction is given this way, it
-forces interpretation of the time in UTC, overriding any previous
-specification for the timezone or the local timezone.  The @var{minute}
-part of the time of the day may not be elided when a timezone correction
-is used.  This is the only way to specify a timezone correction by
+of zone minutes.  When a time zone correction is given this way, it
+forces interpretation of the time relative to
+Coordinated Universal Time (UTC), overriding any previous
+specification for the time zone or the local time zone.  The @var{minute}
+part of the time of the day may not be elided when a time zone correction
+is used.  This is the only way to specify a time zone correction by
 fractional parts of an hour.

-Either @samp{am}/@samp{pm} or a timezone correction may be specified,
+Either @samp{am}/@samp{pm} or a time zone correction may be specified,
 but not both.


-@node Timezone item
-@section Timezone item
+@node Time zone items
+@section Time zone items

-@cindex timezone item
+@cindex time zone item

-A @dfn{timezone item} specifies an international timezone, indicated by
-a small set of letters.  Any included period is ignored.  Military
-timezone designations use a single letter.  Currently, only integral
-zone hours may be represented in a timezone item.  See the previous
-section for a finer control over the timezone correction.
+A @dfn{time zone item} specifies an international time zone, indicated by
+a small set of letters.  They are supported for backward compatibility reasons,
+but they are not recommended because they are ambiguous in practice:
+for example, the abbreviation @samp{EST} has different meanings in
+Australia and the United States.  Any included period is ignored.  Military
+time zone designations use a single letter.  Currently, only integral
+zone hours may be represented in a time zone item.  See the previous
+section for a finer control over the time zone correction.

-Here are many non-daylight-savings-time timezones, indexed by the zone
+Here are many non-daylight-saving-time time zones, indexed by the zone
 hour value.

@table @asis
-@item +000
-@cindex Greenwich Mean Time
-@cindex Universal Coordinated Time
-@cindex Western European Time
-@samp{GMT} for Greenwich Mean, @samp{UT} or @samp{UTC} for Universal
-(Coordinated), @samp{WET} for Western European and @samp{Z} for
-militaries.
-@item +100
-@cindex West African Time
-@samp{WAT} for West Africa and
-@samp{A} for militaries.
-@item +200
-@cindex Azores Time
-@samp{AT} for Azores and @samp{B} for militaries.
-@item +300
-@samp{C} for militaries.
-@item +400
-@cindex Atlantic Standard Time
-@samp{AST} for Atlantic Standard and @samp{D} for militaries.
-@item +500
-@cindex Eastern Standard Time
-@samp{E} for militaries and @samp{EST} for Eastern Standard.
-@item +600
-@cindex Central Standard Time
-@samp{CST} for Central Standard and @samp{F} for militaries.
-@item +700
-@cindex Mountain Standard Time
-@samp{G} for militaries and @samp{MST} for Mountain Standard.
-@item +800
-@cindex Pacific Standard Time
-@samp{H} for militaries and @samp{PST} for Pacific Standard.
-@item +900
-@cindex Yukon Standard Time
-@samp{I} for militaries and @samp{YST} for Yukon Standard.
-@item +1000
-@cindex Alaska-Hawaii Time
-@cindex Central Alaska Time
-@cindex Hawaii Standard Time
-@samp{AHST} for Alaska-Hawaii Standard, @samp{CAT} for Central Alaska,
-@samp{HST} for Hawaii Standard and @samp{K} for militaries.
-@item +1100
-@cindex Nome Standard Time
-@samp{L} for militaries and @samp{NT} for Nome.
-@item +1200
-@cindex International Date Line West
-@samp{IDLW} for International Date Line West and @samp{M} for
-militaries.
-@item -100
-@cindex Central European Time
-@cindex Middle European Time
-@cindex Middle European Winter Time
-@cindex French Winter Time
-@cindex Swedish Winter Time
-@samp{CET} for Central European, @samp{FWT} for French Winter,
-@samp{MET} for Middle European, @samp{MEWT} for Middle European
-Winter, @samp{N} for militaries and @samp{SWT} for Swedish Winter.
-@item -200
-@cindex Eastern European Time
-@cindex USSR Zone
-@samp{EET} for Eastern European, USSR Zone 1 and @samp{O} for militaries.
-@item -300
-@cindex Baghdad Time
-@samp{BT} for Baghdad, USSR Zone 2 and @samp{P} for militaries.
-@item -400
-@samp{Q} for militaries and @samp{ZP4} for USSR Zone 3.
-@item -500
-@samp{R} for militaries and @samp{ZP5} for USSR Zone 4.
-@item -600
-@samp{S} for militaries and @samp{ZP6} for USSR Zone 5.
-@item -700
-@cindex West Australian Standard Time
-@samp{T} for militaries and @samp{WAST} for West Australian Standard.
-@item -800
-@cindex China Coast Time
-@samp{CCT} for China Coast, USSR Zone 7 and @samp{U} for militaries.
-@item -900
-@cindex Japan Standard Time
-@samp{JST} for Japan Standard, USSR Zone 8 and @samp{V} for militaries.
-@item -1000
-@cindex East Australian Standard Time
-@cindex Guam Standard Time
-@samp{EAST} for East Australian Standard, @samp{GST} for Guam
-Standard, USSR Zone 9 and @samp{W} for militaries.
+@item -1200
+@samp{Y} for militaries.
@item -1100
@samp{X} for militaries.
-@item -1200
-@cindex International Date Line East
-@cindex New Zealand Standard Time
-@samp{IDLE} for International Date Line East, @samp{NZST} for
-New Zealand Standard, @samp{NZT} for New Zealand and @samp{Y} for
-militaries.
+@item -1000
+@samp{W} for militaries.
+@item -0900
+@samp{V} for militaries.
+@item -0800
+@samp{PST} for Pacific Standard, and
+@samp{U} for militaries.
+@item -0700
+@samp{MST} for Mountain Standard, and
+@samp{T} for militaries.
+@item -0600
+@samp{CST} for Central Standard, and
+@samp{S} for militaries.
+@item -0500
+@samp{EST} for Eastern Standard, and
+@samp{R} for militaries.
+@item -0400
+@samp{AST} for Atlantic Standard, and
+@samp{Q} for militaries.
+@item -0300
+@samp{P} for militaries.
+@item -0200
+@samp{O} for militaries.
+@item -0100
+@samp{N} for militaries.
+@item +0000
+@cindex Greenwich Mean Time
+@cindex Coordinated Universal Time
+@cindex Universal Coordinated Time
+@cindex Universal Time (Coordinated)
+@samp{GMT} for Greenwich Mean,
+@samp{UT} for Universal,
+@samp{UTC} for Coordinated Universal,
+@samp{WET} for Western European, and
+@samp{Z} for ISO 8601 and militaries.
+@item +0100
+@samp{A} for militaries,
+@samp{CET} for Central European,
+@samp{MET} for Midden Europesche Tijd (Dutch), and
+@samp{MEZ} for Mittel-Europ@"aische Zeit (German).
+@item +0200
+@samp{B} for militaries, and
+@samp{EET} for Eastern European.
+@item +0300
+@samp{C} for militaries.
+@item +0400
+@samp{D} for militaries.
+@item +0500
+@samp{E} for militaries.
+@item +0600
+@samp{F} for militaries.
+@item +0700
+@samp{G} for militaries.
+@item +0800
+@samp{H} for militaries.
+@item +0900
+@samp{I} for militaries, and
+@samp{JST} for Japan Standard.
+@item +1000
+@samp{GST} for Guam Standard, and
+@samp{K} for militaries.
+@item +1100
+@samp{L} for militaries.
+@item +1200
+@samp{M} for militaries, and
+@samp{NZST} for New Zealand Standard.
@end table

-@cindex daylight savings time
-Here are many DST timezones, indexed by the zone hour value.  Also, by
-following a non-DST timezone by the string @samp{DST} in a separate word
-(that is, separated by some whitespace), the corresponding DST timezone
+@cindex daylight-saving time
+Here are many daylight-saving time (DST) time zones,
+indexed by the zone hour value.  Also, by
+following a non-DST time zone by the string @samp{DST} in a separate word
+(that is, separated by some whitespace), the corresponding DST time zone
 may be specified.

@table @asis
-@item 0
-@samp{BST} for British Summer.
-@item +400
-@samp{ADT} for Atlantic Daylight.
-@item +500
-@samp{EDT} for Eastern Daylight.
-@item +600
-@samp{CDT} for Central Daylight.
-@item +700
-@samp{MDT} for Mountain Daylight.
-@item +800
+@item -0700
@samp{PDT} for Pacific Daylight.
-@item +900
-@samp{YDT} for Yukon Daylight.
-@item +1000
-@samp{HDT} for Hawaii Daylight.
-@item -100
-@samp{MEST} for Middle European Summer, @samp{MESZ} for Middle European
-Summer, @samp{SST} for Swedish Summer and @samp{FST} for French Summer.
-@item -700
-@samp{WADT} for West Australian Daylight.
-@item -1000
-@samp{EADT} for Eastern Australian Daylight.
-@item -1200
+@item -0600
+@samp{MDT} for Mountain Daylight.
+@item -0500
+@samp{CDT} for Central Daylight.
+@item -0400
+@samp{EDT} for Eastern Daylight.
+@item -0300
+@samp{ADT} for Atlantic Daylight.
+@item +0100
+@samp{BST} for British Summer, and
+@samp{WEST} for Western European Summer.
+@item +0200
+@samp{CEST} for Central European Summer,
+@samp{MEST} for Midden Europesche S. Tijd (Dutch), and
+@samp{MESZ} for Mittel-Europ@"aische Sommerzeit (German).
+@item +1300
@samp{NZDT} for New Zealand Daylight.
@end table


-@node Day of week item
-@section Day of week item
+@node Day of week items
+@section Day of week items

@cindex day of week item

@@ -372,8 +371,8 @@ the day that @var{day} by itself would represent.
 A comma following a day of the week item is ignored.


-@node Relative item in date strings
-@section Relative item in date strings
+@node Relative items in date strings
+@section Relative items in date strings

@cindex relative items in date strings
@cindex displacement of dates
@@ -425,12 +424,12 @@ one day in the past (equivalent to @samp{day ago}).
 The strings @samp{now} or @samp{today} are relative items corresponding
 to zero-valued time displacement, these strings come from the fact
 a zero-valued time displacement represents the current time when not
-otherwise change by previous items.  They may be used to stress other
+otherwise changed by previous items.  They may be used to stress other
 items, like in @samp{12:00 today}.  The string @samp{this} also has
 the meaning of a zero-valued time displacement, but is preferred in
 date strings like @samp{this thursday}.

-When a relative item makes the resulting date to cross the boundary
+When a relative item causes the resulting date to cross the boundary
 between DST and non-DST (or vice-versa), the hour is adjusted according
 to the local time.

@@ -440,11 +439,11 @@ to the local time.

@cindex pure numbers in date strings

-The precise intepretation of a pure decimal number is dependent of
+The precise intepretation of a pure decimal number depends
 the context in the date string.

 If the decimal number is of the form @var{yyyy}@var{mm}@var{dd} and no
-other calendar date item (@pxref{Calendar date item}) appears before it
+other calendar date item (@pxref{Calendar date items}) appears before it
 in the date string, then @var{yyyy} is read as the year, @var{mm} as the
 month number and @var{dd} as the day of the month, for the specified
 calendar date.
@@ -470,15 +469,15 @@ year.
@cindex MacKenzie, David
@cindex Meyering, Jim
@code{getdate} was originally implemented by Steven M. Bellovin
-(@samp{smb@@research.att.com}) while at the University of North Carolina
+(@email{smb@@research.att.com}) while at the University of North Carolina
 at Chapel Hill.  The code was later tweaked by a couple of people on
-Usenet, then completely overhauled by Rich $alz (@samp{rsalz@@bbn.com})
-and Jim Berets (@samp{jberets@@bbn.com}) in August, 1990.  Various
+Usenet, then completely overhauled by Rich $alz (@email{rsalz@@bbn.com})
+and Jim Berets (@email{jberets@@bbn.com}) in August, 1990.  Various
 revisions for the GNU system were made by David MacKenzie, Jim Meyering,
 and others.

@cindex Pinard, F.
@cindex Berry, K.
-This chapter was originally produced by @value{Francois} Pinard
-(@samp{pinard@@iro.umontreal.ca}) from the @file{getdate.y} source code,
-and then edited by K.@: Berry (@samp{kb@@cs.umb.edu}).
+This chapter was originally produced by Fran@,{c}ois Pinard
+(@email{pinard@@iro.umontreal.ca}) from the @file{getdate.y} source code,
+and then edited by K.@: Berry (@email{kb@@cs.umb.edu}).
--- a/doc/mdate-sh
+++ b/doc/mdate-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# mdate-sh - get modification time of a file and pretty-print it
-# Copyright (C) 1995 Software Foundation, Inc.
-# Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
+# Get modification time of a file or directory and pretty-print it.
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
 # 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
@@ -14,8 +14,8 @@
 # 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.
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 # Prevent date giving response in another language.
 LANG=C
@@ -25,14 +25,15 @@ export LC_ALL
 LC_TIME=C
 export LC_TIME

-# Get the extended ls output of the file.
+# Get the extended ls output of the file or directory.
+# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
 if ls -L /dev/null 1>/dev/null 2>&1; then
-  set - `ls -L -l $1`
+  set - x`ls -L -l -d $1`
 else
-  set - `ls -l $1`
+  set - x`ls -l -d $1`
 fi
-# The month is at least the fourth argument.
-# (3 shifts here, the next inside the loop)
+# The month is at least the fourth argument
+# (3 shifts here, the next inside the loop).
 shift
 shift
 shift
@@ -79,12 +80,11 @@ case $3 in
 	 Dec) nummonthtod=12;;
       esac
       # For the first six month of the year the time notation can also
-       # be used for file modified in the last year.
+       # be used for files modified in the last year.
       if (expr $nummonth \> $nummonthtod) > /dev/null;
       then
 	 year=`expr $year - 1`
-       fi
-       ;;
+       fi;;
  *) year=$3;;
 esac

--- a/doc/perm.texi
+++ b/doc/perm.texi
@@ -342,7 +342,7 @@ og+rX-w
 gives users other than the owner of the file read permission and, if
 it is a directory or if someone already had execute permission
 to it, gives them execute permission; and it also denies them write
-permission to it file.  It does not affect the permission that the
+permission to the file.  It does not affect the permission that the
 owner of the file has for it.  The above mode is equivalent to
 the two modes:

@@ -430,7 +430,7 @@ the file to all users.
@cindex numeric modes
@cindex file permissions, numeric
@cindex octal numbers for file modes
-File permissions are stored internally as 16 bit integers.  As an
+File permissions are stored internally as integers.  As an
 alternative to giving a symbolic mode, you can give an octal (base 8)
 number that corresponds to the internal representation of the new mode.
 This number is always interpreted in octal; you do not have to add a
@@ -440,12 +440,13 @@ A numeric mode is usually shorter than the corresponding symbolic
 mode, but it is limited in that it can not take into account a file's
 previous permissions; it can only set them absolutely.

-The permissions granted to the user, to other users in the file's group,
+On most systems, the permissions granted to the user,
+to other users in the file's group,
 and to other users not in the file's group are each stored as three
 bits, which are represented as one octal digit.  The three special
 permissions are also each stored as one bit, and they are as a group
-represented as another octal digit.  Here is how the bits are arranged
-in the 16 bit integer, starting with the lowest valued bit:
+represented as another octal digit.  Here is how the bits are arranged,
+starting with the lowest valued bit:

@example
 Value in  Corresponding
--- a/doc/sh-utils.texi
+++ b/doc/sh-utils.texi
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
--- a/doc/textutils.texi
+++ b/doc/textutils.texi
--- a/lib/.cppi-disable
+++ b/lib/.cppi-disable
@@ -0,0 +1,10 @@
+error.h
+fnmatch.h
+getopt.h
+getopt.c
+getopt1.c
+md5.h
+obstack.h
+regex.h
+regex.c
+getpagesize.h
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,9 +1,13 @@
+.deps
 Makefile
+charset.alias
 getdate.c
-posixtm.c
-safe-stat.h
-safe-stat.c
+getdate.tab.c
+lstat.c
+ref-add.sed
+ref-del.sed
 safe-lstat.c
 safe-lstat.h
-getdate.tab.c
-.deps
+safe-stat.c
+safe-stat.h
+stat.c
--- a/lib/.gdb-history
+++ b/lib/.gdb-history
@@ -0,0 +1,219 @@
+r 206.65.212.10
+b main
+r
+n
+s
+n
+p addr
+p addr
+p he->h_name
+n
+q
+b canon_host 
+r 206.65.212.10
+n
+p he
+p *he
+n
+n
+p (he->h_addrtype)
+n
+q
+r a:b
+b main
+r a:b
+n
+s
+n
+p separator
+n
+l 128
+c
+q
+r meyering:store
+p *username
+p *username[separator - name]
+p separator - name
+p username[separator - name]
+r ''
+l
+q
+r ''
+l
+q
+r meyering
+b main
+r meyering
+n
+r
+n
+s
+n
+p u
+n
+n
+q
+r ''
+r meyering
+up
+l
+q
+b main
+b a.out 1
+r a.out 1
+n
+s
+fin
+s
+n
+p uid
+p gid
+p euid
+p egid
+n
+p mode
+p path
+fin
+r -v -c 10 -n 20 -x 80 < in-2
+up
+up
+p &dummy
+p *ovp
+p *(int*)*ovp
+p ((struct item*)*ovp)->key
+p old_vec@10
+r -v -c 10 -n 20 -x 80 < in-3
+p *(int*)*ovp
+up
+dow
+p *(int*)*ovp
+up
+p *(int*)*ovp
+i loca
+dow
+p key
+p dummy
+p &dummy
+up
+p old_vec
+p *ovp
+p ovp
+p ovp - old_vec
+p *old_vec@10
+p *old_vec@13
+b hash_insert_item
+r
+b hash_insert_item_at 
+r
+n
+p fail
+p *(ht->vec)@13
+p *(ht->ht_vec)@13
+p ((struct item*)(ht->ht_vec)[10])->key
+b hash_delete_item
+b hash_delete_item_at 
+c
+n
+p slot
+p item
+n
+n
+p *(ht->ht_vec)@13
+p &dummy
+p dummy
+n
+s
+n
+n
+p *(ht->ht_vec)@13
+n
+p new_size
+n
+p *old_vec@13
+p old_vec@13
+n
+p *old_vec@13
+n
+p *old_vec@13
+n
+l
+n
+p ovp - old_vec
+n
+p ovp - old_vec
+n
+p ovp - old_vec
+p *old_vec@13
+p &dummy
+q
+r 444444444444 44444444444
+b human_readable 
+r
+n
+q
+b main
+r 444444444444 44444444444
+n
+p a
+p b
+r 34343434 3434343434
+c
+r
+n
+n
+p a
+p b
+r 343434343 343434343
+c
+q
+b posixtime 
+r
+n
+s
+n
+p len
+n
+p pair
+p len
+n
+b year
+y
+c
+c
+p n
+up
+p len
+q
+complete b user
+complete b user
+complete b pars
+b parse_user_spec 
+r a.b
+n
+n
+p u
+n
+p u
+n
+r -r .aa > k
+pwd
+q
+b main
+r
+b get_date
+c
+n
+p tm
+n
+p tm
+n
+p pc
+n
+p tm
+n
+p tm
+n
+p delta
+n
+p Start
+q
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -0,0 +1,858 @@
+2000-09-09  Jim Meyering  <meyering@lucent.com>
+
+	Don't use atoi.
+	* userspec.c: Include sys/param.h and limits.h.
+	Include xstrtol.h.
+	(CHAR_BIT, TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Define.
+	(UID_T_MAX, GID_T_MAX, MAXUID, MAXGID): Define.
+	(parse_user_spec): Use xstrtoul, not atoi when converting numeric
+	UID, GID.  Check range.
+
+2000-09-06  Jim Meyering  <meyering@lucent.com>
+
+	* getopt.c (_getopt_internal): Update from glibc.
+
+2000-08-30  Jim Meyering  <meyering@lucent.com>
+
+	* strftime.c: Merge in changes from GNU libc.
+
+2000-08-26  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c: Include "__fpending.h".
+	(close_stdout_status): Return right away if there's nothing to flush.
+
+	* Makefile.am (noinst_HEADERS): Add __fpending.h.
+	* __fpending.c: New file.
+	* __fpending.h: New file.
+
+2000-08-07  Paul Eggert  <eggert@twinsun.com>
+
+	Standardize on "memory exhausted" instead of "Memory exhausted"
+	or "virtual memory exhausted".
+	* obstack.c (print_and_abort): Use "memory exhausted", not
+	"virtual memory exhausted".
+	* same.c (same_name): Invoke xalloc_die instead of printing
+	our own message.
+	* userspec.c (parse_user_spec): Likewise.
+	* bumpalloc.h: comment fix
+	* same.c, userspec.c: Include xalloc.h.
+
+	* xalloc.h (xalloc_msg_memory_exhausted): Now char const[],
+	not char *const and pointing to a constant array.
+	* xmalloc.c (xalloc_msg_memory_exhausted): Likewise.
+	(xrealloc): Comment fix.
+
+	* userspec.c (parse_user_spec):
+	Don't translate a message until just before returning,
+	to avoid unnecessary translation.
+
+2000-08-07  Jim Meyering  <meyering@lucent.com>
+
+	* addext.c, argmatch.c, argmatch.h, backupfile.h, bumpalloc.h,
+	chown.c, diacrit.h, dirname.h, dup2.c, exclude.h, fileblocks.c,
+	fnmatch.c, fnmatch.h, fsusage.c, fsusage.h, getdate.h,
+	getgroups.c, gethostname.c, getopt.h, group-member.c,
+	hard-locale.c, hash.h, isdir.c, lchown.c, linebuffer.c,
+	linebuffer.h, long-options.h, malloc.c, md5.c, md5.h, memchr.c,
+	memcmp.c, memcoll.c, memset.c, mktime.c, modechange.h, obstack.h,
+	pathmax.h, realloc.c, rmdir.c, safe-read.c, save-cwd.c, stime.c,
+	stpcpy.c, strcasecmp.c, strcspn.c, strdup.c, stripslash.c,
+	strstr.c, strtod.c, strtol.c, strtoul.c, strtoull.c, strtoumax.c,
+	utime.c, version-etc.h, xalloc.h, xstrdup.c, xstrtoumax.c,
+	yesno.c: Back out Copyright date changes for each file with no change
+	this year.  This eases coordination with other programs using the same
+	source code modules.  From Paul Eggert.
+
+2000-08-03  Greg McGary  <greg@mcgary.org>
+
+	* regex.c (SET_HIGH_BOUND, MOVE_BUFFER_POINTER,
+	ELSE_EXTEND_BUFFER_HIGH_BOUND): New macros.
+	(EXTEND_BUFFER): Use them.
+
+2000-08-01  Jim Meyering  <meyering@lucent.com>
+
+	* dirname.c (ISSLASH): Define.
+	(BACKSLASH_IS_PATH_SEPARATOR): Define.
+	(dir_name) [BACKSLASH_IS_PATH_SEPARATOR]: Handle the case in which
+	both `\' and `/' may be use as path separators.
+	Based on a patch from Prashant TR.
+
+2000-07-31  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c (quotearg_n_options): Don't make the initial
+	slot vector a constant, since it might get modified.
+
+2000-07-31  Jim Meyering  <meyering@lucent.com>
+
+	* xmalloc.c: Use `virtual memory exhausted', not `Memory exhausted'.
+	* obstack.c (print_and_abort): Likewise.
+
+2000-07-30  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c (quotearg_n_options): Preallocate a slot 0
+	buffer, so that the caller can always quote one small
+	component of a "memory exhausted" message in slot 0.
+	From a suggestion by Jim Meyering.
+
+2000-07-30  Jim Meyering  <meyering@lucent.com>
+
+	* makepath.c (make_path): Quote the other instance, too.
+
+	* quotearg.c (N_STATIC_SLOTVECS): Define.
+	(STATIC_BUF_SIZE): Define.
+	(quotearg_n_options): Use only statically allocated storage when
+	N < N_STATIC_SLOTVECS and the length of the quoted result is smaller
+	than STATIC_BUF_SIZE.
+
+2000-07-29  Jim Meyering  <meyering@lucent.com>
+
+	* diacrit.c (diacrit_diac): Use __MSDOS__ in favor of MSDOS.
+	* dirname.c (dir_name): Likewise.
+
+	* basename.c (base_name): Use ISSLASH rather than comparing against `/'.
+
+	* dirname.c (dir_name) [MSDOS]: Declare `lim' to be const.
+	(dir_name): Assert that there are no trailing slashes.
+
+2000-07-18  Bruno Haible  <haible@clisp.cons.org>
+
+	* mbswidth.h (mbswidth): Add a flags argument.
+	(mbswidth): New declaration.
+	(MBSW_ACCEPT_INVALID, MBSW_ACCEPT_UNPRINTABLE): New macros.
+	* mbswidth.c (mbswidth): Add a flags argument.
+	(mbsnwidth): New function.
+
+2000-07-24  Jim Meyering  <meyering@lucent.com>
+
+	* mbswidth.c: Remove useless #else.  From Bruno Haible.
+
+2000-07-23  Paul Eggert  <eggert@twinsun.com>
+
+	* mbswidth.c (_XOPEN_SOURCE):
+	Don't define; this causes problems on Solaris 7.
+	(wcwidth) [!HAVE_DECL_WCWIDTH]: Declare.
+
+2000-07-23  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c:
+	Include <wchar.h> even if ! (HAVE_MBRTOWC && 1 < MB_LEN_MAX),
+	so that mbstate_t is always defined.
+
+	Do not inspect MB_LEN_MAX, since it's incorrectly defined to
+	be 1 in at least one GCC installation, and this configuration
+	error is likely to be common.  Ignoring MB_LEN_MAX hurts
+	performance on hosts that have mbrtowc but have only unibyte
+	locales, but I assume these hosts are rare.
+
+2000-07-23  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c: Streamline by invoking multibyte code only if needed.
+	<wchar.h>: Include only if HAVE_MBRTOWC && 1 < MB_LEN_MAX.
+	(MB_CUR_MAX): Redefine to 1 if ! (HAVE_MBRTOWC && 1 < MB_LEN_MAX).
+	(quotearg_buffer_restyled): If a unibyte locale, don't bother to
+	invoke multibyte primitives.
+
+2000-07-23  Jim Meyering  <meyering@lucent.com>
+
+	* basename.c (base_name): Add an assertion.
+
+2000-07-15  Bruno Haible  <clisp.cons.org>
+
+	* quotearg.c: When the system forces us to redefine mbstate_t,
+	shadow its mbsinit function.
+
+2000-07-16  Bruno Haible  <haible@clisp.cons.org>
+
+	* mbswidth.h: New file.
+	* mbswidth.c: New file.
+	* Makefile.am (libfetish_a_SOURCES): Add mbswidth.c.
+	(noinst_HEADERS): Add mbswidth.h.
+
+2000-07-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Add support for FreeBSD. Improve support for HP-UX
+	and IRIX 6.
+
+2000-07-15  Jim Meyering  <meyering@lucent.com>
+
+	* makepath.c: Include quote.h.
+	(make_path): Convert "`%s'" in format strings to "%s", and wrap each
+	corresponding argument in a `quote (...)' call.
+	Give better diagnostics.
+
+	* Makefile.am (libfetish_a_SOURCES): Add quote.c.
+	(noinst_HEADERS): Add quote.h.
+
+	* quote.c (quote, quote_n): New file.  Two functions taken verbatim
+	from tar's src/misc.c.
+	* quote.h: New file.  Prototypes for same.
+
+2000-07-10  Paul Eggert  <eggert@twinsun.com>
+
+	From a suggestion by Bruno Haible.
+	* quotearg.c (mbrtowc): Do not use HAVE_WCHAR_H in the definition.
+	Use defined mbstate_t, not HAVE_MBSTATE_T_OBJECT,
+	to decide whether to define the BeOS workaround macro;
+	this adjusts to the change to AC_MBSTATE_T.
+
+2000-07-13  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.h (enum quoting style): New enum clocale_quoting_style.
+
+	* 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}"
+	and "{RIGHT QUOTATION MARK}" msgids.
+
+2000-07-05  Paul Eggert  <eggert@twinsun.com>
+
+	The old behavior of quoting `like this' doesn't look good with
+	newer, ISO-style fonts.  See:
+	http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+
+	Instead, quote "like this" by default.  Let the translator
+	tailor the locale-specific quoting behavior by providing
+	translations for {LEFT QUOTATION MARK} and {RIGHT QUOTATION MARK}.
+
+	* quotearg.c (N_): New macro.
+	(gettext_default): New function.
+	(quotearg_buffer_restyled): Use
+	gettext_default ("{LEFT QUOTATION MARK}", "\"") for left quote, and
+	gettext_default ("{RIGHT QUOTATION MARK}", "\"") for right quote.
+
+2000-07-09  Jim Meyering  <meyering@lucent.com>
+
+	* Most files: Update copyright dates to include 2000.
+
+2000-07-08  Jim Meyering  <meyering@lucent.com>
+
+	* xgethostname.c (ENAMETOOLONG): Define to an unlikely value
+	if not defined.
+	(xgethostname): Remove now-unnecessary #ifdef.
+	Move declaration of `err' into loop where it's used.
+
+2000-07-05  Bruno Haible  <haible@clisp.cons.org>
+
+	* xgethostname.c (xgethostname): Protect against the SunOS5.5 bug
+	by allocating a larger buffer. Test the gethostname return value for
+	being >= 0, not == 0, for BeOS.  Don't exhaust memory if gethostname
+	returns an error and ENAMETOOLONG isn't defined.
+
+2000-07-05  Paul Eggert  <eggert@twinsun.com>
+	and Bruno Haible  <haible@clisp.cons.org>
+
+	* quotearg.c (mbrtowc): Declare returned type, since BeOS doesn't.
+
+2000-07-05  Bruno Haible  <haible@clisp.cons.org>
+
+	* quotearg.c (struct quoting_options): Simplify quote_these_too
+	dimension.
+
+2000-07-03  Jim Meyering  <meyering@lucent.com>
+
+	* strndup.c: [!HAVE_DECL_STRNLEN]: Declare strnlen.
+	Reported by Bruno Haible.
+
+2000-07-04  Jim Meyering  <meyering@lucent.com>
+
+	* quotearg.c: Make inclusion of <wchar.h> independent of whether
+	HAVE_MBRTOWC is set.  Required at least for irix-5.6, which
+	lacks mbrtowc.
+
+2000-07-03  Paul Eggert  <eggert@twinsun.com>
+	and Bruno Haible  <haible@clisp.cons.org>
+
+	* quotearg.c (mbrtowc):
+	Assign to *pwc, and return 1 only if result is nonzero.
+	(iswprint): Use ISPRINT when substituting our own mbrtowc.
+
+2000-07-03  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.h: [HAVE_UTMPX_H]: Include <utmp.h> if HAVE_UTMP_H.
+	This is necessary to get a definition of e.g., UTMP_FILE on HP-UX 10.20.
+	From Bob Proulx.
+
+2000-07-02  Jim Meyering  <meyering@lucent.com>
+
+	* quotearg.c (mbstate_t): Don't define here.
+
+2000-07-02  Jim Meyering  <meyering@lucent.com>
+
+	* nanosleep.c (SIGCONT): Define if not already defined.
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* mountlist.c: Use MOUNTED_FS_STAT_DEV instead of MOUNTED_NEXT_DEV,
+	per change in ../m4/ls-mntd-fs.m4.
+	(read_filesystem_list): Ignore symbolic links.
+
+2000-06-29  Jim Meyering  <meyering@lucent.com>
+
+	* same.c: Include <string.h> or <strings.h>, as appropriate,
+	for declaration of strcmp.
+
+	* long-options.c: Include <stdlib.h>, for declaration of exit.
+
+	* mountlist.c (fsp_to_string) [HAVE_F_FSTYPENAME_IN_STATFS]:
+	Avoid warning by casting result to `char *' to remove `const'.
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.am (libfetish_a_SOURCES): Remove readutmp.c.
+
+2000-06-26  Paul Eggert  <eggert@twinsun.com>
+
+	savedir now sets errno on failure and invokes xmalloc to get memory.
+	Fix a couple of other minor bugs while we're at it.
+
+	* savedir.c (<unistd.h>): Do not include; there's no need.
+	(NAMLEN): Remove macro.
+	(malloc, realloc): Remove decls.
+	(stpcpy): Likewise.
+	("xalloc.h"): Include.
+	(NAME_SIZE_DEFAULT): New macro.
+	(savedir): Use xmalloc / xrealloc to allocate memory.
+	Use NAME_SIZE_DEFAULT if name_size is negative or overflows to zero.
+	Skip "" directory entries.
+	Use strlen to calculate directory entry length, since the old method
+	is rarely used these days and isn't worth supporting.
+	Don't use a pointer after freeing it.
+	Check for integer overflow when calculating allocation size.
+	Use memcpy to copy entries, instead of stpcpy.
+	Set errno properly when returning NULL.
+	Check for readdir error.
+
+2000-06-26  Jim Meyering  <meyering@lucent.com>
+
+	* posixtm.c [HAVE_STDLIB_H]: Include stdlib.h, for decl of abort.
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* getusershell.c (xmalloc, xrealloc): Remove functions.
+	Include xalloc.h.
+	Don't include <stdlib.h>.  Don't declare malloc, realloc.
+
+2000-06-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* unicodeio.c (print_unicode_char): Work around ansi2knr deficiency.
+
+2000-06-24  Jim Meyering  <meyering@lucent.com>
+
+	* error.c [!HAVE_DECL_STRERROR_R]: Declare strerror_r.
+
+2000-06-21  Jim Meyering  <meyering@lucent.com>
+
+	* getpass.c: New file, from Bruno Haible.  Required for BeOS.
+
+2000-06-19  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c: Include <wctype.h> after <wchar.h>, for Solaris 2.5.
+	(mbrtowc, mbstate_t): Define substitutes if
+	HAVE_MBRTOWC && HAVE_WCHAR_H && !HAVE_MBSTATE_T_OBJECT.
+	(iswprint): Define to 1 if !defined iswprint && !HAVE_ISWPRINT,
+	not if ! (HAVE_MBRTOWC && HAVE_WCHAR_H).
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* xgetcwd.c (xgetcwd): If the required pathname length is smaller
+	than 1024, return a memory chunk of least possible size, instead
+	of size PATH_MAX + 2. In the loop, increment the size proportionally.
+	Use free/xmalloc instead of xrealloc to avoid copying for very long
+	paths.
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* canon-host.c (canon_host): Use malloc and memcpy to copy an
+	address, not strdup.  Include <stdlib.h> and don't declare free().
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* path-concat.c (path_concat): Don't access dir[-1] if dir is
+	the empty string.
+
+2000-06-21  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (libfetish_a_SOURCES): Add getstr.c.
+	(noinst_HEADERS): Add getstr.h.
+
+	* getline.c (getstr): Move into a separate file.
+	* getstr.c (getstr): New file, extracted from getline.c, with
+	the following changes: new parameter, delim2; both delim[12]
+	parameters have type `int', not `char'.  The latter would lose
+	with 8-bit delimiters.
+	* getstr.h: New file.
+
+2000-06-19  Jim Meyering  <meyering@lucent.com>
+
+	* getloadavg.c [HAVE_NLIST_H] (NLIST_STRUCT): Define.
+
+2000-06-18  Jim Meyering  <meyering@lucent.com>
+
+	* mkdir.c: Remove file, due mainly to copyright incompatibility.
+	Besides, these days every porting target provides a mkdir function.
+
+	* strnlen.c: Include memory.h, string.h, and/or strings.h as needed.
+	(this snippet comes from src/system.h).
+
+2000-06-15  Paul Eggert  <eggert@twinsun.com>
+
+	* human.c (adjust_value): New function.
+	(human_readable_inexact): Apply rounding style even when
+	printing approximate values.
+
+2000-06-14  Paul Eggert  <eggert@twinsun.com>
+
+	* human.c (human_readable_inexact): Allow an input block
+	size that is not a multiple of the output block size, and vice versa.
+	Reported by Piergiorgio Sartor.
+
+2000-06-14  Paul Eggert  <eggert@twinsun.com>
+
+	* getdate.y (get_date): Apply relative times after time
+	zone indicator, not before.  Reported by Todd A. Jacobs.
+
+2000-06-13  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (all-local): Depend on lstat.c and stat.c.
+
+	* xstat.in [!HAVE_DECL_FREE]: Declare free in lstat.c.
+
+2000-06-12  Paul Eggert  <eggert@twinsun.com>
+
+	* xstat.in: Include <stdlib.h> in lstat, to declare "free".
+
+2000-06-04  Paul Eggert  <eggert@twinsun.com>
+
+	* strnlen.c: Include <config.h> if HAVE_CONFIG_H.
+
+2000-06-04  Jim Meyering  <meyering@lucent.com>
+
+	* getugroups.c (getugroups): Cast -1 to gid_t, for systems like
+	SunOS4.1.4 for which gid_t is an unsigned type.
+
+2000-06-03  Jim Meyering  <meyering@lucent.com>
+
+	* strnlen.c [!HAVE_DECL_MEMCHR]: Declare memchr.
+
+2000-05-26  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.am (install-exec-local): On systems with glibc-2.1 or
+	newer, don't install charset.alias.
+	* config.charset: Change the Linux/glibc rules so they become empty
+	on glibc-2.1 or newer.
+
+2000-06-02  Jim Meyering  <meyering@lucent.com>
+
+	* mountlist.c: Back out last change.  Instead, do this...
+	* mountlist.c (read_filesystem_list) [MOUNTED_VMOUNT]: Set the me_dummy
+	member using the same `ignore'-testing code.
+	* mountlist.h (ME_DUMMY): Add `autofs' to the list of ignored
+	fs_type strings.
+	From Mark D. Roth.
+
+2000-05-29  Jim Meyering  <meyering@lucent.com>
+
+	* mountlist.c (read_filesystem_list) [MOUNTED_VMOUNT]: Ignore mounts
+	with the `ignore' attribute.  Based on a patch from Mark D. Roth.
+
+2000-05-22  Jim Meyering  <meyering@lucent.com>
+
+	* makepath.c: Remove old, now-unnecessary `#ifdef __MSDOS__' block.
+
+2000-05-18  Jim Meyering  <meyering@lucent.com>
+
+	* hash.c (hash_rehash): Fix a nasty bug: copy the free entry list
+	back, too, since it may have been modified by allocate_entry.
+	(hash_delete): Rewrite to use neither the assignment operator
+	nor the comma operator in an if-expression.
+
+2000-05-15  Paul Eggert  <eggert@twinsun.com>
+
+	* closeout.c:
+	<sys/stat.h>, <sys/types.h>, <unistd.h>, (STDOUT_FILENO):
+	Remove; no longer needed.
+	"quotearg.h": Add include.
+	(file_name): Do not bother to explicitly initialize to NULL; it's less
+	efficient on some hosts.
+	(close_stdout_status): Remove test as to whether stdout was already
+	closed; it breaks for the case "echo x | sort >&-".
+	Quote file name colons.
+	Do not assume that _("write error") lacks format strings.
+
+2000-05-15  Jim Meyering  <meyering@lucent.com>
+
+	* version-etc.c (version_etc_copyright): Update the copyright string
+	used in all --version output.
+
+2000-05-14  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c (close_stdout_set_file_name): New function.
+	(close_stdout_status): Use new file-scoped global.
+	Return right away if fstat says the stdout file descriptor is invalid.
+	* closeout.h (close_stdout_set_file_name): Declare.
+
+2000-05-10  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c [default_exit_status]: New file-scoped variable.
+	(close_stdout_set_status): New function.
+	* closeout.h (close_stdout_set_status): Declare.
+
+2000-05-08  Jim Meyering  <meyering@lucent.com>
+
+	* long-options.c: Don't include closeout.h.
+	(parse_long_options): Don't call close_stdout for --version.
+
+2000-05-06  Jim Meyering  <meyering@lucent.com>
+
+	* strnlen.c: Undefine __strnlen and strnlen.
+	[!weak_alias]: Define __strnlen to strnlen.
+
+	* atexit.c: New file, from libiberty.
+
+2000-05-06  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c (close_stdout_status): Also check for errors on the
+	stderr stream.
+
+2000-05-05  Bruno Haible  <haible@clisp.cons.org>
+
+	* localcharset.c (get_charset_aliases): Use malloc, realloc and memcpy
+	instead of xmalloc, xrealloc, path_concat.
+	(locale_charset): Treat empty environment variables as absent.
+	(DIRECTORY_SEPARATOR, ISSLASH): New macros.
+
+2000-05-04  Jim Meyering  <meyering@lucent.com>
+
+	* getopt.c: Update from glibc.
+	* obstack.c: Likewise.
+	* obstack.h: Likewise.
+	* regex.c: Likewise.  NB: K&R compiler support is dropped for this file
+
+	* regex.h: Likewise.
+	* strndup.c: Likewise.
+	* strnlen.c: New file, from glibc.
+
+2000-05-01  Jim Meyering  <meyering@lucent.com>
+
+	* full-write.c (full_write): Remove `FIXME' part of comment.
+
+2000-04-29  Jim Meyering  <meyering@lucent.com>
+
+	* path-concat.c: Declare strdup only if it's not defined.
+	* canon-host.c: Likewise.
+
+2000-04-28  Jim Meyering  <meyering@lucent.com>
+
+	* rpmatch.c [HAVE_LIMITS_H]: Include limits.h before regex.h to avoid
+	redefinition warning on some systems (HPUX).  Otherwise, regex.h is
+	included first, then limits.h is included by locale.h by libintl.h.
+	From John David Anglin.
+
+2000-04-25  Jim Meyering  <meyering@lucent.com>
+
+	* makepath.c (S_IRWXUGO): Define.
+	(make_path): Always perform explicit chmod if MODE specifies any
+	of the `special' permission bits.  Prompted by a bug report against
+	install from Mate Wierdl and Joost van Baal.
+
+2000-04-18  Jim Meyering  <meyering@lucent.com>
+
+	* README: New file.
+
+	* getpagesize.h [!getpagesize && HAVE_OS_H && B_PAGE_SIZE]: Define
+	getpagesize.  For BeOS.  Based on a patch from Bruno Haible.
+
+2000-04-17  Jim Meyering  <meyering@lucent.com>
+
+	* strftime.c (my_strftime) [strftime]: Declare strftime here, since
+	the definition of it to rpl_strftime also defined-away the system's
+	declaration.
+
+2000-04-15  Jim Meyering  <meyering@lucent.com>
+
+	Use `C' to denote so-called `contiguous' files, the same way
+	that tar does.
+	* filemode.c (S_ISCTG) [!S_ISCTG && S_IFCTG]: Define.
+	(ftypelet): Use S_ISCTG.
+	From Michael Deutschmann.
+
+2000-04-14  Jim Meyering  <meyering@lucent.com>
+
+	* strftime.c (my_strftime) [#ifdef strftime]: Declare strftime.
+
+2000-04-08  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (charset.alias): Use t-$@, not $@-t so the DOS 8.3
+	names don't conflict.  Reported by Eli Zaretskii.
+
+2000-03-28  Bruno Haible  <haible@clisp.cons.org>
+
+	* unicodeio.c (print_unicode_char): Avoid triggering Solaris iconv
+	bug.  Deal with the different error behavior of Irix iconv.
+
+2000-04-07  Jim Meyering  <meyering@lucent.com>
+
+	* putenv.c: Move inclusion of errno.h so it follows that of sys/types.h,
+	to work around system header problems on AIX 3.2.5.  From Bruno Haible.
+
+2000-04-05  Jim Meyering  <meyering@lucent.com>
+
+	Portability tweaks required for ultrix4.3.
+	* readutmp.h [HAVE_UTMPX_H && !HAVE_DECL_GETUTENT]: Declare getutent.
+	* readutmp.c: Include sys/types.h before sys/stat.h.
+	* canon-host.c: Declare strdup.
+	* path-concat.c: Likewise.
+	From John David Anglin.
+
+2000-04-04  Jim Meyering  <meyering@lucent.com>
+
+	Be more DOS 8.3-friendly.
+	* ref-add.sin: Renamed from ref-add.sed.in.
+	* ref-del.sin: Renamed from ref-del.sed.in.
+	* Makefile.am: Reflect renaming.
+	Reported by Eli Zaretskii.
+
+	Use a temporary file name that won't clash with `charset.alias'
+	in the DOS 8.3 name space.
+	* Makefile.am (charset_tmp): Define.
+	(install-exec-local): Use $(charset_tmp) instead of $(charset_alias)-t.
+	(uninstall-local): Likewise.
+	Reported by Eli Zaretskii.
+
+2000-03-29  Paul Eggert  <eggert@twinsun.com>
+
+	* time/strftime.c (my_strftime): Make sure we call the system
+	strftime, not ourselves, when invoking the underlying strftime.
+
+2000-03-24  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (EXTRA_DIST): Add ref-add.sed.in and ref-del.sed.in.
+	(charset_alias): Define.
+	(install-exec-local): Factor out common code.
+	(uninstall-local): Split lines longer than 80.
+	(ref-add.sed, ref-del.sed): Remove rules... (do the following instead)
+	(SUFFIXES): Define.
+	(.sed.in.sed): New rule.  Don't redirect directly to $@.
+	(CLEANFILES): Add ref-add.sed and ref-del.sed.
+
+2000-03-19  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Output a line containing "Packages using this file".
+	* ref-add.sed.in, ref-del.sed.in: New files.
+	* Makefile.am (install-exec-local, uninstall-local, ref-add.sed,
+	ref-del.sed): New rules.
+
+2000-03-17  Jim Meyering  <meyering@lucent.com>
+
+	* unicodeio.c (<string.h>): Include only #if HAVE_STRING_H.
+	Otherwise, include <strings.h>
+
+2000-03-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* unicodeio.c (utf8_wctomb): New function.
+	(print_unicode_char): Pass the Unicode character to iconv in UTF-8
+	format instead of in UCS-4 with platform dependent endianness.
+
+2000-03-07  Paul Eggert  <eggert@twinsun.com>
+
+	* savedir.c (savedir): Work even if directory size is
+	negative; this can happen with some screwy NFS configurations.
+
+2000-03-06  Jim Meyering  <meyering@lucent.com>
+
+	* localcharset.c (get_charset_aliases): Don't try to free file_name
+	if it's NULL (because we ran out of memory).  From Bruno Haible.
+
+2000-03-05  Jim Meyering  <meyering@lucent.com>
+
+	* localcharset.c ("path-concat.h"): Include.
+	(get_charset_aliases): Use path_concat instead of ANSI string
+	concatenation.
+
+	* unicodeio.h (PARAMS): Define.
+	Use it to guard prototype.
+
+2000-03-04  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (install-exec-local): Create $(libdir) before installing
+	into it.
+	(uninstall-local): Uncomment this rule so `make distcheck' works
+	once again.
+
+	* unicodeio.c (<errno.h>): Include it.
+	(errno): Declare if not defined.
+
+	* localcharset.c: Add Bruno's comment justifying use of volatile.
+
+	* config.charset: New version, incorporating remarks from a linux
+	i18n mailing list.  From Bruno Haible.
+
+2000-03-02  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (EXTRA_DIST): Add config.charset.
+
+2000-03-01  Jim Meyering  <meyering@lucent.com>
+
+	* localcharset.c: Guard some #includes with `#if HAVE_...'.
+	* unicodeio.c: Likewise.
+
+2000-02-02  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: New file.
+	* localcharset.c: New file.
+	* unicodeio.h, unicodeio.c: New files.
+	* Makefile.am (DEFS): Add -DLIBDIR=...
+	(libfetish_a_SOURCES): Add localcharset.c and unicodeio.c.
+	(noinst_HEADERS): Add unicodeio.h.
+	(all-local, install-exec-local, charset.alias): New targets.
+
+2000-02-28  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c (ALERT_CHAR): New macro.
+	(quotearg_buffer_restyled): Use it.
+
+2000-02-27  Jim Meyering  <meyering@lucent.com>
+
+	* strtoumax.c: Fix typo in decl of strtoul: s/long long/long/.
+	Guard declaration of strtoull also with `&& HAVE_UNSIGNED_LONG_LONG'.
+
+	* backupfile.c: Guard inclusion of stdlib.h with `#if HAVE_STDLIB_H',
+	not `#if STDC_HEADERS'.
+	Declare malloc if needed.
+
+	* backupfile.c: Use `#if !HAVE_DECL...' instead of `#ifndef HAVE_DECL..'
+	now that autoconf always defines the HAVE_DECL_ symbols.
+	* human.c: Likewise.
+	* same.c: Likewise.
+	* strtoumax.c: Likewise.
+
+	* backupfile.c: Arrange for cpp to fail if the configure-time
+	declaration check was not run.
+	* hash.c: Likewise.
+	* human.c: Likewise.
+	* same.c: Likewise.
+	* strtoumax.c: Likewise.
+
+	* userspec.c (parse_user_spec): If there is no `:' but there is a `.',
+	then first look up the entire `.'-containing string as a login name.
+
+2000-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	* getdate.y: Handle two-digit years with leading zeros correctly.
+	(textint): New typedef.
+	(parser_control): Member year changed from int to textint.
+	All uses changed.
+	(YYSTYPE): Removed; replaced by %union with int and textint members.
+	(tDAY, tDAY_UNIT, tDAYZONE, tHOUR_UNIT, tID, tLOCAL_ZONE, tMERIDIAN,
+	tMINUTE_UNIT, tMONTH, tMONTH_UNIT tSEC_UNIT, tSNUMBER, tUNUMBER,
+	tYEAR_UNIT, tZONE, o_merid): Now of type <intval>.
+	(tSNUMBER, tUNUMBER): Now of type <textintval>.
+	(date, number, to_year): Use width of number in digits, not its value,
+	to determine whether it's a 2-digit year, or a 2-digit time.
+	(yylex): Store number of digits of numeric tokens.
+	Reported by John Kendall.
+
+	(parser_control): Changed from struct parser_control to typedef (for
+	consistency).  All uses changed.
+
+	(tID): Removed; not used.
+	(yylex): Return '?' for unknown identifiers, rather than (unused) tID.
+
+2000-02-14  Paul Eggert  <eggert@twinsun.com>
+
+	* getpagesize.h (getpagesize): Port to VMS for Alpha;
+	adapted from changes to grep getpagesize.h by Martin P.J. Zinser.
+
+2000-02-12  Jim Meyering  <meyering@lucent.com>
+
+	* userspec.c (ISDIGIT): Define it.
+	(isdigit): Remove definition.
+	(is_number): Use ISDIGIT, not isdigit.
+	<libintl.h>: Include.
+	(_ and N_): Define.
+	(parse_user_spec): Mark translatable strings.
+
+2000-02-10  Jim Meyering  <meyering@lucent.com>
+
+	With these changes, nanosleep.[ch] are finally enough like the other
+	lib/* replacement files to compile on a few more losing systems.
+
+	* nanosleep.h: Don't include config.h.
+	Remove prototype from declaration of nanosleep.
+	(PARAMS): Remove now-unneeded definition.
+	* nanosleep.c: #undef nanosleep.
+	(rpl_nanosleep): Rename from nanosleep.
+
+2000-02-03  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.c (read_utmp): Guard with `#ifdef UTMP_NAME_FUNCTION',
+	rather than with `#if HAVE_UTMPNAME'.
+
+2000-02-01  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.h (UT_USER): Add parens.  From Andreas Schwab.
+
+2000-01-31  Jim Meyering  <meyering@lucent.com>
+
+	* nanosleep.h (nanosleep): Guard declaration with
+	`#if ! HAVE_DECL_NANOSLEEP'.
+	Without this, OFS gets a redeclaration error for rpl_nanosleep, due to
+	the declaration in that vendor's sys/timers.h.
+	Reported by Christian Krackowizer.
+
+	* quotearg.c (ISASCII): Add #undef and move definition to follow
+	inclusion of wctype.h to work around solaris2.6 namespace pollution.
+	(ISPRINT): Likewise.
+	Reported by Tom Tromey.
+
+2000-01-30  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.c (extract_trimmed_name): Use UT_USER instead of hard-coding
+	uses of ->ut_name.  The latter doesn't work with new Linux header files
+	where only utmpx.ut_user is declared.
+
+	* readutmp.h (UT_USER): Define.
+
+2000-01-23  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (libfetish_a_SOURCES): Remove explicit mention of
+	obstack.c.
+
+2000-01-22  Jim Meyering  <meyering@lucent.com>
+
+	* strtoumax.c: [! HAVE_DECL_STRTOUL]: Declare strtoul.
+	[! HAVE_DECL_STRTOULL]: Declare strtoull.
+	Required for some AIX systems.  Reported by Christian Krackowizer.
+	[TESTING] (main): New function.
+
+	1997-10-17  Eli Zaretskii  <eliz@is.elta.co.il>
+	* dirname.c (dir_name): Support for DOS-style file names with drive
+	letters.
+
+	* quotearg.c [HAVE_WCTYPE_H]: Include <wctype.h> for decl of iswprint.
+
+	* strverscmp.c (ISDIGIT): Define.
+	(strverscmp): Use ISDIGIT, not isdigit.
+
+2000-01-17  Paul Eggert  <eggert@twinsun.com>
+
+	* nanosleep.c (nanosleep):
+	Don't use SA_INTERRUPT to decide whether to call sigaction, as
+	POSIX.1 doesn't require SA_INTERRUPT and some systems
+	(e.g. Solaris 7) don't define it.  Use SA_NOCLDSTOP instead;
+	it's been part of POSIX.1 since day 1 (in 1988).
+
+2000-01-17  Jim Meyering  <meyering@lucent.com>
+
+	* interlock: Remove unused file.  Reported by François Pinard.
+
+2000-01-16  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c (quotearg_buffer_restyled): Do not quote
+	alert, backslash, formfeed, and vertical tab unnecessarily in
+	shell quoting style.
+
+Local Variables:
+version-control: never
+End:
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,43 +1,106 @@
-## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = fu
+## Process this file with automake to produce Makefile.in -*-Makefile-*-

-EXTRA_DIST = alloca.c basename.c euidaccess.c fnmatch.c fsusage.c \
-ftruncate.c getdate.y getopt.c getopt1.c group-member.c \
-memcmp.c memcpy.c memset.c \
-mkdir.c mktime.c mountlist.c posixtm.y rename.c rmdir.c \
-stpcpy.c strcasecmp.c strdup.c strndup.c strstr.c strtol.c strtoul.c
+AUTOMAKE_OPTIONS = ../src/ansi2knr

-INCLUDES = -I.. -I$(srcdir)
+noinst_LIBRARIES = libfetish.a

-fu_SOURCES = getdate.c getline.c posixtm.c argmatch.c backupfile.c \
-dirname.c error.c fileblocks.c filemode.c \
-full-write.c getversion.c idcache.c \
-isdir.c long-options.c makepath.c modechange.c obstack.c \
-safe-read.c save-cwd.c savedir.c stripslash.c userspec.c xgetcwd.c \
-xmalloc.c xstrdup.c xstrtol.c xstrtoul.c yesno.c
+INCLUDES = -I.. -I$(srcdir) -I../intl
+DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@

-fu_LIBADD = @LIBOBJS@ @ALLOCA@
+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 \
+  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 \
+  path-concat.c \
+  quote.c quotearg.c readtokens.c safe-read.c same.c save-cwd.c \
+  savedir.c stripslash.c unicodeio.c userspec.c version-etc.c xgetcwd.c \
+  xgethostname.c xmalloc.c xstrdup.c xstrtod.c xstrtol.c xstrtoul.c \
+  xstrtoumax.c yesno.c

-noinst_HEADERS = argmatch.h backupfile.h error.h fnmatch.h fsusage.h \
-getline.h getopt.h group-member.h long-options.h makepath.h modechange.h \
-mountlist.h obstack.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h
+libfetish_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)

-BUILT_SOURCES = getdate.c posixtm.c
+noinst_HEADERS = \
+  argmatch.h backupfile.h bumpalloc.h closeout.h diacrit.h dirname.h error.h \
+  exclude.h filemode.h fnmatch.h __fpending.h fsusage.h \
+  getdate.h getline.h getopt.h \
+  getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
+  linebuffer.h long-options.h mbswidth.h md5.h memcasecmp.h memcoll.h \
+  makepath.h mbswidth.h modechange.h mountlist.h nanosleep.h obstack.h \
+  path-concat.h pathmax.h posixtm.h quote.h quotearg.h readtokens.h \
+  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h \
+  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h

-# Since this directory contains two parsers, we have to be careful to avoid
-# running two $(YACC)s during parallel makes.  See below.
-getdate.c: @MAINT@getdate.y
-	@echo expect 10 shift/reduce conflicts
-	$(YACC) $(srcdir)/getdate.y
-	mv y.tab.c getdate.c
+BUILT_SOURCES = getdate.c lstat.c stat.c
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = lstat.c stat.c

-# Make the rename atomic, in case sed is interrupted and later rerun.
-# The artificial dependency on getdate.c keeps the two parsers from being
-# built in parallel.  Enforcing this little bit of sequentiality lets
-# everyone (even those without bison) still run mostly parallel builds.
-posixtm.c: @MAINT@posixtm.y getdate.c
-	$(YACC) $(srcdir)/posixtm.y
-	mv y.tab.c posixtm.tab.c
-	sed -e 's/yy/zz/g' posixtm.tab.c > tposixtm.c
-	mv tposixtm.c posixtm.c
-	rm -f posixtm.tab.c
+EXTRA_DIST = xstat.in config.charset ref-add.sin ref-del.sin
+lstat.c: xstat.in
+	sed \
+	  -e '/@IGNORE@/d' \
+	  -e 's/@xstat@/lstat/g' \
+	  -e '/_LSTAT_ONLY@/d' \
+	  -e '/@BEGIN_STAT_ONLY@/,/@END_STAT_ONLY@/d' \
+	  $(srcdir)/xstat.in > $@-t
+	mv $@-t $@
+
+stat.c: xstat.in
+	sed \
+	  -e '/@IGNORE@/d' \
+	  -e 's/@xstat@/stat/g' \
+	  -e '/_STAT_ONLY@/d' \
+	  -e '/@BEGIN_LSTAT_ONLY@/,/@END_LSTAT_ONLY@/d' \
+	  $(srcdir)/xstat.in > $@-t
+	mv $@-t $@
+
+
+# The following is needed in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
+
+all-local: charset.alias ref-add.sed ref-del.sed lstat.c stat.c
+
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+install-exec-local: all-local
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	if test -f $(charset_alias); then \
+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	  rm -f $(charset_tmp) ; \
+	else \
+	  if test @GLIBC21@ = no; then \
+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	    rm -f $(charset_tmp) ; \
+	  fi ; \
+	fi
+
+uninstall-local: all-local
+	if test -f $(charset_alias); then \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+	      > /dev/null; then \
+	    rm -f $(charset_alias); \
+	  else \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+	  fi; \
+	  rm -f $(charset_tmp); \
+	fi
+
+charset.alias: config.charset
+	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	mv t-$@ $@
+
+SUFFIXES = .sed .sin
+.sin.sed:
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > $@-t
+	mv $@-t $@
+
+CLEANFILES = charset.alias ref-add.sed ref-del.sed
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
--- a/lib/README
+++ b/lib/README
@@ -0,0 +1,6 @@
+The files in this directory are shared between the fileutils, sh-utils,
+and textutils packages.  Not all files are used by each package.
+The autoconf tests required for these files are in ../m4.
+
+The library name, fetish, is a permutation of the first two
+letters of each of the package names: FIleutils, TExtutils, SH-utils.
--- a/lib/TODO
+++ b/lib/TODO
@@ -0,0 +1,32 @@
+Things to do to hash.c:
+
+Always use curly braces around statements in if/else/while/do/etc.
+that span more than a line -- even around multiline simple statements
+or single-line simple statements preceded by a comment line.
+
+Never have lines longer than 80 chars.
+
+Remove ^L characters.  We don't want/need such crutches.
+Get a good (smart) pagination filter.  I have one (a perl script)
+that usually does a decent job for me -- I called it something
+like stdc-print and think I sent you an early verison.
+
+I don't like the name `cursor'.  I much prefer short names
+like `p' for index variables.  I doubt I'll change all of them,
+but thought you should know why some will probably end up changing.
+
+#define USE_OBSTACK somewhere
+
+Fix this comment.  Depending on system and application...
+Mention fragmentation.
+  +#if USE_OBSTACK
+  +    /* Whenever obstacks are used, it is possible to allocate all overflowed
+  +       entries into a single stack, so they all can be freed in a single
+  +       operation.  It is not clear if the speedup is worth the trouble.  */
+  +    struct obstack entry_stack;
+  +#endif
+
+
+assert (bucket_limit - bucket == n_buckets) ?
+
+remove.c: s/done/successful or ok
--- a/lib/__fpending.c
+++ b/lib/__fpending.c
@@ -0,0 +1,30 @@
+/* __fpending.c -- return the number of pending output bytes on a stream
+   Copyright (C) 2000 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 Jim Meyering. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "__fpending.h"
+
+size_t
+__fpending (FILE *fp)
+{
+  return PENDING_OUTPUT_N_BYTES;
+}
--- a/lib/__fpending.h
+++ b/lib/__fpending.h
@@ -0,0 +1,18 @@
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+
+#if HAVE_STDIO_EXT_H
+# include <stdio_ext.h>
+#endif
+
+#include <sys/types.h>
+
+#ifndef HAVE_DECL___FPENDING
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL___FPENDING
+size_t __fpending (FILE *);
+#endif
--- a/lib/addext.c
+++ b/lib/addext.c
@@ -0,0 +1,105 @@
+/* addext.c -- add an extension to a file name
+   Copyright (C) 1990, 1997, 1998, 1999 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; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Paul Eggert */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifndef HAVE_DOS_FILE_NAMES
+# define HAVE_DOS_FILE_NAMES 0
+#endif
+#ifndef HAVE_LONG_FILE_NAMES
+# define HAVE_LONG_FILE_NAMES 0
+#endif
+
+#include <backupfile.h>
+
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifndef _POSIX_NAME_MAX
+# define _POSIX_NAME_MAX 14
+#endif
+
+#include <sys/types.h>
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+char *base_name PARAMS ((char const *));
+
+/* Append to FILENAME the extension EXT, unless the result would be too long,
+   in which case just append the character E.  */
+
+void
+addext (char *filename, char const *ext, int e)
+{
+  char *s = base_name (filename);
+  size_t slen = strlen (s), extlen = strlen (ext);
+  long slen_max = -1;
+
+#if HAVE_PATHCONF && defined _PC_NAME_MAX
+  if (slen + extlen <= _POSIX_NAME_MAX && ! HAVE_DOS_FILE_NAMES)
+    /* The file name is so short there's no need to call pathconf.  */
+    slen_max = _POSIX_NAME_MAX;
+  else if (s == filename)
+    slen_max = pathconf (".", _PC_NAME_MAX);
+  else
+    {
+      char c = *s;
+      *s = 0;
+      slen_max = pathconf (filename, _PC_NAME_MAX);
+      *s = c;
+    }
+#endif
+  if (slen_max < 0)
+    slen_max = HAVE_LONG_FILE_NAMES ? 255 : 14;
+
+  if (HAVE_DOS_FILE_NAMES && slen_max <= 12)
+    {
+      /* Live within DOS's 8.3 limit.  */
+      char *dot = strchr (s, '.');
+      if (dot)
+	{
+	  slen -= dot + 1 - s;
+	  s = dot + 1;
+	  slen_max = 3;
+	}
+      else
+	slen_max = 8;
+      extlen = 9; /* Don't use EXT.  */
+    }
+
+  if (slen + extlen <= slen_max)
+    strcpy (s + slen, ext);
+  else
+    {
+      if (slen_max <= slen)
+	slen = slen_max - 1;
+      s[slen] = e;
+      s[slen + 1] = 0;
+    }
+}
--- a/lib/alloca.c
+++ b/lib/alloca.c
@@ -1,194 +1,503 @@
-/*
-	alloca -- (mostly) portable public-domain implementation -- D A Gwyn
+/* alloca.c -- allocate automatically reclaimed memory
+   (Mostly) portable public-domain implementation -- D A Gwyn

-	last edit:	86/05/30	rms
-	   include config.h, since on VMS it renames some symbols.
-	   Use xmalloc instead of malloc.
+   This implementation of the PWB library alloca function,
+   which is used to allocate space off the run-time stack so
+   that it is automatically reclaimed upon procedure exit,
+   was inspired by discussions with J. Q. Johnson of Cornell.
+   J.Otto Tennant <jot@cray.com> contributed the Cray support.

-	This implementation of the PWB library alloca() function,
-	which is used to allocate space off the run-time stack so
-	that it is automatically reclaimed upon procedure exit, 
-	was inspired by discussions with J. Q. Johnson of Cornell.
+   There are some preprocessor constants that can
+   be defined when compiling for your specific system, for
+   improved efficiency; however, the defaults should be okay.

-	It should work under any C implementation that uses an
-	actual procedure stack (as opposed to a linked list of
-	frames).  There are some preprocessor constants that can
-	be defined when compiling for your specific system, for
-	improved efficiency; however, the defaults should be okay.
+   The general concept of this implementation is to keep
+   track of all alloca-allocated blocks, and reclaim any
+   that are found to be deeper in the stack than the current
+   invocation.  This heuristic does not reclaim storage as
+   soon as it becomes invalid, but it will do so eventually.

-	The general concept of this implementation is to keep
-	track of all alloca()-allocated blocks, and reclaim any
-	that are found to be deeper in the stack than the current
-	invocation.  This heuristic does not reclaim storage as
-	soon as it becomes invalid, but it will do so eventually.
+   As a special case, alloca(0) reclaims storage without
+   allocating any.  It is a good idea to use alloca(0) in
+   your main control loop, etc. to force garbage collection.  */

-	As a special case, alloca(0) reclaims storage without
-	allocating any.  It is a good idea to use alloca(0) in
-	your main control loop, etc. to force garbage collection.
-*/
-#ifndef lint
-static char	SCCSid[] = "@(#)alloca.c	1.1";	/* for the "what" utility */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
 #endif

 #ifdef emacs
-#include "config.h"
-#ifdef static
+# include "blockinput.h"
+#endif
+
+/* If compiling with GCC 2, this file's not needed.  */
+#if !defined (__GNUC__) || __GNUC__ < 2
+
+/* If someone has defined alloca as a macro,
+   there must be some other way alloca is supposed to work.  */
+# ifndef alloca
+
+#  ifdef emacs
+#   ifdef static
 /* actually, only want this if static is defined as ""
   -- this is for usg, in which emacs must undefine static
   in order to make unexec workable
   */
-#ifndef STACK_DIRECTION
+#    ifndef STACK_DIRECTION
 you
 lose
 -- must know STACK_DIRECTION at compile-time
-#endif /* STACK_DIRECTION undefined */
-#endif /* static */
-#endif /* emacs */
+#    endif /* STACK_DIRECTION undefined */
+#   endif /* static */
+#  endif /* emacs */

-#ifndef alloca  /* If compiling with GCC, this file's not needed.  */
+/* If your stack is a linked list of frames, you have to
+   provide an "address metric" ADDRESS_FUNCTION macro.  */

-#ifdef __STDC__
-typedef void	*pointer;		/* generic pointer type */
-#else
-typedef char	*pointer;		/* generic pointer type */
-#endif
+#  if defined (CRAY) && defined (CRAY_STACKSEG_END)
+long i00afunc ();
+#   define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg))
+#  else
+#   define ADDRESS_FUNCTION(arg) &(arg)
+#  endif

-#define	NULL	0			/* null pointer constant */
+#  if __STDC__
+typedef void *pointer;
+#  else
+typedef char *pointer;
+#  endif

-extern void	free();
-extern pointer	xmalloc();
+#  ifndef NULL
+#   define NULL 0
+#  endif

-/*
-	Define STACK_DIRECTION if you know the direction of stack
-	growth for your system; otherwise it will be automatically
-	deduced at run-time.
+/* Different portions of Emacs need to call different versions of
+   malloc.  The Emacs executable needs alloca to call xmalloc, because
+   ordinary malloc isn't protected from input signals.  On the other
+   hand, the utilities in lib-src need alloca to call malloc; some of
+   them are very simple, and don't have an xmalloc routine.

-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown
-*/
+   Non-Emacs programs expect this to call xmalloc.

-#ifndef STACK_DIRECTION
-#define	STACK_DIRECTION	0		/* direction unknown */
-#endif
+   Callers below should use malloc.  */

-#if STACK_DIRECTION != 0
+#  ifndef emacs
+#   define malloc xmalloc
+#  endif
+extern pointer malloc ();

-#define	STACK_DIR	STACK_DIRECTION	/* known at compile-time */
+/* Define STACK_DIRECTION if you know the direction of stack
+   growth for your system; otherwise it will be automatically
+   deduced at run-time.

-#else	/* STACK_DIRECTION == 0; need run-time code */
+   STACK_DIRECTION > 0 => grows toward higher addresses
+   STACK_DIRECTION < 0 => grows toward lower addresses
+   STACK_DIRECTION = 0 => direction of growth unknown  */

-static int	stack_dir;		/* 1 or -1 once known */
-#define	STACK_DIR	stack_dir
+#  ifndef STACK_DIRECTION
+#   define STACK_DIRECTION	0	/* Direction unknown.  */
+#  endif
+
+#  if STACK_DIRECTION != 0
+
+#   define STACK_DIR	STACK_DIRECTION	/* Known at compile-time.  */
+
+#  else /* STACK_DIRECTION == 0; need run-time code.  */
+
+static int stack_dir;		/* 1 or -1 once known.  */
+#   define STACK_DIR	stack_dir

 static void
-find_stack_direction (/* void */)
+find_stack_direction ()
 {
-  static char	*addr = NULL;	/* address of first
-				   `dummy', once known */
-  auto char	dummy;		/* to get stack address */
+  static char *addr = NULL;	/* Address of first `dummy', once known.  */
+  auto char dummy;		/* To get stack address.  */

  if (addr == NULL)
-    {				/* initial entry */
-      addr = &dummy;
+    {				/* Initial entry.  */
+      addr = ADDRESS_FUNCTION (dummy);

-      find_stack_direction ();	/* recurse once */
+      find_stack_direction ();	/* Recurse once.  */
+    }
+  else
+    {
+      /* Second entry.  */
+      if (ADDRESS_FUNCTION (dummy) > addr)
+	stack_dir = 1;		/* Stack grew upward.  */
+      else
+	stack_dir = -1;		/* Stack grew downward.  */
    }
-  else				/* second entry */
-    if (&dummy > addr)
-      stack_dir = 1;		/* stack grew upward */
-    else
-      stack_dir = -1;		/* stack grew downward */
 }

-#endif	/* STACK_DIRECTION == 0 */
+#  endif /* STACK_DIRECTION == 0 */

-/*
-	An "alloca header" is used to:
-	(a) chain together all alloca()ed blocks;
-	(b) keep track of stack depth.
+/* An "alloca header" is used to:
+   (a) chain together all alloca'ed blocks;
+   (b) keep track of stack depth.

-	It is very important that sizeof(header) agree with malloc()
-	alignment chunk size.  The following default should work okay.
-*/
+   It is very important that sizeof(header) agree with malloc
+   alignment chunk size.  The following default should work okay.  */

-#ifndef	ALIGN_SIZE
-#define	ALIGN_SIZE	sizeof(double)
-#endif
+#  ifndef	ALIGN_SIZE
+#   define ALIGN_SIZE	sizeof(double)
+#  endif

 typedef union hdr
 {
-  char	align[ALIGN_SIZE];	/* to force sizeof(header) */
+  char align[ALIGN_SIZE];	/* To force sizeof(header).  */
  struct
    {
-      union hdr *next;		/* for chaining headers */
-      char *deep;		/* for stack depth measure */
+      union hdr *next;		/* For chaining headers.  */
+      char *deep;		/* For stack depth measure.  */
    } h;
 } header;

-/*
-	alloca( size ) returns a pointer to at least `size' bytes of
-	storage which will be automatically reclaimed upon exit from
-	the procedure that called alloca().  Originally, this space
-	was supposed to be taken from the current stack frame of the
-	caller, but that method cannot be made to work for some
-	implementations of C, for example under Gould's UTX/32.
-*/
+static header *last_alloca_header = NULL;	/* -> last alloca header.  */

-static header *last_alloca_header = NULL; /* -> last alloca header */
+/* Return a pointer to at least SIZE bytes of storage,
+   which will be automatically reclaimed upon exit from
+   the procedure that called alloca.  Originally, this space
+   was supposed to be taken from the current stack frame of the
+   caller, but that method cannot be made to work for some
+   implementations of C, for example under Gould's UTX/32.  */

 pointer
-alloca (size)			/* returns pointer to storage */
-     unsigned	size;		/* # bytes to allocate */
+alloca (unsigned size)
 {
-  auto char	probe;		/* probes stack depth: */
-  register char	*depth = &probe;
+  auto char probe;		/* Probes stack depth: */
+  register char *depth = ADDRESS_FUNCTION (probe);

-#if STACK_DIRECTION == 0
-  if (STACK_DIR == 0)		/* unknown growth direction */
+#  if STACK_DIRECTION == 0
+  if (STACK_DIR == 0)		/* Unknown growth direction.  */
    find_stack_direction ();
-#endif
+#  endif

-				/* Reclaim garbage, defined as all alloca()ed storage that
-				   was allocated from deeper in the stack than currently. */
+  /* Reclaim garbage, defined as all alloca'd storage that
+     was allocated from deeper in the stack than currently.  */

  {
-    register header	*hp;	/* traverses linked list */
+    register header *hp;	/* Traverses linked list.  */
+
+#  ifdef emacs
+    BLOCK_INPUT;
+#  endif

    for (hp = last_alloca_header; hp != NULL;)
      if ((STACK_DIR > 0 && hp->h.deep > depth)
 	  || (STACK_DIR < 0 && hp->h.deep < depth))
 	{
-	  register header	*np = hp->h.next;
+	  register header *np = hp->h.next;

-	  free ((pointer) hp);	/* collect garbage */
+	  free ((pointer) hp);	/* Collect garbage.  */

-	  hp = np;		/* -> next header */
+	  hp = np;		/* -> next header.  */
 	}
      else
-	break;			/* rest are not deeper */
+	break;			/* Rest are not deeper.  */

-    last_alloca_header = hp;	/* -> last valid storage */
+    last_alloca_header = hp;	/* -> last valid storage.  */
+
+#  ifdef emacs
+    UNBLOCK_INPUT;
+#  endif
  }

  if (size == 0)
-    return NULL;		/* no allocation required */
+    return NULL;		/* No allocation required.  */

-  /* Allocate combined header + user data storage. */
+  /* Allocate combined header + user data storage.  */

  {
-    register pointer	new = xmalloc (sizeof (header) + size);
-    /* address of header */
+    register pointer new = malloc (sizeof (header) + size);
+    /* Address of header.  */

-    ((header *)new)->h.next = last_alloca_header;
-    ((header *)new)->h.deep = depth;
+    if (new == 0)
+      abort();

-    last_alloca_header = (header *)new;
+    ((header *) new)->h.next = last_alloca_header;
+    ((header *) new)->h.deep = depth;

-    /* User storage begins just after header. */
+    last_alloca_header = (header *) new;

-    return (pointer)((char *)new + sizeof(header));
+    /* User storage begins just after header.  */
+
+    return (pointer) ((char *) new + sizeof (header));
  }
 }

-#endif /* no alloca */
+#  if defined (CRAY) && defined (CRAY_STACKSEG_END)
+
+#   ifdef DEBUG_I00AFUNC
+#    include <stdio.h>
+#   endif
+
+#   ifndef CRAY_STACK
+#    define CRAY_STACK
+#    ifndef CRAY2
+/* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */
+struct stack_control_header
+  {
+    long shgrow:32;		/* Number of times stack has grown.  */
+    long shaseg:32;		/* Size of increments to stack.  */
+    long shhwm:32;		/* High water mark of stack.  */
+    long shsize:32;		/* Current size of stack (all segments).  */
+  };
+
+/* The stack segment linkage control information occurs at
+   the high-address end of a stack segment.  (The stack
+   grows from low addresses to high addresses.)  The initial
+   part of the stack segment linkage control information is
+   0200 (octal) words.  This provides for register storage
+   for the routine which overflows the stack.  */
+
+struct stack_segment_linkage
+  {
+    long ss[0200];		/* 0200 overflow words.  */
+    long sssize:32;		/* Number of words in this segment.  */
+    long ssbase:32;		/* Offset to stack base.  */
+    long:32;
+    long sspseg:32;		/* Offset to linkage control of previous
+				   segment of stack.  */
+    long:32;
+    long sstcpt:32;		/* Pointer to task common address block.  */
+    long sscsnm;		/* Private control structure number for
+				   microtasking.  */
+    long ssusr1;		/* Reserved for user.  */
+    long ssusr2;		/* Reserved for user.  */
+    long sstpid;		/* Process ID for pid based multi-tasking.  */
+    long ssgvup;		/* Pointer to multitasking thread giveup.  */
+    long sscray[7];		/* Reserved for Cray Research.  */
+    long ssa0;
+    long ssa1;
+    long ssa2;
+    long ssa3;
+    long ssa4;
+    long ssa5;
+    long ssa6;
+    long ssa7;
+    long sss0;
+    long sss1;
+    long sss2;
+    long sss3;
+    long sss4;
+    long sss5;
+    long sss6;
+    long sss7;
+  };
+
+#    else /* CRAY2 */
+/* The following structure defines the vector of words
+   returned by the STKSTAT library routine.  */
+struct stk_stat
+  {
+    long now;			/* Current total stack size.  */
+    long maxc;			/* Amount of contiguous space which would
+				   be required to satisfy the maximum
+				   stack demand to date.  */
+    long high_water;		/* Stack high-water mark.  */
+    long overflows;		/* Number of stack overflow ($STKOFEN) calls.  */
+    long hits;			/* Number of internal buffer hits.  */
+    long extends;		/* Number of block extensions.  */
+    long stko_mallocs;		/* Block allocations by $STKOFEN.  */
+    long underflows;		/* Number of stack underflow calls ($STKRETN).  */
+    long stko_free;		/* Number of deallocations by $STKRETN.  */
+    long stkm_free;		/* Number of deallocations by $STKMRET.  */
+    long segments;		/* Current number of stack segments.  */
+    long maxs;			/* Maximum number of stack segments so far.  */
+    long pad_size;		/* Stack pad size.  */
+    long current_address;	/* Current stack segment address.  */
+    long current_size;		/* Current stack segment size.  This
+				   number is actually corrupted by STKSTAT to
+				   include the fifteen word trailer area.  */
+    long initial_address;	/* Address of initial segment.  */
+    long initial_size;		/* Size of initial segment.  */
+  };
+
+/* The following structure describes the data structure which trails
+   any stack segment.  I think that the description in 'asdef' is
+   out of date.  I only describe the parts that I am sure about.  */
+
+struct stk_trailer
+  {
+    long this_address;		/* Address of this block.  */
+    long this_size;		/* Size of this block (does not include
+				   this trailer).  */
+    long unknown2;
+    long unknown3;
+    long link;			/* Address of trailer block of previous
+				   segment.  */
+    long unknown5;
+    long unknown6;
+    long unknown7;
+    long unknown8;
+    long unknown9;
+    long unknown10;
+    long unknown11;
+    long unknown12;
+    long unknown13;
+    long unknown14;
+  };
+
+#    endif /* CRAY2 */
+#   endif /* not CRAY_STACK */
+
+#   ifdef CRAY2
+/* Determine a "stack measure" for an arbitrary ADDRESS.
+   I doubt that "lint" will like this much.  */
+
+static long
+i00afunc (long *address)
+{
+  struct stk_stat status;
+  struct stk_trailer *trailer;
+  long *block, size;
+  long result = 0;
+
+  /* We want to iterate through all of the segments.  The first
+     step is to get the stack status structure.  We could do this
+     more quickly and more directly, perhaps, by referencing the
+     $LM00 common block, but I know that this works.  */
+
+  STKSTAT (&status);
+
+  /* Set up the iteration.  */
+
+  trailer = (struct stk_trailer *) (status.current_address
+				    + status.current_size
+				    - 15);
+
+  /* There must be at least one stack segment.  Therefore it is
+     a fatal error if "trailer" is null.  */
+
+  if (trailer == 0)
+    abort ();
+
+  /* Discard segments that do not contain our argument address.  */
+
+  while (trailer != 0)
+    {
+      block = (long *) trailer->this_address;
+      size = trailer->this_size;
+      if (block == 0 || size == 0)
+	abort ();
+      trailer = (struct stk_trailer *) trailer->link;
+      if ((block <= address) && (address < (block + size)))
+	break;
+    }
+
+  /* Set the result to the offset in this segment and add the sizes
+     of all predecessor segments.  */
+
+  result = address - block;
+
+  if (trailer == 0)
+    {
+      return result;
+    }
+
+  do
+    {
+      if (trailer->this_size <= 0)
+	abort ();
+      result += trailer->this_size;
+      trailer = (struct stk_trailer *) trailer->link;
+    }
+  while (trailer != 0);
+
+  /* We are done.  Note that if you present a bogus address (one
+     not in any segment), you will get a different number back, formed
+     from subtracting the address of the first block.  This is probably
+     not what you want.  */
+
+  return (result);
+}
+
+#   else /* not CRAY2 */
+/* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP.
+   Determine the number of the cell within the stack,
+   given the address of the cell.  The purpose of this
+   routine is to linearize, in some sense, stack addresses
+   for alloca.  */
+
+static long
+i00afunc (long address)
+{
+  long stkl = 0;
+
+  long size, pseg, this_segment, stack;
+  long result = 0;
+
+  struct stack_segment_linkage *ssptr;
+
+  /* Register B67 contains the address of the end of the
+     current stack segment.  If you (as a subprogram) store
+     your registers on the stack and find that you are past
+     the contents of B67, you have overflowed the segment.
+
+     B67 also points to the stack segment linkage control
+     area, which is what we are really interested in.  */
+
+  stkl = CRAY_STACKSEG_END ();
+  ssptr = (struct stack_segment_linkage *) stkl;
+
+  /* If one subtracts 'size' from the end of the segment,
+     one has the address of the first word of the segment.
+
+     If this is not the first segment, 'pseg' will be
+     nonzero.  */
+
+  pseg = ssptr->sspseg;
+  size = ssptr->sssize;
+
+  this_segment = stkl - size;
+
+  /* It is possible that calling this routine itself caused
+     a stack overflow.  Discard stack segments which do not
+     contain the target address.  */
+
+  while (!(this_segment <= address && address <= stkl))
+    {
+#    ifdef DEBUG_I00AFUNC
+      fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl);
+#    endif
+      if (pseg == 0)
+	break;
+      stkl = stkl - pseg;
+      ssptr = (struct stack_segment_linkage *) stkl;
+      size = ssptr->sssize;
+      pseg = ssptr->sspseg;
+      this_segment = stkl - size;
+    }
+
+  result = address - this_segment;
+
+  /* If you subtract pseg from the current end of the stack,
+     you get the address of the previous stack segment's end.
+     This seems a little convoluted to me, but I'll bet you save
+     a cycle somewhere.  */
+
+  while (pseg != 0)
+    {
+#    ifdef DEBUG_I00AFUNC
+      fprintf (stderr, "%011o %011o\n", pseg, size);
+#    endif
+      stkl = stkl - pseg;
+      ssptr = (struct stack_segment_linkage *) stkl;
+      size = ssptr->sssize;
+      pseg = ssptr->sspseg;
+      result += size;
+    }
+  return (result);
+}
+
+#   endif /* not CRAY2 */
+#  endif /* CRAY */
+
+# endif /* no alloca */
+#endif /* not GCC version 2 */
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -1,5 +1,5 @@
 /* argmatch.c -- find a match for a string in an array
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999 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
@@ -12,35 +12,86 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 David MacKenzie <djm@ai.mit.edu> */
+/* Written by David MacKenzie <djm@ai.mit.edu>
+   Modified by Akim Demaille <demaille@inf.enst.fr> */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
+#include "argmatch.h"

 #include <stdio.h>
 #ifdef STDC_HEADERS
-#include <string.h>
+# include <string.h>
 #endif

-extern char *program_name;
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif

-/* If ARG is an unambiguous match for an element of the
-   null-terminated array OPTLIST, return the index in OPTLIST
-   of the matched element, else -1 if it does not match any element
-   or -2 if it is ambiguous (is a prefix of more than one element).  */
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif

-int
-argmatch (arg, optlist)
-     const char *arg;
-     const char *const *optlist;
+#include "error.h"
+#include "quotearg.h"
+
+/* When reporting an invalid argument, show nonprinting characters
+   by using the quoting style ARGMATCH_QUOTING_STYLE.  Do not use
+   literal_quoting_style.  */
+#ifndef ARGMATCH_QUOTING_STYLE
+# define ARGMATCH_QUOTING_STYLE locale_quoting_style
+#endif
+
+/* The following test is to work around the gross typo in
+   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
+   is defined to 0, not 1.  */
+#if !EXIT_FAILURE
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+/* Non failing version of argmatch call this function after failing. */
+#ifndef ARGMATCH_DIE
+# define ARGMATCH_DIE exit (EXIT_FAILURE)
+#endif
+
+#ifdef ARGMATCH_DIE_DECL
+ARGMATCH_DIE_DECL;
+#endif
+
+static void
+__argmatch_die (void)
 {
-  int i;			/* Temporary index in OPTLIST.  */
+  ARGMATCH_DIE;
+}
+
+/* Used by XARGMATCH and XARGCASEMATCH.  See description in argmatch.h.
+   Default to __argmatch_die, but allow caller to change this at run-time. */
+argmatch_exit_fn argmatch_die = __argmatch_die;
+
+
+/* If ARG is an unambiguous match for an element of the
+   null-terminated array ARGLIST, return the index in ARGLIST
+   of the matched element, else -1 if it does not match any element
+   or -2 if it is ambiguous (is a prefix of more than one element).
+   If SENSITIVE, comparison is case sensitive.
+
+   If VALLIST is none null, use it to resolve ambiguities limited to
+   synonyms, i.e., for
+     "yes", "yop" -> 0
+     "no", "nope" -> 1
+   "y" is a valid argument, for `0', and "n" for `1'.  */
+
+static int
+__argmatch_internal (const char *arg, const char *const *arglist,
+		     const char *vallist, size_t valsize,
+		     int case_sensitive)
+{
+  int i;			/* Temporary index in ARGLIST.  */
  size_t arglen;		/* Length of ARG.  */
  int matchind = -1;		/* Index of first nonexact match.  */
  int ambiguous = 0;		/* If nonzero, multiple nonexact match(es).  */
@@ -48,19 +99,30 @@ argmatch (arg, optlist)
  arglen = strlen (arg);

  /* Test all elements for either exact match or abbreviated matches.  */
-  for (i = 0; optlist[i]; i++)
+  for (i = 0; arglist[i]; i++)
    {
-      if (!strncmp (optlist[i], arg, arglen))
+      if (case_sensitive
+	  ? !strncmp (arglist[i], arg, arglen)
+	  : !strncasecmp (arglist[i], arg, arglen))
 	{
-	  if (strlen (optlist[i]) == arglen)
+	  if (strlen (arglist[i]) == arglen)
 	    /* Exact match found.  */
 	    return i;
 	  else if (matchind == -1)
 	    /* First nonexact match found.  */
 	    matchind = i;
 	  else
-	    /* Second nonexact match found.  */
-	    ambiguous = 1;
+	    {
+	      /* Second nonexact match found.  */
+	      if (vallist == NULL
+		  || memcmp (vallist + valsize * matchind,
+			     vallist + valsize * i, valsize))
+		{
+		  /* There is a real ambiguity, or we could not
+		     disambiguate. */
+		  ambiguous = 1;
+		}
+	    }
 	}
    }
  if (ambiguous)
@@ -69,21 +131,176 @@ argmatch (arg, optlist)
    return matchind;
 }

+/* argmatch - case sensitive version */
+int
+argmatch (const char *arg, const char *const *arglist,
+	  const char *vallist, size_t valsize)
+{
+  return __argmatch_internal (arg, arglist, vallist, valsize, 1);
+}
+
+/* argcasematch - case insensitive version */
+int
+argcasematch (const char *arg, const char *const *arglist,
+	      const char *vallist, size_t valsize)
+{
+  return __argmatch_internal (arg, arglist, vallist, valsize, 0);
+}
+
 /* Error reporting for argmatch.
-   KIND is a description of the type of entity that was being matched.
+   CONTEXT is a description of the type of entity that was being matched.
   VALUE is the invalid value that was given.
   PROBLEM is the return value from argmatch.  */

 void
-invalid_arg (kind, value, problem)
-     const char *kind;
-     const char *value;
-     int problem;
+argmatch_invalid (const char *context, const char *value, int problem)
 {
-  fprintf (stderr, "%s: ", program_name);
-  if (problem == -1)
-    fprintf (stderr, "invalid");
-  else				/* Assume -2.  */
-    fprintf (stderr, "ambiguous");
-  fprintf (stderr, " %s `%s'\n", kind, value);
+  char const *format = (problem == -1
+			? _("invalid argument %s for `%s'")
+			: _("ambiguous argument %s for `%s'"));
+
+  error (0, 0, format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context);
 }
+
+/* List the valid arguments for argmatch.
+   ARGLIST is the same as in argmatch.
+   VALLIST is a pointer to an array of values.
+   VALSIZE is the size of the elements of VALLIST */
+void
+argmatch_valid (const char *const *arglist,
+		const char *vallist, size_t valsize)
+{
+  int i;
+  const char *last_val = NULL;
+
+  /* We try to put synonyms on the same line.  The assumption is that
+     synonyms follow each other */
+  fprintf (stderr, _("Valid arguments are:"));
+  for (i = 0; arglist[i]; i++)
+    if ((i == 0)
+	|| memcmp (last_val, vallist + valsize * i, valsize))
+      {
+	fprintf (stderr, "\n  - `%s'", arglist[i]);
+	last_val = vallist + valsize * i;
+      }
+    else
+      {
+	fprintf (stderr, ", `%s'", arglist[i]);
+      }
+  putc ('\n', stderr);
+}
+
+/* Never failing versions of the previous functions.
+
+   CONTEXT is the context for which argmatch is called (e.g.,
+   "--version-control", or "$VERSION_CONTROL" etc.).  Upon failure,
+   calls the (supposed never to return) function EXIT_FN. */
+
+int
+__xargmatch_internal (const char *context,
+		      const char *arg, const char *const *arglist,
+		      const char *vallist, size_t valsize,
+		      int case_sensitive,
+		      argmatch_exit_fn exit_fn)
+{
+  int res = __argmatch_internal (arg, arglist,
+				 vallist, valsize,
+				 case_sensitive);
+  if (res >= 0)
+    /* Success. */
+    return res;
+
+  /* We failed.  Explain why. */
+  argmatch_invalid (context, arg, res);
+  argmatch_valid (arglist, vallist, valsize);
+  (*exit_fn) ();
+
+  return -1; /* To please the compilers. */
+}
+
+/* Look for VALUE in VALLIST, an array of objects of size VALSIZE and
+   return the first corresponding argument in ARGLIST */
+const char *
+argmatch_to_argument (const char *value,
+		      const char *const *arglist,
+		      const char *vallist, size_t valsize)
+{
+  int i;
+
+  for (i = 0; arglist[i]; i++)
+    if (!memcmp (value, vallist + valsize * i, valsize))
+      return arglist[i];
+  return NULL;
+}
+
+#ifdef TEST
+/*
+ * Based on "getversion.c" by David MacKenzie <djm@gnu.ai.mit.edu>
+ */
+char *program_name;
+extern const char *getenv ();
+
+/* When to make backup files.  */
+enum backup_type
+{
+  /* Never make backups.  */
+  none,
+
+  /* Make simple backups of every file.  */
+  simple,
+
+  /* Make numbered backups of files that already have numbered backups,
+     and simple backups of the others.  */
+  numbered_existing,
+
+  /* Make numbered backups of every file.  */
+  numbered
+};
+
+/* Two tables describing arguments (keys) and their corresponding
+   values */
+static const char *const backup_args[] =
+{
+  "no", "none", "off",
+  "simple", "never",
+  "existing", "nil",
+  "numbered", "t",
+  0
+};
+
+static const enum backup_type backup_vals[] =
+{
+  none, none, none,
+  simple, simple,
+  numbered_existing, numbered_existing,
+  numbered, numbered
+};
+
+int
+main (int argc, const char *const *argv)
+{
+  const char *cp;
+  enum backup_type backup_type = none;
+
+  program_name = (char *) argv[0];
+
+  if (argc > 2)
+    {
+      fprintf (stderr, "Usage: %s [VERSION_CONTROL]\n", program_name);
+      exit (1);
+    }
+
+  if ((cp = getenv ("VERSION_CONTROL")))
+    backup_type = XARGCASEMATCH ("$VERSION_CONTROL", cp,
+				 backup_args, backup_vals);
+
+  if (argc == 2)
+    backup_type = XARGCASEMATCH (program_name, argv[1],
+				 backup_args, backup_vals);
+
+  printf ("The version control is `%s'\n",
+	  ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
+
+  return 0;
+}
+#endif
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -1,18 +1,129 @@
-#ifndef ARGMATCH_H
-#define ARGMATCH_H 1
+/* argmatch.h -- definitions and prototypes for argmatch.c
+   Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.

-#ifndef __P
-# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif  /* Not __P.  */
+   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.

-int
-  argmatch __P ((const char *arg, const char *const *optlist));
+   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.

-void
-  invalid_arg __P ((const char *kind, const char *value, int problem));
+   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.  */

-#endif /* ARGMATCH_H */
+/* Written by David MacKenzie <djm@ai.mit.edu>
+   Modified by Akim Demaille <demaille@inf.enst.fr> */
+
+#ifndef ARGMATCH_H_
+# define ARGMATCH_H_ 1
+
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# include <sys/types.h>
+
+# ifndef PARAMS
+#  if PROTOTYPES || (defined (__STDC__) && __STDC__)
+#   define PARAMS(args) args
+#  else
+#   define PARAMS(args) ()
+#  endif  /* GCC.  */
+# endif  /* Not PARAMS.  */
+
+/* Assert there are as many real arguments as there are values
+   (argument list ends with a NULL guard).  There is no execution
+   cost, since it will be statically evalauted to `assert (0)' or
+   `assert (1)'.  Unfortunately there is no -Wassert-0. */
+
+# undef ARRAY_CARDINALITY
+# define ARRAY_CARDINALITY(Array) (sizeof ((Array)) / sizeof (*(Array)))
+
+# define ARGMATCH_ASSERT(Arglist, Vallist)      \
+  assert (ARRAY_CARDINALITY ((Arglist)) == ARRAY_CARDINALITY ((Vallist)) + 1)
+
+/* Return the index of the element of ARGLIST (NULL terminated) that
+   matches with ARG.  If VALLIST is not NULL, then use it to resolve
+   false ambiguities (i.e., different matches of ARG but corresponding
+   to the same values in VALLIST).  */
+
+int argmatch
+  PARAMS ((const char *arg, const char *const *arglist,
+	   const char *vallist, size_t valsize));
+int argcasematch
+  PARAMS ((const char *arg, const char *const *arglist,
+	   const char *vallist, size_t valsize));
+
+# define ARGMATCH(Arg, Arglist, Vallist) \
+  argmatch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
+
+# define ARGCASEMATCH(Arg, Arglist, Vallist) \
+  argcasematch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
+
+/* xargmatch calls this function when it fails.  This function should not
+   return.  By default, this is a function that calls ARGMATCH_DIE which
+   in turn defaults to `exit (EXIT_FAILURE)'.  */
+typedef void (*argmatch_exit_fn) PARAMS ((void));
+extern argmatch_exit_fn argmatch_die;
+
+/* Report on stderr why argmatch failed.  Report correct values. */
+
+void argmatch_invalid
+  PARAMS ((const char *context, const char *value, int problem));
+
+/* Left for compatibility with the old name invalid_arg */
+
+# define invalid_arg(Context, Value, Problem) \
+  argmatch_invalid ((Context), (Value), (Problem))
+
+
+
+/* Report on stderr the list of possible arguments.  */
+
+void argmatch_valid
+  PARAMS ((const char *const *arglist,
+	   const char *vallist, size_t valsize));
+
+# define ARGMATCH_VALID(Arglist, Vallist) \
+  argmatch_valid (Arglist, (const char *) Vallist, sizeof (*(Vallist)))
+
+
+
+/* Same as argmatch, but upon failure, reports a explanation on the
+   failure, and exits using the function EXIT_FN. */
+
+int __xargmatch_internal
+  PARAMS ((const char *context,
+	   const char *arg, const char *const *arglist,
+	   const char *vallist, size_t valsize,
+	   int case_sensitive, argmatch_exit_fn exit_fn));
+
+/* Programmer friendly interface to __xargmatch_internal. */
+
+# define XARGMATCH(Context, Arg, Arglist, Vallist)			\
+  (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist),	\
+                                  (const char *) (Vallist),	\
+				  sizeof (*(Vallist)),		\
+				  1, argmatch_die)])
+
+# define XARGCASEMATCH(Context, Arg, Arglist, Vallist)		\
+  (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist),	\
+                                  (const char *) (Vallist),	\
+				  sizeof (*(Vallist)),		\
+				  0, argmatch_die)])
+
+/* Convert a value into a corresponding argument. */
+
+const char *argmatch_to_argument
+  PARAMS ((char const *value, const char *const *arglist,
+	   const char *vallist, size_t valsize));
+
+# define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist)			\
+  argmatch_to_argument ((char const *) &(Value), (Arglist), 		\
+		        (const char *) (Vallist), sizeof (*(Vallist)))
+
+#endif /* ARGMATCH_H_ */
--- a/lib/atexit.c
+++ b/lib/atexit.c
@@ -0,0 +1,14 @@
+/* Wrapper to implement ANSI C's atexit using SunOS's on_exit. */
+/* This function is in the public domain.  --Mike Stump. */
+
+#include "config.h"
+
+int
+atexit(f)
+     void (*f)();
+{
+  /* If the system doesn't provide a definition for atexit, use on_exit
+     if the system provides that.  */
+  on_exit (f, 0);
+  return 0;
+}
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997, 1998, 1999, 2000 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
@@ -12,91 +12,111 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-/* David MacKenzie <djm@gnu.ai.mit.edu>.
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu>.
   Some algorithms adapted from GNU Emacs. */

-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

+#include <argmatch.h>
+#include <backupfile.h>
+
 #include <stdio.h>
-#include <ctype.h>
 #include <sys/types.h>
-#include "backupfile.h"
-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>
 #endif

-#ifdef HAVE_DIRENT_H
+#if HAVE_DIRENT_H
 # include <dirent.h>
-# define NLENGTH(direct) (strlen((direct)->d_name))
-#else /* not HAVE_DIRENT_H */
+# define NLENGTH(direct) strlen ((direct)->d_name)
+#else
 # define dirent direct
-# define NLENGTH(direct) ((direct)->d_namlen)
-# ifdef HAVE_SYS_NDIR_H
+# define NLENGTH(direct) ((size_t) (direct)->d_namlen)
+# if HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
+# endif
+# if HAVE_SYS_DIR_H
 #  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
+# endif
+# if HAVE_NDIR_H
 #  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
+# endif
+#endif

-#ifdef CLOSEDIR_VOID
+#if CLOSEDIR_VOID
 /* Fake a return value. */
 # define CLOSEDIR(d) (closedir (d), 0)
 #else
 # define CLOSEDIR(d) closedir (d)
 #endif

-#ifdef STDC_HEADERS
+#if HAVE_STDLIB_H
 # include <stdlib.h>
-#else
+#endif
+
+#ifndef HAVE_DECL_GETENV
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_GETENV
+char *getenv ();
+#endif
+
+#ifndef HAVE_DECL_MALLOC
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_MALLOC
 char *malloc ();
 #endif

-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
+char *base_name PARAMS ((char const *));
+
+#if HAVE_DIRENT_H || HAVE_NDIR_H || HAVE_SYS_DIR_H || HAVE_SYS_NDIR_H
+# define HAVE_DIR 1
 #else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
+# define HAVE_DIR 0
 #endif

-#define ISDIGIT(c) (IN_CTYPE_DOMAIN ((unsigned char) (c)) \
-		    && isdigit ((unsigned char) (c)))
-
-#if defined (HAVE_UNISTD_H)
-#include <unistd.h>
+#if HAVE_LIMITS_H
+# include <limits.h>
 #endif
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
+/* 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)

-#if defined (_POSIX_VERSION)
-/* POSIX does not require that the d_ino field be present, and some
-   systems do not provide it. */
-# define REAL_DIR_ENTRY(dp) 1
-#else
+/* ISDIGIT differs from isdigit, as follows:
+   - Its arg may be any int or unsigned int; it need not be an unsigned char.
+   - It's guaranteed to evaluate its argument exactly once.
+   - It's typically faster.
+   Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
+   only '0' through '9' are digits.  Prefer ISDIGIT to isdigit unless
+   it's important to use the locale's definition of `digit' even when the
+   host does not conform to Posix.  */
+#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
+
+#if D_INO_IN_DIRENT
 # define REAL_DIR_ENTRY(dp) ((dp)->d_ino != 0)
+#else
+# define REAL_DIR_ENTRY(dp) 1
 #endif

-/* Which type of backup file names are generated. */
-enum backup_type backup_type = none;
-
 /* The extension added to file names to produce a simple (as opposed
   to numbered) backup file name. */
-char *simple_backup_suffix = "~";
+const char *simple_backup_suffix = "~";

-char *basename ();
-char *dirname ();
-static char *concat ();
-char *find_backup_file_name ();
-static char *make_version_name ();
-static int max_backup_version ();
-static int version_number ();
+static int max_backup_version PARAMS ((const char *, const char *));
+static int version_number PARAMS ((const char *, const char *, size_t));

 /* Return the name of the new backup file for file FILE,
   allocated with malloc.  Return 0 if out of memory.
@@ -104,41 +124,56 @@ static int version_number ();
   Do not call this function if backup_type == none. */

 char *
-find_backup_file_name (file)
-     const char *file;
+find_backup_file_name (const char *file, enum backup_type backup_type)
 {
-  char *dir;
-  char *base_versions;
-  int highest_backup;
+  size_t backup_suffix_size_max;
+  size_t file_len = strlen (file);
+  size_t numbered_suffix_size_max = INT_STRLEN_BOUND (int) + 4;
+  char *s;
+  const char *suffix = simple_backup_suffix;

-  if (backup_type == simple)
-    return concat (file, simple_backup_suffix);
-  base_versions = concat (basename (file), ".~");
-  if (base_versions == 0)
-    return 0;
-  dir = dirname (file);
-  if (dir == 0)
+  /* Allow room for simple or `.~N~' backups.  */
+  backup_suffix_size_max = strlen (simple_backup_suffix) + 1;
+  if (HAVE_DIR && backup_suffix_size_max < numbered_suffix_size_max)
+    backup_suffix_size_max = numbered_suffix_size_max;
+
+  s = malloc (file_len + backup_suffix_size_max + numbered_suffix_size_max);
+  if (s)
    {
-      free (base_versions);
-      return 0;
+      strcpy (s, file);
+
+#if HAVE_DIR
+      if (backup_type != simple)
+	{
+	  int highest_backup;
+	  size_t dir_len = base_name (s) - s;
+
+	  strcpy (s + dir_len, ".");
+	  highest_backup = max_backup_version (file + dir_len, s);
+	  if (! (backup_type == numbered_existing && highest_backup == 0))
+	    {
+	      char *numbered_suffix = s + (file_len + backup_suffix_size_max);
+	      sprintf (numbered_suffix, ".~%d~", highest_backup + 1);
+	      suffix = numbered_suffix;
+	    }
+	  strcpy (s, file);
+	}
+#endif /* HAVE_DIR */
+
+      addext (s, suffix, '~');
    }
-  highest_backup = max_backup_version (base_versions, dir);
-  free (base_versions);
-  free (dir);
-  if (backup_type == numbered_existing && highest_backup == 0)
-    return concat (file, simple_backup_suffix);
-  return make_version_name (file, highest_backup + 1);
+  return s;
 }

+#if HAVE_DIR
+
 /* Return the number of the highest-numbered backup file for file
   FILE in directory DIR.  If there are no numbered backups
   of FILE in DIR, or an error occurs reading DIR, return 0.
-   FILE should already have ".~" appended to it. */
+   */

 static int
-max_backup_version (file, dir)
-     const char *file;
-     const char *dir;
+max_backup_version (const char *file, const char *dir)
 {
  DIR *dirp;
  struct dirent *dp;
@@ -155,7 +190,7 @@ max_backup_version (file, dir)

  while ((dp = readdir (dirp)) != 0)
    {
-      if (!REAL_DIR_ENTRY (dp) || NLENGTH (dp) <= file_name_length)
+      if (!REAL_DIR_ENTRY (dp) || NLENGTH (dp) < file_name_length + 4)
 	continue;

      this_version = version_number (file, dp->d_name, file_name_length);
@@ -167,62 +202,75 @@ max_backup_version (file, dir)
  return highest_version;
 }

-/* Return a string, allocated with malloc, containing
-   "FILE.~VERSION~".  Return 0 if out of memory. */
-
-static char *
-make_version_name (file, version)
-     const char *file;
-     int version;
-{
-  char *backup_name;
-
-  backup_name = malloc (strlen (file) + 16);
-  if (backup_name == 0)
-    return 0;
-  sprintf (backup_name, "%s.~%d~", file, version);
-  return backup_name;
-}
-
 /* If BACKUP is a numbered backup of BASE, return its version number;
   otherwise return 0.  BASE_LENGTH is the length of BASE.
-   BASE should already have ".~" appended to it. */
+   */

 static int
-version_number (base, backup, base_length)
-     const char *base;
-     const char *backup;
-     int base_length;
+version_number (const char *base, const char *backup, size_t base_length)
 {
  int version;
  const char *p;

  version = 0;
-  if (!strncmp (base, backup, base_length) && ISDIGIT (backup[base_length]))
+  if (strncmp (base, backup, base_length) == 0
+      && backup[base_length] == '.'
+      && backup[base_length + 1] == '~')
    {
-      for (p = &backup[base_length]; ISDIGIT (*p); ++p)
+      for (p = &backup[base_length + 2]; ISDIGIT (*p); ++p)
 	version = version * 10 + *p - '0';
      if (p[0] != '~' || p[1])
 	version = 0;
    }
  return version;
 }
+#endif /* HAVE_DIR */

-/* Return the newly-allocated concatenation of STR1 and STR2.
-   If out of memory, return 0. */
-
-static char *
-concat (str1, str2)
-     const char *str1;
-     const char *str2;
+static const char * const backup_args[] =
 {
-  char *newstr;
-  int str1_length = strlen (str1);
+  /* In a series of synonyms, present the most meaning full first, so
+     that argmatch_valid be more readable. */
+  "none", "off",
+  "simple", "never",
+  "existing", "nil",
+  "numbered", "t",
+  0
+};

-  newstr = malloc (str1_length + strlen (str2) + 1);
-  if (newstr == 0)
-    return 0;
-  strcpy (newstr, str1);
-  strcpy (newstr + str1_length, str2);
-  return newstr;
+static const enum backup_type backup_types[] =
+{
+  none, none,
+  simple, simple,
+  numbered_existing, numbered_existing,
+  numbered, numbered
+};
+
+/* Return the type of backup specified by VERSION.
+   If VERSION is NULL or the empty string, return numbered_existing.
+   If VERSION is invalid or ambiguous, fail with a diagnostic appropriate
+   for the specified CONTEXT.  Unambiguous abbreviations are accepted.  */
+
+enum backup_type
+get_version (const char *context, const char *version)
+{
+  if (version == 0 || *version == 0)
+    return numbered_existing;
+  else
+    return XARGMATCH (context, version, backup_args, backup_types);
+}
+
+
+/* Return the type of backup specified by VERSION.
+   If VERSION is NULL, use the value of the envvar VERSION_CONTROL.
+   If the specified string is invalid or ambiguous, fail with a diagnostic
+   appropriate for the specified CONTEXT.
+   Unambiguous abbreviations are accepted.  */
+
+enum backup_type
+xget_version (const char *context, const char *version)
+{
+  if (version && *version)
+    return get_version (context, version);
+  else
+    return get_version ("$VERSION_CONTROL", getenv ("VERSION_CONTROL"));
 }
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -1,5 +1,5 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990-1992, 1997-1999 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
@@ -12,8 +12,12 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef BACKUPFILE_H_
+# define BACKUPFILE_H_

 /* When to make backup files. */
 enum backup_type
@@ -32,11 +36,25 @@ enum backup_type
  numbered
 };

-extern enum backup_type backup_type;
-extern char *simple_backup_suffix;
+# define VALID_BACKUP_TYPE(Type)	\
+  ((Type) == none			\
+   || (Type) == simple			\
+   || (Type) == numbered_existing	\
+   || (Type) == numbered)

-#ifdef __STDC__
-char *find_backup_file_name (const char *file);
-#else
-char *find_backup_file_name ();
-#endif
+extern char const *simple_backup_suffix;
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+char *find_backup_file_name PARAMS ((char const *, enum backup_type));
+enum backup_type get_version PARAMS ((char const *context, char const *arg));
+enum backup_type xget_version PARAMS ((char const *context, char const *arg));
+void addext PARAMS ((char *, char const *, int));
+
+#endif /* ! BACKUPFILE_H_ */
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,5 +1,5 @@
 /* basename.c -- return the last element in a path
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999, 2000 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
@@ -12,27 +12,59 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

-/* Return NAME with any leading path stripped off.
-   Don't use strrchr/rindex.  */
+#include <assert.h>
+
+#ifndef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
+#endif
+
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == '/')
+#endif
+
+char *base_name PARAMS ((char const *name));
+
+/* In general, we can't use the builtin `basename' function if available,
+   since it has different meanings in different environments.
+   In some environments the builtin `basename' modifies its argument.
+   If NAME is all slashes, be sure to return `/'.  */

 char *
-basename (name)
-     const char *name;
+base_name (char const *name)
 {
-  const char *base = name;
+  char const *base = name += FILESYSTEM_PREFIX_LEN (name);
+  int all_slashes = 1;
+  char const *p;

-  while (*name)
+  for (p = name; *p; p++)
    {
-      if (*name == '/')
-	base = name + 1;
-      ++name;
+      if (ISSLASH (*p))
+	base = p + 1;
+      else
+	all_slashes = 0;
    }
+
+  /* If NAME is all slashes, arrange to return `/'.  */
+  if (*base == '\0' && ISSLASH (*name) && all_slashes)
+    --base;
+
+  /* Make sure the last byte is not a slash.  */
+  assert (all_slashes || !ISSLASH (*(p - 1)));
+
  return (char *) base;
 }
--- a/lib/bumpalloc.h
+++ b/lib/bumpalloc.h
@@ -0,0 +1,63 @@
+/* BUMP_ALLOC macro - increase table allocation by one element.
+   Copyright (C) 1990, 1991, 1993, 1998, 2000 Free Software Foundation, Inc.
+   François Pinard <pinard@iro.umontreal.ca>, 1990.
+
+   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.  */
+
+/*-------------------------------------------------------------------------.
+| Bump the allocation of the array pointed to by TABLE whenever required.  |
+| The table already has already COUNT elements in it, this macro ensure it |
+| has enough space to accommodate at least one more element.  Space is	   |
+| allocated (2 ^ EXPONENT) elements at a time.  Each element of the array  |
+| is of type TYPE.							   |
+`-------------------------------------------------------------------------*/
+
+/* Routines `xmalloc' and `xrealloc' are called to do the actual memory
+   management.  This implies that the program will abort with a "memory
+   exhausted" error if any problem arise.
+
+   To work correctly, at least EXPONENT and TYPE should always be the
+   same for all uses of this macro for any given TABLE.  A secure way to
+   achieve this is to never use this macro directly, but use it to define
+   other macros, which would then be TABLE-specific.
+
+   The first time through, COUNT is usually zero.  Note that COUNT is not
+   updated by this macro, but it should be update elsewhere, later.  This
+   is convenient, because it allows TABLE[COUNT] to refer to the new
+   element at the end.  Once its construction is completed, COUNT++ will
+   record it in the table.  Calling this macro several times in a row
+   without updating COUNT is a bad thing to do.  */
+
+#define BUMP_ALLOC(Table, Count, Exponent, Type) \
+  BUMP_ALLOC_WITH_SIZE ((Table), (Count), (Exponent), Type, sizeof (Type))
+
+/* In cases `sizeof TYPE' would not always yield the correct value for
+   the size of each element entry, this macro accepts a supplementary
+   SIZE argument.  The EXPONENT, TYPE and SIZE parameters should still
+   have the same value for all macro calls related to a specific TABLE.  */
+
+#define BUMP_ALLOC_WITH_SIZE(Table, Count, Exponent, Type, Size)	\
+  do									\
+    {									\
+      if (((Count) & (~(~0 << (Exponent)))) == 0)			\
+	{								\
+	  if ((Count) == 0)						\
+	    (Table) = (Type *) xmalloc ((1 << (Exponent)) * (Size));	\
+	  else								\
+	    (Table) = (Type *)						\
+	      xrealloc ((Table), ((Count) + (1 << (Exponent))) * (Size)); \
+	}								\
+    }									\
+  while (0)
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -1,6 +1,6 @@
 /* Host name canonicalization

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

   Written by Miles Bader <miles@gnu.ai.mit.edu>

@@ -15,62 +15,84 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif

+#include <sys/types.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
 #endif
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
 #endif
 #ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
+# include <sys/socket.h>
 #endif

 #ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
+#endif
+
+#ifndef strdup
+char *strdup ();
 #endif

 /* Returns the canonical hostname associated with HOST (allocated in a static
   buffer), or 0 if it can't be determined.  */
 char *
-canon_host (host)
-     char *host;
+canon_host (const char *host)
 {
 #ifdef HAVE_GETHOSTBYNAME
  struct hostent *he = gethostbyname (host);

  if (he)
    {
-#ifdef HAVE_GETHOSTBYADDR
+# ifdef HAVE_GETHOSTBYADDR
      char *addr = 0;

      /* Try and get an ascii version of the numeric host address.  */
      switch (he->h_addrtype)
 	{
-#ifdef HAVE_INET_NTOA
+#  ifdef HAVE_INET_NTOA
 	case AF_INET:
 	  addr = inet_ntoa (*(struct in_addr *) he->h_addr);
 	  break;
-#endif /* HAVE_INET_NTOA */
+#  endif /* HAVE_INET_NTOA */
 	}

      if (addr && strcmp (he->h_name, addr) == 0)
-	/* gethostbyname() cheated!  Lookup the host name via the address
-	   this time to get the actual host name.  */
-	he = gethostbyaddr (he->h_addr, he->h_length, he->h_addrtype);
-#endif /* HAVE_GETHOSTBYADDR */
+	{
+	  /* gethostbyname has returned a string representation of the IP
+	     address, for example, "127.0.0.1".  So now, look up the host
+	     name via the address.  Although it may seem reasonable to look
+	     up the host name via the address, we must not pass `he->h_addr'
+	     directly to gethostbyaddr because on some systems he->h_addr
+	     is located in a static library buffer that is reused in the
+	     gethostbyaddr call.  Make a copy and use that instead.  */
+	  char *h_addr_copy = (char *) malloc (he->h_length);
+	  if (h_addr_copy == NULL)
+	    he = NULL;
+	  else
+	    {
+	      memcpy (h_addr_copy, he->h_addr, he->h_length);
+	      he = gethostbyaddr (h_addr_copy, he->h_length, he->h_addrtype);
+	      free (h_addr_copy);
+	    }
+	}
+# endif /* HAVE_GETHOSTBYADDR */

      if (he)
 	return (char *) (he->h_name);
@@ -78,3 +100,17 @@ canon_host (host)
 #endif /* HAVE_GETHOSTBYNAME */
  return 0;
 }
+
+#ifdef TEST_CANON_HOST
+int
+main (int argc, char **argv)
+{
+  int i;
+  for (i = 1; i < argc; i++)
+    {
+      char *s = canon_host (argv[i]);
+      printf ("%s: %s\n", argv[i], (s ? s : "<undef>"));
+    }
+  exit (0);
+}
+#endif /* TEST_CANON_HOST */
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -0,0 +1,55 @@
+/* provide consistent interface to chown for systems that don't interpret
+   an ID of -1 as meaning `don't change the corresponding ID'.
+   Copyright (C) 1997 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 Jim Meyering */
+
+#include <config.h>
+
+/* Disable the definition of chown to rpl_chown (from config.h) in this
+   file.  Otherwise, we'd get conflicting prototypes for rpl_chown on
+   most systems.  */
+#undef chown
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+/* FIXME: describe.  */
+
+int
+rpl_chown (const char *file, uid_t uid, gid_t gid)
+{
+  if (gid == (gid_t) -1 || uid == (uid_t) -1)
+    {
+      struct stat file_stats;
+
+      /* Stat file to get id(s) that should remain unchanged.  */
+      if (stat (file, &file_stats))
+	return 1;
+
+      if (gid == (gid_t) -1)
+	gid = file_stats.st_gid;
+
+      if (uid == (uid_t) -1)
+	uid = file_stats.st_uid;
+    }
+
+  return chown (file, uid, gid);
+}
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -0,0 +1,117 @@
+/* closeout.c - close standard output
+   Copyright (C) 1998, 1999, 2000 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.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+#include <stdio.h>
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#include "closeout.h"
+#include "error.h"
+#include "quotearg.h"
+#include "__fpending.h"
+
+static int default_exit_status = EXIT_FAILURE;
+static const char *file_name;
+
+/* Set the value to be used for the exit status when close_stdout is called.
+   This is useful when it is not convenient to call close_stdout_status,
+   e.g., when close_stdout is called via atexit.  */
+void
+close_stdout_set_status (int status)
+{
+  default_exit_status = status;
+}
+
+/* Set the file name to be reported in the event an error is detected
+   by close_stdout_status.  */
+void
+close_stdout_set_file_name (const char *file)
+{
+  file_name = file;
+}
+
+/* Close standard output, exiting with status STATUS on failure.
+   If a program writes *anything* to stdout, that program should `fflush'
+   stdout and make sure that it succeeds before exiting.  Otherwise,
+   suppose that you go to the extreme of checking the return status
+   of every function that does an explicit write to stdout.  The last
+   printf can succeed in writing to the internal stream buffer, and yet
+   the fclose(stdout) could still fail (due e.g., to a disk full error)
+   when it tries to write out that buffered data.  Thus, you would be
+   left with an incomplete output file and the offending program would
+   exit successfully.
+
+   FIXME: note the fflush suggested above is implicit in the fclose
+   we actually do below.  Consider doing only the fflush and/or using
+   setvbuf to inhibit buffering.
+
+   Besides, it's wasteful to check the return value from every call
+   that writes to stdout -- just let the internal stream state record
+   the failure.  That's what the ferror test is checking below.
+
+   It's important to detect such failures and exit nonzero because many
+   tools (most notably `make' and other build-management systems) depend
+   on being able to detect failure in other tools via their exit status.  */
+
+void
+close_stdout_status (int status)
+{
+  int e = ferror (stdout) ? 0 : -1;
+
+  if (__fpending (stdout) == 0)
+    return;
+
+  if (fclose (stdout) != 0)
+    e = errno;
+
+  if (0 <= e)
+    {
+      char const *write_error = _("write error");
+      if (file_name)
+	error (status, e, "%s: %s", quotearg_colon (file_name), write_error);
+      else
+	error (status, e, "%s", write_error);
+    }
+}
+
+/* Close standard output, exiting with status EXIT_FAILURE on failure.  */
+void
+close_stdout (void)
+{
+  close_stdout_status (default_exit_status);
+}
--- a/lib/closeout.h
+++ b/lib/closeout.h
@@ -0,0 +1,12 @@
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+void close_stdout_set_status PARAMS ((int status));
+void close_stdout_set_file_name PARAMS ((const char *file));
+void close_stdout PARAMS ((void));
+void close_stdout_status PARAMS ((int status));
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -0,0 +1,216 @@
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+#   Copyright (C) 2000 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
+#   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
+#   Library General Public License for more details.
+#
+#   You should have received a copy of the GNU Library 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.
+#
+# The table consists of lines of the form
+#    ALIAS  CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+#       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-4                solaris                                   yes
+#   ISO-8859-5                glibc aix hpux irix solaris               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-9                glibc aix hpux irix osf solaris           yes
+#   ISO-8859-13               glibc
+#   ISO-8859-15               aix solaris freebsd
+#   KOI8-R                    glibc solaris freebsd                     yes
+#   KOI8-U                    glibc                                     yes
+#   CP850                     aix osf
+#   CP856                     aix
+#   CP866                     freebsd
+#   CP922                     aix
+#   CP932                     aix
+#   CP943                     aix
+#   CP1046                    aix
+#   CP1124                    aix
+#   CP1129                    aix
+#   CP1251                    glibc
+#   CP1252                    aix
+#   EUC-CN                    aix hpux irix solaris
+#   EUC-JP                    aix hpux irix solaris                     yes
+#   EUC-KR                    aix hpux irix solaris                     yes
+#   EUC-TW                    aix hpux irix solaris
+#   BIG5                      aix hpux solaris                          yes
+#   GBK                       aix
+#   SJIS                      hpux solaris
+#   TIS-620                   aix hpux solaris
+#   HP-ROMAN8                 hpux
+#   HP-ARABIC8                hpux
+#   HP-GREEK8                 hpux
+#   HP-HEBREW8                hpux
+#   HP-TURKISH8               hpux
+#   HP-KANA8                  hpux
+#   UTF-8                     glibc aix hpux 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.).
+#
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+    linux* | *-gnu*)
+	# With glibc-2.1 or newer, we don't need any canonicalization,
+	# because glibc has iconv and both glibc and libiconv support all
+	# GNU canonical names directly. Therefore, the Makefile does not
+	# need to install the alias file at all.
+	# The following applies only to glibc-2.0.x and older libcs.
+	echo "ISO_646.IRV:1983 ASCII"
+	;;
+    aix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	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 "IBM-850 CP850"
+	echo "IBM-856 CP856"
+	echo "IBM-921 ISO-8859-13"
+	echo "IBM-922 CP922"
+	echo "IBM-932 CP932"
+	echo "IBM-943 CP943"
+	echo "IBM-1046 CP1046"
+	echo "IBM-1124 CP1124"
+	echo "IBM-1129 CP1129"
+	echo "IBM-1252 CP1252"
+	echo "IBM-eucCN EUC-CN"
+	echo "IBM-eucJP EUC-JP"
+	echo "IBM-eucKR EUC-KR"
+	echo "IBM-eucTW EUC-TW"
+	echo "big5 BIG5"
+	echo "GBK GBK"
+	echo "TIS-620 TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    hpux*)
+	echo "iso88591 ISO-8859-1"
+	echo "iso88592 ISO-8859-2"
+	echo "iso88595 ISO-8859-5"
+	echo "iso88596 ISO-8859-6"
+	echo "iso88597 ISO-8859-7"
+	echo "iso88598 ISO-8859-8"
+	echo "iso88599 ISO-8859-9"
+	echo "iso885915 ISO-8859-15"
+	echo "roman8 HP-ROMAN8"
+	echo "arabic8 HP-ARABIC8"
+	echo "greek8 HP-GREEK8"
+	echo "hebrew8 HP-HEBREW8"
+	echo "turkish8 HP-TURKISH8"
+	echo "kana8 HP-KANA8"
+	echo "tis620 TIS-620"
+	echo "big5 BIG5"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "hp15CN EUC-CN"
+	#echo "ccdc ?" # what is this?
+	echo "SJIS SJIS"
+	echo "utf8 UTF-8"
+	;;
+    irix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "eucCN EUC-CN"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	;;
+    osf*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "cp850 CP850"
+	;;
+    solaris*)
+	echo "646 ASCII"
+	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-6 ISO-8859-6"
+	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 "koi8-r KOI8-R"
+	echo "BIG5 BIG5"
+	echo "gb2312 EUC-CN"
+	echo "cns11643 EUC-TW"
+	echo "5601 EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "PCK SJIS"
+	echo "TIS620.2533 TIS-620"
+	#echo "sun_eu_greek ?" # what is this?
+	echo "UTF-8 UTF-8"
+	;;
+    freebsd*)
+	# FreeBSD 3.3 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	echo "US-ASCII ASCII"
+	for l in lt_LN; do
+	  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 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
+	for l in hr_HR hu_HU lt_LN pl_PL sl_SI; do
+	  echo "$l.ISO_8859-2 ISO-8859-2"
+	done
+	for l in ru_RU ru_SU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.CP866 CP866"
+	done
+	;;
+esac
--- a/lib/diacrit.c
+++ b/lib/diacrit.c
@@ -0,0 +1,148 @@
+/* Diacritics processing for a few character codes.
+   Copyright (C) 1990, 1991, 1992, 1993, 2000 Free Software Foundation, Inc.
+   François Pinard <pinard@iro.umontreal.ca>, 1988.
+
+   All this file is a temporary hack, waiting for locales in GNU.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "diacrit.h"
+
+/* ISO 8859-1 Latin-1 code is used as the underlying character set.  If
+   MSDOS is defined, IBM-PC's character set code is used instead.  */
+
+/*--------------------------------------------------------------------.
+| For each alphabetic character, returns what it would be without its |
+| possible diacritic symbol.					      |
+`--------------------------------------------------------------------*/
+
+const char diacrit_base[256] =
+{
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      'A',    'B',    'C',    'D',    'E',    'F',    'G',
+  'H',    'I',    'J',    'K',    'L',    'M',    'N',    'O',
+  'P',    'Q',    'R',    'S',    'T',    'U',    'V',    'W',
+  'X',    'Y',    'Z',    0,      0,      0,      0,      0,
+  0,      'a',    'b',    'c',    'd',    'e',    'f',    'g',
+  'h',    'i',    'j',    'k',    'l',    'm',    'n',    'o',
+  'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
+  'x',    'y',    'z',    0,      0,      0,      0,      0,
+
+#ifdef __MSDOS__
+
+  'C',    'u',    'e',    'a',    'a',    'a',    'a',    'c',
+  'e',    'e',    'e',    'i',    'i',    'i',    'A',    'A',
+  'E',    'e',    'E',    'o',    'o',    'o',    'u',    'u',
+  'y',    'O',    'U',    0,      0,      0,      0,      0,
+  'a',    'i',    'o',    'u',    'n',    'N',    0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+
+#else
+
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  'A',    'A',    'A',    'A',    'A',    'A',    'A',    'C',
+  'E',    'E',    'E',    'E',    'I',    'I',    'I',    'I',
+  0,      'N',    'O',    'O',    'O',    'O',    'O',    0,
+  'O',    'U',    'U',    'U',    'U',    'Y',    0,      0,
+  'a',    'a',    'a',    'a',    'a',    'a',    'a',    'c',
+  'e',    'e',    'e',    'e',    'i',    'i',    'i',    'i',
+  0,      'n',    'o',    'o',    'o',    'o',    'o',    0,
+  'o',    'u',    'u',    'u',    'u',    'y',    0,      'y',
+
+#endif
+};
+
+/*------------------------------------------------------------------------.
+| For each alphabetic character, returns a code of what its diacritic is, |
+| according to the following codes: 1 (eE) over aA for latin diphtongs; 2 |
+| (') acute accent; 3 (`) grave accent; 4 (^) circumflex accent; 5 (")	  |
+| umlaut or diaraesis; 6 (~) tilda; 7 (,) cedilla; 8 (o) covering degree  |
+| symbol; 9 (|) slashed character.					  |
+`------------------------------------------------------------------------*/
+
+const char diacrit_diac[256] =
+{
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      4,      0,
+  3,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      6,      0,
+
+#ifdef __MSDOS__
+
+  7,      5,      2,      4,      5,      3,      8,      7,
+  4,      5,      3,      5,      4,      3,      5,      8,
+  2,      1,      1,      4,      5,      3,      4,      3,
+  5,      5,      5,      0,      0,      0,      0,      0,
+  2,      2,      2,      2,      6,      6,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+
+#else
+
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  0,      0,      0,      0,      0,      0,      0,      0,
+  3,      2,      4,      6,      5,      8,      1,      7,
+  3,      2,      4,      5,      3,      2,      4,      5,
+  0,      6,      3,      2,      4,      6,      5,      0,
+  9,      3,      2,      4,      5,      2,      0,      0,
+  3,      2,      4,      6,      5,      8,      1,      7,
+  3,      2,      4,      5,      3,      2,      4,      5,
+  0,      6,      3,      2,      4,      6,      5,      0,
+  9,      3,      2,      4,      5,      2,      0,      0,
+
+#endif
+};
--- a/lib/diacrit.h
+++ b/lib/diacrit.h
@@ -0,0 +1,15 @@
+/* Diacritics processing for a few character codes.
+   Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   François Pinard <pinard@iro.umontreal.ca>, 1988.
+
+   All this file is a temporary hack, waiting for locales in GNU.
+*/
+
+extern const char diacrit_base[]; /* characters without diacritics */
+extern const char diacrit_diac[]; /* diacritic code for each character */
+
+/* Returns CHAR without its diacritic.  CHAR is known to be alphabetic.  */
+#define tobase(Char) (diacrit_base[(unsigned char) (Char)])
+
+/* Returns a diacritic code for CHAR.  CHAR is known to be alphabetic.  */
+#define todiac(Char) (diacrit_diac[(unsigned char) (Char)])
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -1,5 +1,5 @@
 /* dirname.c -- return all but the last element in a path
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2000 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
@@ -12,41 +12,62 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 char *malloc ();
 #endif
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
+#if defined STDC_HEADERS || defined HAVE_STRING_H
+# include <string.h>
 #else
-#include <strings.h>
-#ifndef strrchr
-#define strrchr rindex
+# include <strings.h>
+# ifndef strrchr
+#  define strrchr rindex
+# endif
 #endif
+#include <assert.h>
+
+#include "dirname.h"
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == '/')
 #endif

+#define BACKSLASH_IS_PATH_SEPARATOR ISSLASH ('\\')
+
 /* Return the leading directories part of PATH,
   allocated with malloc.  If out of memory, return 0.
   Assumes that trailing slashes have already been
   removed.  */

 char *
-dirname (path)
-     char *path;
+dir_name (const char *path)
 {
  char *newpath;
  char *slash;
  int length;			/* Length of result, not including NUL.  */

  slash = strrchr (path, '/');
+  if (BACKSLASH_IS_PATH_SEPARATOR)
+    {
+      char *b = strrchr (path, '\\');
+      if (b && slash < b)
+	slash = b;
+    }
+
+  /* Make sure there are no trailing slashes.  */
+  assert (slash == NULL	   /* There are no slashes in PATH.  */
+	  || slash[1] != 0 /* There is a non-NUL byte after the last slash.  */
+	  || path == slash /* PATH is just `/'.  */
+	  );
+
  if (slash == 0)
    {
      /* File is in the current directory.  */
@@ -56,11 +77,25 @@ dirname (path)
  else
    {
      /* Remove any trailing slashes from the result.  */
-      while (slash > path && *slash == '/')
-	--slash;
+      if (BACKSLASH_IS_PATH_SEPARATOR)
+	{
+	  const char *lim = ((path[0] >= 'A' && path[0] <= 'z'
+			      && path[1] == ':')
+			     ? path + 2 : path);
+
+	  /* If canonicalized "d:/path", leave alone the root case "d:/".  */
+	  while (slash > lim && ISSLASH (*slash))
+	    --slash;
+	}
+      else
+	{
+	  while (slash > path && ISSLASH (*slash))
+	    --slash;
+	}

      length = slash - path + 1;
    }
+
  newpath = (char *) malloc (length + 1);
  if (newpath == 0)
    return 0;
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -0,0 +1,31 @@
+/*  Copyright (C) 1998 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.  */
+
+#ifndef DIRNAME_H_
+# define DIRNAME_H_ 1
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+char *
+dir_name PARAMS ((const char *path));
+
+#endif /* not DIRNAME_H_ */
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -0,0 +1,66 @@
+/* Duplicate an open file descriptor to a specified file descriptor.
+   Copyright 1999 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 F_DUPFD
+static int
+dupfd (int fd, int desired_fd)
+{
+  int duplicated_fd = dup (fd);
+  if (duplicated_fd < 0 || duplicated_fd == desired_fd)
+    return duplicated_fd;
+  else
+    {
+      int r = dupfd (fd, desired_fd);
+      int e = errno;
+      close (duplicated_fd);
+      errno = e;
+      return r;
+    }
+}
+#endif
+
+int
+dup2 (int fd, int desired_fd)
+{
+  if (fd == desired_fd)
+    return fd;
+  close (desired_fd);
+#ifdef F_DUPFD
+  return fcntl (fd, F_DUPFD, desired_fd);
+#else
+  return dupfd (fd, desired_fd);
+#endif
+}
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,19 +1,23 @@
-/* error.c -- error handler for noninteractive utilities
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+/* Error handler for noninteractive utilities
+   Copyright (C) 1990-2000 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 file is part of the GNU C Library.  Its master source is NOT part of
+   the C library, however.  The master source lives in /gd/gnu/lib.

-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.
+   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.

-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.  */
+   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.  */

 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */

@@ -43,6 +47,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 void exit ();
 #endif

+#include "error.h"
+
+#ifndef HAVE_DECL_STRERROR_R
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_STRERROR_R
+char *strerror_r ();
+#endif
+
 #ifndef _
 # define _(String) String
 #endif
@@ -65,17 +78,25 @@ unsigned int error_message_count;
 # define program_name program_invocation_name
 # include <errno.h>

-#else
+/* In GNU libc we want do not want to use the common name `error' directly.
+   Instead make it a weak alias.  */
+# define error __error
+# define error_at_line __error_at_line
+
+#else /* not _LIBC */

 /* The calling program should define program_name and set it to the
   name of the executing program.  */
 extern char *program_name;

-# if HAVE_STRERROR
-#  ifndef strerror		/* On some systems, strerror is a macro */
-char *strerror ();
-#  endif
+# ifdef HAVE_STRERROR_R
+#  define __strerror_r strerror_r
 # else
+#  if HAVE_STRERROR
+#   ifndef strerror		/* On some systems, strerror is a macro */
+char *strerror ();
+#   endif
+#  else
 static char *
 private_strerror (errnum)
     int errnum;
@@ -84,12 +105,13 @@ private_strerror (errnum)
  extern int sys_nerr;

  if (errnum > 0 && errnum <= sys_nerr)
-    return sys_errlist[errnum];
+    return _(sys_errlist[errnum]);
  return _("Unknown system error");
 }
-#  define strerror private_strerror
-# endif	/* HAVE_STRERROR */
-#endif	/* _LIBC */
+#   define strerror private_strerror
+#  endif /* HAVE_STRERROR */
+# endif	/* HAVE_STRERROR_R */
+#endif	/* not _LIBC */

 /* Print the program name and error message MESSAGE, which is a printf-style
   format string with optional args.
@@ -98,7 +120,7 @@ private_strerror (errnum)
 /* VARARGS */

 void
-#if defined(VA_START) && __STDC__
+#if defined VA_START && __STDC__
 error (int status, int errnum, const char *message, ...)
 #else
 error (status, errnum, message, va_alist)
@@ -134,7 +156,21 @@ error (status, errnum, message, va_alist)

  ++error_message_count;
  if (errnum)
-    fprintf (stderr, ": %s", strerror (errnum));
+    {
+#if defined HAVE_STRERROR_R || _LIBC
+      char errbuf[1024];
+# if HAVE_WORKING_STRERROR_R || _LIBC
+      fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
+# else
+      /* Don't use __strerror_r's return value because on some systems
+	 (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'.  */
+      __strerror_r (errnum, errbuf, sizeof errbuf);
+      fprintf (stderr, ": %s", errbuf);
+# endif
+#else
+      fprintf (stderr, ": %s", strerror (errnum));
+#endif
+    }
  putc ('\n', stderr);
  fflush (stderr);
  if (status)
@@ -146,7 +182,7 @@ error (status, errnum, message, va_alist)
 int error_one_per_line;

 void
-#if defined(VA_START) && __STDC__
+#if defined VA_START && __STDC__
 error_at_line (int status, int errnum, const char *file_name,
 	       unsigned int line_number, const char *message, ...)
 #else
@@ -202,9 +238,31 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)

  ++error_message_count;
  if (errnum)
-    fprintf (stderr, ": %s", strerror (errnum));
+    {
+#if defined HAVE_STRERROR_R || _LIBC
+      char errbuf[1024];
+# if HAVE_WORKING_STRERROR_R || _LIBC
+      fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
+# else
+      /* Don't use __strerror_r's return value because on some systems
+	 (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'.  */
+      __strerror_r (errnum, errbuf, sizeof errbuf);
+      fprintf (stderr, ": %s", errbuf);
+# endif
+#else
+      fprintf (stderr, ": %s", strerror (errnum));
+#endif
+    }
  putc ('\n', stderr);
  fflush (stderr);
  if (status)
    exit (status);
 }
+
+#ifdef _LIBC
+/* Make the weak alias.  */
+# undef error
+# undef error_at_line
+weak_alias (__error, error)
+weak_alias (__error_at_line, error_at_line)
+#endif
--- a/lib/error.h
+++ b/lib/error.h
@@ -1,22 +1,27 @@
-/* error.h -- declaration for error-reporting function
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Declaration for error-reporting function
+   Copyright (C) 1995, 1996, 1997, 2000 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.
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@prep.ai.mit.edu.

-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.  */
+   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.

-#ifndef _error_h_
-#define _error_h_
+   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.  */
+
+#ifndef _ERROR_H
+#define _ERROR_H 1

 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
@@ -31,6 +36,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # endif
 #endif

+#ifdef	__cplusplus
+extern "C" {
+#endif
+
 #if defined (__STDC__) && __STDC__

 /* Print a message with `fprintf (stderr, FORMAT, ...)';
@@ -62,4 +71,8 @@ extern unsigned int error_message_count;
   variable controls whether this mode is selected or not.  */
 extern int error_one_per_line;

-#endif /* _error_h_ */
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* error.h */
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -1,5 +1,5 @@
 /* euidaccess -- check if effective user id can access file
-   Copyright (C) 1990, 1991, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1995, 1998, 2000 Free Software Foundation, Inc.

 This file is part of the GNU C Library.

@@ -15,13 +15,13 @@ 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+not, write to the Free Software Foundation, Inc., 59 Temple Place -
+Suite 330, Boston, MA 02111-1307, USA.  */

 /* Written by David MacKenzie and Torbjorn Granlund.
   Adapted for GNU C library by Roland McGrath.  */

-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

@@ -66,6 +66,9 @@ gid_t getegid ();
 #ifndef errno
 extern int errno;
 #endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif

 #if defined(EACCES) && !defined(EACCESS)
 # define EACCESS EACCES
@@ -93,6 +96,7 @@ extern int errno;
 #ifdef _LIBC

 # define group_member __group_member
+# define euidaccess __euidaccess

 #else

@@ -102,6 +106,14 @@ static uid_t uid;
 /* The user's real group id. */
 static gid_t gid;

+# if HAVE_GETGROUPS
+int group_member ();
+# else
+#  define group_member(gid)	0
+# endif
+
+#endif
+
 /* The user's effective user id. */
 static uid_t euid;

@@ -109,15 +121,7 @@ static uid_t euid;
 static gid_t egid;

 /* Nonzero if UID, GID, EUID, and EGID have valid values. */
-static int have_ids = 0;
-
-# ifdef HAVE_GETGROUPS
-int group_member ();
-# else
-#  define group_member(gid)	0
-# endif
-
-#endif
+static int have_ids;


 /* Return 0 if the user has permission of type MODE on file PATH;
@@ -127,16 +131,15 @@ int group_member ();
   filesystem, text busy, etc. */

 int
-euidaccess (path, mode)
-     const char *path;
-     int mode;
+euidaccess (const char *path, int mode)
 {
  struct stat stats;
  int granted;

 #ifdef	_LIBC
-  uid_t uid = getuid (), euid = geteuid ();
-  gid_t gid = getgid (), egid = getegid ();
+  if (! __libc_enable_secure)
+    /* If we are not set-uid or set-gid, access does the same.  */
+    return __access (path, mode);
 #else
  if (have_ids == 0)
    {
@@ -146,11 +149,11 @@ euidaccess (path, mode)
      euid = geteuid ();
      egid = getegid ();
    }
-#endif

  if (uid == euid && gid == egid)
    /* If we are not set-uid or set-gid, access does the same.  */
    return access (path, mode);
+#endif

  if (stat (path, &stats))
    return -1;
@@ -163,6 +166,16 @@ euidaccess (path, mode)
  if (mode == F_OK)
    return 0;			/* The file exists. */

+#ifdef	_LIBC
+  /* Now we need the IDs.  */
+  if (have_ids == 0)
+    {
+      have_ids = 1;
+      euid = __geteuid ();
+      egid = __getegid ();
+    }
+#endif
+
  /* The super-user can read and write any file, and execute any file
     that anyone can execute. */
  if (euid == 0 && ((mode & X_OK) == 0
@@ -177,6 +190,40 @@ euidaccess (path, mode)
    granted = (stats.st_mode & mode);
  if (granted == mode)
    return 0;
-  errno = EACCESS;
+  __set_errno (EACCESS);
  return -1;
 }
+#undef euidaccess
+#ifdef weak_alias
+weak_alias (__euidaccess, euidaccess)
+#endif
+
+#ifdef TEST
+# include <stdio.h>
+# include <errno.h>
+# include "error.h"
+
+char *program_name;
+
+int
+main (argc, argv)
+     int argc;
+     char **argv;
+{
+  char *file;
+  int mode;
+  int err;
+
+  program_name = argv[0];
+  if (argc < 3)
+    abort ();
+  file = argv[1];
+  mode = atoi (argv[2]);
+
+  err = euidaccess (file, mode);
+  printf ("%d\n", err);
+  if (err != 0)
+    error (0, errno, "%s", file);
+  exit (0);
+}
+#endif
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -0,0 +1,128 @@
+/* exclude.c -- exclude file names
+   Copyright 1992, 1993, 1994, 1997, 1999, 2000 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; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert <eggert@twinsun.com>  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#include <exclude.h>
+#include <fnmatch.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+void *xmalloc PARAMS ((size_t));
+void *xrealloc PARAMS ((void *, size_t));
+
+/* Keep track of excluded file name patterns.  */
+
+struct exclude
+  {
+    char const **exclude;
+    int exclude_alloc;
+    int exclude_count;
+  };
+
+struct exclude *
+new_exclude (void)
+{
+  struct exclude *ex = (struct exclude *) xmalloc (sizeof (struct exclude));
+  ex->exclude_count = 0;
+  ex->exclude_alloc = 64;
+  ex->exclude = (char const **) xmalloc (ex->exclude_alloc * sizeof (char *));
+  return ex;
+}
+
+int
+excluded_filename (struct exclude const *ex, char const *f, int options)
+{
+  char const * const *exclude = ex->exclude;
+  int exclude_count = ex->exclude_count;
+  int i;
+
+  for (i = 0;  i < exclude_count;  i++)
+    if (fnmatch (exclude[i], f, options) == 0)
+      return 1;
+
+  return 0;
+}
+
+void
+add_exclude (struct exclude *ex, char const *pattern)
+{
+  if (ex->exclude_alloc <= ex->exclude_count)
+    ex->exclude = (char const **) xrealloc (ex->exclude,
+					    ((ex->exclude_alloc *= 2)
+					     * sizeof (char *)));
+
+  ex->exclude[ex->exclude_count++] = pattern;
+}
+
+int
+add_exclude_file (void (*add_func) PARAMS ((struct exclude *, char const *)),
+		  struct exclude *ex, char const *filename, char line_end)
+{
+  int use_stdin = filename[0] == '-' && !filename[1];
+  FILE *in;
+  char *buf;
+  char *p;
+  char const *pattern;
+  char const *lim;
+  size_t buf_alloc = 1024;
+  size_t buf_count = 0;
+  int c;
+  int e = 0;
+
+  if (use_stdin)
+    in = stdin;
+  else if (! (in = fopen (filename, "r")))
+    return -1;
+
+  buf = xmalloc (buf_alloc);
+
+  while ((c = getc (in)) != EOF)
+    {
+      buf[buf_count++] = c;
+      if (buf_count == buf_alloc)
+	buf = xrealloc (buf, buf_alloc *= 2);
+    }
+
+  buf = xrealloc (buf, buf_count + 1);
+
+  if (ferror (in))
+    e = errno;
+
+  if (!use_stdin && fclose (in) != 0)
+    e = errno;
+
+  for (pattern = p = buf, lim = buf + buf_count;  p <= lim;  p++)
+    if (p < lim ? *p == line_end : buf < p && p[-1])
+      {
+	*p = '\0';
+	(*add_func) (ex, pattern);
+	pattern = p + 1;
+      }
+
+  errno = e;
+  return e ? -1 : 0;
+}
--- a/lib/exclude.h
+++ b/lib/exclude.h
@@ -0,0 +1,35 @@
+/* exclude.h -- declarations for excluding file names
+   Copyright 1992, 1993, 1994, 1997, 1999 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; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert <eggert@twinsun.com>  */
+
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+struct exclude;
+
+struct exclude *new_exclude PARAMS ((void));
+void add_exclude PARAMS ((struct exclude *, char const *));
+int add_exclude_file PARAMS ((void (*) (struct exclude *, char const *),
+			      struct exclude *, char const *, char));
+int excluded_filename PARAMS ((struct exclude const *, char const *, int));
--- a/lib/fatal.c
+++ b/lib/fatal.c
@@ -0,0 +1,70 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* FIXME: define EXIT_FAILURE */
+
+#include <stdio.h>
+
+#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
+# if __STDC__
+#  include <stdarg.h>
+#  define VA_START(args, lastarg) va_start(args, lastarg)
+# else
+#  include <varargs.h>
+#  define VA_START(args, lastarg) va_start(args)
+# endif
+#else
+# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
+# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
+#endif
+
+#if STDC_HEADERS || _LIBC
+# include <stdlib.h>
+# include <string.h>
+#else
+void exit ();
+#endif
+
+#ifdef _LIBC
+# define program_name program_invocation_name
+#else /* not _LIBC */
+/* The calling program should define program_name and set it to the
+   name of the executing program.  */
+extern char *program_name;
+#endif
+
+#include "fatal.h"
+
+/* Like error, but always exit with EXIT_FAILURE.  */
+
+void
+#if defined VA_START && __STDC__
+fatal (int errnum, const char *message, ...)
+#else
+fatal (errnum, message, va_alist)
+     int errnum;
+     char *message;
+     va_dcl
+#endif
+{
+#ifdef VA_START
+  va_list args;
+#endif
+
+  if (error_print_progname)
+    (*error_print_progname) ();
+  else
+    {
+      fflush (stdout);
+      fprintf (stderr, "%s: ", program_name);
+    }
+
+#ifdef VA_START
+  VA_START (args, message);
+  error (EXIT_FAILURE, errnum, message, args);
+  va_end (args);
+#else
+  error (EXIT_FAILURE, errnum, message, a1, a2, a3, a4, a5, a6, a7, a8);
+#endif
+}
--- a/lib/fatal.h
+++ b/lib/fatal.h
@@ -0,0 +1,68 @@
+#include "error.h"
+
+/* FIXME: this is all from ansidecl.  better to simply swipe
+   that file from egcs/include and include it from here.  */
+
+/* Using MACRO(x,y) in cpp #if conditionals does not work with some
+   older preprocessors.  Thus we can't define something like this:
+
+#define HAVE_GCC_VERSION(MAJOR, MINOR) \
+  (__GNUC__ > (MAJOR) || (__GNUC__ == (MAJOR) && __GNUC_MINOR__ >= (MINOR)))
+
+and then test "#if HAVE_GCC_VERSION(2,7)".
+
+So instead we use the macro below and test it against specific values.  */
+
+/* This macro simplifies testing whether we are using gcc, and if it
+   is of a particular minimum version. (Both major & minor numbers are
+   significant.)  This macro will evaluate to 0 if we are not using
+   gcc at all.  */
+#ifndef GCC_VERSION
+# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
+#endif /* GCC_VERSION */
+
+/* Define macros for some gcc attributes.  This permits us to use the
+   macros freely, and know that they will come into play for the
+   version of gcc in which they are supported.  */
+
+#if (GCC_VERSION < 2007)
+# define __attribute__(x)
+#endif
+
+/* Attribute __malloc__ on functions was valid as of gcc 2.96. */
+#ifndef ATTRIBUTE_MALLOC
+# if (GCC_VERSION >= 2096)
+#  define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+#  define ATTRIBUTE_MALLOC
+# endif /* GNUC >= 2.96 */
+#endif /* ATTRIBUTE_MALLOC */
+
+/* Attributes on labels were valid as of gcc 2.93. */
+#ifndef ATTRIBUTE_UNUSED_LABEL
+# if (GCC_VERSION >= 2093)
+#  define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
+# else
+#  define ATTRIBUTE_UNUSED_LABEL
+# endif /* GNUC >= 2.93 */
+#endif /* ATTRIBUTE_UNUSED_LABEL */
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif /* ATTRIBUTE_UNUSED */
+
+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif /* ATTRIBUTE_NORETURN */
+
+#ifndef ATTRIBUTE_PRINTF
+# define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+# define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
+# define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
+# define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
+# define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
+# define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
+#endif /* ATTRIBUTE_PRINTF */
+
+extern void fatal (int errnum, const char *format, ...)
+     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF_2;
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -1,5 +1,5 @@
 /* Convert file size to number of blocks on System V-like machines.
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999 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
@@ -12,28 +12,36 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 Brian L. Matthews, blm@6sceng.UUCP. */

-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

-#if !defined (HAVE_ST_BLOCKS) && !defined(_POSIX_VERSION)
-# include <sys/types.h>
+#include <sys/types.h>
+
+#if HAVE_SYS_PARAM_H
 # include <sys/param.h>
+#endif
+
+#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
+
+# if HAVE_UNISTD_H
+#  include <unistd.h>
+# endif

 # ifndef NINDIR
-/* Some SysV's, like Irix, seem to lack these.  Hope they're correct. */
-/* Size of a indirect block, in bytes. */
-#  ifndef BSIZE
-#   define BSIZE 1024
+
+#  if defined (__DJGPP__)
+typedef long daddr_t; /* for disk address */
 #  endif

+/* Some SysV's, like Irix, seem to lack this.  Hope it's correct. */
 /* Number of inode pointers per indirect block. */
-#  define NINDIR (BSIZE/sizeof(daddr_t))
+#  define NINDIR (BSIZE / sizeof (daddr_t))
 # endif /* !NINDIR */

 /* Number of direct block addresses in an inode. */
@@ -41,12 +49,11 @@

 /* Return the number of 512-byte blocks in a file of SIZE bytes. */

-long
-st_blocks (size)
-     long size;
+off_t
+st_blocks (off_t size)
 {
-  long datablks = (size + 512 - 1) / 512;
-  long indrblks = 0;
+  off_t datablks = size / 512 + (size % 512 != 0);
+  off_t indrblks = 0;

  if (datablks > NDIR)
    {
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -1,5 +1,5 @@
 /* filemode.c -- make a string describing file modes
-   Copyright (C) 1985, 1990, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1990, 1993, 1998-2000 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
@@ -12,16 +12,18 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+   along with this program; 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 <sys/stat.h>

+#include "filemode.h"
+
 #if !S_IRUSR
 # if S_IREAD
 #  define S_IRUSR S_IREAD
@@ -46,52 +48,207 @@
 # endif
 #endif

+#if !S_IRGRP
+# define S_IRGRP (S_IRUSR >> 3)
+#endif
+#if !S_IWGRP
+# define S_IWGRP (S_IWUSR >> 3)
+#endif
+#if !S_IXGRP
+# define S_IXGRP (S_IXUSR >> 3)
+#endif
+#if !S_IROTH
+# define S_IROTH (S_IRUSR >> 6)
+#endif
+#if !S_IWOTH
+# define S_IWOTH (S_IWUSR >> 6)
+#endif
+#if !S_IXOTH
+# define S_IXOTH (S_IXUSR >> 6)
+#endif
+
 #ifdef STAT_MACROS_BROKEN
-#undef S_ISBLK
-#undef S_ISCHR
-#undef S_ISDIR
-#undef S_ISFIFO
-#undef S_ISLNK
-#undef S_ISMPB
-#undef S_ISMPC
-#undef S_ISNWK
-#undef S_ISREG
-#undef S_ISSOCK
+# undef S_ISBLK
+# undef S_ISCHR
+# undef S_ISDIR
+# undef S_ISFIFO
+# undef S_ISLNK
+# undef S_ISMPB
+# undef S_ISMPC
+# undef S_ISNWK
+# undef S_ISREG
+# undef S_ISSOCK
 #endif /* STAT_MACROS_BROKEN.  */

-#if !defined(S_ISBLK) && defined(S_IFBLK)
-#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
+#if !defined S_ISBLK && defined S_IFBLK
+# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
 #endif
-#if !defined(S_ISCHR) && defined(S_IFCHR)
-#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
+#if !defined S_ISCHR && defined S_IFCHR
+# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
 #endif
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#if !defined S_ISDIR && defined S_IFDIR
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
-#if !defined(S_ISREG) && defined(S_IFREG)
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#if !defined S_ISREG && defined S_IFREG
+# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
-#if !defined(S_ISFIFO) && defined(S_IFIFO)
-#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+#if !defined S_ISFIFO && defined S_IFIFO
+# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
 #endif
-#if !defined(S_ISLNK) && defined(S_IFLNK)
-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+#if !defined S_ISLNK && defined S_IFLNK
+# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 #endif
-#if !defined(S_ISSOCK) && defined(S_IFSOCK)
-#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+#if !defined S_ISSOCK && defined S_IFSOCK
+# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
 #endif
-#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */
-#define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB)
-#define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC)
+#if !defined S_ISMPB && defined S_IFMPB /* V7 */
+# define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB)
+# define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC)
 #endif
-#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */
-#define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
+#if !defined S_ISNWK && defined S_IFNWK /* HP/UX */
+# define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
+#endif
+#if !defined S_ISDOOR && defined S_IFDOOR /* Solaris 2.5 and up */
+# define S_ISDOOR(m) (((m) & S_IFMT) == S_IFDOOR)
+#endif
+#if !defined S_ISCTG && defined S_IFCTG /* MassComp */
+# define S_ISCTG(m) (((m) & S_IFMT) == S_IFCTG)
 #endif

-void mode_string ();
-static char ftypelet ();
-static void rwx ();
-static void setst ();
+
+
+/* Set the 's' and 't' flags in file attributes string CHARS,
+   according to the file mode BITS.  */
+
+static void
+setst (mode_t bits, char *chars)
+{
+#ifdef S_ISUID
+  if (bits & S_ISUID)
+    {
+      if (chars[3] != 'x')
+	/* Set-uid, but not executable by owner.  */
+	chars[3] = 'S';
+      else
+	chars[3] = 's';
+    }
+#endif
+#ifdef S_ISGID
+  if (bits & S_ISGID)
+    {
+      if (chars[6] != 'x')
+	/* Set-gid, but not executable by group.  */
+	chars[6] = 'S';
+      else
+	chars[6] = 's';
+    }
+#endif
+#ifdef S_ISVTX
+  if (bits & S_ISVTX)
+    {
+      if (chars[9] != 'x')
+	/* Sticky, but not executable by others.  */
+	chars[9] = 'T';
+      else
+	chars[9] = 't';
+    }
+#endif
+}
+
+/* Return a character indicating the type of file described by
+   file mode BITS:
+   'd' for directories
+   'D' for doors
+   'b' for block special files
+   'c' for character special files
+   'n' for network special files
+   'm' for multiplexor files
+   'M' for an off-line (regular) file
+   'l' for symbolic links
+   's' for sockets
+   'p' for fifos
+   'C' for contigous data files
+   '-' for regular files
+   '?' for any other file type.  */
+
+static char
+ftypelet (mode_t bits)
+{
+#ifdef S_ISBLK
+  if (S_ISBLK (bits))
+    return 'b';
+#endif
+  if (S_ISCHR (bits))
+    return 'c';
+  if (S_ISDIR (bits))
+    return 'd';
+  if (S_ISREG (bits))
+    return '-';
+#ifdef S_ISFIFO
+  if (S_ISFIFO (bits))
+    return 'p';
+#endif
+#ifdef S_ISLNK
+  if (S_ISLNK (bits))
+    return 'l';
+#endif
+#ifdef S_ISSOCK
+  if (S_ISSOCK (bits))
+    return 's';
+#endif
+#ifdef S_ISMPC
+  if (S_ISMPC (bits))
+    return 'm';
+#endif
+#ifdef S_ISNWK
+  if (S_ISNWK (bits))
+    return 'n';
+#endif
+#ifdef S_ISDOOR
+  if (S_ISDOOR (bits))
+    return 'D';
+#endif
+#ifdef S_ISCTG
+  if (S_ISCTG (bits))
+    return 'C';
+#endif
+
+  /* The following two tests are for Cray DMF (Data Migration
+     Facility), which is a HSM file system.  A migrated file has a
+     `st_dm_mode' that is different from the normal `st_mode', so any
+     tests for migrated files should use the former.  */
+
+#ifdef S_ISOFD
+  if (S_ISOFD (bits))
+    /* off line, with data  */
+    return 'M';
+#endif
+#ifdef S_ISOFL
+  /* off line, with no data  */
+  if (S_ISOFL (bits))
+    return 'M';
+#endif
+  return '?';
+}
+
+/* Like filemodestring, but only the relevant part of the `struct stat'
+   is given as an argument.  */
+
+void
+mode_string (mode_t mode, char *str)
+{
+  str[0] = ftypelet (mode);
+  str[1] = mode & S_IRUSR ? 'r' : '-';
+  str[2] = mode & S_IWUSR ? 'w' : '-';
+  str[3] = mode & S_IXUSR ? 'x' : '-';
+  str[4] = mode & S_IRGRP ? 'r' : '-';
+  str[5] = mode & S_IWGRP ? 'w' : '-';
+  str[6] = mode & S_IXGRP ? 'x' : '-';
+  str[7] = mode & S_IROTH ? 'r' : '-';
+  str[8] = mode & S_IWOTH ? 'w' : '-';
+  str[9] = mode & S_IXOTH ? 'x' : '-';
+  setst (mode, str);
+}

 /* filemodestring - fill in string STR with an ls-style ASCII
   representation of the st_mode field of file stats block STATP.
@@ -130,126 +287,7 @@ static void setst ();
 	'T' if the file is sticky but not executable.  */

 void
-filemodestring (statp, str)
-     struct stat *statp;
-     char *str;
+filemodestring (struct stat *statp, char *str)
 {
  mode_string (statp->st_mode, str);
 }
-
-/* Like filemodestring, but only the relevant part of the `struct stat'
-   is given as an argument.  */
-
-void
-mode_string (mode, str)
-     unsigned short mode;
-     char *str;
-{
-  str[0] = ftypelet ((long) mode);
-  rwx ((mode & 0700) << 0, &str[1]);
-  rwx ((mode & 0070) << 3, &str[4]);
-  rwx ((mode & 0007) << 6, &str[7]);
-  setst (mode, str);
-}
-
-/* Return a character indicating the type of file described by
-   file mode BITS:
-   'd' for directories
-   'b' for block special files
-   'c' for character special files
-   'm' for multiplexor files
-   'l' for symbolic links
-   's' for sockets
-   'p' for fifos
-   '-' for regular files
-   '?' for any other file type.  */
-
-static char
-ftypelet (bits)
-     long bits;
-{
-#ifdef S_ISBLK
-  if (S_ISBLK (bits))
-    return 'b';
-#endif
-  if (S_ISCHR (bits))
-    return 'c';
-  if (S_ISDIR (bits))
-    return 'd';
-  if (S_ISREG (bits))
-    return '-';
-#ifdef S_ISFIFO
-  if (S_ISFIFO (bits))
-    return 'p';
-#endif
-#ifdef S_ISLNK
-  if (S_ISLNK (bits))
-    return 'l';
-#endif
-#ifdef S_ISSOCK
-  if (S_ISSOCK (bits))
-    return 's';
-#endif
-#ifdef S_ISMPC
-  if (S_ISMPC (bits))
-    return 'm';
-#endif
-#ifdef S_ISNWK
-  if (S_ISNWK (bits))
-    return 'n';
-#endif
-  return '?';
-}
-
-/* Look at read, write, and execute bits in BITS and set
-   flags in CHARS accordingly.  */
-
-static void
-rwx (bits, chars)
-     unsigned short bits;
-     char *chars;
-{
-  chars[0] = (bits & S_IRUSR) ? 'r' : '-';
-  chars[1] = (bits & S_IWUSR) ? 'w' : '-';
-  chars[2] = (bits & S_IXUSR) ? 'x' : '-';
-}
-
-/* Set the 's' and 't' flags in file attributes string CHARS,
-   according to the file mode BITS.  */
-
-static void
-setst (bits, chars)
-     unsigned short bits;
-     char *chars;
-{
-#ifdef S_ISUID
-  if (bits & S_ISUID)
-    {
-      if (chars[3] != 'x')
-	/* Set-uid, but not executable by owner.  */
-	chars[3] = 'S';
-      else
-	chars[3] = 's';
-    }
-#endif
-#ifdef S_ISGID
-  if (bits & S_ISGID)
-    {
-      if (chars[6] != 'x')
-	/* Set-gid, but not executable by group.  */
-	chars[6] = 'S';
-      else
-	chars[6] = 's';
-    }
-#endif
-#ifdef S_ISVTX
-  if (bits & S_ISVTX)
-    {
-      if (chars[9] != 'x')
-	/* Sticky, but not executable by others.  */
-	chars[9] = 'T';
-      else
-	chars[9] = 't';
-    }
-#endif
-}
--- a/lib/filemode.h
+++ b/lib/filemode.h
@@ -0,0 +1,19 @@
+#ifndef FILEMODE_H_
+
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# include <sys/types.h>
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+void mode_string PARAMS ((mode_t mode, char *str));
+
+#endif
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -1,24 +1,26 @@
-/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc.

-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+   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 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.

-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.  */

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+/* Enable GNU extensions in fnmatch.h.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE	1
 #endif

 #include <errno.h>
@@ -34,26 +36,32 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
   program understand `configure --with-gnu-libc' and omit the object files,
   it is simpler to just do this in the source for each such file.  */

-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
+#if defined _LIBC || !defined __GNU_LIBRARY__


-#ifndef errno
+# if defined STDC_HEADERS || !defined isascii
+#  define ISASCII(c) 1
+# else
+#  define ISASCII(c) isascii(c)
+# endif
+
+# define ISUPPER(c) (ISASCII (c) && isupper (c))
+
+
+# ifndef errno
 extern int errno;
-#endif
+# endif

 /* Match STRING against the filename pattern PATTERN, returning zero if
   it matches, nonzero if not.  */
 int
-fnmatch (pattern, string, flags)
-     const char *pattern;
-     const char *string;
-     int flags;
+fnmatch (const char *pattern, const char *string, int flags)
 {
  register const char *p = pattern, *n = string;
  register char c;

-/* Note that this evalutes C many times.  */
-#define FOLD(c)	((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c))
+/* Note that this evaluates C many times.  */
+# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c))

  while ((c = *p++) != '\0')
    {
@@ -75,6 +83,9 @@ fnmatch (pattern, string, flags)
 	  if (!(flags & FNM_NOESCAPE))
 	    {
 	      c = *p++;
+	      if (c == '\0')
+		/* Trailing \ loses.  */
+		return FNM_NOMATCH;
 	      c = FOLD (c);
 	    }
 	  if (FOLD (*n) != c)
@@ -86,10 +97,24 @@ fnmatch (pattern, string, flags)
 	      (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
 	    return FNM_NOMATCH;

-	  for (c = *p++; c == '?' || c == '*'; c = *p++, ++n)
-	    if (((flags & FNM_FILE_NAME) && *n == '/') ||
-		(c == '?' && *n == '\0'))
-	      return FNM_NOMATCH;
+	  for (c = *p++; c == '?' || c == '*'; c = *p++)
+	    {
+	      if ((flags & FNM_FILE_NAME) && *n == '/')
+		/* A slash does not match a wildcard under FNM_FILE_NAME.  */
+		return FNM_NOMATCH;
+	      else if (c == '?')
+		{
+		  /* A ? needs to match one character.  */
+		  if (*n == '\0')
+		    /* There isn't another character; no match.  */
+		    return FNM_NOMATCH;
+		  else
+		    /* One character of the string is consumed in matching
+		       this ? wildcard, so *??? won't match if there are
+		       less than three characters.  */
+		    ++n;
+		}
+	    }

 	  if (c == '\0')
 	    return 0;
@@ -126,7 +151,11 @@ fnmatch (pattern, string, flags)
 		register char cstart = c, cend = c;

 		if (!(flags & FNM_NOESCAPE) && c == '\\')
-		  cstart = cend = *p++;
+		  {
+		    if (*p == '\0')
+		      return FNM_NOMATCH;
+		    cstart = cend = *p++;
+		  }

 		cstart = cend = FOLD (cstart);

@@ -173,8 +202,12 @@ fnmatch (pattern, string, flags)

 		c = *p++;
 		if (!(flags & FNM_NOESCAPE) && c == '\\')
-		  /* XXX 1003.2d11 is unclear if this is right.  */
-		  ++p;
+		  {
+		    if (*p == '\0')
+		      return FNM_NOMATCH;
+		    /* XXX 1003.2d11 is unclear if this is right.  */
+		    ++p;
+		  }
 	      }
 	    if (not)
 	      return FNM_NOMATCH;
@@ -197,6 +230,8 @@ fnmatch (pattern, string, flags)
    return 0;

  return FNM_NOMATCH;
+
+# undef FOLD
 }

 #endif	/* _LIBC or not __GNU_LIBRARY__.  */
--- a/lib/fnmatch.h
+++ b/lib/fnmatch.h
@@ -1,48 +1,57 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.

-This 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.
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.

-This library is distributed in the hope that it will be useful,
+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
-Library General Public License for more details.
+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 Library General Public
-License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+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.  */

 #ifndef	_FNMATCH_H

 #define	_FNMATCH_H	1

 #ifdef	__cplusplus
-extern "C"
-{
+extern "C" {
 #endif

 #if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
 #undef	__P
-#define	__P(args)	args
+#define	__P(protos)	protos
 #else /* Not C++ or ANSI C.  */
 #undef	__P
-#define	__P(args)	()
-#undef	const
-#define	const
+#define	__P(protos)	()
+/* We can get away without defining `const' here only because in this file
+   it is used only inside the prototype for `fnmatch', which is elided in
+   non-ANSI C where `const' is problematical.  */
 #endif /* C++ or ANSI C.  */

-/* Bits set in the FLAGS argument to `fnmatch'.  */
-#define	FNM_PATHNAME	(1 << 0)/* No wildcard can ever match `/'.  */
-#define	FNM_NOESCAPE	(1 << 1)/* Backslashes don't quote special chars.  */
-#define	FNM_PERIOD	(1 << 2)/* Leading `.' is matched only explicitly.  */
-#define	FNM_TARPATH	(1 << 4)/* Ignore `/...' after a match.  */
-#define	__FNM_FLAGS	(FNM_PATHNAME|FNM_NOESCAPE|FNM_PERIOD|FNM_TARPATH)

-#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_BSD_SOURCE)
-#define	FNM_FILE_NAME	FNM_PATHNAME
+/* We #undef these before defining them because some losing systems
+   (HP-UX A.08.07 for example) define these in <unistd.h>.  */
+#undef	FNM_PATHNAME
+#undef	FNM_NOESCAPE
+#undef	FNM_PERIOD
+
+/* Bits set in the FLAGS argument to `fnmatch'.  */
+#define	FNM_PATHNAME	(1 << 0) /* No wildcard can ever match `/'.  */
+#define	FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
+#define	FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
+
+#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE)
+#define	FNM_FILE_NAME	FNM_PATHNAME /* Preferred GNU name.  */
+#define	FNM_LEADING_DIR	(1 << 3) /* Ignore `/...' after a match.  */
+#define	FNM_CASEFOLD	(1 << 4) /* Compare without regard to case.  */
 #endif

 /* Value returned by `fnmatch' if STRING does not match PATTERN.  */
@@ -50,12 +59,11 @@ extern "C"

 /* Match STRING against the filename pattern PATTERN,
   returning zero if it matches, FNM_NOMATCH if not.  */
-  extern int fnmatch __P ((const char *__pattern, const char *__string,
-			   int __flags));
+extern int fnmatch __P ((const char *__pattern, const char *__string,
+			 int __flags));

 #ifdef	__cplusplus
 }
-
 #endif

 #endif /* fnmatch.h */
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -1,5 +1,5 @@
 /* fsusage.c -- return space usage of mounted filesystems
-   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1996, 1998, 1999 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
@@ -12,202 +12,245 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "fsusage.h"

+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
+
 int statfs ();

-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
 #endif

-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
+#if HAVE_SYS_MOUNT_H
+# include <sys/mount.h>
 #endif

-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
+#if HAVE_SYS_VFS_H
+# include <sys/vfs.h>
 #endif

-#if defined(HAVE_SYS_FILSYS_H) && !defined(_CRAY)
-#include <sys/filsys.h>		/* SVR2.  */
+#if HAVE_SYS_FS_S5PARAM_H	/* Fujitsu UXP/V */
+# include <sys/fs/s5param.h>
 #endif

-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+#if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY)
+# include <sys/filsys.h>	/* SVR2 */
 #endif

-#ifdef HAVE_SYS_STATFS_H
-#include <sys/statfs.h>
+#if HAVE_FCNTL_H
+# include <fcntl.h>
 #endif

-#ifdef HAVE_DUSTAT_H		/* AIX PS/2.  */
-#include <sys/dustat.h>
+#if HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
 #endif

-#ifdef HAVE_SYS_STATVFS_H	/* SVR4.  */
-#include <sys/statvfs.h>
+#if HAVE_DUSTAT_H		/* AIX PS/2 */
+# include <sys/dustat.h>
+#endif
+
+#if HAVE_SYS_STATVFS_H		/* SVR4 */
+# include <sys/statvfs.h>
 int statvfs ();
 #endif

+/* Many space usage primitives use all 1 bits to denote a value that is
+   not applicable or unknown.  Propagate this information by returning
+   a uintmax_t value that is all 1 bits if the argument is all 1 bits,
+   even if the argument is unsigned and smaller than uintmax_t.  */
+#define PROPAGATE_ALL_ONES(x) ((x) == -1 ? (uintmax_t) -1 : (uintmax_t) (x))
+
+/* Extract the top bit of X as an uintmax_t value.  */
+#define EXTRACT_TOP_BIT(x) ((x) \
+			    & ((uintmax_t) 1 << (sizeof (x) * CHAR_BIT - 1)))
+
+/* If a value is negative, many space usage primitives store it into an
+   integer variable by assignment, even if the variable's type is unsigned.
+   So, if a space usage variable X's top bit is set, convert X to the
+   uintmax_t value V such that (- (uintmax_t) V) is the negative of
+   the original value.  If X's top bit is clear, just yield X.
+   Use PROPAGATE_TOP_BIT if the original value might be negative;
+   otherwise, use PROPAGATE_ALL_ONES.  */
+#define PROPAGATE_TOP_BIT(x) ((x) | ~ (EXTRACT_TOP_BIT (x) - 1))
+
 int safe_read ();

-/* Return the number of TOSIZE-byte blocks used by
-   BLOCKS FROMSIZE-byte blocks, rounding away from zero.
-   TOSIZE must be positive.  Return -1 if FROMSIZE is not positive.  */
-
-static long
-adjust_blocks (blocks, fromsize, tosize)
-     long blocks;
-     int fromsize, tosize;
-{
-  if (tosize <= 0)
-    abort ();
-  if (fromsize <= 0)
-    return -1;
-
-  if (fromsize == tosize)	/* E.g., from 512 to 512.  */
-    return blocks;
-  else if (fromsize > tosize)	/* E.g., from 2048 to 512.  */
-    return blocks * (fromsize / tosize);
-  else				/* E.g., from 256 to 512.  */
-    return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
-}
-
 /* Fill in the fields of FSP with information about space usage for
   the filesystem on which PATH resides.
   DISK is the device on which PATH is mounted, for space-getting
   methods that need to know it.
-   Return 0 if successful, -1 if not. */
-
+   Return 0 if successful, -1 if not.  When returning -1, ensure that
+   ERRNO is either a system error value, or zero if DISK is NULL
+   on a system that requires a non-NULL value.  */
 int
-get_fs_usage (path, disk, fsp)
-     const char *path;
-     const char *disk;
-     struct fs_usage *fsp;
+get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
 {
-#if defined (STAT_STATFS3_OSF1)
+#ifdef STAT_STATFS3_OSF1
+
  struct statfs fsd;

  if (statfs (path, &fsd, sizeof (struct statfs)) != 0)
    return -1;
-#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_fsize, 512)
+
+  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
+
 #endif /* STAT_STATFS3_OSF1 */

-#ifdef STAT_STATFS2_FS_DATA	/* Ultrix.  */
+#ifdef STAT_STATFS2_FS_DATA	/* Ultrix */
+
  struct fs_data fsd;

  if (statfs (path, &fsd) != 1)
    return -1;
-#define CONVERT_BLOCKS(b) adjust_blocks ((b), 1024, 512)
-  fsp->fsu_blocks = CONVERT_BLOCKS (fsd.fd_req.btot);
-  fsp->fsu_bfree = CONVERT_BLOCKS (fsd.fd_req.bfree);
-  fsp->fsu_bavail = CONVERT_BLOCKS (fsd.fd_req.bfreen);
-  fsp->fsu_files = fsd.fd_req.gtot;
-  fsp->fsu_ffree = fsd.fd_req.gfree;
-#endif

-#ifdef STAT_READ_FILSYS		/* SVR2.  */
-#ifndef SUPERBOFF
-#define SUPERBOFF (SUPERB * 512)
-#endif
+  fsp->fsu_blocksize = 1024;
+  fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.fd_req.btot);
+  fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.fd_req.bfree);
+  fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.fd_req.bfreen);
+  fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.fd_req.bfreen) != 0;
+  fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.fd_req.gtot);
+  fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.fd_req.gfree);
+
+#endif /* STAT_STATFS2_FS_DATA */
+
+#ifdef STAT_READ_FILSYS		/* SVR2 */
+# ifndef SUPERBOFF
+#  define SUPERBOFF (SUPERB * 512)
+# endif
+
  struct filsys fsd;
  int fd;

+  if (! disk)
+    {
+      errno = 0;
+      return -1;
+    }
+
  fd = open (disk, O_RDONLY);
  if (fd < 0)
    return -1;
-  lseek (fd, (long) SUPERBOFF, 0);
+  lseek (fd, (off_t) SUPERBOFF, 0);
  if (safe_read (fd, (char *) &fsd, sizeof fsd) != sizeof fsd)
    {
      close (fd);
      return -1;
    }
  close (fd);
-#define CONVERT_BLOCKS(b) adjust_blocks ((b), (fsd.s_type == Fs2b ? 1024 : 512), 512)
-  fsp->fsu_blocks = CONVERT_BLOCKS (fsd.s_fsize);
-  fsp->fsu_bfree = CONVERT_BLOCKS (fsd.s_tfree);
-  fsp->fsu_bavail = CONVERT_BLOCKS (fsd.s_tfree);
-  fsp->fsu_files = (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1);
-  fsp->fsu_ffree = fsd.s_tinode;
-#endif

-#ifdef STAT_STATFS2_BSIZE	/* 4.3BSD, SunOS 4, HP-UX, AIX.  */
+  fsp->fsu_blocksize = (fsd.s_type == Fs2b ? 1024 : 512);
+  fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.s_fsize);
+  fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.s_tfree);
+  fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.s_tfree);
+  fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.s_tfree) != 0;
+  fsp->fsu_files = (fsd.s_isize == -1
+		    ? (uintmax_t) -1
+		    : (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1));
+  fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.s_tinode);
+
+#endif /* STAT_READ_FILSYS */
+
+#ifdef STAT_STATFS2_BSIZE	/* 4.3BSD, SunOS 4, HP-UX, AIX */
+
  struct statfs fsd;

  if (statfs (path, &fsd) < 0)
    return -1;

-#ifdef STATFS_TRUNCATES_BLOCK_COUNTS
+  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
+
+# ifdef STATFS_TRUNCATES_BLOCK_COUNTS
+
  /* In SunOS 4.1.2, 4.1.3, and 4.1.3_U1, the block counts in the
     struct statfs are truncated to 2GB.  These conditions detect that
     truncation, presumably without botching the 4.1.1 case, in which
     the values are not truncated.  The correct counts are stored in
     undocumented spare fields.  */
-  if (fsd.f_blocks == 0x1fffff && fsd.f_spare[0] > 0)
+  if (fsd.f_blocks == 0x7fffffff / fsd.f_bsize && fsd.f_spare[0] > 0)
    {
      fsd.f_blocks = fsd.f_spare[0];
      fsd.f_bfree = fsd.f_spare[1];
      fsd.f_bavail = fsd.f_spare[2];
    }
-#endif /* STATFS_TRUNCATES_BLOCK_COUNTS */
+# endif /* STATFS_TRUNCATES_BLOCK_COUNTS */

-#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_bsize, 512)
-#endif
+#endif /* STAT_STATFS2_BSIZE */
+
+#ifdef STAT_STATFS2_FSIZE	/* 4.4BSD */

-#ifdef STAT_STATFS2_FSIZE	/* 4.4BSD.  */
  struct statfs fsd;

  if (statfs (path, &fsd) < 0)
    return -1;
-#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_fsize, 512)
-#endif

-#ifdef STAT_STATFS4		/* SVR3, Dynix, Irix, AIX.  */
+  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
+
+#endif /* STAT_STATFS2_FSIZE */
+
+#ifdef STAT_STATFS4		/* SVR3, Dynix, Irix, AIX */
+
+# if !_AIX && !defined _SEQUENT_ && !defined DOLPHIN
+#  define f_bavail f_bfree
+# endif
+
  struct statfs fsd;

  if (statfs (path, &fsd, sizeof fsd, 0) < 0)
    return -1;
+
  /* Empirically, the block counts on most SVR3 and SVR3-derived
     systems seem to always be in terms of 512-byte blocks,
     no matter what value f_bsize has.  */
-# if _AIX
-#  define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_bsize, 512)
+# if _AIX || defined(_CRAY)
+   fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
 # else
-#  define CONVERT_BLOCKS(b) (b)
-#  ifndef _SEQUENT_		/* _SEQUENT_ is DYNIX/ptx.  */
-#   ifndef DOLPHIN		/* DOLPHIN 3.8.alfa/7.18 has f_bavail */
-#    define f_bavail f_bfree
-#   endif
-#  endif
+   fsp->fsu_blocksize = 512;
 # endif
-#endif

-#ifdef STAT_STATVFS		/* SVR4.  */
+#endif /* STAT_STATFS4 */
+
+#ifdef STAT_STATVFS		/* SVR4 */
+
  struct statvfs fsd;

  if (statvfs (path, &fsd) < 0)
    return -1;
-  /* f_frsize isn't guaranteed to be supported.  */
-#define CONVERT_BLOCKS(b) \
-  adjust_blocks ((b), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512)
-#endif

-#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) /* !Ultrix && !SVR2.  */
-  fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks);
-  fsp->fsu_bfree = CONVERT_BLOCKS (fsd.f_bfree);
-  fsp->fsu_bavail = CONVERT_BLOCKS (fsd.f_bavail);
-  fsp->fsu_files = fsd.f_files;
-  fsp->fsu_ffree = fsd.f_ffree;
-#endif
+  /* f_frsize isn't guaranteed to be supported.  */
+  fsp->fsu_blocksize =
+    PROPAGATE_ALL_ONES (fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize);
+
+#endif /* STAT_STATVFS */
+
+#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS)
+				/* !Ultrix && !SVR2 */
+
+  fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.f_blocks);
+  fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.f_bfree);
+  fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.f_bavail);
+  fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.f_bavail) != 0;
+  fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.f_files);
+  fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.f_ffree);
+
+#endif /* not STAT_STATFS2_FS_DATA && not STAT_READ_FILSYS */

  return 0;
 }
@@ -216,9 +259,7 @@ get_fs_usage (path, disk, fsp)
 /* AIX PS/2 does not supply statfs.  */

 int
-statfs (path, fsb)
-     char *path;
-     struct statfs *fsb;
+statfs (char *path, struct statfs *fsb)
 {
  struct stat stats;
  struct dustat fsd;
@@ -238,4 +279,5 @@ statfs (path, fsb)
  fsb->f_fsid.val[1] = fsd.du_pckno;
  return 0;
 }
+
 #endif /* _AIX && _I386 */
--- a/lib/fsusage.h
+++ b/lib/fsusage.h
@@ -1,5 +1,5 @@
 /* fsusage.h -- declarations for filesystem space usage info
-   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1997 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
@@ -12,26 +12,34 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 /* Space usage statistics for a filesystem.  Blocks are 512-byte. */
+
+#if !defined FSUSAGE_H_
+# define FSUSAGE_H_
+
 struct fs_usage
 {
-  long fsu_blocks;		/* Total blocks. */
-  long fsu_bfree;		/* Free blocks available to superuser. */
-  long fsu_bavail;		/* Free blocks available to non-superuser. */
-  long fsu_files;		/* Total file nodes. */
-  long fsu_ffree;		/* Free file nodes. */
+  int fsu_blocksize;		/* Size of a block.  */
+  uintmax_t fsu_blocks;		/* Total blocks. */
+  uintmax_t fsu_bfree;		/* Free blocks available to superuser. */
+  uintmax_t fsu_bavail;		/* Free blocks available to non-superuser. */
+  int fsu_bavail_top_bit_set;	/* 1 if fsu_bavail represents a value < 0.  */
+  uintmax_t fsu_files;		/* Total file nodes. */
+  uintmax_t fsu_ffree;		/* Free file nodes. */
 };

-#ifndef __P
-#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#define __P(args) args
-#else
-#define __P(args) ()
-#endif  /* GCC.  */
-#endif  /* Not __P.  */
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif

-int get_fs_usage __P ((const char *path, const char *disk,
-		       struct fs_usage *fsp));
+int get_fs_usage PARAMS ((const char *path, const char *disk,
+			  struct fs_usage *fsp));
+
+#endif
--- a/lib/ftruncate.c
+++ b/lib/ftruncate.c
@@ -1,8 +1,8 @@
 /* ftruncate emulations that work on some System V's.
   This file is in the public domain.  */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

 #include <sys/types.h>
@@ -11,28 +11,24 @@
 #ifdef F_CHSIZE

 int
-ftruncate (fd, length)
-     int fd;
-     off_t length;
+ftruncate (int fd, off_t length)
 {
  return fcntl (fd, F_CHSIZE, length);
 }

 #else /* not F_CHSIZE */
-#ifdef F_FREESP
+# ifdef F_FREESP

 /* By William Kucharski <kucharsk@netcom.com>.  */

-#include <sys/stat.h>
-#include <errno.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#  include <sys/stat.h>
+#  include <errno.h>
+#  if HAVE_UNISTD_H
+#   include <unistd.h>
+#  endif

 int
-ftruncate (fd, length)
-     int fd;
-     off_t length;
+ftruncate (int fd, off_t length)
 {
  struct flock fl;
  struct stat filebuf;
@@ -71,33 +67,29 @@ ftruncate (fd, length)
  return 0;
 }

-#else /* not F_CHSIZE nor F_FREESP */
-#ifdef HAVE_CHSIZE
+# else /* not F_CHSIZE nor F_FREESP */
+#  if HAVE_CHSIZE

 int
-ftruncate (fd, length)
-     int fd;
-     off_t length;
+ftruncate (int fd, off_t length)
 {
  return chsize (fd, length);
 }

-#else /* not F_CHSIZE nor F_FREESP nor HAVE_CHSIZE */
+#  else /* not F_CHSIZE nor F_FREESP nor HAVE_CHSIZE */

-#include <errno.h>
-#ifndef errno
+#   include <errno.h>
+#   ifndef errno
 extern int errno;
-#endif
+#   endif

 int
-ftruncate (fd, length)
-     int fd;
-     off_t length;
+ftruncate (int fd, off_t length)
 {
  errno = EIO;
  return -1;
 }

-#endif /* not HAVE_CHSIZE */
-#endif /* not F_FREESP */
+#  endif /* not HAVE_CHSIZE */
+# endif /* not F_FREESP */
 #endif /* not F_CHSIZE */
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -1,5 +1,5 @@
 /* full-write.c -- an interface to write that retries after interrupts
-   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1997, 1998, 2000 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
@@ -12,20 +12,20 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Copied largely from GNU C's cccp.c.
   */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

 #include <sys/types.h>

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif

 #include <errno.h>
@@ -37,10 +37,7 @@ extern int errno;
   Return LEN upon success, write's (negative) error code otherwise.  */

 int
-full_write (desc, ptr, len)
-     int desc;
-     char *ptr;
-     size_t len;
+full_write (int desc, const char *ptr, size_t len)
 {
  int total_written;

@@ -48,6 +45,11 @@ full_write (desc, ptr, len)
  while (len > 0)
    {
      int written = write (desc, ptr, len);
+      /* write on an old Slackware Linux 1.2.13 returns zero when
+	 I try to write more data than there is room on a floppy disk.
+	 This puts dd into an infinite loop.  Reproduce with
+	 dd if=/dev/zero of=/dev/fd0.  If you have this problem,
+	 consider upgrading to a newer kernel.  */
      if (written < 0)
 	{
 #ifdef EINTR
--- a/lib/getdate.h
+++ b/lib/getdate.h
@@ -0,0 +1,46 @@
+/*  Copyright (C) 1995, 1997, 1998 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.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+#ifdef vms
+# include <types.h>
+# include <time.h>
+#else
+# include <sys/types.h>
+# if TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+# else
+#  if HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#  else
+#   include <time.h>
+#  endif
+# endif
+#endif /* defined (vms) */
+
+time_t get_date PARAMS ((const char *p, const time_t *now));
--- a/lib/getdate.y
+++ b/lib/getdate.y
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -0,0 +1,56 @@
+/* provide consistent interface to getgroups for systems that don't allow N==0
+   Copyright (C) 1996, 1999 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 Jim Meyering */
+
+#include <config.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+char *xmalloc ();
+
+/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, 0) always fails.
+   On other systems, it returns the number of supplemental groups for the
+   process.  This function handles that special case and lets the system-
+   provided function handle all others. */
+
+int
+getgroups (size_t n, GETGROUPS_T *group)
+{
+  int n_groups;
+  GETGROUPS_T *gbuf;
+
+#undef getgroups
+
+  if (n != 0)
+    return getgroups (n, group);
+
+  n = 20;
+  gbuf = NULL;
+  while (1)
+    {
+      gbuf = (GETGROUPS_T *) xrealloc (gbuf, n * sizeof (GETGROUPS_T));
+      n_groups = getgroups (n, gbuf);
+      if (n_groups < n)
+	break;
+      n += 10;
+    }
+
+  free (gbuf);
+
+  return n_groups;
+}
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -12,13 +12,17 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 /* David MacKenzie <djm@gnu.ai.mit.edu> */

+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #ifdef HAVE_UNAME
-#include <sys/utsname.h>
+# include <sys/utsname.h>
 #endif

 /* Put up to LEN chars of the host name into NAME.
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -1,6 +1,6 @@
 /* getline.c -- Replacement for GNU C library function getline

-Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 1997, 1998, 2000 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
@@ -18,138 +18,40 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */

 /* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */

-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

-/* The `getdelim' function is only declared if there following symbol
+/* The `getdelim' function is only declared if the following symbol
   is defined.  */
-#define _GNU_SOURCE	1
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>

-#if defined __GNU_LIBRARY__ && defined HAVE_GETDELIM
+#if defined __GNU_LIBRARY__ && HAVE_GETDELIM

 int
-getline (lineptr, n, stream)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
+getline (char **lineptr, size_t *n, FILE *stream)
 {
  return getdelim (lineptr, n, '\n', stream);
 }

-
 #else /* ! have getdelim */

-#define NDEBUG
-#include <assert.h>
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc (), *realloc ();
-#endif
-
-/* Always add at least this many bytes when extending the buffer.  */
-#define MIN_CHUNK 64
-
-/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
-   + OFFSET (and null-terminate it). *LINEPTR is a pointer returned from
-   malloc (or NULL), pointing to *N characters of space.  It is realloc'd
-   as necessary.  Return the number of characters read (not including the
-   null terminator), or -1 on error or EOF.  */
+# include "getstr.h"

 int
-getstr (lineptr, n, stream, terminator, offset)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
-     char terminator;
-     size_t offset;
+getline (char **lineptr, size_t *n, FILE *stream)
 {
-  int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
-  char *read_pos;		/* Where we're reading into *LINEPTR. */
-  int ret;
-
-  if (!lineptr || !n || !stream)
-    return -1;
-
-  if (!*lineptr)
-    {
-      *n = MIN_CHUNK;
-      *lineptr = malloc (*n);
-      if (!*lineptr)
-	return -1;
-    }
-
-  nchars_avail = *n - offset;
-  read_pos = *lineptr + offset;
-
-  for (;;)
-    {
-      register int c = getc (stream);
-
-      /* We always want at least one char left in the buffer, since we
-	 always (unless we get an error while reading the first char)
-	 NUL-terminate the line buffer.  */
-
-      assert(*n - nchars_avail == read_pos - *lineptr);
-      if (nchars_avail < 2)
-	{
-	  if (*n > MIN_CHUNK)
-	    *n *= 2;
-	  else
-	    *n += MIN_CHUNK;
-
-	  nchars_avail = *n + *lineptr - read_pos;
-	  *lineptr = realloc (*lineptr, *n);
-	  if (!*lineptr)
-	    return -1;
-	  read_pos = *n - nchars_avail + *lineptr;
-	  assert(*n - nchars_avail == read_pos - *lineptr);
-	}
-
-      if (c == EOF || ferror (stream))
-	{
-	  /* Return partial line, if any.  */
-	  if (read_pos == *lineptr)
-	    return -1;
-	  else
-	    break;
-	}
-
-      *read_pos++ = c;
-      nchars_avail--;
-
-      if (c == terminator)
-	/* Return the line.  */
-	break;
-    }
-
-  /* Done - NUL terminate and return the number of chars read.  */
-  *read_pos = '\0';
-
-  ret = read_pos - (*lineptr + offset);
-  return ret;
+  return getstr (lineptr, n, stream, '\n', 0, 0);
 }

 int
-getline (lineptr, n, stream)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
+getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream)
 {
-  return getstr (lineptr, n, stream, '\n', 0);
-}
-
-int
-getdelim (lineptr, n, delimiter, stream)
-     char **lineptr;
-     size_t *n;
-     int delimiter;
-     FILE *stream;
-{
-  return getstr (lineptr, n, stream, delimiter, 0);
+  return getstr (lineptr, n, stream, delimiter, 0, 0);
 }
 #endif
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 1995 Free Software Foundation, Inc.
+/*  Copyright (C) 1995, 1997, 1999, 2000 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
@@ -14,23 +14,25 @@ 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.  */

-#ifndef _getline_h_
-#define _getline_h_ 1
+#ifndef GETLINE_H_
+# define GETLINE_H_ 1

-#include <stdio.h>
+# include <stdio.h>

-#ifndef PARAMS
-# if defined (__GNUC__) || __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif  /* GCC.  */
-#endif  /* Not PARAMS.  */
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif

+# if __GLIBC__ < 2
 int
 getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));

 int
 getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+# endif

-#endif
+#endif /* not GETLINE_H_ */
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -1,9 +1,8 @@
 /* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
-   before changing it!
+   NOTE: The canonical source of this file is maintained with the GNU
+   C Library.  Bugs can be reported to bug-glibc@gnu.org.

-   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 1996
+   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
   	Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify it
@@ -17,25 +16,25 @@
   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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
   Ditto for AIX 3.2 and <stdlib.h>.  */
 #ifndef _NO_PROTO
-#define _NO_PROTO
+# define _NO_PROTO
 #endif

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif

-#if !defined (__STDC__) || !__STDC__
+#if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
+# ifndef const
+#  define const
+# endif
 #endif

 #include <stdio.h>
@@ -48,42 +47,42 @@
   program understand `configure --with-gnu-libc' and omit the object files,
   it is simpler to just do this in the source for each such file.  */

-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+# include <gnu-versions.h>
+# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#  define ELIDE_CODE
+# endif
+#endif
+
+#ifndef ELIDE_CODE


 /* This needs to come after some library #include
   to get __GNU_LIBRARY__ defined.  */
-#ifdef __GNU_LIBRARY__
+#ifdef	__GNU_LIBRARY__
 /* Don't include stdlib.h for non-GNU C libraries because some of them
   contain conflicting prototypes for getopt.  */
-#include <stdlib.h>
-#if defined (_LIBC) || defined (HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
+# include <stdlib.h>
+# include <unistd.h>
 #endif	/* GNU C library.  */

 #ifdef VMS
-#include <unixlib.h>
-#if HAVE_STRING_H - 0
-#include <string.h>
-#endif
-#endif
-
-#ifdef WIN32
-/* It's not Unix, really.  See?  Capital letters.  */
-#include <windows.h>
-#define getpid() GetCurrentProcessId()
+# include <unixlib.h>
+# if HAVE_STRING_H - 0
+#  include <string.h>
+# endif
 #endif

 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
   When compiling libc, the _ macro is predefined.  */
-#ifdef HAVE_LIBINTL_H
-# include <libintl.h>
-# define _(msgid)	gettext (msgid)
-#else
-# define _(msgid)	(msgid)
-#endif
+# ifdef HAVE_LIBINTL_H
+#  include <libintl.h>
+#  define _(msgid)	gettext (msgid)
+# else
+#  define _(msgid)	(msgid)
+# endif
 #endif

 /* This version of `getopt' appears to the caller like standard Unix `getopt'
@@ -108,7 +107,7 @@
   Also, when `ordering' is RETURN_IN_ORDER,
   each non-option ARGV-element is returned here.  */

-char *optarg = NULL;
+char *optarg;

 /* Index in ARGV of the next element to be scanned.
   This is used for communication to and from the caller
@@ -116,14 +115,20 @@ char *optarg = NULL;

   On entry to `getopt', zero means this is the first call; initialize.

-   When `getopt' returns EOF, this is the index of the first of the
+   When `getopt' returns -1, this is the index of the first of the
   non-option elements that the caller should itself scan.

   Otherwise, `optind' communicates from one call to the next
   how much of ARGV has been scanned so far.  */

-/* XXX 1003.2 says this must be 1 before any call.  */
-int optind = 0;
+/* 1003.2 says this must be 1 before any call.  */
+int optind = 1;
+
+/* Formerly, initialization of getopt depended on optind==0, which
+   causes problems with re-calling getopt as programs generally don't
+   know that. */
+
+int __getopt_initialized;

 /* The next char to be scanned in the option-element
   in which the last option character we returned was found.
@@ -172,7 +177,7 @@ int optopt = '?';

   The special argument `--' forces an end of option-scanning regardless
   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return EOF with `optind' != ARGC.  */
+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */

 static enum
 {
@@ -182,19 +187,27 @@ static enum
 /* Value of POSIXLY_CORRECT environment variable.  */
 static char *posixly_correct;

-#ifdef __GNU_LIBRARY__
+#ifdef	__GNU_LIBRARY__
 /* We want to avoid inclusion of string.h with non-GNU libraries
   because there are many ways it can cause trouble.
   On some systems, it contains special magic macros that don't work
   in GCC.  */
-#include <string.h>
-#define	my_index	strchr
+# include <string.h>
+# define my_index	strchr
 #else

+# if HAVE_STRING_H
+#  include <string.h>
+# else
+#  include <strings.h>
+# endif
+
 /* Avoid depending on library functions or files
   whose names are inconsistent.  */

-char *getenv ();
+#ifndef getenv
+extern char *getenv ();
+#endif

 static char *
 my_index (str, chr)
@@ -215,11 +228,11 @@ my_index (str, chr)
 #ifdef __GNUC__
 /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
   That was relevant to code that was here before.  */
-#if !defined (__STDC__) || !__STDC__
+# if (!defined __STDC__ || !__STDC__) && !defined strlen
 /* gcc with -traditional declares the built-in strlen to return int,
   and has done so at least since version 2.4.5. -- rms.  */
 extern int strlen (const char *);
-#endif /* not __STDC__ */
+# endif /* not __STDC__ */
 #endif /* __GNUC__ */

 #endif /* not __GNU_LIBRARY__ */
@@ -233,12 +246,46 @@ extern int strlen (const char *);
 static int first_nonopt;
 static int last_nonopt;

+#ifdef _LIBC
 /* Bash 2.0 gives us an environment variable containing flags
   indicating ARGV elements that should not be considered arguments.  */

-static const char *nonoption_flags;
+/* Defined in getopt_init.c  */
+extern char *__getopt_nonoption_flags;
+
+static int nonoption_flags_max_len;
 static int nonoption_flags_len;

+static int original_argc;
+static char *const *original_argv;
+
+/* Make sure the environment variable bash 2.0 puts in the environment
+   is valid for the getopt call we must make sure that the ARGV passed
+   to getopt is that one passed to the process.  */
+static void
+__attribute__ ((unused))
+store_args_and_env (int argc, char *const *argv)
+{
+  /* XXX This is no good solution.  We should rather copy the args so
+     that we can compare them later.  But we must not use malloc(3).  */
+  original_argc = argc;
+  original_argv = argv;
+}
+# ifdef text_set_element
+text_set_element (__libc_subinit, store_args_and_env);
+# endif /* text_set_element */
+
+# define SWAP_FLAGS(ch1, ch2) \
+  if (nonoption_flags_len > 0)						      \
+    {									      \
+      char __tmp = __getopt_nonoption_flags[ch1];			      \
+      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
+      __getopt_nonoption_flags[ch2] = __tmp;				      \
+    }
+#else	/* !_LIBC */
+# define SWAP_FLAGS(ch1, ch2)
+#endif	/* _LIBC */
+
 /* Exchange two adjacent subsequences of ARGV.
   One subsequence is elements [first_nonopt,last_nonopt)
   which contains all the non-options that have been skipped so far.
@@ -248,7 +295,7 @@ static int nonoption_flags_len;
   `first_nonopt' and `last_nonopt' are relocated so that they describe
   the new indices of the non-options in ARGV after they are moved.  */

-#if defined (__STDC__) && __STDC__
+#if defined __STDC__ && __STDC__
 static void exchange (char **);
 #endif

@@ -266,6 +313,28 @@ exchange (argv)
     It leaves the longer segment in the right place overall,
     but it consists of two parts that need to be swapped next.  */

+#ifdef _LIBC
+  /* First make sure the handling of the `__getopt_nonoption_flags'
+     string can work normally.  Our top argument must be in the range
+     of the string.  */
+  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+    {
+      /* We must extend the array.  The user plays games with us and
+	 presents new arguments.  */
+      char *new_str = malloc (top + 1);
+      if (new_str == NULL)
+	nonoption_flags_len = nonoption_flags_max_len = 0;
+      else
+	{
+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+			     nonoption_flags_max_len),
+		  '\0', top + 1 - nonoption_flags_max_len);
+	  nonoption_flags_max_len = top + 1;
+	  __getopt_nonoption_flags = new_str;
+	}
+    }
+#endif
+
  while (top > middle && middle > bottom)
    {
      if (top - middle > middle - bottom)
@@ -280,6 +349,7 @@ exchange (argv)
 	      tem = argv[bottom + i];
 	      argv[bottom + i] = argv[top - (middle - bottom) + i];
 	      argv[top - (middle - bottom) + i] = tem;
+	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
 	    }
 	  /* Exclude the moved bottom segment from further swapping.  */
 	  top -= len;
@@ -296,6 +366,7 @@ exchange (argv)
 	      tem = argv[bottom + i];
 	      argv[bottom + i] = argv[middle + i];
 	      argv[middle + i] = tem;
+	      SWAP_FLAGS (bottom + i, middle + i);
 	    }
 	  /* Exclude the moved top segment from further swapping.  */
 	  bottom += len;
@@ -310,18 +381,20 @@ exchange (argv)

 /* Initialize the internal data when the first call is made.  */

-#if defined (__STDC__) && __STDC__
-static const char *_getopt_initialize (const char *);
+#if defined __STDC__ && __STDC__
+static const char *_getopt_initialize (int, char *const *, const char *);
 #endif
 static const char *
-_getopt_initialize (optstring)
+_getopt_initialize (argc, argv, optstring)
+     int argc;
+     char *const *argv;
     const char *optstring;
 {
  /* Start processing options with ARGV-element 1 (since ARGV-element 0
     is the program name); the sequence of previously skipped
     non-option ARGV-elements is empty.  */

-  first_nonopt = last_nonopt = optind = 1;
+  first_nonopt = last_nonopt = optind;

  nextchar = NULL;

@@ -344,20 +417,35 @@ _getopt_initialize (optstring)
  else
    ordering = PERMUTE;

-  if (posixly_correct == NULL)
+#ifdef _LIBC
+  if (posixly_correct == NULL
+      && argc == original_argc && argv == original_argv)
    {
-      /* Bash 2.0 puts a special variable in the environment for each
-	 command it runs, specifying which ARGV elements are the results of
-	 file name wildcard expansion and therefore should not be
-	 considered as options.  */
-      char var[100];
-      sprintf (var, "_%d_GNU_nonoption_argv_flags_", getpid ());
-      nonoption_flags = getenv (var);
-      if (nonoption_flags == NULL)
-	nonoption_flags_len = 0;
-      else
-	nonoption_flags_len = strlen (nonoption_flags);
+      if (nonoption_flags_max_len == 0)
+	{
+	  if (__getopt_nonoption_flags == NULL
+	      || __getopt_nonoption_flags[0] == '\0')
+	    nonoption_flags_max_len = -1;
+	  else
+	    {
+	      const char *orig_str = __getopt_nonoption_flags;
+	      int len = nonoption_flags_max_len = strlen (orig_str);
+	      if (nonoption_flags_max_len < argc)
+		nonoption_flags_max_len = argc;
+	      __getopt_nonoption_flags =
+		(char *) malloc (nonoption_flags_max_len);
+	      if (__getopt_nonoption_flags == NULL)
+		nonoption_flags_max_len = -1;
+	      else
+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', nonoption_flags_max_len - len);
+	    }
+	}
+      nonoption_flags_len = nonoption_flags_max_len;
    }
+  else
+    nonoption_flags_len = 0;
+#endif

  return optstring;
 }
@@ -375,7 +463,7 @@ _getopt_initialize (optstring)
   updating `optind' and `nextchar' so that the next call to `getopt' can
   resume the scan with the following option character or ARGV-element.

-   If there are no more option characters, `getopt' returns `EOF'.
+   If there are no more option characters, `getopt' returns -1.
   Then `optind' is the index in ARGV of the first ARGV-element
   that is not an option.  (The ARGV-elements have been permuted
   so that those that are not options now come last.)
@@ -427,20 +515,34 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
     int *longind;
     int long_only;
 {
+  int print_errors = opterr;
+  if (optstring[0] == ':')
+    print_errors = 0;
+
+  if (argc < 1)
+    return -1;
+
  optarg = NULL;

-  if (optind == 0)
+  if (optind == 0 || !__getopt_initialized)
    {
-      optstring = _getopt_initialize (optstring);
-      optind = 1;		/* Don't scan ARGV[0], the program name.  */
+      if (optind == 0)
+	optind = 1;	/* Don't scan ARGV[0], the program name.  */
+      optstring = _getopt_initialize (argc, argv, optstring);
+      __getopt_initialized = 1;
    }

  /* Test whether ARGV[optind] points to a non-option argument.
     Either it does not have option syntax, or there is an environment flag
-     from the shell indicating it is not an option.  */
-#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
-		     || (optind < nonoption_flags_len			      \
-			 && nonoption_flags[optind] == '1'))
+     from the shell indicating it is not an option.  The later information
+     is only used when the used in the GNU libc.  */
+#ifdef _LIBC
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
+		      || (optind < nonoption_flags_len			      \
+			  && __getopt_nonoption_flags[optind] == '1'))
+#else
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif

  if (nextchar == NULL || *nextchar == '\0')
    {
@@ -498,7 +600,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	     that we previously skipped, so the caller will digest them.  */
 	  if (first_nonopt != last_nonopt)
 	    optind = first_nonopt;
-	  return EOF;
+	  return -1;
 	}

      /* If we have come to a non-option and did not permute it,
@@ -507,7 +609,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      if (NONOPTION_P)
 	{
 	  if (ordering == REQUIRE_ORDER)
-	    return EOF;
+	    return -1;
 	  optarg = argv[optind++];
 	  return 1;
 	}
@@ -543,22 +645,19 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      const struct option *pfound = NULL;
      int exact = 0;
      int ambig = 0;
-      int indfound;
+      int indfound = -1;
      int option_index;

      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
 	/* Do nothing.  */ ;

-#ifdef lint		/* Suppress `used before initialized' warning.  */
-      indfound = 0;
-#endif
-
      /* Test all long options for either exact match
 	 or abbreviated matches.  */
      for (p = longopts, option_index = 0; p->name; p++, option_index++)
 	if (!strncmp (p->name, nextchar, nameend - nextchar))
 	  {
-	    if (nameend - nextchar == strlen (p->name))
+	    if ((unsigned int) (nameend - nextchar)
+		== (unsigned int) strlen (p->name))
 	      {
 		/* Exact match found.  */
 		pfound = p;
@@ -572,14 +671,16 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		pfound = p;
 		indfound = option_index;
 	      }
-	    else
+	    else if (pfound->has_arg != p->has_arg
+		     || pfound->flag != p->flag
+		     || pfound->val != p->val)
 	      /* Second or later nonexact match found.  */
 	      ambig = 1;
 	  }

      if (ambig && !exact)
 	{
-	  if (opterr)
+	  if (print_errors)
 	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
 		     argv[0], argv[optind]);
 	  nextchar += strlen (nextchar);
@@ -600,17 +701,19 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		optarg = nameend + 1;
 	      else
 		{
-		  if (opterr)
-		    if (argv[optind - 1][1] == '-')
-		      /* --option */
-		      fprintf (stderr,
-			_("%s: option `--%s' doesn't allow an argument\n"),
-			       argv[0], pfound->name);
-		    else
-		      /* +option or -option */
-		      fprintf (stderr,
-			_("%s: option `%c%s' doesn't allow an argument\n"),
-			       argv[0], argv[optind - 1][0], pfound->name);
+		  if (print_errors)
+		    {
+		      if (argv[optind - 1][1] == '-')
+			/* --option */
+			fprintf (stderr,
+				 _("%s: option `--%s' doesn't allow an argument\n"),
+				 argv[0], pfound->name);
+		      else
+			/* +option or -option */
+			fprintf (stderr,
+				 _("%s: option `%c%s' doesn't allow an argument\n"),
+				 argv[0], argv[optind - 1][0], pfound->name);
+		    }

 		  nextchar += strlen (nextchar);

@@ -624,10 +727,10 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		optarg = argv[optind++];
 	      else
 		{
-		  if (opterr)
+		  if (print_errors)
 		    fprintf (stderr,
-			     _("%s: option `%s' requires an argument\n"),
-			     argv[0], argv[optind - 1]);
+			   _("%s: option `%s' requires an argument\n"),
+			   argv[0], argv[optind - 1]);
 		  nextchar += strlen (nextchar);
 		  optopt = pfound->val;
 		  return optstring[0] == ':' ? ':' : '?';
@@ -651,7 +754,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      if (!long_only || argv[optind][1] == '-'
 	  || my_index (optstring, *nextchar) == NULL)
 	{
-	  if (opterr)
+	  if (print_errors)
 	    {
 	      if (argv[optind][1] == '-')
 		/* --option */
@@ -681,7 +784,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)

    if (temp == NULL || c == ':')
      {
-	if (opterr)
+	if (print_errors)
 	  {
 	    if (posixly_correct)
 	      /* 1003.2 specifies the format of this message.  */
@@ -694,6 +797,130 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	optopt = c;
 	return '?';
      }
+    /* Convenience. Treat POSIX -W foo same as long option --foo */
+    if (temp[0] == 'W' && temp[1] == ';')
+      {
+	char *nameend;
+	const struct option *p;
+	const struct option *pfound = NULL;
+	int exact = 0;
+	int ambig = 0;
+	int indfound = 0;
+	int option_index;
+
+	/* This is an option that requires an argument.  */
+	if (*nextchar != '\0')
+	  {
+	    optarg = nextchar;
+	    /* If we end this ARGV-element by taking the rest as an arg,
+	       we must advance to the next element now.  */
+	    optind++;
+	  }
+	else if (optind == argc)
+	  {
+	    if (print_errors)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+			 argv[0], c);
+	      }
+	    optopt = c;
+	    if (optstring[0] == ':')
+	      c = ':';
+	    else
+	      c = '?';
+	    return c;
+	  }
+	else
+	  /* We already incremented `optind' once;
+	     increment it again when taking next ARGV-elt as argument.  */
+	  optarg = argv[optind++];
+
+	/* optarg is now the argument, see if it's in the
+	   table of longopts.  */
+
+	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+	  /* Do nothing.  */ ;
+
+	/* Test all long options for either exact match
+	   or abbreviated matches.  */
+	for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	  if (!strncmp (p->name, nextchar, nameend - nextchar))
+	    {
+	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))
+		{
+		  /* Exact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		  exact = 1;
+		  break;
+		}
+	      else if (pfound == NULL)
+		{
+		  /* First nonexact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		}
+	      else
+		/* Second or later nonexact match found.  */
+		ambig = 1;
+	    }
+	if (ambig && !exact)
+	  {
+	    if (print_errors)
+	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+		       argv[0], argv[optind]);
+	    nextchar += strlen (nextchar);
+	    optind++;
+	    return '?';
+	  }
+	if (pfound != NULL)
+	  {
+	    option_index = indfound;
+	    if (*nameend)
+	      {
+		/* Don't test has_arg with >, because some C compilers don't
+		   allow it to be used on enums.  */
+		if (pfound->has_arg)
+		  optarg = nameend + 1;
+		else
+		  {
+		    if (print_errors)
+		      fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+			       argv[0], pfound->name);
+
+		    nextchar += strlen (nextchar);
+		    return '?';
+		  }
+	      }
+	    else if (pfound->has_arg == 1)
+	      {
+		if (optind < argc)
+		  optarg = argv[optind++];
+		else
+		  {
+		    if (print_errors)
+		      fprintf (stderr,
+			       _("%s: option `%s' requires an argument\n"),
+			       argv[0], argv[optind - 1]);
+		    nextchar += strlen (nextchar);
+		    return optstring[0] == ':' ? ':' : '?';
+		  }
+	      }
+	    nextchar += strlen (nextchar);
+	    if (longind != NULL)
+	      *longind = option_index;
+	    if (pfound->flag)
+	      {
+		*(pfound->flag) = pfound->val;
+		return 0;
+	      }
+	    return pfound->val;
+	  }
+	  nextchar = NULL;
+	  return 'W';	/* Let the application handle it.   */
+      }
    if (temp[1] == ':')
      {
 	if (temp[2] == ':')
@@ -720,7 +947,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	      }
 	    else if (optind == argc)
 	      {
-		if (opterr)
+		if (print_errors)
 		  {
 		    /* 1003.2 specifies the format of this message.  */
 		    fprintf (stderr,
@@ -756,7 +983,7 @@ getopt (argc, argv, optstring)
 			   0);
 }

-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
+#endif	/* Not ELIDE_CODE.  */

 #ifdef TEST

@@ -776,7 +1003,7 @@ main (argc, argv)
      int this_option_optind = optind ? optind : 1;

      c = getopt (argc, argv, "abc:d:0123456789");
-      if (c == EOF)
+      if (c == -1)
 	break;

      switch (c)
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -1,6 +1,7 @@
 /* Declarations for getopt.
-   Copyright (C) 1989, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
-
+   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.
   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
@@ -13,10 +14,14 @@

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _GETOPT_H
-#define _GETOPT_H 1
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif

 #ifdef	__cplusplus
 extern "C" {
@@ -36,7 +41,7 @@ extern char *optarg;

   On entry to `getopt', zero means this is the first call; initialize.

-   When `getopt' returns EOF, this is the index of the first of the
+   When `getopt' returns -1, this is the index of the first of the
   non-option elements that the caller should itself scan.

   Otherwise, `optind' communicates from one call to the next
@@ -53,6 +58,7 @@ extern int opterr;

 extern int optopt;

+#ifndef __need_getopt
 /* Describe the long-named options requested by the application.
   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
   of `struct option' terminated by an element containing a name which is
@@ -76,11 +82,11 @@ extern int optopt;

 struct option
 {
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
  const char *name;
-#else
+# else
  char *name;
-#endif
+# endif
  /* has_arg can't be an enum because some compilers complain about
     type mismatches in all the code that assumes it is an int.  */
  int has_arg;
@@ -90,40 +96,74 @@ struct option

 /* Names for the values of the `has_arg' field of `struct option'.  */

-#define	no_argument		0
-#define required_argument	1
-#define optional_argument	2
+# define no_argument		0
+# define required_argument	1
+# define optional_argument	2
+#endif	/* need getopt */

-#if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, `optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in `optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU `getopt'.
+
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
+   options.
+
+   If OPTS begins with `--', then non-option arguments are treated as
+   arguments to the option '\0'.  This behavior is specific to the GNU
+   `getopt'.  */
+
+#if defined __STDC__ && __STDC__
+# ifdef __GNU_LIBRARY__
 /* Many other libraries have conflicting prototypes for getopt, with
   differences in the consts, in stdlib.h.  To avoid compilation
   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
+extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
+# else /* not __GNU_LIBRARY__ */
 extern int getopt ();
-#endif /* __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-		        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind);
+# endif /* __GNU_LIBRARY__ */
+
+# ifndef __need_getopt
+extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
+		        const struct option *__longopts, int *__longind);
+extern int getopt_long_only (int __argc, char *const *__argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind);

 /* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind,
-			     int long_only);
+extern int _getopt_internal (int __argc, char *const *__argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind,
+			     int __long_only);
+# endif
 #else /* not __STDC__ */
 extern int getopt ();
+# ifndef __need_getopt
 extern int getopt_long ();
 extern int getopt_long_only ();

 extern int _getopt_internal ();
+# endif
 #endif /* __STDC__ */

 #ifdef	__cplusplus
 }
 #endif

-#endif /* _GETOPT_H */
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
+
+#endif /* getopt.h */
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -1,6 +1,8 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 1993, 1994
-	Free Software Foundation, Inc.
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
+     Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.

   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
@@ -13,22 +15,22 @@
   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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "getopt.h"
-
-#if !defined (__STDC__) || !__STDC__
+#else
+#if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
   reject `defined (const)'.  */
 #ifndef const
 #define const
 #endif
 #endif
+#endif
+
+#include "getopt.h"

 #include <stdio.h>

@@ -40,15 +42,21 @@
   program understand `configure --with-gnu-libc' and omit the object files,
   it is simpler to just do this in the source for each such file.  */

-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+#ifndef ELIDE_CODE


 /* This needs to come after some library #include
   to get __GNU_LIBRARY__ defined.  */
 #ifdef __GNU_LIBRARY__
 #include <stdlib.h>
-#else
-char *getenv ();
 #endif

 #ifndef	NULL
@@ -83,7 +91,7 @@ getopt_long_only (argc, argv, options, long_options, opt_index)
 }


-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
+#endif	/* Not ELIDE_CODE.  */

 #ifdef TEST

@@ -114,7 +122,7 @@ main (argc, argv)

      c = getopt_long (argc, argv, "abc:d:0123456789",
 		       long_options, &option_index);
-      if (c == EOF)
+      if (c == -1)
 	break;

      switch (c)
--- a/lib/getpagesize.h
+++ b/lib/getpagesize.h
@@ -0,0 +1,49 @@
+/* Emulate getpagesize on systems that lack it.  */
+
+#ifndef HAVE_GETPAGESIZE
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#if !defined getpagesize && defined _SC_PAGESIZE
+# if !(defined VMS && __VMS_VER < 70000000)
+#  define getpagesize() sysconf (_SC_PAGESIZE)
+# endif
+#endif
+
+#if !defined getpagesize && defined VMS
+# ifdef __ALPHA
+#  define getpagesize() 8192
+# else
+#  define getpagesize() 512
+# endif
+#endif
+
+/* This is for BeOS.  */
+#if !defined getpagesize && HAVE_OS_H
+# include <OS.h>
+# if defined B_PAGE_SIZE
+#  define getpagesize() B_PAGE_SIZE
+# endif
+#endif
+
+#ifndef getpagesize
+# include <sys/param.h>
+# ifdef EXEC_PAGESIZE
+#  define getpagesize() EXEC_PAGESIZE
+# else
+#  ifdef NBPG
+#   ifndef CLSIZE
+#    define CLSIZE 1
+#   endif
+#   define getpagesize() (NBPG * CLSIZE)
+#  else
+#   ifdef NBPC
+#    define getpagesize() NBPC
+#   endif
+#  endif
+# endif
+#endif
+
+#endif /* not HAVE_GETPAGESIZE */
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -0,0 +1,101 @@
+/* Copyright (C) 1992,93,94,95,96,97,98,99,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 <stdio.h>
+#include <termios.h>
+#include <unistd.h>
+#include "getline.h"
+
+/* It is desirable to use this bit on systems that have it.
+   The only bit of terminal state we want to twiddle is echoing, which is
+   done in software; there is no need to change the state of the terminal
+   hardware.  */
+
+#ifndef TCSASOFT
+# define TCSASOFT 0
+#endif
+
+char *
+getpass (const char *prompt)
+{
+  FILE *in, *out;
+  struct termios s, t;
+  int tty_changed;
+  static char *buf;
+  static size_t bufsize;
+  ssize_t nread;
+
+  /* Try to write to and read from the terminal if we can.
+     If we can't open the terminal, use stderr and stdin.  */
+
+  in = fopen ("/dev/tty", "w+");
+  if (in == NULL)
+    {
+      in = stdin;
+      out = stderr;
+    }
+  else
+    out = in;
+
+  /* Turn echoing off if it is on now.  */
+
+  if (tcgetattr (fileno (in), &t) == 0)
+    {
+      /* Save the old one. */
+      s = t;
+      /* Tricky, tricky. */
+      t.c_lflag &= ~(ECHO|ISIG);
+      tty_changed = (tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t) == 0);
+    }
+  else
+    tty_changed = 0;
+
+  /* Write the prompt.  */
+  fputs (prompt, out);
+  fflush (out);
+
+  /* Read the password.  */
+  nread = getline (&buf, &bufsize, in);
+  if (buf != NULL)
+    {
+      if (nread < 0)
+	buf[0] = '\0';
+      else if (buf[nread - 1] == '\n')
+	{
+	  /* Remove the newline.  */
+	  buf[nread - 1] = '\0';
+	  if (tty_changed)
+	    /* Write the newline that was not echoed.  */
+	    putc ('\n', out);
+	}
+    }
+
+  /* Restore the original setting.  */
+  if (tty_changed)
+    (void) tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &s);
+
+  if (in != stdin)
+    /* We opened the terminal; now close it.  */
+    fclose (in);
+
+  return buf;
+}
--- a/lib/getstr.c
+++ b/lib/getstr.c
@@ -0,0 +1,114 @@
+/* getstr.c -- core function for GNU C library getline replacement function
+
+   Copyright (C) 1993, 1996-2000 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 of the
+   License, 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 Jan Brittenson, bson@gnu.ai.mit.edu.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#include <assert.h>
+
+#if STDC_HEADERS
+# include <stdlib.h>
+#else
+char *malloc (), *realloc ();
+#endif
+
+/* Always add at least this many bytes when extending the buffer.  */
+#define MIN_CHUNK 64
+
+/* Read up to (and including) a delimiter DELIM1 from STREAM into *LINEPTR
+   + OFFSET (and NUL-terminate it).  If DELIM2 is non-zero, then read up
+   and including the first occurrence of DELIM1 or DELIM2.  *LINEPTR is
+   a pointer returned from malloc (or NULL), pointing to *N characters of
+   space.  It is realloc'd as necessary.  Return the number of characters
+   read (not including the NUL terminator), or -1 on error or EOF.  */
+
+int
+getstr (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
+	size_t offset)
+{
+  int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
+  char *read_pos;		/* Where we're reading into *LINEPTR. */
+  int ret;
+
+  if (!lineptr || !n || !stream)
+    return -1;
+
+  if (!*lineptr)
+    {
+      *n = MIN_CHUNK;
+      *lineptr = malloc (*n);
+      if (!*lineptr)
+	return -1;
+    }
+
+  nchars_avail = *n - offset;
+  read_pos = *lineptr + offset;
+
+  for (;;)
+    {
+      register int c = getc (stream);
+
+      /* We always want at least one char left in the buffer, since we
+	 always (unless we get an error while reading the first char)
+	 NUL-terminate the line buffer.  */
+
+      assert(*n - nchars_avail == read_pos - *lineptr);
+      if (nchars_avail < 2)
+	{
+	  if (*n > MIN_CHUNK)
+	    *n *= 2;
+	  else
+	    *n += MIN_CHUNK;
+
+	  nchars_avail = *n + *lineptr - read_pos;
+	  *lineptr = realloc (*lineptr, *n);
+	  if (!*lineptr)
+	    return -1;
+	  read_pos = *n - nchars_avail + *lineptr;
+	  assert(*n - nchars_avail == read_pos - *lineptr);
+	}
+
+      if (c == EOF || ferror (stream))
+	{
+	  /* Return partial line, if any.  */
+	  if (read_pos == *lineptr)
+	    return -1;
+	  else
+	    break;
+	}
+
+      *read_pos++ = c;
+      nchars_avail--;
+
+      if (c == delim1 || (delim2 && c == delim2))
+	/* Return the line.  */
+	break;
+    }
+
+  /* Done - NUL terminate and return the number of chars read.  */
+  *read_pos = '\0';
+
+  ret = read_pos - (*lineptr + offset);
+  return ret;
+}
--- a/lib/getstr.h
+++ b/lib/getstr.h
@@ -0,0 +1,19 @@
+#ifndef GETSTR_H_
+# define GETSTR_H_ 1
+
+# include <stdio.h>
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+int
+getstr PARAMS ((char **lineptr, size_t *n, FILE *stream,
+		int delim1, int delim2,
+		size_t offset));
+
+#endif
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,5 +1,5 @@
 /* getugroups.c -- return a list of the groups a user is in
-   Copyright (C) 1990, 1991 Free Software Foundation.
+   Copyright (C) 1990, 1991, 1998, 1999, 2000 Free Software Foundation.

   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
@@ -12,13 +12,13 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 David MacKenzie. */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif

 #include <sys/types.h>
@@ -26,7 +26,7 @@
 #include <grp.h>

 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif

 /* setgrent, getgrent, and endgrent are not specified by POSIX.1,
@@ -36,40 +36,66 @@
 struct group *getgrent ();

 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
+# include <string.h>
 #else
-#include <strings.h>
+# include <strings.h>
 #endif

-/* Like `getgroups', but for user USERNAME instead of for
-   the current process. */
+#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+
+/* Like `getgroups', but for user USERNAME instead of for the current
+   process.  Store at most MAXCOUNT group IDs in the GROUPLIST array.
+   If GID is not -1, store it first (if possible).  GID should be the
+   group ID (pw_gid) obtained from getpwuid, in case USERNAME is not
+   listed in /etc/groups.
+   Always return the number of groups of which USERNAME is a member.  */

 int
-getugroups (maxcount, grouplist, username)
-     int maxcount;
-     GETGROUPS_T *grouplist;
-     char *username;
+getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
 {
  struct group *grp;
  register char **cp;
  register int count = 0;

+  if (gid != (gid_t) -1)
+    {
+      if (maxcount != 0)
+	grouplist[count] = gid;
+      ++count;
+    }
+
  setgrent ();
  while ((grp = getgrent ()) != 0)
-    for (cp = grp->gr_mem; *cp; ++cp)
-      if (!strcmp (username, *cp))
+    {
+      for (cp = grp->gr_mem; *cp; ++cp)
 	{
-	  if (maxcount != 0)
+	  int n;
+
+	  if ( ! STREQ (username, *cp))
+	    continue;
+
+	  /* See if this group number is already on the list.  */
+	  for (n = 0; n < count; ++n)
+	    if (grouplist && grouplist[n] == grp->gr_gid)
+	      break;
+
+	  /* If it's a new group number, then try to add it to the list.  */
+	  if (n == count)
 	    {
-	      if (count >= maxcount)
+	      if (maxcount != 0)
 		{
-		  endgrent ();
-		  return count;
+		  if (count >= maxcount)
+		    {
+		      endgrent ();
+		      return count;
+		    }
+		  grouplist[count] = grp->gr_gid;
 		}
-	      grouplist[count] = grp->gr_gid;
+	      count++;
 	    }
-	  count++;
 	}
+    }
  endgrent ();
+
  return count;
 }
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -1,5 +1,5 @@
 /* getusershell.c -- Return names of valid user shells.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1997, 2000 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
@@ -12,31 +12,31 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 David MacKenzie <djm@gnu.ai.mit.edu> */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif

 #ifndef SHELLS_FILE
 /* File containing a list of nonrestricted shells, one per line. */
-#define SHELLS_FILE "/etc/shells"
+# define SHELLS_FILE "/etc/shells"
 #endif

 #include <stdio.h>
 #include <ctype.h>
+#include "xalloc.h"

-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
 #else
-char *malloc ();
-char *realloc ();
+# define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif

-char *xstrdup ();
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))

 static int readname ();

@@ -118,39 +118,6 @@ endusershell ()
    }
 }

-/* Allocate N bytes of memory dynamically, with error checking.  */
-
-static char *
-xmalloc (n)
-     unsigned n;
-{
-  char *p;
-
-  p = malloc (n);
-  if (p == 0)
-    {
-      fprintf (stderr, "virtual memory exhausted\n");
-      exit (1);
-    }
-  return p;
-}
-
-/* Reallocate space P to size N, with error checking.  */
-
-static char *
-xrealloc (p, n)
-     char *p;
-     unsigned n;
-{
-  p = realloc (p, n);
-  if (p == 0)
-    {
-      fprintf (stderr, "virtual memory exhausted\n");
-      exit (1);
-    }
-  return p;
-}
-
 /* Read a line from STREAM, removing any newline at the end.
   Place the result in *NAME, which is malloc'd
   and/or realloc'd as necessary and can start out NULL,
@@ -175,10 +142,10 @@ readname (name, size, stream)
    }

  /* Skip blank space.  */
-  while ((c = getc (stream)) != EOF && isspace (c))
+  while ((c = getc (stream)) != EOF && ISSPACE (c))
    /* Do nothing. */ ;
-  
-  while (c != EOF && !isspace (c))
+
+  while (c != EOF && !ISSPACE (c))
    {
      (*name)[name_index++] = c;
      while (name_index >= *size)
--- a/lib/getversion.c
+++ b/lib/getversion.c
@@ -1,5 +1,5 @@
 /* getversion.c -- select backup filename type
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2000 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
@@ -12,15 +12,19 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 David MacKenzie <djm@gnu.ai.mit.edu> */

+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "backupfile.h"

-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if STDC_HEADERS
+# include <stdlib.h>
 #endif

 int argmatch ();
@@ -28,12 +32,12 @@ void invalid_arg ();

 extern char *program_name;

-static char *backup_args[] =
+static const char *const backup_args[] =
 {
  "never", "simple", "nil", "existing", "t", "numbered", 0
 };

-static enum backup_type backup_types[] =
+static const enum backup_type backup_types[] =
 {
  simple, simple, numbered_existing, numbered_existing, numbered, numbered
 };
@@ -42,8 +46,7 @@ static enum backup_type backup_types[] =
   Unique abbreviations are accepted. */

 enum backup_type
-get_version (version)
-     char *version;
+get_version (const char *version)
 {
  int i;

--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -1,5 +1,5 @@
 /* group-member.c -- determine whether group id is in calling user's group list
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1998 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
@@ -12,22 +12,22 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

 #include <stdio.h>
 #include <sys/types.h>

 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #endif

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif

 #include "group-member.h"
@@ -41,18 +41,17 @@ struct group_info
    GETGROUPS_T *group;
  };

-#ifdef HAVE_GETGROUPS
+#if HAVE_GETGROUPS

 static void
-free_group_info (g)
-     struct group_info *g;
+free_group_info (struct group_info *g)
 {
  free (g->group);
  free (g);
 }

 static struct group_info *
-get_group_info ()
+get_group_info (void)
 {
  int n_groups;
  int n_group_slots;
@@ -96,8 +95,7 @@ get_group_info ()
   either of the current or effective group IDs.  */

 int
-group_member (gid)
-     gid_t gid;
+group_member (gid_t gid)
 {
 #ifndef HAVE_GETGROUPS
  return ((gid == getgid ()) || (gid == getegid ()));
@@ -120,7 +118,7 @@ group_member (gid)
 	  break;
 	}
    }
-  
+
  free_group_info (gi);

  return found;
--- a/lib/group-member.h
+++ b/lib/group-member.h
@@ -1,7 +1,15 @@
-#ifndef _group_member_h_
-#define _group_member_h_ 1
+#ifndef GROUP_MEMBER_H_
+# define GROUP_MEMBER_H_ 1
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif

 int
-  group_member ();
+  group_member PARAMS ((gid_t));

-#endif /* _group_member_h_ */
+#endif /* GROUP_MEMBER_H_ */
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -0,0 +1,85 @@
+/* hard-locale.c -- Determine whether a locale is hard.
+   Copyright 1997, 1998, 1999 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.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifndef __GNUC__
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #  pragma alloca
+#  else
+#   ifdef _WIN32
+#    include <malloc.h>
+#    include <io.h>
+#   else
+#    ifndef alloca
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+
+/* Return nonzero if the current CATEGORY locale is hard, i.e. if you
+   can't get away with assuming traditional C or POSIX behavior.  */
+int
+hard_locale (int category)
+{
+#if ! (defined ENABLE_NLS && HAVE_SETLOCALE)
+  return 0;
+#else
+
+  int hard = 1;
+  char const *p = setlocale (category, 0);
+
+  if (p)
+    {
+# if defined __GLIBC__ && __GLIBC__ >= 2
+      if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+	hard = 0;
+# else
+      char *locale = alloca (strlen (p) + 1);
+      strcpy (locale, p);
+
+      /* Temporarily set the locale to the "C" and "POSIX" locales to
+	 find their names, so that we can determine whether one or the
+	 other is the caller's locale.  */
+      if (((p = setlocale (category, "C")) && strcmp (p, locale) == 0)
+	  || ((p = setlocale (category, "POSIX")) && strcmp (p, locale) == 0))
+	hard = 0;
+
+      /* Restore the caller's locale.  */
+      setlocale (category, locale);
+# endif
+    }
+
+  return hard;
+
+#endif
+}
--- a/lib/hard-locale.h
+++ b/lib/hard-locale.h
@@ -0,0 +1,18 @@
+#ifndef HARD_LOCALE_H_
+# define HARD_LOCALE_H_ 1
+
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+int hard_locale PARAMS ((int));
+
+#endif /* HARD_LOCALE_H_ */
--- a/lib/hash.c
+++ b/lib/hash.c
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -0,0 +1,120 @@
+/* hash - hashing table processing.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Written by Jim Meyering <meyering@ascend.com>, 1998.
+
+   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.  */
+
+/* A generic hash table package.  */
+
+/* Make sure USE_OBSTACK is defined to 1 if you want the allocator to use
+   obstacks instead of malloc, and recompile `hash.c' with same setting.  */
+
+#ifndef PARAMS
+# if PROTOTYPES || __STDC__
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+typedef unsigned (*Hash_hasher) PARAMS ((const void *, unsigned));
+typedef bool (*Hash_comparator) PARAMS ((const void *, const void *));
+typedef void (*Hash_data_freer) PARAMS ((void *));
+typedef bool (*Hash_processor) PARAMS ((void *, void *));
+
+struct hash_entry
+  {
+    void *data;
+    struct hash_entry *next;
+  };
+
+struct hash_tuning
+  {
+    /* This structure is mainly used for `hash_initialize', see the block
+       documentation of `hash_reset_tuning' for more complete comments.  */
+
+    float shrink_threshold;	/* ratio of used buckets to trigger a shrink */
+    float shrink_factor;	/* ratio of new smaller size to original size */
+    float growth_threshold;	/* ratio of used buckets to trigger a growth */
+    float growth_factor;	/* ratio of new bigger size to original size */
+    bool is_n_buckets;		/* if CANDIDATE really means table size */
+  };
+
+typedef struct hash_tuning Hash_tuning;
+
+struct hash_table
+  {
+    /* The array of buckets starts at BUCKET and extends to BUCKET_LIMIT-1,
+       for a possibility of N_BUCKETS.  Among those, N_BUCKETS_USED buckets
+       are not empty, there are N_ENTRIES active entries in the table.  */
+    struct hash_entry *bucket;
+    struct hash_entry *bucket_limit;
+    unsigned n_buckets;
+    unsigned n_buckets_used;
+    unsigned n_entries;
+
+    /* Tuning arguments, kept in a physicaly separate structure.  */
+    const Hash_tuning *tuning;
+
+    /* Three functions are given to `hash_initialize', see the documentation
+       block for this function.  In a word, HASHER randomizes a user entry
+       into a number up from 0 up to some maximum minus 1; COMPARATOR returns
+       true if two user entries compare equally; and DATA_FREER is the cleanup
+       function for a user entry.  */
+    Hash_hasher hasher;
+    Hash_comparator comparator;
+    Hash_data_freer data_freer;
+
+    /* A linked list of freed struct hash_entry structs.  */
+    struct hash_entry *free_entry_list;
+
+#if USE_OBSTACK
+    /* Whenever obstacks are used, it is possible to allocate all overflowed
+       entries into a single stack, so they all can be freed in a single
+       operation.  It is not clear if the speedup is worth the trouble.  */
+    struct obstack entry_stack;
+#endif
+  };
+
+typedef struct hash_table Hash_table;
+
+/* Information and lookup.  */
+unsigned hash_get_n_buckets PARAMS ((const Hash_table *));
+unsigned hash_get_n_buckets_used PARAMS ((const Hash_table *));
+unsigned hash_get_n_entries PARAMS ((const Hash_table *));
+unsigned hash_get_max_bucket_length PARAMS ((const Hash_table *));
+bool hash_table_ok PARAMS ((const Hash_table *));
+void hash_print_statistics PARAMS ((const Hash_table *, FILE *));
+void *hash_lookup PARAMS ((const Hash_table *, const void *));
+
+/* Walking.  */
+void *hash_get_first PARAMS ((const Hash_table *));
+void *hash_get_next PARAMS ((const Hash_table *, const void *));
+unsigned hash_get_entries PARAMS ((const Hash_table *, void **, unsigned));
+unsigned hash_do_for_each PARAMS ((const Hash_table *, Hash_processor, void *));
+
+/* Allocation and clean-up.  */
+unsigned hash_string PARAMS ((const char *, unsigned));
+void hash_reset_tuning PARAMS ((Hash_tuning *));
+Hash_table *hash_initialize PARAMS ((unsigned, const Hash_tuning *,
+				     Hash_hasher, Hash_comparator,
+				     Hash_data_freer));
+void hash_clear PARAMS ((Hash_table *));
+void hash_free PARAMS ((Hash_table *));
+
+/* Insertion and deletion.  */
+bool hash_rehash PARAMS ((Hash_table *, unsigned));
+void *hash_insert PARAMS ((Hash_table *, const void *));
+void *hash_delete PARAMS ((Hash_table *, const void *));
--- a/lib/human.c
+++ b/lib/human.c
@@ -0,0 +1,342 @@
+/* human.c -- print human readable file size
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 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.  */
+
+/* Originally contributed by lm@sgi.com;
+   --si, output block size selection, and large file support
+   added by eggert@twinsun.com.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <stdio.h>
+
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifndef HAVE_DECL_GETENV
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_GETENV
+char *getenv ();
+#endif
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+
+#include <argmatch.h>
+#include <error.h>
+#include <xstrtol.h>
+
+#include "human.h"
+
+static const char suffixes[] =
+{
+  0,	/* not used */
+  'k',	/* kilo */
+  'M',	/* Mega */
+  'G',	/* Giga */
+  'T',	/* Tera */
+  'P',	/* Peta */
+  'E',	/* Exa */
+  'Z',	/* Zetta */
+  'Y'	/* Yotta */
+};
+
+/* If INEXACT_STYLE is not human_round_to_even, and if easily
+   possible, adjust VALUE according to the style.  */
+static double
+adjust_value (enum human_inexact_style inexact_style, double value)
+{
+  /* Do not use the floor or ceil functions, as that would mean
+     linking with the standard math library, which is a porting pain.
+     So leave the value alone if it is too large to easily round.  */
+  if (inexact_style != human_round_to_even && value < (uintmax_t) -1)
+    {
+      uintmax_t u = value;
+      value = u + (inexact_style == human_ceiling && u != value);
+    }
+
+  return value;
+}
+
+/* Like human_readable_inexact, except always round to even.  */
+char *
+human_readable (uintmax_t n, char *buf,
+		int from_block_size, int output_block_size)
+{
+  return human_readable_inexact (n, buf, from_block_size, output_block_size,
+				 human_round_to_even);
+}
+
+/* Convert N to a human readable format in BUF.
+
+   N is expressed in units of FROM_BLOCK_SIZE.  FROM_BLOCK_SIZE must
+   be nonnegative.
+
+   OUTPUT_BLOCK_SIZE must be nonzero.  If it is positive, use units of
+   OUTPUT_BLOCK_SIZE in the output number.
+
+   Use INEXACT_STYLE to determine whether to take the ceiling or floor
+   of any result that cannot be expressed exactly.
+
+   If OUTPUT_BLOCK_SIZE is negative, use a format like "127k" if
+   possible, using powers of -OUTPUT_BLOCK_SIZE; otherwise, use
+   ordinary decimal format.  Normally -OUTPUT_BLOCK_SIZE is either
+   1000 or 1024; it must be at least 2.  Most people visually process
+   strings of 3-4 digits effectively, but longer strings of digits are
+   more prone to misinterpretation.  Hence, converting to an
+   abbreviated form usually improves readability.  Use a suffix
+   indicating which power is being used.  For example, assuming
+   -OUTPUT_BLOCK_SIZE is 1024, 8500 would be converted to 8.3k,
+   133456345 to 127M, 56990456345 to 53G, and so on.  Numbers smaller
+   than -OUTPUT_BLOCK_SIZE aren't modified.  */
+
+char *
+human_readable_inexact (uintmax_t n, char *buf,
+			int from_block_size, int output_block_size,
+			enum human_inexact_style inexact_style)
+{
+  uintmax_t amt;
+  int base;
+  int to_block_size;
+  int tenths = 0;
+  int power;
+  char *p;
+
+  /* 0 means adjusted N == AMT.TENTHS;
+     1 means AMT.TENTHS < adjusted N < AMT.TENTHS + 0.05;
+     2 means adjusted N == AMT.TENTHS + 0.05;
+     3 means AMT.TENTHS + 0.05 < adjusted N < AMT.TENTHS + 0.1.  */
+  int rounding = 0;
+
+  if (output_block_size < 0)
+    {
+      base = -output_block_size;
+      to_block_size = 1;
+    }
+  else
+    {
+      base = 0;
+      to_block_size = output_block_size;
+    }
+
+  p = buf + LONGEST_HUMAN_READABLE;
+  *p = '\0';
+
+#ifdef lint
+  /* Suppress `used before initialized' warning.  */
+  power = 0;
+#endif
+
+  /* Adjust AMT out of FROM_BLOCK_SIZE units and into TO_BLOCK_SIZE units.  */
+
+  {
+    int multiplier;
+    int divisor;
+    int r2;
+    int r10;
+    if (to_block_size <= from_block_size
+	? (from_block_size % to_block_size != 0
+	   || (multiplier = from_block_size / to_block_size,
+	       (amt = n * multiplier) / multiplier != n))
+	: (from_block_size == 0
+	   || to_block_size % from_block_size != 0
+	   || (divisor = to_block_size / from_block_size,
+	       r10 = (n % divisor) * 10,
+	       r2 = (r10 % divisor) * 2,
+	       amt = n / divisor,
+	       tenths = r10 / divisor,
+	       rounding = r2 < divisor ? 0 < r2 : 2 + (divisor < r2),
+	       0)))
+      {
+	/* Either the result cannot be computed easily using uintmax_t,
+	   or from_block_size is zero.  Fall back on floating point.
+	   FIXME: This can yield answers that are slightly off.  */
+
+	double damt = n * (from_block_size / (double) to_block_size);
+
+	if (! base)
+	  sprintf (buf, "%.0f", adjust_value (inexact_style, damt));
+	else
+	  {
+	    double e = 1;
+	    power = 0;
+
+	    do
+	      {
+		e *= base;
+		power++;
+	      }
+	    while (e * base <= damt && power < sizeof suffixes - 1);
+
+	    damt /= e;
+
+	    sprintf (buf, "%.1f%c", adjust_value (inexact_style, damt),
+		     suffixes[power]);
+	    if (4 < strlen (buf))
+	      sprintf (buf, "%.0f%c",
+		       adjust_value (inexact_style, damt * 10) / 10,
+		       suffixes[power]);
+	  }
+
+	return buf;
+      }
+  }
+
+  /* Use power of BASE notation if adjusted AMT is large enough.  */
+
+  if (base && base <= amt)
+    {
+      power = 0;
+
+      do
+	{
+	  int r10 = (amt % base) * 10 + tenths;
+	  int r2 = (r10 % base) * 2 + (rounding >> 1);
+	  amt /= base;
+	  tenths = r10 / base;
+	  rounding = (r2 < base
+		      ? 0 < r2 + rounding
+		      : 2 + (base < r2 + rounding));
+	  power++;
+	}
+      while (base <= amt && power < sizeof suffixes - 1);
+
+      *--p = suffixes[power];
+
+      if (amt < 10)
+	{
+	  if (2 * (1 - (int) inexact_style)
+	      < rounding + (tenths & (inexact_style == human_round_to_even)))
+	    {
+	      tenths++;
+	      rounding = 0;
+
+	      if (tenths == 10)
+		{
+		  amt++;
+		  tenths = 0;
+		}
+	    }
+
+	  if (amt < 10)
+	    {
+	      *--p = '0' + tenths;
+	      *--p = '.';
+	      tenths = rounding = 0;
+	    }
+	}
+    }
+
+  if (inexact_style == human_ceiling
+      ? 0 < tenths + rounding
+      : inexact_style == human_round_to_even
+      ? 5 < tenths + (2 < rounding + (amt & 1))
+      : /* inexact_style == human_floor */ 0)
+    {
+      amt++;
+
+      if (amt == base && power < sizeof suffixes - 1)
+	{
+	  *p = suffixes[power + 1];
+	  *--p = '0';
+	  *--p = '.';
+	  amt = 1;
+	}
+    }
+
+  do
+    *--p = '0' + (int) (amt % 10);
+  while ((amt /= 10) != 0);
+
+  return p;
+}
+
+
+/* The default block size used for output.  This number may change in
+   the future as disks get larger.  */
+#ifndef DEFAULT_BLOCK_SIZE
+# define DEFAULT_BLOCK_SIZE 1024
+#endif
+
+static char const *const block_size_args[] = { "human-readable", "si", 0 };
+static int const block_size_types[] = { -1024, -1000 };
+
+static int
+default_block_size (void)
+{
+  return getenv ("POSIXLY_CORRECT") ? 512 : DEFAULT_BLOCK_SIZE;
+}
+
+static strtol_error
+humblock (char const *spec, int *block_size)
+{
+  int i;
+
+  if (! spec && ! (spec = getenv ("BLOCK_SIZE")))
+    *block_size = default_block_size ();
+  else if (0 <= (i = ARGMATCH (spec, block_size_args, block_size_types)))
+    *block_size = block_size_types[i];
+  else
+    {
+      char *ptr;
+      unsigned long val;
+      strtol_error e = xstrtoul (spec, &ptr, 0, &val, "eEgGkKmMpPtTyYzZ0");
+      if (e != LONGINT_OK)
+	return e;
+      if (*ptr)
+	return LONGINT_INVALID_SUFFIX_CHAR;
+      if ((int) val < 0 || val != (int) val)
+	return LONGINT_OVERFLOW;
+      *block_size = (int) val;
+    }
+
+  return LONGINT_OK;
+}
+
+void
+human_block_size (char const *spec, int report_errors, int *block_size)
+{
+  strtol_error e = humblock (spec, block_size);
+  if (*block_size == 0)
+    {
+      *block_size = default_block_size ();
+      e = LONGINT_INVALID;
+    }
+  if (e != LONGINT_OK && report_errors)
+    STRTOL_FATAL_ERROR (spec, _("block size"), e);
+}
--- a/lib/human.h
+++ b/lib/human.h
@@ -0,0 +1,39 @@
+#ifndef HUMAN_H_
+# define HUMAN_H_ 1
+
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# if HAVE_INTTYPES_H
+#  include <inttypes.h>
+# endif
+
+/* A conservative bound on the maximum length of a human-readable string.
+   The output can be the product of the largest uintmax_t and the largest int,
+   so add their sizes before converting to a bound on digits.  */
+# define LONGEST_HUMAN_READABLE ((sizeof (uintmax_t) + sizeof (int)) \
+				 * CHAR_BIT / 3)
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+enum human_inexact_style
+{
+  human_floor = -1,
+  human_round_to_even = 0,
+  human_ceiling = 1
+};
+
+char *human_readable PARAMS ((uintmax_t, char *, int, int));
+char *human_readable_inexact PARAMS ((uintmax_t, char *, int, int,
+				      enum human_inexact_style));
+
+void human_block_size PARAMS ((char const *, int, int *));
+
+#endif /* HUMAN_H_ */
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -1,5 +1,6 @@
 /* idcache.c -- map user and group IDs, cached for speed
-   Copyright (C) 1985, 1988, 1989, 1990 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998 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
@@ -12,23 +13,28 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; 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 <stdio.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>

-#if defined(USG) || defined(STDC_HEADERS)
-#include <string.h>
+#if STDC_HEADERS || HAVE_STRING_H
+# include <string.h>
 #else
-#include <strings.h>
+# include <strings.h>
 #endif

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif
+
 #ifndef _POSIX_VERSION
 struct passwd *getpwuid ();
 struct passwd *getpwnam ();
@@ -39,6 +45,10 @@ struct group *getgrnam ();
 char *xmalloc ();
 char *xstrdup ();

+#ifdef __DJGPP__
+static char digits[] = "0123456789";
+#endif
+
 struct userid
 {
  union
@@ -55,16 +65,13 @@ static struct userid *user_alist;
 /* The members of this list have names not in the local passwd file.  */
 static struct userid *nouser_alist;

-/* Translate UID to a login name or a stringified number,
-   with cache.  */
+/* Translate UID to a login name, with cache, or NULL if unresolved.  */

 char *
-getuser (uid)
-     uid_t uid;
+getuser (uid_t uid)
 {
  register struct userid *tail;
  struct passwd *pwent;
-  char usernum_string[20];

  for (tail = user_alist; tail; tail = tail->next)
    if (tail->id.u == uid)
@@ -73,13 +80,7 @@ getuser (uid)
  pwent = getpwuid (uid);
  tail = (struct userid *) xmalloc (sizeof (struct userid));
  tail->id.u = uid;
-  if (pwent == 0)
-    {
-      sprintf (usernum_string, "%u", (unsigned) uid);
-      tail->name = xstrdup (usernum_string);
-    }
-  else
-    tail->name = xstrdup (pwent->pw_name);
+  tail->name = pwent ? xstrdup (pwent->pw_name) : NULL;

  /* Add to the head of the list, so most recently used is first.  */
  tail->next = user_alist;
@@ -93,8 +94,7 @@ getuser (uid)
   so we don't keep looking them up.)  */

 uid_t *
-getuidbyname (user)
-     char *user;
+getuidbyname (const char *user)
 {
  register struct userid *tail;
  struct passwd *pwent;
@@ -110,6 +110,15 @@ getuidbyname (user)
      return 0;

  pwent = getpwnam (user);
+#ifdef __DJGPP__
+  /* We need to pretend to be the user USER, to make
+     pwd functions know about an arbitrary user name.  */
+  if (!pwent && strspn (user, digits) < strlen (user))
+    {
+      setenv ("USER", user, 1);
+      pwent = getpwnam (user);	/* now it will succeed */
+    }
+#endif

  tail = (struct userid *) xmalloc (sizeof (struct userid));
  tail->name = xstrdup (user);
@@ -132,16 +141,13 @@ getuidbyname (user)
 static struct userid *group_alist;
 static struct userid *nogroup_alist;

-/* Translate GID to a group name or a stringified number,
-   with cache.  */
+/* Translate GID to a group name, with cache, or NULL if unresolved.  */

 char *
-getgroup (gid)
-     gid_t gid;
+getgroup (gid_t gid)
 {
  register struct userid *tail;
  struct group *grent;
-  char groupnum_string[20];

  for (tail = group_alist; tail; tail = tail->next)
    if (tail->id.g == gid)
@@ -150,13 +156,7 @@ getgroup (gid)
  grent = getgrgid (gid);
  tail = (struct userid *) xmalloc (sizeof (struct userid));
  tail->id.g = gid;
-  if (grent == 0)
-    {
-      sprintf (groupnum_string, "%u", (unsigned int) gid);
-      tail->name = xstrdup (groupnum_string);
-    }
-  else
-    tail->name = xstrdup (grent->gr_name);
+  tail->name = grent ? xstrdup (grent->gr_name) : NULL;

  /* Add to the head of the list, so most recently used is first.  */
  tail->next = group_alist;
@@ -164,14 +164,13 @@ getgroup (gid)
  return tail->name;
 }

-/* Translate GROUP to a UID, with cache.
+/* Translate GROUP to a GID, with cache.
   Return NULL if there is no such group.
   (We also cache which group names have no group entry,
   so we don't keep looking them up.)  */

 gid_t *
-getgidbyname (group)
-     char *group;
+getgidbyname (const char *group)
 {
  register struct userid *tail;
  struct group *grent;
@@ -187,6 +186,15 @@ getgidbyname (group)
      return 0;

  grent = getgrnam (group);
+#ifdef __DJGPP__
+  /* We need to pretend to belong to group GROUP, to make
+     grp functions know about any arbitrary group name.  */
+  if (!grent && strspn (group, digits) < strlen (group))
+    {
+      setenv ("GROUP", group, 1);
+      grent = getgrnam (group);	/* now it will succeed */
+    }
+#endif

  tail = (struct userid *) xmalloc (sizeof (struct userid));
  tail->name = xstrdup (group);
@@ -199,7 +207,7 @@ getgidbyname (group)
      group_alist = tail;
      return &tail->id.g;
    }
-  
+
  tail->next = nogroup_alist;
  nogroup_alist = tail;
  return 0;
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -1,5 +1,5 @@
 /* isdir.c -- determine whether a directory exists
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998 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
@@ -12,30 +12,29 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

 #include <sys/types.h>
 #include <sys/stat.h>

-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
-#endif /* STAT_MACROS_BROKEN.  */
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
+#endif

-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#if !defined S_ISDIR && defined S_IFDIR
+# define S_ISDIR(Mode) (((Mode) & S_IFMT) == S_IFDIR)
 #endif

 /* If PATH is an existing directory or symbolic link to a directory,
   return nonzero, else 0.  */

 int
-isdir (path)
-     char *path;
+isdir (const char *path)
 {
  struct stat stats;

--- a/lib/lchown.c
+++ b/lib/lchown.c
@@ -0,0 +1,56 @@
+/* Provide a stub lchown function for systems that lack it.
+   Copyright (C) 1998, 1999 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 Jim Meyering */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#include "lchown.h"
+
+#ifdef STAT_MACROS_BROKEN
+# undef S_ISLNK
+#endif
+#if !defined(S_ISLNK) && defined(S_IFLNK)
+# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+#endif
+
+/* Declare chown to avoid a warning.  Don't include unistd.h,
+   because it may have a conflicting prototype for lchown.  */
+int chown ();
+
+/* Work just like chown, except when FILE is a symbolic link.
+   In that case, set errno to ENOSYS and return -1.  */
+
+int
+lchown (const char *file, uid_t uid, gid_t gid)
+{
+  struct stat stats;
+
+  if (lstat (file, &stats) == 0 && S_ISLNK (stats.st_mode))
+    {
+      errno = ENOSYS;
+      return -1;
+    }
+
+  return chown (file, uid, gid);
+}
--- a/lib/lchown.h
+++ b/lib/lchown.h
@@ -0,0 +1,9 @@
+/* Some systems don't have ENOSYS.  */
+#ifndef ENOSYS
+# ifdef ENOTSUP
+#  define ENOSYS ENOTSUP
+# else
+/* Some systems don't have ENOTSUP either.  */
+#  define ENOSYS EINVAL
+# endif
+#endif
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -1,5 +1,5 @@
 /* linebuffer.c -- read arbitrarily long lines
-   Copyright (C) 1986, 1991 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999 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
@@ -12,12 +12,17 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 Richard Stallman. */

+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdio.h>
+#include <sys/types.h>
 #include "linebuffer.h"

 char *xmalloc ();
@@ -27,8 +32,7 @@ void free ();
 /* Initialize linebuffer LINEBUFFER for use. */

 void
-initbuffer (linebuffer)
-     struct linebuffer *linebuffer;
+initbuffer (struct linebuffer *linebuffer)
 {
  linebuffer->length = 0;
  linebuffer->size = 200;
@@ -36,55 +40,52 @@ initbuffer (linebuffer)
 }

 /* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
-   Remove any newline.  Does not null terminate.
+   Keep the newline; append a newline if it's the last line of a file
+   that ends in a non-newline character.  Do not null terminate.
   Return LINEBUFFER, except at end of file return 0.  */

 struct linebuffer *
-readline (linebuffer, stream)
-     struct linebuffer *linebuffer;
-     FILE *stream;
+readline (struct linebuffer *linebuffer, FILE *stream)
 {
  int c;
  char *buffer = linebuffer->buffer;
  char *p = linebuffer->buffer;
  char *end = buffer + linebuffer->size; /* Sentinel. */

-  if (feof (stream))
-    {
-      linebuffer->length = 0;
-      return 0;
-    }
+  if (feof (stream) || ferror (stream))
+    return 0;

-  while (1)
+  do
    {
      c = getc (stream);
+      if (c == EOF)
+	{
+	  if (p == buffer)
+	    return 0;
+	  if (p[-1] == '\n')
+	    break;
+	  c = '\n';
+	}
      if (p == end)
 	{
 	  linebuffer->size *= 2;
 	  buffer = (char *) xrealloc (buffer, linebuffer->size);
-	  p += buffer - linebuffer->buffer;
+	  p = p - linebuffer->buffer + buffer;
 	  linebuffer->buffer = buffer;
 	  end = buffer + linebuffer->size;
 	}
-      if (c == EOF || c == '\n')
-	break;
      *p++ = c;
    }
+  while (c != '\n');

-  if (feof (stream) && p == buffer)
-    {
-      linebuffer->length = 0;
-      return 0;
-    }
-  linebuffer->length = p - linebuffer->buffer;
+  linebuffer->length = p - buffer;
  return linebuffer;
 }

 /* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */

 void
-freebuffer (linebuffer)
-     struct linebuffer *linebuffer;
+freebuffer (struct linebuffer *linebuffer)
 {
  free (linebuffer->buffer);
  free (linebuffer);
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -1,5 +1,5 @@
 /* linebuffer.h -- declarations for reading arbitrarily long lines
-   Copyright (C) 1986, 1991 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999 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
@@ -12,32 +12,40 @@
   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.  */
-
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if !defined LINEBUFFER_H
+# define LINEBUFFER_H
+
 /* A `struct linebuffer' holds a line of text. */

 struct linebuffer
 {
-  long size;			/* Allocated. */
-  long length;			/* Used. */
+  size_t size;			/* Allocated. */
+  size_t length;		/* Used. */
  char *buffer;
 };

-#undef __P
-#if defined (__STDC__) && __STDC__
-#define	__P(x) x
-#else
-#define	__P(x) ()
-#endif
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif

 /* Initialize linebuffer LINEBUFFER for use. */
-void initbuffer __P ((struct linebuffer *linebuffer));
+void initbuffer PARAMS ((struct linebuffer *linebuffer));

 /* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
-   Remove any newline.  Does not null terminate.
+   Keep the newline; append a newline if it's the last line of a file
+   that ends in a non-newline character.  Do not null terminate.
   Return LINEBUFFER, except at end of file return 0.  */
-struct linebuffer *readline __P ((struct linebuffer *linebuffer, FILE *stream));
+struct linebuffer *readline PARAMS ((struct linebuffer *linebuffer,
+				     FILE *stream));

 /* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
-void freebuffer __P ((struct linebuffer *));
+void freebuffer PARAMS ((struct linebuffer *));
+
+#endif /* LINEBUFFER_H */
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -0,0 +1,228 @@
+/* Determine a canonical name for the current locale's character encoding.
+
+   Copyright (C) 2000 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
+   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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 Bruno Haible <haible@clisp.cons.org>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#include <stdio.h>
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#else
+# if HAVE_SETLOCALE
+#  include <locale.h>
+# endif
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+   possible multithread problem in the function get_charset_aliases. If we
+   are running in a threaded environment, and if two threads initialize
+   'charset_aliases' simultaneously, both will produce the same value,
+   and everything will be ok if the two assignments to 'charset_aliases'
+   are atomic. But I don't know what will happen if the two assignments mix.  */
+/* Pointer to the contents of the charset.alias file, if it has already been
+   read, else NULL.  Its format is:
+   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
+static char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file.  */
+static const char *
+get_charset_aliases ()
+{
+  char *cp;
+
+  cp = charset_aliases;
+  if (cp == NULL)
+    {
+      FILE *fp;
+      const char *dir = LIBDIR;
+      const char *base = "charset.alias";
+      char *file_name;
+
+      /* Concatenate dir and base into freshly allocated file_name.  */
+      {
+	size_t dir_len = strlen (dir);
+	size_t base_len = strlen (base);
+	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+	if (file_name != NULL)
+	  {
+	    memcpy (file_name, dir, dir_len);
+	    if (add_slash)
+	      file_name[dir_len] = DIRECTORY_SEPARATOR;
+	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+	  }
+      }
+
+      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+	/* Out of memory or file not found, treat it as empty.  */
+	cp = "";
+      else
+	{
+	  /* Parse the file's contents.  */
+	  int c;
+	  char buf1[50+1];
+	  char buf2[50+1];
+	  char *res_ptr = NULL;
+	  size_t res_size = 0;
+	  size_t l1, l2;
+
+	  for (;;)
+	    {
+	      c = getc (fp);
+	      if (c == EOF)
+		break;
+	      if (c == '\n' || c == ' ' || c == '\t')
+		continue;
+	      if (c == '#')
+		{
+		  /* Skip comment, to end of line.  */
+		  do
+		    c = getc (fp);
+		  while (!(c == EOF || c == '\n'));
+		  if (c == EOF)
+		    break;
+		  continue;
+		}
+	      ungetc (c, fp);
+	      if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
+		break;
+	      l1 = strlen (buf1);
+	      l2 = strlen (buf2);
+	      if (res_size == 0)
+		{
+		  res_size = l1 + 1 + l2 + 1;
+		  res_ptr = malloc (res_size + 1);
+		}
+	      else
+		{
+		  res_size += l1 + 1 + l2 + 1;
+		  res_ptr = realloc (res_ptr, res_size + 1);
+		}
+	      if (res_ptr == NULL)
+		{
+		  /* Out of memory. */
+		  res_size = 0;
+		  break;
+		}
+	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
+	    }
+	  fclose (fp);
+	  if (res_size == 0)
+	    cp = "";
+	  else
+	    {
+	      *(res_ptr + res_size) = '\0';
+	      cp = res_ptr;
+	    }
+	}
+
+      charset_aliases = cp;
+      if (file_name != NULL)
+	free (file_name);
+    }
+
+  return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+   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.  */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset ()
+{
+  const char *codeset;
+  const char *aliases;
+
+#if HAVE_LANGINFO_CODESET
+
+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+  codeset = nl_langinfo (CODESET);
+
+#else
+
+  /* On old systems which lack it, use setlocale and getenv.  */
+  const char *locale = NULL;
+
+# if HAVE_SETLOCALE
+  locale = setlocale (LC_CTYPE, NULL);
+# endif
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+    }
+
+  /* On some old systems, one used to set locale = "iso8859_1". On others,
+     you set it to "language_COUNTRY.charset". In any case, we resolve it
+     through the charset.alias file.  */
+  codeset = locale;
+
+#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;
+	  }
+    }
+
+  return codeset;
+}
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,5 +1,5 @@
 /* Utility to accept --help and --version options as unobtrusively as possible.
-   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999, 2000 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
@@ -12,18 +12,30 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-/* Jim Meyering (meyering@comco.com) */
+/* Written by Jim Meyering.  */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

 #include <stdio.h>
 #include <getopt.h>
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
 #include "long-options.h"
+#include "version-etc.h"
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif

 static struct option const long_options[] =
 {
@@ -36,33 +48,32 @@ static struct option const long_options[] =
   Be careful not to gobble up `--'.  */

 void
-parse_long_options (argc, argv, command_name, version_string, usage)
-     int argc;
-     char **argv;
-     const char *command_name;
-     const char *version_string;
-     void (*usage)();
+parse_long_options (int argc,
+		    char **argv,
+		    const char *command_name,
+		    const char *package,
+		    const char *version,
+		    const char *authors,
+		    void (*usage_func)())
 {
  int c;
  int saved_opterr;
-  int saved_optind;

  saved_opterr = opterr;
-  saved_optind = optind;

  /* Don't print an error message for unrecognized options.  */
  opterr = 0;

  if (argc == 2
-      && (c = getopt_long (argc, argv, "+", long_options, (int *) 0)) != EOF)
+      && (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
    {
      switch (c)
 	{
 	case 'h':
-	  (*usage) (0);
+	  (*usage_func) (0);

 	case 'v':
-	  printf ("%s - %s\n", command_name, version_string);
+	  version_etc (stdout, command_name, package, version, authors);
 	  exit (0);

 	default:
@@ -74,6 +85,7 @@ parse_long_options (argc, argv, command_name, version_string, usage)
  /* Restore previous value.  */
  opterr = saved_opterr;

-  /* Restore optind in case it has advanced past a leading `--'.  */
-  optind = saved_optind;
+  /* Reset this to zero so that getopt internals get initialized from
+     the probably-new parameters when/if getopt is called later.  */
+  optind = 0;
 }
--- a/lib/long-options.h
+++ b/lib/long-options.h
@@ -1,10 +1,35 @@
-#undef __P
-#if defined (__STDC__) && __STDC__
-#define __P(args) args
-#else
-#define __P(args) ()
+/* long-options.h -- declaration for --help- and --version-handling function.
+   Copyright (C) 1993, 1994, 1998, 1999 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 Jim Meyering.  */
+
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
 #endif

 void
-  parse_long_options __P ((int _argc, char **_argv, const char *_command_name,
-			   const char *_version_string, void (*_usage) (int)));
+  parse_long_options PARAMS ((int _argc,
+			      char **_argv,
+			      const char *_command_name,
+			      const char *_package,
+			      const char *_version,
+			      const char *_authors,
+			      void (*_usage) (int)));
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -1,5 +1,5 @@
 /* makepath.c -- Ensure that a directory path exists.
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999, 2000 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
@@ -12,58 +12,61 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 David MacKenzie <djm@gnu.ai.mit.edu> and
-   Jim Meyering <meyering@cs.utexas.edu>.  */
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Jim Meyering.  */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif

-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
- #pragma alloca
+#if __GNUC__
+# define alloca __builtin_alloca
 #else
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #  pragma alloca
+#  else
 char *alloca ();
-#endif
-#endif
+#  endif
+# endif
 #endif

 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif

-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
-#endif /* STAT_MACROS_BROKEN.  */
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
+#endif

 #if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif

-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#ifndef S_IRWXUGO
+# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
 #endif

-#ifdef HAVE_ERRNO_H
-#include <errno.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+#endif
+
+#if HAVE_ERRNO_H
+# include <errno.h>
 #endif

 #ifndef errno
 extern int errno;
 #endif

-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>
@@ -72,14 +75,125 @@ extern int errno;
 # endif
 #endif

-#ifdef __MSDOS__
-typedef int uid_t;
-typedef int gid_t;
+#ifndef S_ISUID
+# define S_ISUID 04000
+#endif
+#ifndef S_ISGID
+# define S_ISGID 02000
+#endif
+#ifndef S_ISVTX
+# define S_ISVTX 01000
+#endif
+#ifndef S_IRUSR
+# define S_IRUSR 0200
+#endif
+#ifndef S_IWUSR
+# define S_IWUSR 0200
+#endif
+#ifndef S_IXUSR
+# define S_IXUSR 0100
 #endif

+#ifndef S_IRWXU
+# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
+#endif
+
+#define WX_USR (S_IWUSR | S_IXUSR)
+
+/* Include this before libintl.h so we get our definition of PARAMS. */
 #include "makepath.h"

-void error ();
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+
+#include "save-cwd.h"
+#include "error.h"
+#include "quote.h"
+
+void strip_trailing_slashes ();
+
+#define CLEANUP_CWD					\
+  do							\
+    {							\
+      /* We're done operating on basename_dir.		\
+	 Restore working directory.  */			\
+      if (do_chdir)					\
+	{						\
+	  int _fail = restore_cwd (&cwd, NULL, NULL);	\
+	  free_cwd (&cwd);				\
+	  if (_fail)					\
+	    return 1;					\
+	}						\
+    }							\
+  while (0)
+
+#define CLEANUP						\
+  do							\
+    {							\
+      umask (oldmask);					\
+      CLEANUP_CWD;					\
+    }							\
+  while (0)
+
+/* Attempt to create directory DIR (aka DIRPATH) with the specified MODE.
+   If CREATED_DIR_P is non-NULL, set *CREATED_DIR_P to non-zero if this
+   function creates DIR and to zero otherwise.  Give a diagnostic and
+   return non-zero if DIR cannot be created or cannot be determined to
+   exist already.  Use DIRPATH in any diagnostic, not DIR.
+   Note that if DIR already exists, this function will return zero
+   (indicating success) and will set *CREATED_DIR_P to zero.  */
+
+static int
+make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
+{
+  int fail = 0;
+  int created_dir;
+
+  created_dir = (mkdir (dir, mode) == 0);
+
+  if (!created_dir)
+    {
+      struct stat stats;
+      int saved_errno = errno;
+
+      /* The mkdir and stat calls below may appear to be reversed.
+	 They are not.  It is important to call mkdir first and then to
+	 call stat (to distinguish the three cases) only if mkdir fails.
+	 The alternative to this approach is to `stat' each directory,
+	 then to call mkdir if it doesn't exist.  But if some other process
+	 were to create the directory between the stat & mkdir, the mkdir
+	 would fail with EEXIST.  */
+
+      if (stat (dir, &stats))
+	{
+	  error (0, saved_errno, _("cannot create directory %s"),
+		 quote (dirpath));
+	  fail = 1;
+	}
+      else if (!S_ISDIR (stats.st_mode))
+	{
+	  error (0, 0, _("%s exists but is not a directory"), quote (dirpath));
+	  fail = 1;
+	}
+      else
+	{
+	  /* DIR (aka DIRPATH) already exists and is a directory. */
+	}
+    }
+
+  if (created_dir_p)
+    *created_dir_p = created_dir;
+
+  return fail;
+}

 /* Ensure that the directory ARGPATH exists.
   Remove any trailing slashes from ARGPATH before calling this function.
@@ -99,7 +213,6 @@ void error ();
   Return 0 if ARGPATH exists as a directory with the proper
   ownership and permissions when done, otherwise 1.  */

-#if __STDC__
 int
 make_path (const char *argpath,
 	   int mode,
@@ -108,30 +221,11 @@ make_path (const char *argpath,
 	   gid_t group,
 	   int preserve_existing,
 	   const char *verbose_fmt_string)
-#else
-int
-make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
-	   verbose_fmt_string)
-     const char *argpath;
-     int mode;
-     int parent_mode;
-     uid_t owner;
-     gid_t group;
-     int preserve_existing;
-     const char *verbose_fmt_string;
-#endif
 {
-  char *dirpath;		/* A copy we can scribble NULs on.  */
  struct stat stats;
  int retval = 0;
-  int oldmask = umask (0);

-  /* FIXME: move this alloca and strcpy into the if-block.
-     Set dirpath to argpath in the else-block.  */
-  dirpath = (char *) alloca (strlen (argpath) + 1);
-  strcpy (dirpath, argpath);
-
-  if (stat (dirpath, &stats))
+  if (stat (argpath, &stats))
    {
      char *slash;
      int tmp_mode;		/* Initial perms for leading dirs.  */
@@ -142,15 +236,27 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	struct ptr_list *next;
      };
      struct ptr_list *p, *leading_dirs = NULL;
+      int do_chdir;		/* Whether to chdir before each mkdir.  */
+      struct saved_cwd cwd;
+      char *basename_dir;
+      char *dirpath;
+
+      /* Temporarily relax umask in case it's overly restrictive.  */
+      mode_t oldmask = umask (0);
+
+      /* Make a copy of ARGPATH that we can scribble NULs on.  */
+      dirpath = (char *) alloca (strlen (argpath) + 1);
+      strcpy (dirpath, argpath);
+      strip_trailing_slashes (dirpath);

      /* If leading directories shouldn't be writable or executable,
 	 or should have set[ug]id or sticky bits set and we are setting
 	 their owners, we need to fix their permissions after making them.  */
-      if (((parent_mode & 0300) != 0300)
-	  || (owner != (uid_t) -1 && group != (gid_t) -1
-	      && (parent_mode & 07000) != 0))
+      if (((parent_mode & WX_USR) != WX_USR)
+	  || ((owner != (uid_t) -1 || group != (gid_t) -1)
+	      && (parent_mode & (S_ISUID | S_ISGID | S_ISVTX)) != 0))
 	{
-	  tmp_mode = 0700;
+	  tmp_mode = S_IRWXU;
 	  re_protect = 1;
 	}
      else
@@ -159,49 +265,84 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	  re_protect = 0;
 	}

+      /* If we can record the current working directory, we may be able
+	 to do the chdir optimization.  */
+      do_chdir = !save_cwd (&cwd);
+
+      /* If we've saved the cwd and DIRPATH is an absolute pathname,
+	 we must chdir to `/' in order to enable the chdir optimization.
+         So if chdir ("/") fails, turn off the optimization.  */
+      if (do_chdir && *dirpath == '/' && chdir ("/") < 0)
+	do_chdir = 0;
+
      slash = dirpath;
+
+      /* Skip over leading slashes.  */
      while (*slash == '/')
 	slash++;
-      while ((slash = strchr (slash, '/')))
+
+      while (1)
 	{
+	  int newly_created_dir;
+	  int fail;
+
+	  /* slash points to the leftmost unprocessed component of dirpath.  */
+	  basename_dir = slash;
+
+	  slash = strchr (slash, '/');
+	  if (slash == NULL)
+	    break;
+
+	  /* If we're *not* doing chdir before each mkdir, then we have to refer
+	     to the target using the full (multi-component) directory name.  */
+	  if (!do_chdir)
+	    basename_dir = dirpath;
+
 	  *slash = '\0';
-	  if (stat (dirpath, &stats))
+	  fail = make_dir (basename_dir, dirpath, tmp_mode, &newly_created_dir);
+	  if (fail)
 	    {
-	      if (mkdir (dirpath, tmp_mode))
+	      CLEANUP;
+	      return 1;
+	    }
+
+	  if (newly_created_dir)
+	    {
+	      if (verbose_fmt_string)
+		error (0, 0, verbose_fmt_string, quote (dirpath));
+
+	      if ((owner != (uid_t) -1 || group != (gid_t) -1)
+		  && chown (basename_dir, owner, group)
+#if defined(AFS) && defined (EPERM)
+		  && errno != EPERM
+#endif
+		  )
 		{
-		  error (0, errno, "cannot create directory `%s'", dirpath);
-		  umask (oldmask);
+		  error (0, errno, _("cannot change owner and/or group of %s"),
+			 quote (dirpath));
+		  CLEANUP;
 		  return 1;
 		}
-	      else
-		{
-		  if (verbose_fmt_string != NULL)
-		    error (0, 0, verbose_fmt_string, dirpath);

-		  if (owner != (uid_t) -1 && group != (gid_t) -1
-		      && chown (dirpath, owner, group)
-#if defined(AFS) && defined (EPERM)
-		      && errno != EPERM
-#endif
-		      )
-		    {
-		      error (0, errno, "%s", dirpath);
-		      retval = 1;
-		    }
-		  if (re_protect)
-		    {
-		      struct ptr_list *new = (struct ptr_list *)
-			alloca (sizeof (struct ptr_list));
-		      new->dirname_end = slash;
-		      new->next = leading_dirs;
-		      leading_dirs = new;
-		    }
+	      if (re_protect)
+		{
+		  struct ptr_list *new = (struct ptr_list *)
+		    alloca (sizeof (struct ptr_list));
+		  new->dirname_end = slash;
+		  new->next = leading_dirs;
+		  leading_dirs = new;
 		}
 	    }
-	  else if (!S_ISDIR (stats.st_mode))
+
+	  /* If we were able to save the initial working directory,
+	     then we can use chdir to change into each directory before
+	     creating an entry in that directory.  This avoids making
+	     stat and mkdir process O(n^2) file name components.  */
+	  if (do_chdir && chdir (basename_dir) < 0)
 	    {
-	      error (0, 0, "`%s' exists but is not a directory", dirpath);
-	      umask (oldmask);
+	      error (0, errno, _("cannot chdir to directory, %s"),
+		     quote (dirpath));
+	      CLEANUP;
 	      return 1;
 	    }

@@ -213,40 +354,52 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	    slash++;
 	}

+      if (!do_chdir)
+	basename_dir = dirpath;
+
      /* We're done making leading directories.
 	 Create the final component of the path.  */

-      /* The path could end in "/." or contain "/..", so test
-	 if we really have to create the directory.  */
-
-      if (stat (dirpath, &stats) && mkdir (dirpath, mode))
+      if (make_dir (basename_dir, dirpath, mode, NULL))
 	{
-	  error (0, errno, "cannot create directory `%s'", dirpath);
-	  umask (oldmask);
+	  CLEANUP;
 	  return 1;
 	}
-      if (verbose_fmt_string != NULL)
-	error (0, 0, verbose_fmt_string, dirpath);

-      if (owner != (uid_t) -1 && group != (gid_t) -1)
+      /* Done creating directories.  Restore original umask.  */
+      umask (oldmask);
+
+      if (verbose_fmt_string != NULL)
+	error (0, 0, verbose_fmt_string, quote (dirpath));
+
+      if (owner != (uid_t) -1 || group != (gid_t) -1)
 	{
-	  if (chown (dirpath, owner, group)
+	  if (chown (basename_dir, owner, group)
 #ifdef AFS
 	      && errno != EPERM
 #endif
 	      )
 	    {
-	      error (0, errno, "%s", dirpath);
-	      retval = 1;
-	    }
-	  /* chown may have turned off some permission bits we wanted.  */
-	  if ((mode & 07000) != 0 && chmod (dirpath, mode))
-	    {
-	      error (0, errno, "%s", dirpath);
+	      error (0, errno, _("cannot change owner and/or group of %s"),
+		     quote (dirpath));
 	      retval = 1;
 	    }
 	}

+      /* The above chown may have turned off some permission bits in MODE.
+	 Another reason we may have to use chmod here is that mkdir(2) is
+	 required to honor only the file permission bits.  In particular,
+	 it need not honor the `special' bits, so if MODE includes any
+	 special bits, set them here.  */
+      if ((mode & ~S_IRWXUGO)
+	  && chmod (basename_dir, mode))
+	{
+	  error (0, errno, _("cannot change permissions of %s"), quote (dirpath));
+	  retval = 1;
+	}
+
+      CLEANUP_CWD;
+
      /* If the mode for leading directories didn't include owner "wx"
 	 privileges, we have to reset their protections to the correct
 	 value.  */
@@ -255,7 +408,8 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	  *(p->dirname_end) = '\0';
 	  if (chmod (dirpath, parent_mode))
 	    {
-	      error (0, errno, "%s", dirpath);
+	      error (0, errno, "cannot change permissions of %s",
+		     quote (dirpath));
 	      retval = 1;
 	    }
 	}
@@ -264,10 +418,11 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
    {
      /* We get here if the entire path already exists.  */

+      const char *dirpath = argpath;
+
      if (!S_ISDIR (stats.st_mode))
 	{
-	  error (0, 0, "`%s' exists but is not a directory", dirpath);
-	  umask (oldmask);
+	  error (0, 0, _("%s exists but is not a directory"), quote (dirpath));
 	  return 1;
 	}

@@ -279,24 +434,25 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	     On System V, users can give away files with chown and then not
 	     be able to chmod them.  So don't give files away.  */

-	  if (owner != (uid_t) -1 && group != (gid_t) -1
+	  if ((owner != (uid_t) -1 || group != (gid_t) -1)
 	      && chown (dirpath, owner, group)
 #ifdef AFS
 	      && errno != EPERM
 #endif
 	      )
 	    {
-	      error (0, errno, "%s", dirpath);
+	      error (0, errno, _("cannot change owner and/or group of %s"),
+		     quote (dirpath));
 	      retval = 1;
 	    }
 	  if (chmod (dirpath, mode))
 	    {
-	      error (0, errno, "%s", dirpath);
+	      error (0, errno, _("cannot change permissions of %s"),
+				 quote (dirpath));
 	      retval = 1;
 	    }
 	}
    }

-  umask (oldmask);
  return retval;
 }
--- a/lib/makepath.h
+++ b/lib/makepath.h
@@ -1,15 +1,16 @@
-#if __STDC__
-#undef __P
-#define __P(args) args
-#else
-#define __P(args) ()
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
 #endif

 int
-  make_path __P ((const char *_argpath,
-		  int _mode,
-		  int _parent_mode,
-		  uid_t _owner,
-		  gid_t _group,
-		  int _preserve_existing,
-		  const char *_verbose_fmt_string));
+make_path PARAMS ((const char *_argpath,
+		   int _mode,
+		   int _parent_mode,
+		   uid_t _owner,
+		   gid_t _group,
+		   int _preserve_existing,
+		   const char *_verbose_fmt_string));
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -0,0 +1,38 @@
+/* Work around bug on some systems where malloc (0) fails.
+   Copyright (C) 1997, 1998 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 Jim Meyering */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef malloc
+
+#include <sys/types.h>
+
+char *malloc ();
+
+/* Allocate an N-byte block of memory from the heap.
+   If N is zero, allocate a 1-byte block.  */
+
+char *
+rpl_malloc (size_t n)
+{
+  if (n == 0)
+    n = 1;
+  return malloc (n);
+}
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -0,0 +1,207 @@
+/* Determine the number of screen columns needed for a string.
+   Copyright (C) 2000 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 Bruno Haible <haible@clisp.cons.org>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Get MB_LEN_MAX.  */
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+/* Get MB_CUR_MAX.  */
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+
+/* Get isprint().  */
+#include <ctype.h>
+
+/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  */
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
+/* Get iswprint().  */
+#if HAVE_WCTYPE_H
+# include <wctype.h>
+#endif
+#if !defined iswprint && !HAVE_ISWPRINT
+# define iswprint(wc) 1
+#endif
+
+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
+#if HAVE_MBRTOWC && defined mbstate_t
+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
+# define mbsinit(ps) 1
+#endif
+
+#ifndef HAVE_DECL_WCWIDTH
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_WCWIDTH
+int wcwidth ();
+#endif
+
+#ifndef wcwidth
+# if !HAVE_WCWIDTH
+/* wcwidth doesn't exist, so assume all printable characters have
+   width 1.  */
+#  define wcwidth(wc) ((wc) == 0 ? 0 : iswprint (wc) ? 1 : -1)
+# endif
+#endif
+
+/* Get ISPRINT.  */
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
+# undef ISASCII
+# define ISASCII(c) 1
+#else
+# define ISASCII(c) isascii (c)
+#endif
+/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
+#undef ISPRINT
+#define ISPRINT(c) (ISASCII (c) && isprint (c))
+
+#include "mbswidth.h"
+
+/* Returns the number of columns needed to represent the multibyte
+   character string pointed to by STRING.  If a non-printable character
+   occurs, -1 is returned, unless MBSW_ACCEPT_UNPRINTABLE is specified.
+   With flags = 0, this is the multibyte analogon of the wcswidth function.  */
+int
+mbswidth (const char *string, int flags)
+{
+  return mbsnwidth (string, strlen (string), flags);
+}
+
+/* Returns the number of columns needed to represent the multibyte
+   character string pointed to by STRING of length NBYTES.  If a
+   non-printable character occurs, -1 is returned, unless
+   MBSW_ACCEPT_UNPRINTABLE is specified.  */
+int
+mbsnwidth (const char *string, size_t nbytes, int flags)
+{
+  const char *p = string;
+  const char *plimit = p + nbytes;
+  int width;
+
+  width = 0;
+#if HAVE_MBRTOWC && (MB_LEN_MAX > 1)
+  if (MB_CUR_MAX > 1)
+    {
+      while (p < plimit)
+	switch (*p)
+	  {
+	    case ' ': case '!': case '"': case '#': case '%':
+	    case '&': case '\'': case '(': case ')': case '*':
+	    case '+': case ',': case '-': case '.': case '/':
+	    case '0': case '1': case '2': case '3': case '4':
+	    case '5': case '6': case '7': case '8': case '9':
+	    case ':': case ';': case '<': case '=': case '>':
+	    case '?':
+	    case 'A': case 'B': case 'C': case 'D': case 'E':
+	    case 'F': case 'G': case 'H': case 'I': case 'J':
+	    case 'K': case 'L': case 'M': case 'N': case 'O':
+	    case 'P': case 'Q': case 'R': case 'S': case 'T':
+	    case 'U': case 'V': case 'W': case 'X': case 'Y':
+	    case 'Z':
+	    case '[': case '\\': case ']': case '^': case '_':
+	    case 'a': case 'b': case 'c': case 'd': case 'e':
+	    case 'f': case 'g': case 'h': case 'i': case 'j':
+	    case 'k': case 'l': case 'm': case 'n': case 'o':
+	    case 'p': case 'q': case 'r': case 's': case 't':
+	    case 'u': case 'v': case 'w': case 'x': case 'y':
+	    case 'z': case '{': case '|': case '}': case '~':
+	      /* These characters are printable ASCII characters.  */
+	      p++;
+	      width++;
+	      break;
+	    default:
+	      /* If we have a multibyte sequence, scan it up to its end.  */
+	      {
+		mbstate_t mbstate;
+		memset (&mbstate, 0, sizeof mbstate);
+		do
+		  {
+		    wchar_t wc;
+		    size_t bytes;
+		    int w;
+
+		    bytes = mbrtowc (&wc, p, plimit - p, &mbstate);
+
+		    if (bytes == (size_t) -1)
+		      /* An invalid multibyte sequence was encountered.  */
+		      {
+			if (flags & MBSW_ACCEPT_INVALID)
+			  break;
+			else
+			  return -1;
+		      }
+
+		    if (bytes == (size_t) -2)
+		      /* An incomplete multibyte character at the end.  */
+		      {
+			if (flags & MBSW_ACCEPT_INVALID)
+			  break;
+			else
+			  return -1;
+		      }
+
+		    if (bytes == 0)
+		      /* A null wide character was encountered.  */
+		      bytes = 1;
+
+		    w = wcwidth (wc);
+		    if (w >= 0)
+		      /* A printable multibyte character.  */
+		      width += w;
+		    else
+		      /* An unprintable multibyte character.  */
+		      if (flags & MBSW_ACCEPT_UNPRINTABLE)
+			width += 1;
+		      else
+			return -1;
+
+		    p += bytes;
+		  }
+		while (! mbsinit (&mbstate));
+	      }
+	      break;
+	  }
+      return width;
+    }
+#endif
+
+  while (p < plimit)
+    {
+      unsigned char c = (unsigned char) *p++;
+
+      if ((flags & MBSW_ACCEPT_UNPRINTABLE) || ISPRINT (c))
+	width++;
+      else
+	return -1;
+    }
+  return width;
+}
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -0,0 +1,41 @@
+/* Determine the number of screen columns needed for a string.
+   Copyright (C) 2000 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.  */
+
+#ifndef PARAMS
+# if defined PROTOTYPES || defined __STDC__
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+/* Optional flags to influence mbswidth/mbsnwidth behavior.  */
+
+/* If this bit is set, assume invalid characters have width 0.
+   Otherwise, return -1 upon finding an invalid or incomplete character.  */
+#define MBSW_ACCEPT_INVALID 1
+
+/* If this bit is set, assume unprintable characters have width 1.
+   Otherwise, return -1 upon finding a non-printable character.  */
+#define MBSW_ACCEPT_UNPRINTABLE	2
+
+/* Returns the number of screen columns needed for STRING.  */
+extern int mbswidth PARAMS ((const char *string, int flags));
+
+/* Returns the number of screen columns needed for the NBYTES bytes
+   starting at BUF.  */
+extern int mbsnwidth PARAMS ((const char *buf, size_t nbytes, int flags));
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -1,11 +1,13 @@
 /* md5.c - Functions to compute MD5 message digest of files or memory blocks
   according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995 Software Foundation, Inc.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C
+   Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.

-   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 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
@@ -13,10 +15,10 @@
   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 Ulrich Drepper <drepper@gnu.ai.mit.edu>.  */
+/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -24,7 +26,7 @@

 #include <sys/types.h>

-#if STDC_HEADERS
+#if STDC_HEADERS || defined _LIBC
 # include <stdlib.h>
 # include <string.h>
 #else
@@ -35,6 +37,13 @@

 #include "md5.h"

+#ifdef _LIBC
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define WORDS_BIGENDIAN 1
+# endif
+#endif
+
 #ifdef WORDS_BIGENDIAN
 # define SWAP(n)							\
    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
@@ -58,10 +67,16 @@ md5_init_ctx (ctx)
  ctx->B = 0xefcdab89;
  ctx->C = 0x98badcfe;
  ctx->D = 0x10325476;
+
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
 }

-/* Put result from CTX in first 16 bytes following RESBUF.  The result must
-   be in little endian byte order.  */
+/* Put result from CTX in first 16 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
 void *
 md5_read_ctx (ctx, resbuf)
     const struct md5_ctx *ctx;
@@ -75,6 +90,39 @@ md5_read_ctx (ctx, resbuf)
  return resbuf;
 }

+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+void *
+md5_finish_ctx (ctx, resbuf)
+     struct md5_ctx *ctx;
+     void *resbuf;
+{
+  /* Take yet unprocessed bytes into account.  */
+  md5_uint32 bytes = ctx->buflen;
+  size_t pad;
+
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
+
+  pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
+  memcpy (&ctx->buffer[bytes], fillbuf, pad);
+
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
+  *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
+							(ctx->total[0] >> 29));
+
+  /* Process last bytes.  */
+  md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
+
+  return md5_read_ctx (ctx, resbuf);
+}
+
 /* Compute MD5 message digest for bytes read from STREAM.  The
   resulting message digest number will be written into the 16 bytes
   beginning at RESBLOCK.  */
@@ -86,16 +134,12 @@ md5_stream (stream, resblock)
  /* Important: BLOCKSIZE must be a multiple of 64.  */
 #define BLOCKSIZE 4096
  struct md5_ctx ctx;
-  md5_uint32 len[2];
  char buffer[BLOCKSIZE + 72];
-  size_t pad, sum;
+  size_t sum;

  /* Initialize the computation context.  */
  md5_init_ctx (&ctx);

-  len[0] = 0;
-  len[1] = 0;
-
  /* Iterate over full file contents.  */
  while (1)
    {
@@ -108,7 +152,7 @@ md5_stream (stream, resblock)
      /* Read block.  Take care for partial reads.  */
      do
 	{
-	  n = fread (buffer, 1, BLOCKSIZE - sum, stream);
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);

 	  sum += n;
 	}
@@ -116,13 +160,6 @@ md5_stream (stream, resblock)
      if (n == 0 && ferror (stream))
        return 1;

-      /* RFC 1321 specifies the possible length of the file up to 2^64 bits.
-	 Here we only compute the number of bytes.  Do a double word
-         increment.  */
-      len[0] += sum;
-      if (len[0] < sum)
-	++len[1];
-
      /* If end of file is reached, end the loop.  */
      if (n == 0)
 	break;
@@ -133,27 +170,12 @@ md5_stream (stream, resblock)
      md5_process_block (buffer, BLOCKSIZE, &ctx);
    }

-  /* We can copy 64 byte because the buffer is always big enough.  FILLBUF
-     contains the needed bits.  */
-  memcpy (&buffer[sum], fillbuf, 64);
-
-  /* Compute amount of padding bytes needed.  Alignment is done to
-		(N + PAD) % 64 == 56
-     There is always at least one byte padded.  I.e. even the alignment
-     is correctly aligned 64 padding bytes are added.  */
-  pad = sum & 63;
-  pad = pad >= 56 ? 64 + 56 - pad : 56 - pad;
-
-  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
-  *(md5_uint32 *) &buffer[sum + pad] = SWAP (len[0] << 3);
-  *(md5_uint32 *) &buffer[sum + pad + 4] = SWAP ((len[1] << 3)
-						 | (len[0] >> 29));
-
-  /* Process last bytes.  */
-  md5_process_block (buffer, sum + pad + 8, &ctx);
+  /* Add the last bytes if necessary.  */
+  if (sum > 0)
+    md5_process_bytes (buffer, sum, &ctx);

  /* Construct result in desired memory.  */
-  md5_read_ctx (&ctx, resblock);
+  md5_finish_ctx (&ctx, resblock);
  return 0;
 }

@@ -168,37 +190,61 @@ md5_buffer (buffer, len, resblock)
     void *resblock;
 {
  struct md5_ctx ctx;
-  char restbuf[64 + 72];
-  size_t blocks = len & ~63;
-  size_t pad, rest;

  /* Initialize the computation context.  */
  md5_init_ctx (&ctx);

  /* Process whole buffer but last len % 64 bytes.  */
-  md5_process_block (buffer, blocks, &ctx);
-
-  /* REST bytes are not processed yet.  */
-  rest = len - blocks;
-  /* Copy to own buffer.  */
-  memcpy (restbuf, &buffer[blocks], rest);
-  /* Append needed fill bytes at end of buffer.  We can copy 64 byte
-     because the buffer is always big enough.  */
-  memcpy (&restbuf[rest], fillbuf, 64);
-
-  /* PAD bytes are used for padding to correct alignment.  Note that
-     always at least one byte is padded.  */
-  pad = rest >= 56 ? 64 + 56 - rest : 56 - rest;
-
-  /* Put length of buffer in *bits* in last eight bytes.  */
-  *(md5_uint32 *) &restbuf[rest + pad] = (md5_uint32) SWAP (len << 3);
-  *(md5_uint32 *) &restbuf[rest + pad + 4] = (md5_uint32) SWAP (len >> 29);
-
-  /* Process last bytes.  */
-  md5_process_block (restbuf, rest + pad + 8, &ctx);
+  md5_process_bytes (buffer, len, &ctx);

  /* Put result in desired memory area.  */
-  return md5_read_ctx (&ctx, resblock);
+  return md5_finish_ctx (&ctx, resblock);
+}
+
+
+void
+md5_process_bytes (buffer, len, ctx)
+     const void *buffer;
+     size_t len;
+     struct md5_ctx *ctx;
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
+
+      memcpy (&ctx->buffer[left_over], buffer, add);
+      ctx->buflen += add;
+
+      if (left_over + add > 64)
+	{
+	  md5_process_block (ctx->buffer, (left_over + add) & ~63, ctx);
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
+		  (left_over + add) & 63);
+	  ctx->buflen = (left_over + add) & 63;
+	}
+
+      buffer = (const char *) buffer + add;
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len > 64)
+    {
+      md5_process_block (buffer, len & ~63, ctx);
+      buffer = (const char *) buffer + (len & ~63);
+      len &= 63;
+    }
+
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      memcpy (ctx->buffer, buffer, len);
+      ctx->buflen = len;
+    }
 }


@@ -229,6 +275,13 @@ md5_process_block (buffer, len, ctx)
  md5_uint32 C = ctx->C;
  md5_uint32 D = ctx->D;

+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
  /* Process all bytes in the buffer with 64 bytes in each round of
     the loop.  */
  while (words < endp)
--- a/Show More
+++ b/Show More