.

*** empty log message ***
2025-09-10 07:59:52 +02:00 · 1997-06-30 03:53:28 +00:00 · 1997-06-30 01:58:23 +00:00 · 1997-06-29 22:26:54 +00:00 · 1997-06-29 22:26:18 +00:00 · 1997-06-29 22:25:54 +00:00
401 changed files with 47881 additions and 10217 deletions
--- a/66
+++ b/66
@@ -134,7 +134,8 @@ 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 February
+1997:

     Arabic `ar', Chinese `zh', Czech `cs', Danish `da', Dutch `nl',
     English `en', Esperanto `eo', Finnish `fi', French `fr', German
@@ -172,39 +173,42 @@ 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.
+as of February 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
+     Ready PO files    cs de en es fi fr ja ko nl no pl pt sl sv
                     .-------------------------------------------.
-     bash            |                []                         |  1
-     bison           |                []                         |  1
+     bash            |    []          []       []                |  3
+     bison           |    []          []       []                |  3
     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
+     cpio            |    []    []    []       []    []          |  5
+     diffutils       |          []    []             []       [] |  4
+     enscript        |    []       [] []       []          []    |  5
+     fileutils       |    []    []    []       []    [] [] [] [] |  8
+     findutils       |    []    []    []    [] []    []       [] |  7
+     flex            |                []    []                [] |  3
+     gcal            |    []          []       []                |  3
+     gettext         |    []    []    []    [] [] [] [] [] [] [] | 11
+     grep            |          []    []    [] [] [] []    [] [] |  8
+     hello           |    []    []    []    [] [] [] [] [] [] [] | 10
+     id-utils        |    []          []                         |  2
+     indent          |    []                []                   |  2
+     libc            |    []    []    []    [] []    []       [] |  7
+     m4              |    []          [] []    []             [] |  5
+     make            |    []    []    []    [] []    []          |  6
     music           |                []                         |  1
-     ptx             |    []          []                      [] |  3
-     recode          |    []    []    []                   [] [] |  5
-     sh-utils        |    []          []                         |  2
-     sharutils       |    []          []       []             [] |  4
-     tar             |    []          []    []    []    [] [] [] |  7
-     textutils       |    []          []    [] []                |  4
-     wdiff           | [] []          []                      [] |  4
+     ptx             |    []    []    []       [] [] [] []    [] |  8
+     recode          |    []    []    []       []    [] [] [] [] |  8
+     sh-utils        |    []          []       []       []    [] |  5
+     sharutils       |    []    []    []       []             [] |  5
+     tar             |    []          []    [] [] [] [] [] [] [] |  9
+     texinfo         |                                           |  0
+     textutils       |    []    []    []    [] []    []          |  6
+     wdiff           | [] []    []    []       [] [] []       [] |  8
                     `-------------------------------------------'
-                       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
+       14 languages    cs de en es fi fr ja ko nl no pl pt sl sv
+       27 packages      1 22  1 14  1 25  1 10 20  7 14  7  7 15  145

   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
@@ -217,6 +221,6 @@ 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.

-   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 February 1997 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites.

--- a/9
+++ b/9
@@ -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
@@ -304,8 +304,9 @@ 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.

--- 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/30
+++ b/30
@@ -0,0 +1,30 @@
+This is just a start at listing e-mail addresses of contributors.
+The rest of the addresses are still in the ChangeLog.
+
+Andreas Schwab: schwab@issan.informatik.uni-dortmund.de
+Arne Henrik Juul: arnej@imf.unit.no
+Bauke Jan Douma: bjdouma@xs4all.nl
+Charles Karney: karney@pppl.gov
+Eirik Fuller: eirik@netcom.com
+Emile LeBlanc: leblanc@math.toronto.edu
+Galen Hazelwood: galenh@micron.net
+Hugh Daniel: hugh@xanadu.com
+James: james@albion.glarp.com
+James Antill: jmanti%essex.ac.uk@seralph21.essex.ac.uk
+Jesse Thilo: jgt2@eecs.lehigh.edu
+Joakim Rosqvist: dvljrt@cs.umu.se
+John Gatewood Ham: zappaman@alphabox.compsci.buu.ac.th
+Marcus Daniels: marcus@sysc.pdx.edu
+Mark A. Thomas: thommark@access.digex.net
+Mark Harris: mark@monitor.designacc.com
+Matthew S. Levine: mslevine@theory.lcs.mit.edu
+Miles Bader: miles@gnu.ai.mit.edu
+Peter Eriksson: peter@ifm.liu.se
+Ross Ridge: rridge@calum.csclub.uwaterloo.ca
+Santiago Vila Doncel: sanvila@ctv.es
+Stuart Kemp: skemp@peter.bmc.com
+Thomas Bushnell, n/BSG: thomas@gnu.ai.mit.edu
+Torbjorn Lindgren: tl@funcom.no
+Tony Leneis: tony@plaza.ds.adp.com
+Wayne Stewart: wstewa@atl.com
+
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,3 +4,9 @@ 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
+
+# Tell makeinfo to put everything in a single info file: sh-utils.info.
+# Otherwise, it would also generate files with names like sh-utils.info-[123],
+# and those names all map to one 14-byte name (sh-utils.info-) on some crufty
+# old systems.
+MAKEINFO = makeinfo --no-split
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1c from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am

-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.

@@ -32,63 +32,106 @@ 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@
 transform = @program_transform_name@

+NORMAL_INSTALL = true
+PRE_INSTALL = true
+POST_INSTALL = true
+NORMAL_UNINSTALL = true
+PRE_UNINSTALL = true
+POST_UNINSTALL = true
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CPP = @CPP@
+DATADIRNAME = @DATADIRNAME@
+DF_PROG = @DF_PROG@
+GENCAT = @GENCAT@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+LIBOBJS = @LIBOBJS@
+MAINT = @MAINT@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MVDIR_PROG = @MVDIR_PROG@
+PACKAGE = @PACKAGE@
+PERL = @PERL@
+POFILES = @POFILES@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+U = @U@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+YACC = @YACC@
+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
+
+# Tell makeinfo to put everything in a single info file: sh-utils.info.
+# Otherwise, it would also generate files with names like sh-utils.info-[123],
+# and those names all map to one 14-byte name (sh-utils.info-) on some crufty
+# old systems.
+MAKEINFO = makeinfo --no-split
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-
-MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
-INFOS = fileutils.info fileutils.info-[0-9] fileutils.info-[0-9][0-9]
+TEXINFO_TEX = $(srcdir)/texinfo.tex
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
-
-DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
+DIST_COMMON =  Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
 version.texi


-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-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)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

 TAR = tar
+GZIP = --best
 default: all

+.SUFFIXES:
+.SUFFIXES: .dvi .info .ps .texi .texinfo
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile

-$(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in
-	cd $(top_srcdir) && automake $(subdir)/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

-Makefile: $(top_builddir)/config.status Makefile.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status

 version.texi: @MAINT@stamp-vti
+	cp $(srcdir)/stamp-vti $(srcdir)/version.texi

 stamp-vti: fileutils.texi $(top_srcdir)/configure.in
-	echo "@set UPDATED `cd $(srcdir) \
+	@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
+	@echo "@set EDITION $(VERSION)" >> vti.tmp
+	@echo "@set VERSION $(VERSION)" >> vti.tmp
+	@cmp -s vti.tmp $(srcdir)/stamp-vti \
+	  || (echo "Updating $(srcdir)/stamp-vti"; \
+	      cp vti.tmp $(srcdir)/stamp-vti)
+	@rm -f vti.tmp

 mostlyclean-vti:
 	rm -f vti.tmp
@@ -104,40 +147,94 @@ fileutils.info: fileutils.texi version.texi
 fileutils.dvi: fileutils.texi version.texi


+DVIPS = dvips
+
 .texi.info:
+	@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)
+.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) $<
+.dvi.ps:
+	$(DVIPS) $< -o $@
+
+install-info-am: $(INFO_DEPS)
+	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
-	for file in $(INFO_DEPS); do \
-	  for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $(srcdir)/$$ifile; then \
-	      $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+	@for file in $(INFO_DEPS); do \
+	  d=$(srcdir); \
+	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    if test -f $$d/$$ifile; then \
+	      echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \
+	      $(INSTALL_DATA) $$d/$$ifile $(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 \
+	  for file in $(INFO_DEPS); do \
+	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
+	    install-info --info-dir=$(infodir) $(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 \
+	  ii=yes; \
+	else ii=; fi; \
+	for file in $(INFO_DEPS); do \
+	  test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \
+	done
+	$(NORMAL_UNINSTALL)
+	for file in $(INFO_DEPS); do \
+	  (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
 	done

-mostlyclean-info:
+dist-info: $(INFO_DEPS)
+	for base in $(INFO_DEPS); do \
+	  d=$(srcdir); \
+	  for file in `cd $$d && eval echo $$base*`; do \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file; \
+	  done; \
+	done
+
+mostlyclean-aminfo:
 	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
+	  fileutils.pg fileutils.toc fileutils.tp fileutils.tps \
+	  fileutils.vr fileutils.vrs fileutils.op fileutils.tr \
+	  fileutils.cv

-clean-info:
+clean-aminfo:

-distclean-info:
+distclean-aminfo:

-maintainer-clean-info:
-	rm -f $(INFOS)
+maintainer-clean-aminfo:
+	for i in $(INFO_DEPS); do rm -f `eval echo $$i*`; done
 tags: TAGS
 TAGS:

@@ -145,33 +242,39 @@ TAGS:
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

 subdir = doc
-distdir: $(DEP_DISTFILES)
-	@for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits doc/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
-	  || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
 info: $(INFO_DEPS)
-
 dvi: $(DVIS)
-
 check: all
-
+	$(MAKE)
 installcheck:
-
 install-exec: 
+	@$(NORMAL_INSTALL)

-install-data: install-info
+install-data: install-info-am
+	@$(NORMAL_INSTALL)

 install: install-exec install-data all
 	@:

 uninstall: uninstall-info

-all: $(INFO_DEPS) Makefile
+all: Makefile $(INFO_DEPS)

 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 	$(mkinstalldirs)  $(infodir)

@@ -181,36 +284,34 @@ mostlyclean-generic:

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

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

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

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

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

-maintainer-clean:  maintainer-clean-vti maintainer-clean-info \
-		maintainer-clean-generic distclean 
+maintainer-clean:  maintainer-clean-vti maintainer-clean-aminfo \
+		maintainer-clean-generic distclean
 	@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-vti install-info-am uninstall-info mostlyclean-aminfo \
+distclean-aminfo clean-aminfo maintainer-clean-aminfo tags distdir info \
+dvi installcheck install-exec install-data install uninstall all \
 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,10 +1,3 @@
-@ifinfo
-@set Francois Franc,ois
-@end ifinfo
-@tex
-@set Francois Fran\noexpand\ptexc cois
-@end tex
-
@node Date input formats
@chapter Date input formats

@@ -51,7 +44,7 @@ midnight, 1 January 1970 UCT.
 * General date syntax::            Common rules.
 * Calendar date item::             19 Dec 1994.
 * Time of day item::               9:20pm.
-* Timezone item::                  EST, DST, BST, UCT, AHST, ...
+* Timezone item::                  EST, DST, BST, UCT, HAST, ...
 * Day of week item::               Monday and others.
 * Relative item in date strings::  next tuesday, 2 years ago.
 * Pure numbers in date strings::   19931219, 1440.
@@ -77,7 +70,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.
@@ -113,7 +106,7 @@ zeros on numbers are ignored.

@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:

@@ -279,7 +272,7 @@ militaries.
@cindex Alaska-Hawaii Time
@cindex Central Alaska Time
@cindex Hawaii Standard Time
-@samp{AHST} for Alaska-Hawaii Standard, @samp{CAT} for Central Alaska,
+@samp{HAST} for Hawaii-Aleutian Standard, @samp{CAT} for Central Alaska,
@samp{HST} for Hawaii Standard and @samp{K} for militaries.
@item +1100
@cindex Nome Standard Time
@@ -355,8 +348,6 @@ may be specified.
@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.
@@ -503,6 +494,6 @@ and others.

@cindex Pinard, F.
@cindex Berry, K.
-This chapter was originally produced by @value{Francois} Pinard
+This chapter was originally produced by Fran@,{c}ois Pinard
 (@samp{pinard@@iro.umontreal.ca}) from the @file{getdate.y} source code,
 and then edited by K.@: Berry (@samp{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
--- a/doc/sh-utils.texi
+++ b/doc/sh-utils.texi
@@ -18,12 +18,7 @@
@syncodeindex pg cp
@syncodeindex vr cp

-@ifinfo
-@set Francois Franc,ois
-@end ifinfo
-@tex
-@set Francois Fran\noexpand\ptexc cois
-@end tex
+@set Francois Fran@,{c}ois

@ifinfo
@format
@@ -172,7 +167,7 @@ The GNU shell utilities are mostly compatible with the POSIX.2 standard.
@c This paragraph appears in all of fileutils.texi, textutils.texi, and
@c sh-utils.texi too -- so be sure to keep them consistent.
@cindex bugs, reporting
-Please report bugs to @samp{bug-gnu-utils@@prep.ai.mit.edu}.  Remember
+Please report bugs to @samp{sh-utils-bugs@@gnu.ai.mit.edu}.  Remember
 to include the version number, machine architecture, input files, and
 any other information needed to reproduce the bug: your input, what you
 expected, what you got, and why it is wrong.  Diffs are welcome, but
@@ -184,11 +179,13 @@ sometimes difficult to infer. @xref{Bugs, , , gcc, GNU CC}.
@cindex Meyering, Jim
@c Sorry, but the @value trick doesn't work with TeX in indexing
@c commands, and I don't want to fix it right now. --karl.
-@cindex Pinard, Francois
+@cindex Pinard, @value{Francois}
@cindex Berry, Karl
@cindex Stallman, Richard
-This manual is based on the Unix man pages in the distribution, which
-were originally written by David MacKenzie and updated by Jim Meyering.
+This manual was originally derived from the Unix man pages in the
+distribution, which were written by David MacKenzie and updated by Jim
+Meyering.  What you are reading now is the authoritative documentation
+for these utilities;  the man pages are no longer being maintained.
@value{Francois} Pinard did the initial conversion to Texinfo format.
 Karl Berry did the indexing, some reorganization, and editing of the results.
 Richard Stallman contributed his usual invaluable insights to the
@@ -724,7 +721,7 @@ Exit status:
@menu
 * Relations for expr::          | & < <= = == != >= >
 * Numeric expressions::         + - * / %
-* String expressions::          : match substr index length
+* String expressions::          <colon> match substr index length quote
 * Examples of expr::            Examples.
@end menu

@@ -845,9 +842,9 @@ An alternative way to do pattern matching.  This is the same as
@findex substr
 Returns the substring of @var{string} beginning at @var{position}
 with length at most @var{length}.  If either @var{position} or
-@var{length} is negative or non-numeric, returns the null string.
+@var{length} is negative, zero, or non-numeric, returns the null string.

-@item index @var{string} @var{character-class}
+@item index @var{string} @var{charset}
@findex index
 Returns the first position in @var{string} where the first character in
@var{charset} was found.  If no character in @var{charset} is found in
@@ -857,9 +854,20 @@ Returns the first position in @var{string} where the first character in
@findex length
 Returns the length of @var{string}.

+@item quote @var{token}
+@findex quote
+Interpret @var{token} as a string, even if it is a keyword like @var{match}
+or an operator like @code{/}.
+This makes it possible to test @code{expr length quote "$x"} or
+@code{expr quote "$x" : '.*/\(.\)'} and have it do the right thing even if
+the value of @var{$x} happens to be (for example) @code{/} or @code{index}.
+This operator is a GNU extension.  It is disabled when
+the environment variable @var{POSIXLY_CORRECT} is set.
+
@end table

-The keywords cannot be used as strings.
+To make @code{expr} interpret keywords as strings, you must use the
+@code{quote} operator.


@node Examples of expr
@@ -886,6 +894,8 @@ expr index abcdef cz
@result{} 3
 expr index index a
@error{} expr: syntax error
+expr index quote index a
+@result{} 0

@end example

@@ -2504,6 +2514,13 @@ Print the machine (hardware) type.
@cindex network node name
 Print the machine's network node hostname.

+@item -p
+@itemx --processor
+@opindex -p
+@opindex --processor
+@cindex host processor type
+Print the machine's processor type
+
@item -r
@itemx --release
@opindex -r
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
--- a/doc/textutils.texi
+++ b/doc/textutils.texi
@@ -16,13 +16,6 @@
@syncodeindex pg cp
@syncodeindex vr cp

-@ifinfo
-@set Francois Franc,ois
-@end ifinfo
-@tex
-@set Francois Fran\noexpand\ptexc cois
-@end tex
-
@ifinfo
@format
 START-INFO-DIR-ENTRY
@@ -150,17 +143,19 @@ The GNU text utilities are mostly compatible with the @sc{POSIX.2} standard.
@c This paragraph appears in all of fileutils.texi, textutils.texi, and
@c sh-utils.texi too -- so be sure to keep them consistent.
@cindex bugs, reporting
-Please report bugs to @samp{bug-gnu-utils@@prep.ai.mit.edu}.  Remember
+Please report bugs to @samp{textutils-bugs@@gnu.ai.mit.edu}.  Remember
 to include the version number, machine architecture, input files, and
 any other information needed to reproduce the bug: your input, what you
 expected, what you got, and why it is wrong.  Diffs are welcome, but
 please include a description of the problem as well, since this is
 sometimes difficult to infer. @xref{Bugs, , , gcc, GNU CC}.

-This manual is based on the Unix man pages in the distribution, which
-were originally written by David MacKenzie and updated by Jim Meyering.
+This manual was originally derived from the Unix man pages in the
+distribution, which were written by David MacKenzie and updated by Jim
+Meyering.  What you are reading now is the authoritative documentation
+for these utilities;  the man pages are no longer being maintained.
 The original @code{fmt} man page was written by Ross Paterson.
-@value{Francois} Pinard did the initial conversion to Texinfo format.
+Fran@,{c}ois Pinard did the initial conversion to Texinfo format.
 Karl Berry did the indexing, some reorganization, and editing of the results.
 Richard Stallman contributed his usual invaluable insights to the
 overall process.
@@ -841,10 +836,12 @@ leaving the code unchanged.
@pindex pr
@cindex printing, preparing files for
@cindex multicolumn output, generating
+@cindex merging files in parallel

@code{pr} writes each @var{file} (@samp{-} means standard input), or
 standard input if none are given, to standard output, paginating and
-optionally outputting in multicolumn format.  Synopsis:
+optionally outputting in multicolumn format; optionally merges all
+@var{file}s, printing all in parallel, one per column.  Synopsis:

@example
 pr [@var{option}]@dots{} [@var{file}]@dots{}
@@ -852,33 +849,50 @@ pr [@var{option}]@dots{} [@var{file}]@dots{}

 By default, a 5-line header is printed: two blank lines; a line with the
 date, the file name, and the page count; and two more blank lines.  A
-five line footer (entirely) is also printed.
+footer of five blank lines is also printed. With the @samp{-f} option, a
+3-line header is printed: the leading two blank lines are omitted; no
+footer used. The default @var{page_length} in both cases is 66 lines.
+The text line of the header takes up the full @var{page_width} in the
+form @samp{yy-mm-dd HH:MM string Page nnnn}. String is a centered
+string.

-Form feeds in the input cause page breaks in the output.
+Form feeds in the input cause page breaks in the output. Multiple form
+feeds produce empty pages.
+
+Columns have equal width, separated by an optional string (default
+space). Lines will always be truncated to line width (default 72),
+unless you use the @samp{-j} option. For single column output no line
+truncation occurs by default. Use @samp{-w} option to truncate lines
+in that case.

 The program accepts the following options.  Also see @ref{Common options}.

@table @samp

-@item +@var{page}
-Begin printing with page @var{page}.
+@item +@var{first_page}[@var{:last_page}]
+@opindex +@var{first_page}[@var{:last_page}]
+Begin printing with page @var{first_page} and stop with
+@var{last_page}. Missing @samp{:LAST_PAGE} implies end of file. While
+estimating the number of skipped pages each form feed in the input file
+results in a new page. Page counting with and without
+@samp{+@var{first_page}} is identical. By default, it starts with the
+first page of input file (not first page printed). Page numbering may be
+altered by @samp{-N} option.

@item -@var{column}
@opindex -@var{column}
-Produce @var{column}-column output and print columns down.  The column
-width is automatically decreased as @var{column} increases; unless you
-use the @samp{-w} option to increase the page width as well, this option
-might well cause some input to be truncated.
+@cindex down columns
+With each single @var{file}, produce @var{column}-column output and
+print columns down. The column width is automatically estimated from
+@var{page_width}. This option might well cause some columns to be
+truncated. The number of lines in the columns on each page will be
+balanced. @samp{-@var{column}} may not be used with @samp{-m} option.

@item -a
@opindex -a
@cindex across columns
-Print columns across rather than down.
-
-@item -b
-@opindex -b
-@cindex balancing columns
-Balance columns on the last page.
+With each single @var{file}, print columns across rather than down.
+@var{column} must be greater than one.

@item -c
@opindex -c
@@ -903,11 +917,19 @@ is 8).
@itemx -F
@opindex -F
@opindex -f
-Use a formfeed instead of newlines to separate output pages.
+Use a form feed instead of newlines to separate output pages. Default
+page length of 66 lines is not altered. But the number of lines of text
+per page changes from 56 to 63 lines.

-@item -h @var{header}
+
+@item -h @var{HEADER}
@opindex -h
-Replace the file name in the header with the string @var{header}.
+Replace the file name in the header with the centered string
+@var{header}. Left-hand-side truncation (marked by a @samp{*}) may occur
+if the total header line @samp{yy-mm-dd HH:MM HEADER Page nnnn}
+becomes larger than @var{page_width}. @samp{-h ""} prints a blank line
+header. Don't use @samp{-h""}. A space between the -h option and the
+argument is always peremptory.

@item -i[@var{out-tabchar}[@var{out-tabwidth}]]
@opindex -i
@@ -917,30 +939,54 @@ is the output tab character (default is @key{TAB}).  Second optional
 argument @var{out-tabwidth} is the output tab character's width (default
 is 8).

-@item -l @var{n}
+@item -j
+@opindex -j
+Merge lines of full length. Used together with the column options
+@samp{-@var{column}}, @samp{-a -@var{column}} or @samp{-m}. Turns off
+@samp{-w} line truncation; no column alignment used; may be used with
+@samp{-s[@var{separator}]}.
+
+
+@item -l @var{page_length}
@opindex -l
-Set the page length to @var{n} (default 66) lines.  If @var{n} is less
-than 10, the headers and footers are omitted, as if the @samp{-t} option
-had been given.
+Set the page length to @var{page_length} (default 66) lines. If
+@var{page_length} is less than or equal 10 (and <= 3 with @samp{-f}),
+the headers and footers are omitted, and all form feeds set in input
+files are eliminated, as if the @samp{-T} option had been given.

@item -m
@opindex -m
-Print all files in parallel, one in each column.
+Merge and print all @var{file}s in parallel, one in each column. If a
+line is too long to fit in a column, it is truncated (but see
+@samp{-j}). @samp{-s[@var{separator}]} may be used. Empty pages in some
+@var{file}s (form feeds set) produce empty columns, still marked by
+@var{separator}. Completely empty common pages show no separators or
+line numbers. The default header becomes
+@samp{yy-mm-dd HH:MM <blanks> Page nnnn}; may be used with
+@samp{-h @var{header}} to fill up the middle part.
+

@item -n[@var{number-separator}[@var{digits}]]
@opindex -n
-Precede each column with a line number; with parallel files (@samp{-m}),
-precede each line with a line number.  Optional argument
+Precede each column with a line number; with parallel @var{file}s
+(@samp{-m}), precede only each line with a line number. Optional argument
@var{number-separator} is the character to print after each number
 (default is @key{TAB}).  Optional argument @var{digits} is the number of
-digits per line number (default is 5).
+digits per line number (default is 5). Default line counting starts with
+first line of the input file (not with the first line printed, see
+@samp{-N}).
+
+@item -N @var{line_number}
+@opindex -N
+Start line counting with no. @var{line_number} at first line of first
+page printed.

@item -o @var{n}
@opindex -o
@cindex indenting lines
@cindex left margin
 Indent each line with @var{n} (default is zero) spaces wide, i.e., set
-the left margin.  The total page width is @samp{n} plus the width set
+the left margin.  The total page width is @var{n} plus the width set
 with the @samp{-w} option.

@item -r
@@ -948,25 +994,44 @@ with the @samp{-w} option.
 Do not print a warning message when an argument @var{file} cannot be
 opened.  (The exit status will still be nonzero, however.)

-@item -s[@var{c}]
+@item -s[@var{separator}]
@opindex -s
-Separate columns by the single character @var{c}.  If @var{c} is
-omitted, the default is space; if this option is omitted altogether, the
-default is @key{TAB}.
+Separate columns by a string @var{separator}. Don't use
+@samp{-s @var{separator}}, no space between flag and argument. If this
+option is omitted altogether, the default is @key{TAB} together with
+@samp{-j} option and space otherwise (same as @samp{-s" "}). With
+@samp{-s} only, no separator is used (same as @samp{-s""}). @samp{-s}
+does not affect line truncation or column alignment.

@item -t
@opindex -t
-Do not print the usual 5-line header and the 5-line footer on each page,
-and do not fill out the bottoms of pages (with blank lines or
-formfeeds).
+Do not print the usual header [and footer] on each page, and do not fill
+out the bottoms of pages (with blank lines or a form feed). No page
+structure is produced, but retain form feeds set in the input files. The
+predefined page layout is not changed. @samp{-t} or @samp{-T} may be
+useful together with other options; e.g.: @samp{-t -e4}, expand
+@key{TAB} in the input file to 4 spaces but do not do any other changes.
+Use of @samp{-t} overrides @samp{-h}.
+
+@item -T
+@opindex -T
+Do not print header [and footer]. In addition eliminate all form feeds
+set in the input files.

@item -v
@opindex -v
 Print unprintable characters in octal backslash notation.

-@item -w @var{n}
+@item -w @var{page_width}
@opindex -w
-Set the page width to @var{n} (default is 72) columns.
+Set the page width to @var{page_width} (default 72) characters.
+With/without @samp{-w}, header lines are always truncated to
+@var{page_width} characters. With @samp{-w}, text lines are truncated,
+unless @samp{-j} is used. Without @samp{-w} together with one of the
+column options @samp{-@var{column}}, @samp{-a -@var{column}} or
+@samp{-m}, default truncation of text lines to 72 characters is used.
+Without @samp{-w} and without any of the column options, no line
+truncation is used. That's equivalent to @samp{-w 72 -j}.

@end table

@@ -1259,7 +1324,7 @@ less than @var{bytes} bytes of the line are left, then continue
 normally.  @var{bytes} has the same format as for the @samp{--bytes}
 option.

-@itemx --verbose=@var{bytes}
+@itemx --verbose
@opindex --verbose
 Write a diagnostic to standard error just before each output file is opened.

@@ -1567,12 +1632,11 @@ options}.
 If a @var{file} is specified as @samp{-} or if no files are given
@code{md5sum} computes the checksum for the standard input.
@code{md5sum} can also determine whether a file and checksum are
-consistent. Synopsis:
+consistent. Synopses:

@example
 md5sum [@var{option}]@dots{} [@var{file}]@dots{}
 md5sum [@var{option}]@dots{} --check [@var{file}]
-md5sum [@var{option}]@dots{} --string=@var{string} @dots{}
@end example

 For each @var{file}, @samp{md5sum} outputs the MD5 checksum, a flag
@@ -1629,11 +1693,6 @@ If all listed files are readable and are consistent with the associated
 MD5 checksums, exit successfully.  Otherwise exit with a status code
 indicating there was a failure.

-@itemx --string=@var{string}
-@opindex --string
-Compute the message digest for @var{string}, instead of for a file.  The
-result is the same as for a file that contains exactly @var{string}.
-
@item -t
@itemx --text
@opindex -t
@@ -1647,7 +1706,7 @@ Treat all input files as text files.  This is the reverse of
@opindex -w
@opindex --warn
@cindex verifying MD5 checksums
-When verifying checksums, warn about improperly formated MD5 checksum lines.
+When verifying checksums, warn about improperly formatted MD5 checksum lines.
 This option is useful only if all but a few lines in the checked input
 are valid.

@@ -1904,11 +1963,8 @@ appended to it, in which case the global ordering options are not used
 for that particular field.  The @samp{-b} option may be independently
 attached to either or both of the @samp{+@var{pos}} and
@samp{-@var{pos}} parts of a field specification, and if it is inherited
-from the global options it will be attached to both.  If a @samp{-n} or
-@samp{-M} option is used, thus implying a @samp{-b} option, the
-@samp{-b} option is taken to apply to both the @samp{+@var{pos}} and the
-@samp{-@var{pos}} parts of a key specification.  Keys may span multiple
-fields.
+from the global options it will be attached to both.
+Keys may span multiple fields.

 Here are some examples to illustrate various combinations of options.
 In them, the @sc{POSIX} @samp{-k} option is used to specify sort keys rather
@@ -2113,6 +2169,11 @@ Columns are separated by @key{TAB}.
 The options @samp{-1}, @samp{-2}, and @samp{-3} suppress printing of
 the corresponding columns.  Also see @ref{Common options}.

+Unlike some other comparison utilities, @code{comm} has an exit
+status that does not depend on the result of the comparison.
+Upon normal completion @code{comm} produces an exit code of zero.
+If there is an error it exits with nonzero status.
+

@node Operating on fields within a line
@chapter Operating on fields within a line
@@ -2399,7 +2460,7 @@ used only in @var{set1} or @var{set2}, as noted below.

@table @asis

-@item Backslash escapes.
+@item Backslash escapes
@cindex backslash escapes

 A backslash followed by a character not listed below causes an error
@@ -2407,19 +2468,19 @@ message.

@table @samp
@item \a
-Control-G,
+Control-G.
@item \b
-Control-H,
+Control-H.
@item \f
-Control-L,
+Control-L.
@item \n
-Control-J,
+Control-J.
@item \r
-Control-M,
+Control-M.
@item \t
-Control-I,
+Control-I.
@item \v
-Control-K,
+Control-K.
@item \@var{ooo}
 The character with the value given by @var{ooo}, which is 1 to 3
 octal digits,
@@ -2427,7 +2488,7 @@ octal digits,
 A backslash.
@end table

-@item Ranges.
+@item Ranges
@cindex ranges

 The notation @samp{@var{m}-@var{n}} expands to all of the characters
@@ -2439,7 +2500,7 @@ enclose ranges, translations specified in that format will still work as
 long as the brackets in @var{string1} correspond to identical brackets
 in @var{string2}.

-@item Repeated characters.
+@item Repeated characters
@cindex repeated characters

 The notation @samp{[@var{c}*@var{n}]} in @var{set2} expands to @var{n}
@@ -2449,7 +2510,7 @@ to as many copies of @var{c} as are needed to make @var{set2} as long as
@var{set1}.  If @var{n} begins with @samp{0}, it is interpreted in
 octal, otherwise in decimal.

-@item Character classes.
+@item Character classes
@cindex characters classes

 The notation @samp{[:@var{class}:]} expands to all of the characters in
@@ -2504,7 +2565,7 @@ Uppercase letters.
 Hexadecimal digits.
@end table

-@item Equivalence classes.
+@item Equivalence classes
@cindex equivalence classes

 The syntax @samp{[=@var{c}=]} expands to all of the characters that are
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -7,4 +7,3 @@ safe-lstat.c
 safe-lstat.h
 getdate.tab.c
 .deps
-group_member.c
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,43 +1,25 @@
 ## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = fu
+noinst_LIBRARIES = libfu.a

-EXTRA_DIST = alloca.c basename.c error.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 obstack.c posixtm.y rename.c rmdir.c rpmatch.c \
-stpcpy.c strcasecmp.c strdup.c strndup.c strstr.c strtol.c strtoul.c
+## FIXME: Remove mvdir.c, and rmdir.c when
+## automake is fixed -- probably for 1.1g
+EXTRA_DIST = chown.c mkdir.c rmdir.c getline.c mktime.c strftime.c getgroups.c

-INCLUDES = -I.. -I$(srcdir)
+INCLUDES = -I.. -I$(srcdir) -I../intl

-fu_SOURCES = getdate.c getline.c posixtm.c argmatch.c backupfile.c \
-dirname.c fileblocks.c filemode.c \
-full-write.c getversion.c idcache.c \
+libfu_a_SOURCES = getdate.y posixtm.y getopt.c getopt1.c \
+addext.c argmatch.c backupfile.c basename.c dirname.c filemode.c \
+full-write.c idcache.c \
 isdir.c long-options.c makepath.c modechange.c path-concat.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

-fu_LIBADD = @LIBOBJS@ @ALLOCA@
+libfu_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libfu_a_DEPENDENCIES = $(libfu_a_LIBADD)

 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 path-concat.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h
+getdate.h getline.h getopt.h group-member.h long-options.h \
+makepath.h modechange.h mountlist.h path-concat.h pathmax.h \
+save-cwd.h xstrtol.h xstrtoul.h

 BUILT_SOURCES = getdate.c posixtm.c
-
-# 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
-
-# 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
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1c from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am

-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.

@@ -32,109 +32,146 @@ 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@
 transform = @program_transform_name@

-noinst_LIBRARIES = fu
+NORMAL_INSTALL = true
+PRE_INSTALL = true
+POST_INSTALL = true
+NORMAL_UNINSTALL = true
+PRE_UNINSTALL = true
+POST_UNINSTALL = true
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CPP = @CPP@
+DATADIRNAME = @DATADIRNAME@
+DF_PROG = @DF_PROG@
+GENCAT = @GENCAT@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+LIBOBJS = @LIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MVDIR_PROG = @MVDIR_PROG@
+PACKAGE = @PACKAGE@
+PERL = @PERL@
+POFILES = @POFILES@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+U = @U@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+YACC = @YACC@
+l = @l@

-EXTRA_DIST = alloca.c basename.c error.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 obstack.c posixtm.y rename.c rmdir.c rpmatch.c \
-stpcpy.c strcasecmp.c strdup.c strndup.c strstr.c strtol.c strtoul.c
+noinst_LIBRARIES = libfu.a

-INCLUDES = -I.. -I$(srcdir)
+EXTRA_DIST = chown.c mkdir.c rmdir.c getline.c mktime.c strftime.c getgroups.c

-fu_SOURCES = getdate.c getline.c posixtm.c argmatch.c backupfile.c \
-dirname.c fileblocks.c filemode.c \
-full-write.c getversion.c idcache.c \
+INCLUDES = -I.. -I$(srcdir) -I../intl
+
+libfu_a_SOURCES = getdate.y posixtm.y getopt.c getopt1.c \
+addext.c argmatch.c backupfile.c basename.c dirname.c filemode.c \
+full-write.c idcache.c \
 isdir.c long-options.c makepath.c modechange.c path-concat.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

-fu_LIBADD = @LIBOBJS@ @ALLOCA@
+libfu_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libfu_a_DEPENDENCIES = $(libfu_a_LIBADD)

 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 path-concat.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h
+getdate.h getline.h getopt.h group-member.h long-options.h \
+makepath.h modechange.h mountlist.h path-concat.h pathmax.h \
+save-cwd.h xstrtol.h xstrtoul.h

 BUILT_SOURCES = getdate.c posixtm.c
-mkinstalldirs = $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-LIBRARIES = $(noinst_LIBRARIES)
+LIBRARIES =  $(noinst_LIBRARIES)

-noinst_LIBFILES = libfu.a

 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-fu_DEPENDENCIES =  @LIBOBJS@ @ALLOCA@
-fu_OBJECTS = getdate.o getline.o posixtm.o argmatch.o backupfile.o \
-dirname.o fileblocks.o filemode.o full-write.o getversion.o idcache.o \
-isdir.o long-options.o makepath.o modechange.o path-concat.o \
+libfu_a_OBJECTS =  getdate.o posixtm.o getopt.o getopt1.o addext.o \
+argmatch.o backupfile.o basename.o dirname.o filemode.o full-write.o \
+idcache.o isdir.o long-options.o makepath.o modechange.o path-concat.o \
 safe-read.o save-cwd.o savedir.o stripslash.o userspec.o xgetcwd.o \
 xmalloc.o xstrdup.o xstrtol.o xstrtoul.o yesno.o
-EXTRA_fu_SOURCES =
-LIBFILES =  libfu.a
 AR = ar
-RANLIB = @RANLIB@
-CC = @CC@
+YLWRAP = $(srcdir)/ylwrap
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(LDFLAGS) -o $@
-HEADERS = $(noinst_HEADERS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+HEADERS =  $(noinst_HEADERS)

-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON =  Makefile.am Makefile.in alloca.c chown.c error.c error.h \
+euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c \
+getgroups.c getline.c group-member.c memcmp.c memcpy.c memset.c mkdir.c \
+mktime.c mountlist.c obstack.c obstack.h posixtm.c regex.c regex.h \
+rename.c rmdir.c rpmatch.c rx.c rx.h stpcpy.c strcasecmp.c strdup.c \
+strftime.c strndup.c strstr.c strtol.c strtoul.c ylwrap


-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-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)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

 TAR = tar
-DEP_FILES = $(srcdir)/.deps/alloca.P $(srcdir)/.deps/argmatch.P \
-$(srcdir)/.deps/backupfile.P $(srcdir)/.deps/dirname.P \
-$(srcdir)/.deps/error.P $(srcdir)/.deps/fileblocks.P \
-$(srcdir)/.deps/filemode.P $(srcdir)/.deps/fnmatch.P \
-$(srcdir)/.deps/fsusage.P $(srcdir)/.deps/ftruncate.P \
-$(srcdir)/.deps/full-write.P $(srcdir)/.deps/getdate.P \
-$(srcdir)/.deps/getline.P $(srcdir)/.deps/getopt.P \
-$(srcdir)/.deps/getopt1.P $(srcdir)/.deps/getversion.P \
-$(srcdir)/.deps/idcache.P $(srcdir)/.deps/isdir.P \
-$(srcdir)/.deps/long-options.P $(srcdir)/.deps/makepath.P \
-$(srcdir)/.deps/modechange.P $(srcdir)/.deps/mountlist.P \
-$(srcdir)/.deps/obstack.P $(srcdir)/.deps/path-concat.P \
-$(srcdir)/.deps/posixtm.P $(srcdir)/.deps/safe-read.P \
-$(srcdir)/.deps/save-cwd.P $(srcdir)/.deps/savedir.P \
-$(srcdir)/.deps/stripslash.P $(srcdir)/.deps/userspec.P \
-$(srcdir)/.deps/xgetcwd.P $(srcdir)/.deps/xmalloc.P \
-$(srcdir)/.deps/xstrdup.P $(srcdir)/.deps/xstrtol.P \
-$(srcdir)/.deps/xstrtoul.P $(srcdir)/.deps/yesno.P
-SOURCES = $(fu_SOURCES)
-OBJECTS = $(fu_OBJECTS)
+GZIP = --best
+DEP_FILES =  .deps/addext.P .deps/alloca.P .deps/argmatch.P \
+.deps/backupfile.P .deps/basename.P .deps/chown.P .deps/dirname.P \
+.deps/error.P .deps/euidaccess.P .deps/fileblocks.P .deps/filemode.P \
+.deps/fnmatch.P .deps/fsusage.P .deps/ftruncate.P .deps/full-write.P \
+.deps/getdate.P .deps/getgroups.P .deps/getline.P .deps/getopt.P \
+.deps/getopt1.P .deps/group-member.P .deps/idcache.P .deps/isdir.P \
+.deps/long-options.P .deps/makepath.P .deps/memcmp.P .deps/memcpy.P \
+.deps/memset.P .deps/mkdir.P .deps/mktime.P .deps/modechange.P \
+.deps/mountlist.P .deps/obstack.P .deps/path-concat.P .deps/posixtm.P \
+.deps/regex.P .deps/rename.P .deps/rmdir.P .deps/rpmatch.P .deps/rx.P \
+.deps/safe-read.P .deps/save-cwd.P .deps/savedir.P .deps/stpcpy.P \
+.deps/strcasecmp.P .deps/strdup.P .deps/strftime.P .deps/stripslash.P \
+.deps/strndup.P .deps/strstr.P .deps/strtol.P .deps/strtoul.P \
+.deps/userspec.P .deps/xgetcwd.P .deps/xmalloc.P .deps/xstrdup.P \
+.deps/xstrtol.P .deps/xstrtoul.P .deps/yesno.P
+SOURCES = $(libfu_a_SOURCES)
+OBJECTS = $(libfu_a_OBJECTS)

 default: all

+.SUFFIXES:
+.SUFFIXES: .c .h .o .y
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile

-$(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in
-	cd $(top_srcdir) && automake $(subdir)/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

-Makefile: $(top_builddir)/config.status Makefile.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status

 mostlyclean-noinstLIBRARIES:

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

 distclean-noinstLIBRARIES:

@@ -152,81 +189,97 @@ distclean-compile:
 	rm -f *.tab.c

 maintainer-clean-compile:
-$(fu_OBJECTS): ../config.h

-libfu.a: $(fu_OBJECTS) $(fu_DEPENDENCIES)
+libfu.a: $(libfu_a_OBJECTS) $(libfu_a_DEPENDENCIES)
 	rm -f libfu.a
-	$(AR) cru libfu.a $(fu_OBJECTS) $(fu_LIBADD)
+	$(AR) cru libfu.a $(libfu_a_OBJECTS) $(libfu_a_LIBADD)
 	$(RANLIB) libfu.a
+.y.c:
+	$(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(YFLAGS)
+.y.h:
+	$(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(YFLAGS)
+
+tags: TAGS

 ID: $(HEADERS) $(SOURCES)
 	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)

-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES)
-	here=`pwd` && cd $(srcdir) && etags $(ETAGS_ARGS) $(SOURCES) $(HEADERS) -o $$here/TAGS
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+	tags=; \
+	here=`pwd`; \
+	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)

 mostlyclean-tags:

 clean-tags:

 distclean-tags:
+	rm -f TAGS ID

 maintainer-clean-tags:
-	rm -f TAGS ID

 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

 subdir = lib
-distdir: $(DEP_DISTFILES)
-	@for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits lib/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
-	  || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done

-MKDEP = gcc -MM $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)

-include $(srcdir)/.deps/.P
-$(srcdir)/.deps/.P: $(BUILT_SOURCES)
-	cd $(srcdir) && test -d .deps || mkdir .deps
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+-include .deps/.P
+.deps/.P: $(BUILT_SOURCES)
 	echo > $@

 -include $(DEP_FILES)
-$(DEP_FILES): $(srcdir)/.deps/.P

-$(srcdir)/.deps/%.P: $(srcdir)/%.c
-	@echo "mkdeps $< > $@"
-	@re=`echo 's,^$(srcdir)//*,,g;s, $(srcdir)//*, ,g' | sed 's,\.,\\\\.,g'`; \
-	  $(MKDEP) $< | sed "$$re" > $@-tmp
-	@if test -n "$o"; then			\
-	  sed 's/\.o:/$$o:/' $@-tmp > $@;	\
-	  rm $@-tmp;				\
-	else					\
-	  mv $@-tmp $@;				\
-	fi
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+
+maintainer-clean-depend:
+	rm -rf .deps
+
+.deps/%.P: %.c
+	@echo "Computing dependencies for $<..."
+	@o='o'; \
+	test -n "$o" && o='$$o'; \
+	$(MKDEP) $< >$@.tmp \
+	  && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \
+	  && rm -f $@.tmp
 info:
-
 dvi:
-
 check: all
-
+	$(MAKE)
 installcheck:
-
 install-exec: 
+	@$(NORMAL_INSTALL)

 install-data: 
+	@$(NORMAL_INSTALL)

 install: install-exec install-data all
 	@:

 uninstall: 

-all: $(LIBFILES) $(HEADERS) Makefile
+all: Makefile $(LIBRARIES) $(HEADERS)

 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:


@@ -235,28 +288,29 @@ mostlyclean-generic:

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

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

 maintainer-clean-generic:
 	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic

-clean:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean 
+clean:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean

 distclean:  distclean-noinstLIBRARIES distclean-compile distclean-tags \
-		distclean-generic clean 
+		distclean-depend distclean-generic clean
 	rm -f config.status

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

@@ -264,32 +318,13 @@ maintainer-clean:  maintainer-clean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info dvi check installcheck \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info dvi \
+installcheck install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean


-# 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
-
-# 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
-.SUFFIXES:
-.SUFFIXES: .c .o
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/lib/addext.c
+++ b/lib/addext.c
@@ -0,0 +1,106 @@
+/* addext.c -- add an extension to a file name
+   Copyright (C) 1990, 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; 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
+
+/* Append to FILENAME the extension EXT, unless the result would be too long,
+   in which case just append the character E.  */
+
+void
+addext (filename, ext, e)
+     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,37 +1,42 @@
-/*
-	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

 #ifdef emacs
-#include "config.h"
+#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
@@ -45,72 +50,90 @@ lose
 #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 */
+#if defined (CRAY) && defined (CRAY_STACKSEG_END)
+long i00afunc ();
+#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg))
 #else
-typedef char	*pointer;		/* generic pointer type */
+#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();
+#define	NULL	0

-/*
-	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.
+
+   Callers below should use malloc.  */
+
+#ifndef emacs
+#define malloc xmalloc
+#endif
+extern pointer malloc ();
+
+/* Define STACK_DIRECTION if you know the direction of stack
+   growth for your system; otherwise it will be automatically
+   deduced at run-time.
+
+   STACK_DIRECTION > 0 => grows toward higher addresses
+   STACK_DIRECTION < 0 => grows toward lower addresses
+   STACK_DIRECTION = 0 => direction of growth unknown  */

 #ifndef STACK_DIRECTION
-#define	STACK_DIRECTION	0		/* direction unknown */
+#define	STACK_DIRECTION	0	/* Direction unknown.  */
 #endif

 #if STACK_DIRECTION != 0

-#define	STACK_DIR	STACK_DIRECTION	/* known at compile-time */
+#define	STACK_DIR	STACK_DIRECTION	/* Known at compile-time.  */

-#else	/* STACK_DIRECTION == 0; need run-time code */
+#else /* STACK_DIRECTION == 0; need run-time code.  */

-static int	stack_dir;		/* 1 or -1 once known */
+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)
@@ -118,77 +141,352 @@ find_stack_direction (/* void */)

 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 (size)
+     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_DIR == 0)		/* Unknown growth direction.  */
    find_stack_direction ();
 #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;
+    ((header *) new)->h.next = last_alloca_header;
+    ((header *) new)->h.deep = depth;

-    last_alloca_header = (header *)new;
+    last_alloca_header = (header *) new;

-    /* User storage begins just after header. */
+    /* User storage begins just after header.  */

-    return (pointer)((char *)new + sizeof(header));
+    return (pointer) ((char *) new + sizeof (header));
  }
 }

+#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, 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,24 +12,27 @@
   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; 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@ai.mit.edu> */
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */

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

+#include <argmatch.h>
+
 #include <sys/types.h>

 #include <stdio.h>
-#ifdef STDC_HEADERS
-#include <string.h>
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
 #endif

-extern char *program_name;
-
 /* 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
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -1,18 +1,12 @@
-#ifndef ARGMATCH_H
-#define ARGMATCH_H 1
+/* argmatch.h -- declarations for matching arguments against option lists */

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

-int
-  argmatch __P ((const char *arg, const char *const *optlist));
+int argmatch __ARGMATCH_P ((const char *, const char * const *));
+void invalid_arg __ARGMATCH_P ((const char *, const char *, int));

-void
-  invalid_arg __P ((const char *kind, const char *value, int problem));
-
-#endif /* ARGMATCH_H */
+extern char *program_name;
--- 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,1991,1992,1993,1995,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,75 +12,89 @@
   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; 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 STDC_HEADERS
 # include <stdlib.h>
 #else
 char *malloc ();
 #endif

-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
+#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. */
@@ -88,15 +102,10 @@ 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 = ".orig";

-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 __BACKUPFILE_P ((const char *, const char *));
+static int version_number __BACKUPFILE_P ((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.
@@ -107,33 +116,51 @@ char *
 find_backup_file_name (file)
     const char *file;
 {
-  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)
@@ -155,7 +182,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 +194,59 @@ 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;
+     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);
+  "never", "simple", "nil", "existing", "t", "numbered", 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[] =
+{
+  simple, simple, numbered_existing, numbered_existing, numbered, numbered
+};
+
+/* Return the type of backup indicated by VERSION.
+   Unique abbreviations are accepted. */
+
+enum backup_type
+get_version (version)
+     const char *version;
+{
+  int i;
+
+  if (version == 0 || *version == 0)
+    return numbered_existing;
+  i = argmatch (version, backup_args);
+  if (i < 0)
+    {
+      invalid_arg ("version control type", version, i);
+      exit (2);
+    }
+  return backup_types[i];
 }
--- 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, 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,8 +12,9 @@
   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; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 /* When to make backup files. */
 enum backup_type
@@ -33,10 +34,17 @@ enum backup_type
 };

 extern enum backup_type backup_type;
-extern char *simple_backup_suffix;
+extern char const *simple_backup_suffix;

-#ifdef __STDC__
-char *find_backup_file_name (const char *file);
-#else
-char *find_backup_file_name ();
+#ifndef __BACKUPFILE_P
+# if defined __STDC__ || __GNUC__
+#  define __BACKUPFILE_P(args) args
+# else
+#  define __BACKUPFILE_P(args) ()
+# endif
 #endif
+
+char *base_name __BACKUPFILE_P ((char const *));
+char *find_backup_file_name __BACKUPFILE_P ((char const *));
+enum backup_type get_version __BACKUPFILE_P ((char const *));
+void addext __BACKUPFILE_P ((char *, char const *, int));
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,38 +1,30 @@
-/* basename.c -- return the last element in a path
-   Copyright (C) 1990 Free Software Foundation, Inc.
+/* basename.c -- return the last element in a path */

-   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.  */
-
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

-/* Return NAME with any leading path stripped off.
-   Don't use strrchr/rindex.  */
+#ifndef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(f) 0
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(c) ((c) == '/')
+#endif
+
+/* 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.  */

 char *
-basename (name)
-     const char *name;
+base_name (name)
+     char const *name;
 {
-  const char *base = name;
+  char const *base = name += FILESYSTEM_PREFIX_LEN (name);
+
+  for (; *name; name++)
+    if (ISSLASH (*name))
+      base = name + 1;

-  while (*name)
-    {
-      if (*name == '/')
-	base = name + 1;
-      ++name;
-    }
  return (char *) base;
 }
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -22,6 +22,7 @@
 # include <config.h>
 #endif

+#include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -0,0 +1,53 @@
+/* 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>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+/* FIXME: describe.  */
+
+int
+chown (file, gid, uid)
+     const char *file;
+     gid_t git;
+     uid_t uit;
+{
+  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;
+    }
+
+#undef chown
+
+  return chown (file, gid, uid);
+}
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,23 +1,23 @@
 /* error.c -- error handler for noninteractive utilities
   Copyright (C) 1990, 91, 92, 93, 94, 95, 96 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 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,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

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

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

@@ -47,6 +47,9 @@ void exit ();
 # define _(String) String
 #endif

+/* Get prototypes for the functions defined here.  */
+#include <error.h>
+
 /* If NULL, error will flush stdout, then print on stderr the program
   name, a colon and a space.  Otherwise, error will call this
   function without parameters instead.  */
@@ -65,7 +68,7 @@ unsigned int error_message_count;
 # define program_name program_invocation_name
 # include <errno.h>

-#else
+#else /* not _LIBC */

 /* The calling program should define program_name and set it to the
   name of the executing program.  */
@@ -89,7 +92,8 @@ private_strerror (errnum)
 }
 #  define strerror private_strerror
 # endif	/* HAVE_STRERROR */
-#endif	/* _LIBC */
+
+#endif	/* not _LIBC */

 /* Print the program name and error message MESSAGE, which is a printf-style
   format string with optional args.
--- a/lib/error.h
+++ b/lib/error.h
@@ -1,22 +1,22 @@
 /* error.h -- declaration for error-reporting function
   Copyright (C) 1995, 1996 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 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,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#ifndef _error_h_
-# define _error_h_
+#ifndef ERROR_H_
+# define ERROR_H_

 # ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
@@ -62,4 +62,4 @@ extern unsigned int error_message_count;
   variable controls whether this mode is selected or not.  */
 extern int error_one_per_line;

-#endif /* _error_h_ */
+#endif /* not ERROR_H_ */
--- 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 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
@@ -25,6 +25,10 @@
 # include <sys/types.h>
 # include <sys/param.h>

+# 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. */
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -198,6 +198,17 @@ ftypelet (bits)
  if (S_ISNWK (bits))
    return 'n';
 #endif
+
+#ifdef S_ISOFD
+  /* Cray migrated dmf file.  */
+  if (S_ISOFD (bits))
+    return 'M';
+#endif
+#ifdef S_ISOFL
+  /* Cray migrated dmf file.  */
+  if (S_ISOFL (bits))
+    return 'M';
+#endif
  return '?';
 }

--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -1,46 +1,42 @@
-/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 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.
+   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,
+   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 <errno.h>
 #include <fnmatch.h>
 #include <ctype.h>

-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   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__)
-
-
-#ifndef errno
-extern int 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
+
 /* Match STRING against the filename pattern PATTERN, returning zero if
   it matches, nonzero if not.  */
 int
@@ -52,8 +48,8 @@ fnmatch (pattern, string, 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')
    {
@@ -197,6 +193,6 @@ fnmatch (pattern, string, flags)
    return 0;

  return FNM_NOMATCH;
-}

-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
+# undef FOLD
+}
--- 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 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
@@ -15,8 +15,8 @@
   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>
@@ -25,40 +25,40 @@

 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

-#ifdef HAVE_SYS_FS_S5PARAM_H /* Fujitsu UXP/V */
-#include <sys/fs/s5param.h>
+#if HAVE_SYS_FS_S5PARAM_H	/* Fujitsu UXP/V */
+# include <sys/fs/s5param.h>
 #endif

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

-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+#if HAVE_FCNTL_H
+# include <fcntl.h>
 #endif

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

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

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

@@ -78,11 +78,11 @@ adjust_blocks (blocks, fromsize, tosize)
  if (fromsize <= 0)
    return -1;

-  if (fromsize == tosize)	/* E.g., from 512 to 512.  */
+  if (fromsize == tosize)	/* e.g., from 512 to 512 */
    return blocks;
-  else if (fromsize > tosize)	/* E.g., from 2048 to 512.  */
+  else if (fromsize > tosize)	/* e.g., from 2048 to 512 */
    return blocks * (fromsize / tosize);
-  else				/* E.g., from 256 to 512.  */
+  else				/* e.g., from 256 to 512 */
    return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
 }

@@ -90,42 +90,56 @@ adjust_blocks (blocks, fromsize, tosize)
   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;
 {
-#if defined (STAT_STATFS3_OSF1)
+#ifdef STAT_STATFS3_OSF1
+# define CONVERT_BLOCKS(B) adjust_blocks ((B), fsd.f_fsize, 512)
+
  struct statfs fsd;

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

-#ifdef STAT_STATFS2_FS_DATA	/* Ultrix.  */
+#ifdef STAT_STATFS2_FS_DATA	/* Ultrix */
+# define CONVERT_BLOCKS(B) adjust_blocks ((B), 1024, 512)
+
  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
+#endif /* STAT_STATFS2_FS_DATA */
+
+#ifdef STAT_READ_FILSYS		/* SVR2 */
+# ifndef SUPERBOFF
+#  define SUPERBOFF (SUPERB * 512)
+# endif
+# define CONVERT_BLOCKS(B) \
+    adjust_blocks ((B), (fsd.s_type == Fs2b ? 1024 : 512), 512)
+
  struct filsys fsd;
  int fd;

+  if (! disk)
+    {
+      errno = 0;
+      return -1;
+    }
+
  fd = open (disk, O_RDONLY);
  if (fd < 0)
    return -1;
@@ -136,21 +150,24 @@ get_fs_usage (path, disk, fsp)
      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.  */
+#endif /* STAT_READ_FILSYS */
+
+#ifdef STAT_STATFS2_BSIZE	/* 4.3BSD, SunOS 4, HP-UX, AIX */
+# define CONVERT_BLOCKS(B) adjust_blocks ((B), fsd.f_bsize, 512)
+
  struct statfs fsd;

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

-#ifdef STATFS_TRUNCATES_BLOCK_COUNTS
+# 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
@@ -162,20 +179,35 @@ get_fs_usage (path, disk, fsp)
      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 */
+# define CONVERT_BLOCKS(B) adjust_blocks ((B), fsd.f_fsize, 512)

-#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.  */
+#endif /* STAT_STATFS2_FSIZE */
+
+#ifdef STAT_STATFS4		/* SVR3, Dynix, Irix, AIX */
+# if _AIX || defined(_CRAY)
+#  define CONVERT_BLOCKS(B) adjust_blocks ((B), fsd.f_bsize, 512)
+#  ifdef _CRAY
+#   define f_bavail f_bfree
+#  endif
+# 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
+# endif
+
  struct statfs fsd;

  if (statfs (path, &fsd, sizeof fsd, 0) < 0)
@@ -183,38 +215,31 @@ get_fs_usage (path, disk, fsp)
  /* 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 || defined(_CRAY)
-#  define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_bsize, 512)
-#  ifdef _CRAY
-#   define f_bavail f_bfree
-#  endif
-# 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
-# endif
-#endif

-#ifdef STAT_STATVFS		/* SVR4.  */
+#endif /* STAT_STATFS4 */
+
+#ifdef STAT_STATVFS		/* SVR4 */
+# define CONVERT_BLOCKS(B) \
+    adjust_blocks ((B), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512)
+
  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.  */
+#endif /* STAT_STATVFS */
+
+#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
+
+#endif /* not STAT_STATFS2_FS_DATA && not STAT_READ_FILSYS */

  return 0;
 }
@@ -245,4 +270,5 @@ statfs (path, fsb)
  fsb->f_fsid.val[1] = fsd.du_pckno;
  return 0;
 }
+
 #endif /* _AIX && _I386 */
--- 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 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
@@ -18,13 +18,13 @@
   Copied largely from GNU C's cccp.c.
   */

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

 #include <sys/types.h>

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

@@ -48,6 +48,10 @@ full_write (desc, ptr, len)
  while (len > 0)
    {
      int written = write (desc, ptr, len);
+      /* FIXME: write on my 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 (written < 0)
 	{
 #ifdef EINTR
--- a/lib/getdate.h
+++ b/lib/getdate.h
@@ -0,0 +1,46 @@
+/*  Copyright (C) 1995 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.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+# ifndef PARAMS
+#  if defined (__GNUC__) || __STDC__
+#   define PARAMS(args) args
+#  else
+#   define PARAMS(args) ()
+#  endif
+# endif
+
+#if defined (vms)
+# include <types.h>
+# include <time.h>
+#else
+# include <sys/types.h>
+# ifdef TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+# else
+#  ifdef 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,59 @@
+/* provide consistent interface to getgroups for systems that don't allow N==0
+   Copyright (C) 1996 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 is returned.
+   This function handles that special case and lets the system-
+   provided function handle all others.  */
+
+int
+getgroups (n, group)
+     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/getline.h
+++ b/lib/getline.h
@@ -14,8 +14,8 @@ 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>

@@ -24,8 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #   define PARAMS(args) args
 #  else
 #   define PARAMS(args) ()
-#  endif  /* GCC.  */
-# endif  /* Not PARAMS.  */
+#  endif
+# endif

 int
 getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
@@ -33,4 +33,4 @@ getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
 int
 getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));

-#endif
+#endif /* not GETLINE_H_ */
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -3,22 +3,28 @@
   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
   before changing it!

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

 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
   Ditto for AIX 3.2 and <stdlib.h>.  */
@@ -48,18 +54,24 @@
   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
 #endif	/* GNU C library.  */

 #ifdef VMS
@@ -69,7 +81,7 @@
 #endif
 #endif

-#ifdef WIN32
+#if defined (WIN32) && !defined (__CYGWIN32__)
 /* It's not Unix, really.  See?  Capital letters.  */
 #include <windows.h>
 #define getpid() GetCurrentProcessId()
@@ -116,14 +128,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 = 0;

 /* The next char to be scanned in the option-element
   in which the last option character we returned was found.
@@ -172,7 +190,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,7 +200,7 @@ 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
@@ -233,12 +251,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;
+
+extern pid_t __libc_pid;
+
+/* 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;
+}
+text_set_element (__libc_subinit, store_args_and_env);
+
+# 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.
@@ -266,6 +318,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
+	{
+	  memcpy (new_str, __getopt_nonoption_flags, nonoption_flags_max_len);
+	  memset (&new_str[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 +354,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 +371,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;
@@ -311,17 +387,19 @@ exchange (argv)
 /* Initialize the internal data when the first call is made.  */

 #if defined (__STDC__) && __STDC__
-static const char *_getopt_initialize (const char *);
+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 +422,38 @@ _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
+		{
+		  memcpy (__getopt_nonoption_flags, orig_str, len);
+		  memset (&__getopt_nonoption_flags[len], '\0',
+			  nonoption_flags_max_len - len);
+		}
+	    }
+	}
+      nonoption_flags_len = nonoption_flags_max_len;
    }
+  else
+    nonoption_flags_len = 0;
+#endif

  return optstring;
 }
@@ -375,7 +471,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.)
@@ -429,18 +525,25 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 {
  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.  */
+     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			      \
-			 && nonoption_flags[optind] == '1'))
+			 && __getopt_nonoption_flags[optind] == '1'))
+#else
+#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif

  if (nextchar == NULL || *nextchar == '\0')
    {
@@ -498,7 +601,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 +610,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 +646,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;
@@ -601,16 +701,16 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	      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 (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);

@@ -626,8 +726,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		{
 		  if (opterr)
 		    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] == ':' ? ':' : '?';
@@ -694,6 +794,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 (opterr)
+	      {
+		/* 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 (opterr)
+	      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 (opterr)
+		      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 (opterr)
+		      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] == ':')
@@ -724,8 +948,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		  {
 		    /* 1003.2 specifies the format of this message.  */
 		    fprintf (stderr,
-			     _("%s: option requires an argument -- %c\n"),
-			     argv[0], c);
+			   _("%s: option requires an argument -- %c\n"),
+			   argv[0], c);
 		  }
 		optopt = c;
 		if (optstring[0] == ':')
@@ -756,7 +980,7 @@ getopt (argc, argv, optstring)
 			   0);
 }

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

 #ifdef TEST

@@ -776,7 +1000,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,19 +1,25 @@
 /* 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 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.
+   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.
+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, 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.
+
+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 _GETOPT_H
 #define _GETOPT_H 1
@@ -36,7 +42,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
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -1,20 +1,25 @@
 /* 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 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.
+   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.
+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, 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.
+
+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.  */

 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -40,15 +45,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 +94,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 +125,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/getusershell.c
+++ b/lib/getusershell.c
@@ -177,7 +177,7 @@ readname (name, size, stream)
  /* Skip blank space.  */
  while ((c = getc (stream)) != EOF && isspace (c))
    /* Do nothing. */ ;
-  
+
  while (c != EOF && !isspace (c))
    {
      (*name)[name_index++] = c;
--- a/lib/getversion.c
+++ b/lib/getversion.c
@@ -17,14 +17,14 @@

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

-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#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 ();
@@ -32,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
 };
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -120,7 +120,7 @@ group_member (gid)
 	  break;
 	}
    }
-  
+
  free_group_info (gi);

  return found;
--- a/lib/group-member.h
+++ b/lib/group-member.h
@@ -1,7 +1,7 @@
-#ifndef _group_member_h_
-# define _group_member_h_ 1
+#ifndef GROUP_MEMBER_H_
+# define GROUP_MEMBER_H_ 1

 int
  group_member ();

-#endif /* _group_member_h_ */
+#endif /* GROUP_MEMBER_H_ */
--- a/lib/interlock
+++ b/lib/interlock
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+# interlock - wrap program invocation in lock to allow
+#             parallel builds to work.
+# Written by Tom Tromey <tromey@cygnus.com>, Aug 10 1996
+#
+# 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.
+
+# Usage:
+#   interlock lock-dir-name program args-to-program...
+
+dirname="$1"
+program="$2"
+
+shift
+shift
+
+while (mkdir $dirname > /dev/null 2>&1 && exit 1 || exit 0); do
+   # Wait a bit.
+   sleep 1
+done
+
+# Race condition here: if interrupted after the loop but before this
+# trap, the lock can be left around.
+trap "rmdir $dirname > /dev/null 2>&1" 1 2 3 15
+
+# We have the lock, so run the program.
+$program ${1+"$@"}
+ret=$?
+
+# Release the lock.
+rmdir $dirname > /dev/null 2>&1
+
+exit $ret
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -12,8 +12,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.  */

 /* A `struct linebuffer' holds a line of text. */

@@ -24,20 +24,21 @@ struct linebuffer
  char *buffer;
 };

-#undef __P
+#undef PARAMS
 #if defined (__STDC__) && __STDC__
-#define	__P(x) x
+# define PARAMS(Args) Args
 #else
-#define	__P(x) ()
+# define PARAMS(Args) ()
 #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.
   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 *));
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -36,25 +36,24 @@ static struct option const long_options[] =
   Be careful not to gobble up `--'.  */

 void
-parse_long_options (argc, argv, command_name, version_string, usage)
+parse_long_options (argc, argv, command_name, package, version, usage)
     int argc;
     char **argv;
     const char *command_name;
-     const char *version_string;
+     const char *package;
+     const char *version;
     void (*usage)();
 {
  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)
 	{
@@ -62,7 +61,7 @@ parse_long_options (argc, argv, command_name, version_string, usage)
 	  (*usage) (0);

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

 	default:
@@ -74,6 +73,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,31 @@
-#undef __P
+/* long-options.h -- declaration for --help- and --version-handling function.
+   Copyright (C) 1993, 1994 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.  */
+
+#undef PARAMS
 #if defined (__STDC__) && __STDC__
-#define __P(args) args
+# define PARAMS(Args) Args
 #else
-#define __P(args) ()
+# define PARAMS(Args) ()
 #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, 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 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
@@ -17,52 +17,52 @@

 /* 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>
+#if STDC_HEADERS
+# include <stdlib.h>
 #endif

-#ifdef HAVE_ERRNO_H
-#include <errno.h>
+#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>
@@ -76,9 +76,34 @@ typedef int uid_t;
 typedef int gid_t;
 #endif

+#include "save-cwd.h"
 #include "makepath.h"
+#include "error.h"

-void error ();
+void strip_trailing_slashes ();
+
+#define CLEANUP_CWD					\
+  do							\
+    {							\
+      /* We're done operating on basename_dir.		\
+	 Restore working directory.  */			\
+      if (saved_cwd)					\
+	{						\
+	  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)

 /* Ensure that the directory ARGPATH exists.
   Remove any trailing slashes from ARGPATH before calling this function.
@@ -120,17 +145,10 @@ make_path (argpath, mode, parent_mode, owner, group, 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.  */
@@ -141,6 +159,19 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	struct ptr_list *next;
      };
      struct ptr_list *p, *leading_dirs = NULL;
+      int saved_cwd = 0;
+      struct saved_cwd cwd;
+      char *basename_dir;
+      int first_subdir = 1;
+      char *dirpath;
+
+      /* Temporarily relax umask in case it's overly restrictive.  */
+      int 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
@@ -159,17 +190,36 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	}

      slash = dirpath;
+
+      /* Skip over leading slashes.  */
      while (*slash == '/')
 	slash++;
-      while ((slash = strchr (slash, '/')))
+
+      while (1)
 	{
-	  *slash = '\0';
-	  if (stat (dirpath, &stats))
+	  /* slash points to the leftmost unprocessed component of dirpath.  */
+	  basename_dir = slash;
+
+	  slash = strchr (slash, '/');
+	  if (slash == NULL)
+	    break;
+
+	  if (first_subdir)
 	    {
-	      if (mkdir (dirpath, tmp_mode))
+	      first_subdir = 0;
+	      saved_cwd = !save_cwd (&cwd);
+	    }
+
+	  if (!saved_cwd)
+	    basename_dir = dirpath;
+
+	  *slash = '\0';
+	  if (stat (basename_dir, &stats))
+	    {
+	      if (mkdir (basename_dir, tmp_mode))
 		{
 		  error (0, errno, "cannot create directory `%s'", dirpath);
-		  umask (oldmask);
+		  CLEANUP;
 		  return 1;
 		}
 	      else
@@ -178,15 +228,17 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 		    error (0, 0, verbose_fmt_string, dirpath);

 		  if (owner != (uid_t) -1 && group != (gid_t) -1
-		      && chown (dirpath, owner, group)
+		      && chown (basename_dir, owner, group)
 #if defined(AFS) && defined (EPERM)
 		      && errno != EPERM
 #endif
 		      )
 		    {
 		      error (0, errno, "%s", dirpath);
-		      retval = 1;
+		      CLEANUP;
+		      return 1;
 		    }
+
 		  if (re_protect)
 		    {
 		      struct ptr_list *new = (struct ptr_list *)
@@ -200,7 +252,14 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	  else if (!S_ISDIR (stats.st_mode))
 	    {
 	      error (0, 0, "`%s' exists but is not a directory", dirpath);
-	      umask (oldmask);
+	      CLEANUP;
+	      return 1;
+	    }
+
+	  if (saved_cwd && chdir (basename_dir) < 0)
+	    {
+	      error (0, errno, "cannot chdir to directory, %s", dirpath);
+	      CLEANUP;
 	      return 1;
 	    }

@@ -212,40 +271,49 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	    slash++;
 	}

+      if (!saved_cwd)
+	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 (stat (basename_dir, &stats) && mkdir (basename_dir, mode))
 	{
 	  error (0, errno, "cannot create directory `%s'", dirpath);
-	  umask (oldmask);
+	  CLEANUP;
 	  return 1;
 	}
+
+      /* Done creating directories.  Restore original umask.  */
+      umask (oldmask);
+
      if (verbose_fmt_string != NULL)
 	error (0, 0, verbose_fmt_string, 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);
+	      error (0, errno, "cannot chown %s", dirpath);
 	      retval = 1;
 	    }
 	  /* chown may have turned off some permission bits we wanted.  */
-	  if ((mode & 07000) != 0 && chmod (dirpath, mode))
+	  if ((mode & 07000) != 0 && chmod (basename_dir, mode))
 	    {
-	      error (0, errno, "%s", dirpath);
+	      error (0, errno, "cannot chmod %s", 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.  */
@@ -263,10 +331,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);
 	  return 1;
 	}

@@ -296,6 +365,5 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	}
    }

-  umask (oldmask);
  return retval;
 }
--- a/lib/makepath.h
+++ b/lib/makepath.h
@@ -1,8 +1,8 @@
-#if __STDC__
 # undef __P
-# define __P(args) args
+#if __STDC__
+# define __P(Args) Args
 #else
-# define __P(args) ()
+# define __P(Args) ()
 #endif

 int
--- 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
@@ -16,7 +18,7 @@
   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/lib/md5.h
+++ b/lib/md5.h
@@ -1,23 +1,25 @@
 /* md5.h - Declaration of functions and data types used for MD5 sum
   computing library functions.
-   Copyright (C) 1995 Free 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
-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,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #ifndef _MD5_H
-#define _MD5_H
+#define _MD5_H 1

 #include <stdio.h>

@@ -32,33 +34,38 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   the resulting executable.  Locally running cross-compiled executables
   is usually not possible.  */

-#if defined __STDC__ && __STDC__
-# define UINT_MAX_32_BITS 4294967295U
+#ifdef _LIBC
+# include <sys/types.h>
+typedef u_int32_t md5_uint32;
 #else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
+# if defined __STDC__ && __STDC__
+#  define UINT_MAX_32_BITS 4294967295U
+# else
+#  define UINT_MAX_32_BITS 0xFFFFFFFF
+# endif

 /* If UINT_MAX isn't defined, assume it's a 32-bit type.
   This should be valid for all systems GNU cares about because
   that doesn't include 16-bit systems, and only modern systems
   (that certainly have <limits.h>) have 64+-bit integral types.  */

-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
+# ifndef UINT_MAX
+#  define UINT_MAX UINT_MAX_32_BITS
+# endif

-#if UINT_MAX == UINT_MAX_32_BITS
-  typedef unsigned int md5_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-   typedef unsigned short md5_uint32;
+# if UINT_MAX == UINT_MAX_32_BITS
+   typedef unsigned int md5_uint32;
 # else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-    typedef unsigned long md5_uint32;
+#  if USHRT_MAX == UINT_MAX_32_BITS
+    typedef unsigned short md5_uint32;
 #  else
-    /* The following line is intended to evoke an error.
-       Using #error is not portable enough.  */
-    "Cannot determine unsigned 32-bit data type."
+#   if ULONG_MAX == UINT_MAX_32_BITS
+     typedef unsigned long md5_uint32;
+#   else
+     /* The following line is intended to evoke an error.
+        Using #error is not portable enough.  */
+     "Cannot determine unsigned 32-bit data type."
+#   endif
 #  endif
 # endif
 #endif
@@ -77,6 +84,10 @@ struct md5_ctx
  md5_uint32 B;
  md5_uint32 C;
  md5_uint32 D;
+
+  md5_uint32 total[2];
+  md5_uint32 buflen;
+  char buffer[128];
 };

 /*
@@ -86,30 +97,50 @@ struct md5_ctx

 /* Initialize structure containing state of computation.
   (RFC 1321, 3.3: Step 3)  */
-void md5_init_ctx __P ((struct md5_ctx *ctx));
+extern void md5_init_ctx __P ((struct md5_ctx *ctx));

 /* Starting with the result of former calls of this function (or the
-   initialzation function update the context for the next LEN bytes
+   initialization function update the context for the next LEN bytes
   starting at BUFFER.
   It is necessary that LEN is a multiple of 64!!! */
-void md5_process_block __P ((const void *buffer, size_t len,
-			     struct md5_ctx *ctx));
+extern void md5_process_block __P ((const void *buffer, size_t len,
+				    struct md5_ctx *ctx));
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void md5_process_bytes __P ((const void *buffer, size_t len,
+				    struct md5_ctx *ctx));
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+extern void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf));
+

 /* Put result from CTX in first 16 bytes following RESBUF.  The result is
   always in little endian byte order, so that a byte-wise output yields
-   to the wanted ASCII representation of the message digest.  */
-void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf));
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+extern void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *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.  */
-int md5_stream __P ((FILE *stream, void *resblock));
+extern int md5_stream __P ((FILE *stream, void *resblock));

 /* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
   result is always in little endian byte order, so that a byte-wise
   output yields to the wanted ASCII representation of the message
   digest.  */
-void *md5_buffer __P ((const char *buffer, size_t len, void *resblock));
+extern void *md5_buffer __P ((const char *buffer, size_t len, void *resblock));

 #endif
--- a/lib/memcasecmp.h
+++ b/lib/memcasecmp.h
@@ -1,9 +1,9 @@
-#undef __P
+#undef PARAMS
 #if defined (__STDC__) && __STDC__
-# define __P(args) args
+# define PARAMS(Args) Args
 #else
-# define __P(args) ()
+# define PARAMS(Args) ()
 #endif

 int
-  memcasecmp __P((const void *vs1, const void *vs2, size_t n));
+  memcasecmp PARAMS ((const void *vs1, const void *vs2, size_t n));
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991, 1993 Free Software Foundation, Inc.
-   Based on strlen implemention by Torbjorn Granlund (tege@sics.se),
+/* Copyright (C) 1991, 1993, 1997 Free Software Foundation, Inc.
+   Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
   with help from Dan Sahlin (dan@sics.se) and
   commentary by Jim Blandy (jimb@ai.mit.edu);
   adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
--- a/lib/memcmp.c
+++ b/lib/memcmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc.
   Contributed by Torbjorn Granlund (tege@sics.se).

 NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -364,3 +364,8 @@ memcmp (s1, s2, len)

  return 0;
 }
+
+#ifdef weak_alias
+#undef bcmp
+weak_alias (memcmp, bcmp)
+#endif
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -1,3 +1,25 @@
+/* Copyright (C) 1995, 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 <meyering@na-net.ornl.gov>.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 /* Copy LEN bytes starting at SRCADDR to DESTADDR.  Result undefined
   if the source overlaps with the destination.
   Return DESTADDR. */
--- a/lib/memmove.c
+++ b/lib/memmove.c
@@ -3,7 +3,7 @@
   In the public domain.
   By David MacKenzie <djm@gnu.ai.mit.edu>.  */

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

--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -1,4 +1,4 @@
-/* mkdir.c -- BSD compatible make directory function for System V
+/* BSD compatible make directory function for System V
   Copyright (C) 1988, 1990 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
@@ -15,8 +15,8 @@
   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>
@@ -26,12 +26,12 @@
 extern int errno;
 #endif

-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
+#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

 /* mkdir adapted from GNU tar.  */
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
   Contributed by Paul Eggert (eggert@twinsun.com).

-This file is part of the GNU C Library.
+   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.

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

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

 /* Define this to have a standalone program to test this implementation of
   mktime.  */
@@ -26,6 +26,12 @@ Suite 330, Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #endif

+#ifdef _LIBC
+# define HAVE_LIMITS_H 1
+# define HAVE_LOCALTIME_R 1
+# define STDC_HEADERS 1
+#endif
+
 /* Assume that leap seconds are possible, unless told otherwise.
   If the host has a `zic' command with a `-L leapsecondfilename' option,
   then it supports leap seconds; otherwise it probably doesn't.  */
@@ -36,13 +42,13 @@ Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/types.h>		/* Some systems define `time_t' here.  */
 #include <time.h>

-#if __STDC__ || __GNU_LIBRARY__ || STDC_HEADERS
+#if HAVE_LIMITS_H
 #include <limits.h>
 #endif

 #if DEBUG
 #include <stdio.h>
-#if __STDC__ || __GNU_LIBRARY__ || STDC_HEADERS
+#if STDC_HEADERS
 #include <stdlib.h>
 #endif
 /* Make it work even if the system's libc has its own mktime routine.  */
@@ -69,8 +75,10 @@ Suite 330, Boston, MA 02111-1307, USA.  */
 #endif

 #ifndef TIME_T_MIN
-#define TIME_T_MIN (0 < (time_t) -1 ? (time_t) 0 \
-		    : ~ (time_t) 0 << (sizeof (time_t) * CHAR_BIT - 1))
+/* The outer cast to time_t works around a bug in Cray C 5.0.3.0.  */
+#define TIME_T_MIN ((time_t) \
+		    (0 < (time_t) -1 ? (time_t) 0 \
+		     : ~ (time_t) 0 << (sizeof (time_t) * CHAR_BIT - 1)))
 #endif
 #ifndef TIME_T_MAX
 #define TIME_T_MAX (~ (time_t) 0 - TIME_T_MIN)
@@ -101,10 +109,10 @@ time_t __mktime_internal __P ((struct tm *,
 			       time_t *));


-#if ! HAVE_LOCALTIME_R && ! defined (localtime_r)
 #ifdef _LIBC
 #define localtime_r __localtime_r
 #else
+#if ! HAVE_LOCALTIME_R && ! defined (localtime_r)
 /* Approximate localtime_r as best we can in its absence.  */
 #define localtime_r my_localtime_r
 static struct tm *localtime_r __P ((const time_t *, struct tm *));
@@ -119,8 +127,8 @@ localtime_r (t, tp)
  *tp = *l;
  return tp;
 }
-#endif /* ! _LIBC */
 #endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */
+#endif /* ! _LIBC */


 /* Yield the difference between (YEAR-YDAY HOUR:MIN:SEC) and (*TP),
@@ -133,11 +141,19 @@ ydhms_tm_diff (year, yday, hour, min, sec, tp)
     int year, yday, hour, min, sec;
     const struct tm *tp;
 {
-  time_t ay = year + (time_t) (TM_YEAR_BASE - 1);
-  time_t by = tp->tm_year + (time_t) (TM_YEAR_BASE - 1);
-  time_t intervening_leap_days =
-    (ay/4 - by/4) - (ay/100 - by/100) + (ay/400 - by/400);
-  time_t years = ay - by;
+  /* Compute intervening leap days correctly even if year is negative.
+     Take care to avoid int overflow.  time_t overflow is OK, since
+     only the low order bits of the correct time_t answer are needed.
+     Don't convert to time_t until after all divisions are done, since
+     time_t might be unsigned.  */
+  int a4 = (year >> 2) + (TM_YEAR_BASE >> 2) - ! (year & 3);
+  int b4 = (tp->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (tp->tm_year & 3);
+  int a100 = a4 / 25 - (a4 % 25 < 0);
+  int b100 = b4 / 25 - (b4 % 25 < 0);
+  int a400 = a100 >> 2;
+  int b400 = b100 >> 2;
+  int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
+  time_t years = year - (time_t) tp->tm_year;
  time_t days = (365 * years + intervening_leap_days
 		 + (yday - tp->tm_yday));
  return (60 * (60 * (24 * days + (hour - tp->tm_hour))
@@ -146,12 +162,20 @@ ydhms_tm_diff (year, yday, hour, min, sec, tp)
 }


+static time_t localtime_offset;
+
 /* Convert *TP to a time_t value.  */
 time_t
 mktime (tp)
     struct tm *tp;
 {
-  static time_t localtime_offset;
+#ifdef _LIBC
+  /* POSIX.1 8.1.1 requires that whenever mktime() is called, the
+     time zone names contained in the external variable `tzname' shall
+     be set as if the tzset() function had been called.  */
+  __tzset ();
+#endif
+
  return __mktime_internal (tp, localtime_r, &localtime_offset);
 }

--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -24,30 +24,30 @@
   changing the mode of many files, this probably results in a
   performance gain. */

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

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

-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if STDC_HEADERS
+# include <stdlib.h>
 #else
 char *malloc ();
 #endif

 #ifndef NULL
-#define NULL 0
+# define NULL 0
 #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

 /* Return newly allocated memory to hold one element of type TYPE. */
--- a/lib/modechange.h
+++ b/lib/modechange.h
@@ -46,11 +46,11 @@ struct mode_change

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

 struct mode_change *mode_compile __P ((const char *, unsigned));
 unsigned short mode_adjust __P ((unsigned, const struct mode_change *));
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -1,5 +1,5 @@
 /* mountlist.c -- return a list of mounted filesystems
-   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
@@ -16,7 +16,7 @@
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

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

 #include <stdio.h>
@@ -24,14 +24,14 @@
 #include "mountlist.h"

 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 void free ();
 #endif
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
+# include <string.h>
 #else
-#include <strings.h>
+# include <strings.h>
 #endif

 char *strstr ();
@@ -41,62 +41,73 @@ char *xstrdup ();
 void error ();

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

 #if defined (MOUNTED_GETFSSTAT)	/* __alpha running OSF_1 */
-#  include <sys/mount.h>
-#  include <sys/fs_types.h>
+# include <sys/mount.h>
+# include <sys/fs_types.h>
 #endif /* MOUNTED_GETFSSTAT */

 #ifdef MOUNTED_GETMNTENT1	/* 4.3BSD, SunOS, HP-UX, Dynix, Irix.  */
-#include <mntent.h>
-#if !defined(MOUNTED)
+# include <mntent.h>
+# if !defined(MOUNTED)
 #  if defined(MNT_MNTTAB)	/* HP-UX.  */
-#    define MOUNTED MNT_MNTTAB
+#   define MOUNTED MNT_MNTTAB
 #  endif
 #  if defined(MNTTABNAME)	/* Dynix.  */
-#    define MOUNTED MNTTABNAME
+#   define MOUNTED MNTTABNAME
 #  endif
-#endif
+# endif
 #endif

 #ifdef MOUNTED_GETMNTINFO	/* 4.4BSD.  */
-#include <sys/mount.h>
+# include <sys/mount.h>
 #endif

 #ifdef MOUNTED_GETMNT		/* Ultrix.  */
-#include <sys/mount.h>
-#include <sys/fs_types.h>
+# include <sys/mount.h>
+# include <sys/fs_types.h>
 #endif

 #ifdef MOUNTED_FREAD		/* SVR2.  */
-#include <mnttab.h>
+# include <mnttab.h>
 #endif

 #ifdef MOUNTED_FREAD_FSTYP	/* SVR3.  */
-#include <mnttab.h>
-#include <sys/fstyp.h>
-#include <sys/statfs.h>
+# include <mnttab.h>
+# include <sys/fstyp.h>
+# include <sys/statfs.h>
 #endif

 #ifdef MOUNTED_LISTMNTENT
-#include <mntent.h>
+# include <mntent.h>
 #endif

 #ifdef MOUNTED_GETMNTENT2	/* SVR4.  */
-#include <sys/mnttab.h>
+# include <sys/mnttab.h>
 #endif

 #ifdef MOUNTED_VMOUNT		/* AIX.  */
-#include <fshelp.h>
-#include <sys/vfs.h>
+# include <fshelp.h>
+# include <sys/vfs.h>
 #endif

 #ifdef DOLPHIN
 /* So special that it's not worth putting this in autoconf.  */
-#undef MOUNTED_FREAD_FSTYP
-#define MOUNTED_GETMNTTBL
+# undef MOUNTED_FREAD_FSTYP
+# define MOUNTED_GETMNTTBL
+#endif
+
+#ifdef HAVE_SYS_MNTENT_H
+/* This is to get MNTOPT_IGNORE on e.g. SVR4.  */
+# include <sys/mntent.h>
+#endif
+
+#if defined (MNTOPT_IGNORE) && defined (HAVE_HASMNTOPT)
+# define MNT_IGNORE(M) hasmntopt ((M), MNTOPT_IGNORE)
+#else
+# define MNT_IGNORE(M) 0
 #endif

 #ifdef MOUNTED_GETMNTENT1	/* 4.3BSD, SunOS, HP-UX, Dynix, Irix.  */
@@ -127,37 +138,97 @@ xatoi (cp)
 }
 #endif /* MOUNTED_GETMNTENT1.  */

-#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__)
+#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__)
 static char *
 fstype_to_string (t)
     short t;
 {
  switch (t)
    {
-    case MOUNT_UFS:
-      return "ufs";
-    case MOUNT_NFS:
-      return "nfs";
-#ifdef MOUNT_PC
+# ifdef MOUNT_PC
    case MOUNT_PC:
      return "pc";
-#endif
-#ifdef MOUNT_MFS
+# endif
+# ifdef MOUNT_MFS
    case MOUNT_MFS:
      return "mfs";
-#endif
-#ifdef MOUNT_LO
+# endif
+# ifdef MOUNT_LO
    case MOUNT_LO:
      return "lo";
-#endif
-#ifdef MOUNT_TFS
+# endif
+# ifdef MOUNT_TFS
    case MOUNT_TFS:
      return "tfs";
-#endif
-#ifdef MOUNT_TMP
+# endif
+# ifdef MOUNT_TMP
    case MOUNT_TMP:
      return "tmp";
-#endif
+# endif
+# ifdef MOUNT_UFS
+   case MOUNT_UFS:
+     return "ufs" ;
+# endif
+# ifdef MOUNT_NFS
+   case MOUNT_NFS:
+     return "nfs" ;
+# endif
+# ifdef MOUNT_MSDOS
+   case MOUNT_MSDOS:
+     return "msdos" ;
+# endif
+# ifdef MOUNT_LFS
+   case MOUNT_LFS:
+     return "lfs" ;
+# endif
+# ifdef MOUNT_LOFS
+   case MOUNT_LOFS:
+     return "lofs" ;
+# endif
+# ifdef MOUNT_FDESC
+   case MOUNT_FDESC:
+     return "fdesc" ;
+# endif
+# ifdef MOUNT_PORTAL
+   case MOUNT_PORTAL:
+     return "portal" ;
+# endif
+# ifdef MOUNT_NULL
+   case MOUNT_NULL:
+     return "null" ;
+# endif
+# ifdef MOUNT_UMAP
+   case MOUNT_UMAP:
+     return "umap" ;
+# endif
+# ifdef MOUNT_KERNFS
+   case MOUNT_KERNFS:
+     return "kernfs" ;
+# endif
+# ifdef MOUNT_PROCFS
+   case MOUNT_PROCFS:
+     return "procfs" ;
+# endif
+# ifdef MOUNT_AFS
+   case MOUNT_AFS:
+     return "afs" ;
+# endif
+# ifdef MOUNT_CD9660
+   case MOUNT_CD9660:
+     return "cd9660" ;
+# endif
+# ifdef MOUNT_UNION
+   case MOUNT_UNION:
+     return "union" ;
+# endif
+# ifdef MOUNT_DEVFS
+   case MOUNT_DEVFS:
+     return "devfs" ;
+# endif
+# ifdef MOUNT_EXT2FS
+   case MOUNT_EXT2FS:
+     return "ext2fs" ;
+# endif
    default:
      return "?";
    }
@@ -204,7 +275,7 @@ read_filesystem_list (need_fs_type, all_fs)
    struct tabmntent *mntlist, *p;
    struct mntent *mnt;
    struct mount_entry *me;
-    
+
    /* the third and fourth arguments could be used to filter mounts,
       but Crays doesn't seem to have any mounts that we want to
       remove. Specifically, automount create normal NFS mounts.
@@ -285,11 +356,11 @@ read_filesystem_list (need_fs_type, all_fs)
 	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
 	me->me_devname = xstrdup (fsp->f_mntfromname);
 	me->me_mountdir = xstrdup (fsp->f_mntonname);
-#ifdef __NetBSD__
+# if defined (__NetBSD__) || defined (__OpenBSD__)
 	me->me_type = xstrdup (fsp->f_fstypename);
-#else
+# else
 	me->me_type = fstype_to_string (fsp->f_type);
-#endif
+# endif
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
 	me->me_next = NULL;

@@ -376,17 +447,17 @@ read_filesystem_list (need_fs_type, all_fs)
    while (fread (&mnt, sizeof mnt, 1, fp) > 0)
      {
 	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
-#ifdef GETFSTYP			/* SVR3.  */
+# ifdef GETFSTYP			/* SVR3.  */
 	me->me_devname = xstrdup (mnt.mt_dev);
-#else
+# else
 	me->me_devname = xmalloc (strlen (mnt.mt_dev) + 6);
 	strcpy (me->me_devname, "/dev/");
 	strcpy (me->me_devname + 5, mnt.mt_dev);
-#endif
+# endif
 	me->me_mountdir = xstrdup (mnt.mt_filsys);
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
 	me->me_type = "";
-#ifdef GETFSTYP			/* SVR3.  */
+# ifdef GETFSTYP			/* SVR3.  */
 	if (need_fs_type)
 	  {
 	    struct statfs fsd;
@@ -396,7 +467,7 @@ read_filesystem_list (need_fs_type, all_fs)
 		&& sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1)
 	      me->me_type = xstrdup (typebuf);
 	  }
-#endif
+# endif
 	me->me_next = NULL;

 	/* Add to the linked list. */
@@ -442,6 +513,10 @@ read_filesystem_list (need_fs_type, all_fs)

    while ((ret = getmntent (fp, &mnt)) == 0)
      {
+	/* Don't show automounted filesystems twice on e.g., Solaris.  */
+	if (!all_fs && MNT_IGNORE (&mnt))
+	  continue;
+
 	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
 	me->me_devname = xstrdup (mnt.mnt_special);
 	me->me_mountdir = xstrdup (mnt.mnt_mountp);
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -1,34 +1,50 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1988,89,90,91,92,93,94,96 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.  */

 #include "obstack.h"

-/* This is just to get __GNU_LIBRARY__ defined.  */
-#include <stdio.h>
+/* NOTE BEFORE MODIFYING THIS FILE: This version number must be
+   incremented whenever callers compiled using an old obstack.h can no
+   longer properly call the functions in this obstack.c.  */
+#define OBSTACK_INTERFACE_VERSION 1

 /* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
+   actually compiling the library itself, and the installed library
+   supports the same library interface we do.  This code is part of the GNU
+   C Library, but also included in many other GNU distributions.  Compiling
   and linking in this code is a waste when using the GNU C library
   (especially if it is a shared library).  Rather than having every GNU
-   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.  */
+   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__)
+#include <stdio.h>		/* Random thing to get __GNU_LIBRARY__.  */
+#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+#include <gnu-versions.h>
+#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+
+#ifndef ELIDE_CODE


 #if defined (__STDC__) && __STDC__
@@ -40,7 +56,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Determine default alignment.  */
 struct fooalign {char x; double d;};
 #define DEFAULT_ALIGNMENT  \
-  ((PTR_INT_TYPE) ((char *)&((struct fooalign *) 0)->d - (char *)0))
+  ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0))
 /* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
   But in fact it might be less smart and round addresses to as much as
   DEFAULT_ROUNDING.  So we prepare for it to do that.  */
@@ -55,6 +71,28 @@ union fooround {long x; double d;};
 #define COPYING_UNIT int
 #endif

+
+/* The functions allocating more room by calling `obstack_chunk_alloc'
+   jump to the handler pointed to by `obstack_alloc_failed_handler'.
+   This variable by default points to the internal function
+   `print_and_abort'.  */
+#if defined (__STDC__) && __STDC__
+static void print_and_abort (void);
+void (*obstack_alloc_failed_handler) (void) = print_and_abort;
+#else
+static void print_and_abort ();
+void (*obstack_alloc_failed_handler) () = print_and_abort;
+#endif
+
+/* Exit value used when `print_and_abort' is used.  */
+#if defined (__STDC__) && __STDC__
+#include <stdlib.h>
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+int obstack_exit_failure = EXIT_FAILURE;
+
 /* The non-GNU-C macros copy the obstack into this global variable
   to avoid multiple evaluation.  */

@@ -66,18 +104,33 @@ struct obstack *_obstack;
   For free, do not use ?:, since some compilers, like the MIPS compilers,
   do not allow (expr) ? void : void.  */

+#if defined (__STDC__) && __STDC__
 #define CALL_CHUNKFUN(h, size) \
  (((h) -> use_extra_arg) \
   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
-   : (*(h)->chunkfun) ((size)))
+   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))

 #define CALL_FREEFUN(h, old_chunk) \
  do { \
    if ((h) -> use_extra_arg) \
      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
    else \
-      (*(h)->freefun) ((old_chunk)); \
+      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
  } while (0)
+#else
+#define CALL_CHUNKFUN(h, size) \
+  (((h) -> use_extra_arg) \
+   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
+   : (*(struct _obstack_chunk *(*) ()) (h)->chunkfun) ((size)))
+
+#define CALL_FREEFUN(h, old_chunk) \
+  do { \
+    if ((h) -> use_extra_arg) \
+      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
+    else \
+      (*(void (*) ()) (h)->freefun) ((old_chunk)); \
+  } while (0)
+#endif


 /* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
@@ -94,10 +147,15 @@ _obstack_begin (h, size, alignment, chunkfun, freefun)
     struct obstack *h;
     int size;
     int alignment;
+#if defined (__STDC__) && __STDC__
+     POINTER (*chunkfun) (long);
+     void (*freefun) (void *);
+#else
     POINTER (*chunkfun) ();
     void (*freefun) ();
+#endif
 {
-  register struct _obstack_chunk* chunk; /* points to new chunk */
+  register struct _obstack_chunk *chunk; /* points to new chunk */

  if (alignment == 0)
    alignment = DEFAULT_ALIGNMENT;
@@ -118,25 +176,27 @@ _obstack_begin (h, size, alignment, chunkfun, freefun)
      size = 4096 - extra;
    }

+#if defined (__STDC__) && __STDC__
+  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
+  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
+#else
  h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
  h->freefun = freefun;
+#endif
  h->chunk_size = size;
  h->alignment_mask = alignment - 1;
  h->use_extra_arg = 0;

  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
  if (!chunk)
-    {
-      h->alloc_failed = 1;
-      return 0;
-    }
-  h->alloc_failed = 0;
+    (*obstack_alloc_failed_handler) ();
  h->next_free = h->object_base = chunk->contents;
  h->chunk_limit = chunk->limit
    = (char *) chunk + h->chunk_size;
  chunk->prev = 0;
  /* The initial chunk now contains no empty object.  */
  h->maybe_empty_object = 0;
+  h->alloc_failed = 0;
  return 1;
 }

@@ -145,11 +205,16 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
     struct obstack *h;
     int size;
     int alignment;
+#if defined (__STDC__) && __STDC__
+     POINTER (*chunkfun) (POINTER, long);
+     void (*freefun) (POINTER, POINTER);
+#else
     POINTER (*chunkfun) ();
     void (*freefun) ();
+#endif
     POINTER arg;
 {
-  register struct _obstack_chunk* chunk; /* points to new chunk */
+  register struct _obstack_chunk *chunk; /* points to new chunk */

  if (alignment == 0)
    alignment = DEFAULT_ALIGNMENT;
@@ -170,8 +235,13 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
      size = 4096 - extra;
    }

+#if defined(__STDC__) && __STDC__
+  h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun;
+  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
+#else
  h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
  h->freefun = freefun;
+#endif
  h->chunk_size = size;
  h->alignment_mask = alignment - 1;
  h->extra_arg = arg;
@@ -179,17 +249,14 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)

  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
  if (!chunk)
-    {
-      h->alloc_failed = 1;
-      return 0;
-    }
-  h->alloc_failed = 0;
+    (*obstack_alloc_failed_handler) ();
  h->next_free = h->object_base = chunk->contents;
  h->chunk_limit = chunk->limit
    = (char *) chunk + h->chunk_size;
  chunk->prev = 0;
  /* The initial chunk now contains no empty object.  */
  h->maybe_empty_object = 0;
+  h->alloc_failed = 0;
  return 1;
 }

@@ -204,8 +271,8 @@ _obstack_newchunk (h, length)
     struct obstack *h;
     int length;
 {
-  register struct _obstack_chunk*	old_chunk = h->chunk;
-  register struct _obstack_chunk*	new_chunk;
+  register struct _obstack_chunk *old_chunk = h->chunk;
+  register struct _obstack_chunk *new_chunk;
  register long	new_size;
  register int obj_size = h->next_free - h->object_base;
  register int i;
@@ -219,11 +286,7 @@ _obstack_newchunk (h, length)
  /* Allocate and initialize the new chunk.  */
  new_chunk = CALL_CHUNKFUN (h, new_size);
  if (!new_chunk)
-    {
-      h->alloc_failed = 1;
-      return;
-    }
-  h->alloc_failed = 0;
+    (*obstack_alloc_failed_handler) ();
  h->chunk = new_chunk;
  new_chunk->prev = old_chunk;
  new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
@@ -278,14 +341,14 @@ _obstack_allocated_p (h, obj)
     struct obstack *h;
     POINTER obj;
 {
-  register struct _obstack_chunk*  lp;	/* below addr of any objects in this chunk */
-  register struct _obstack_chunk*  plp;	/* point to previous chunk if any */
+  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;	/* point to previous chunk if any */

  lp = (h)->chunk;
  /* We use >= rather than > since the object cannot be exactly at
     the beginning of the chunk but might be an empty object exactly
-     at the end of an adjacent chunk. */
-  while (lp != 0 && ((POINTER)lp >= obj || (POINTER)(lp)->limit < obj))
+     at the end of an adjacent chunk.  */
+  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
    {
      plp = lp->prev;
      lp = plp;
@@ -306,14 +369,14 @@ _obstack_free (h, obj)
     struct obstack *h;
     POINTER obj;
 {
-  register struct _obstack_chunk*  lp;	/* below addr of any objects in this chunk */
-  register struct _obstack_chunk*  plp;	/* point to previous chunk if any */
+  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;	/* point to previous chunk if any */

  lp = h->chunk;
  /* We use >= because there cannot be an object at the beginning of a chunk.
     But there can be an empty object at that address
     at the end of another chunk.  */
-  while (lp != 0 && ((POINTER)lp >= obj || (POINTER)(lp)->limit < obj))
+  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
    {
      plp = lp->prev;
      CALL_FREEFUN (h, lp);
@@ -324,7 +387,7 @@ _obstack_free (h, obj)
    }
  if (lp)
    {
-      h->object_base = h->next_free = (char *)(obj);
+      h->object_base = h->next_free = (char *) (obj);
      h->chunk_limit = lp->limit;
      h->chunk = lp;
    }
@@ -340,14 +403,14 @@ obstack_free (h, obj)
     struct obstack *h;
     POINTER obj;
 {
-  register struct _obstack_chunk*  lp;	/* below addr of any objects in this chunk */
-  register struct _obstack_chunk*  plp;	/* point to previous chunk if any */
+  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;	/* point to previous chunk if any */

  lp = h->chunk;
  /* We use >= because there cannot be an object at the beginning of a chunk.
     But there can be an empty object at that address
     at the end of another chunk.  */
-  while (lp != 0 && ((POINTER)lp >= obj || (POINTER)(lp)->limit < obj))
+  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
    {
      plp = lp->prev;
      CALL_FREEFUN (h, lp);
@@ -358,7 +421,7 @@ obstack_free (h, obj)
    }
  if (lp)
    {
-      h->object_base = h->next_free = (char *)(obj);
+      h->object_base = h->next_free = (char *) (obj);
      h->chunk_limit = lp->limit;
      h->chunk = lp;
    }
@@ -367,6 +430,39 @@ obstack_free (h, obj)
    abort ();
 }

+int
+_obstack_memory_used (h)
+     struct obstack *h;
+{
+  register struct _obstack_chunk* lp;
+  register int nbytes = 0;
+
+  for (lp = h->chunk; lp != 0; lp = lp->prev)
+    {
+      nbytes += lp->limit - (char *) lp;
+    }
+  return nbytes;
+}
+
+/* Define the error handler.  */
+#ifndef _
+# ifdef HAVE_LIBINTL_H
+#  include <libintl.h>
+#  ifndef _
+#   define _(Str) gettext (Str)
+#  endif
+# else
+#  define _(Str) (Str)
+# endif
+#endif
+
+static void
+print_and_abort ()
+{
+  fputs (_("memory exhausted\n"), stderr);
+  exit (obstack_exit_failure);
+}
+
 #if 0
 /* These are now turned off because the applications do not use it
   and it uses bcopy via obstack_grow, which causes trouble on sysV.  */
@@ -405,6 +501,13 @@ int (obstack_room) (obstack)
  return obstack_room (obstack);
 }

+int (obstack_make_room) (obstack, length)
+     struct obstack *obstack;
+     int length;
+{
+  return obstack_make_room (obstack, length);
+}
+
 void (obstack_grow) (obstack, pointer, length)
     struct obstack *obstack;
     POINTER pointer;
@@ -482,4 +585,4 @@ POINTER (obstack_copy0) (obstack, pointer, length)

 #endif /* 0 */

-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
+#endif	/* !ELIDE_CODE */
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -1,19 +1,23 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1988,89,90,91,92,93,94,96,97 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.  */

 /* Summary:

@@ -103,20 +107,16 @@ Summary:
 #ifndef __OBSTACK_H__
 #define __OBSTACK_H__

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* We use subtraction of (char *)0 instead of casting to int
+/* We use subtraction of (char *) 0 instead of casting to int
   because on word-addressable machines a simple cast to int
   may ignore the byte-within-word field of the pointer.  */

 #ifndef __PTR_TO_INT
-#define __PTR_TO_INT(P) ((P) - (char *)0)
+#define __PTR_TO_INT(P) ((P) - (char *) 0)
 #endif

 #ifndef __INT_TO_PTR
-#define __INT_TO_PTR(P) ((P) + (char *)0)
+#define __INT_TO_PTR(P) ((P) + (char *) 0)
 #endif

 /* We need the type of the resulting object.  In ANSI C it is ptrdiff_t
@@ -142,14 +142,16 @@ Summary:
 #define PTR_INT_TYPE long
 #endif

-#if HAVE_STRING_H || STDC_HEADERS
-# include <string.h>
-# ifndef bcopy
-#  define bcopy(s, d, n) memcpy ((d), (s), (n))
-# endif
-#else /* HAVE_STRING_H || STDC_HEADERS */
-# include <strings.h>
-#endif   /* not (HAVE_STRING_H || STDC_HEADERS) */
+#if defined (_LIBC) || defined (HAVE_STRING_H)
+#include <string.h>
+#define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
+#else
+#ifdef memcpy
+#define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
+#else
+#define _obstack_memcpy(To, From, N) bcopy ((From), (To), (N))
+#endif
+#endif

 struct _obstack_chunk		/* Lives at front of each chunk. */
 {
@@ -161,21 +163,32 @@ struct _obstack_chunk		/* Lives at front of each chunk. */
 struct obstack		/* control current object in current chunk */
 {
  long	chunk_size;		/* preferred size to allocate chunks in */
-  struct _obstack_chunk* chunk;	/* address of current struct obstack_chunk */
+  struct _obstack_chunk *chunk;	/* address of current struct obstack_chunk */
  char	*object_base;		/* address of object we are building */
  char	*next_free;		/* where to add next char to current object */
  char	*chunk_limit;		/* address of char after current chunk */
  PTR_INT_TYPE temp;		/* Temporary for some macros.  */
  int   alignment_mask;		/* Mask of alignment for each object. */
+#if defined (__STDC__) && __STDC__
+  /* These prototypes vary based on `use_extra_arg', and we use
+     casts to the prototypeless function type in all assignments,
+     but having prototypes here quiets -Wstrict-prototypes.  */
+  struct _obstack_chunk *(*chunkfun) (void *, long);
+  void (*freefun) (void *, struct _obstack_chunk *);
+  void *extra_arg;		/* first arg for chunk alloc/dealloc funcs */
+#else
  struct _obstack_chunk *(*chunkfun) (); /* User's fcn to allocate a chunk.  */
  void (*freefun) ();		/* User's function to free a chunk.  */
  char *extra_arg;		/* first arg for chunk alloc/dealloc funcs */
+#endif
  unsigned use_extra_arg:1;	/* chunk alloc/dealloc funcs take extra arg */
  unsigned maybe_empty_object:1;/* There is a possibility that the current
 				   chunk contains a zero-length object.  This
 				   prevents freeing the chunk if we allocate
 				   a bigger chunk to replace it. */
-  unsigned alloc_failed:1;	/* chunk alloc func returned 0 */
+  unsigned alloc_failed:1;	/* No longer used, as we now call the failed
+				   handler on error, but retained for binary
+				   compatibility.  */
 };

 /* Declare the external functions we use; they are in obstack.c.  */
@@ -184,14 +197,17 @@ struct obstack		/* control current object in current chunk */
 extern void _obstack_newchunk (struct obstack *, int);
 extern void _obstack_free (struct obstack *, void *);
 extern int _obstack_begin (struct obstack *, int, int,
-			    void *(*) (), void (*) ());
+			    void *(*) (long), void (*) (void *));
 extern int _obstack_begin_1 (struct obstack *, int, int,
-			      void *(*) (), void (*) (), void *);
+			     void *(*) (void *, long),
+			     void (*) (void *, void *), void *);
+extern int _obstack_memory_used (struct obstack *);
 #else
 extern void _obstack_newchunk ();
 extern void _obstack_free ();
 extern int _obstack_begin ();
 extern int _obstack_begin_1 ();
+extern int _obstack_memory_used ();
 #endif

 #if defined (__STDC__) && __STDC__
@@ -222,6 +238,7 @@ void * obstack_finish (struct obstack *obstack);
 int obstack_object_size (struct obstack *obstack);

 int obstack_room (struct obstack *obstack);
+void obstack_make_room (struct obstack *obstack, int size);
 void obstack_1grow_fast (struct obstack *obstack, int data_char);
 void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
 void obstack_int_grow_fast (struct obstack *obstack, int data);
@@ -231,17 +248,30 @@ void * obstack_base (struct obstack *obstack);
 void * obstack_next_free (struct obstack *obstack);
 int obstack_alignment_mask (struct obstack *obstack);
 int obstack_chunk_size (struct obstack *obstack);
+int obstack_memory_used (struct obstack *obstack);

 #endif /* __STDC__ */

 /* Non-ANSI C cannot really support alternative functions for these macros,
   so we do not declare them.  */
+
+/* Error handler called when `obstack_chunk_alloc' failed to allocate
+   more memory.  This can be set to a user defined function.  The
+   default action is to print a message and abort.  */
+#if defined (__STDC__) && __STDC__
+extern void (*obstack_alloc_failed_handler) (void);
+#else
+extern void (*obstack_alloc_failed_handler) ();
+#endif
+
+/* Exit value used when `print_and_abort' is used.  */
+extern int obstack_exit_failure;

 /* Pointer to beginning of object being allocated or to be allocated next.
   Note that this might not be the final address of the object
   because a new chunk might be needed to hold the final size.  */

-#define obstack_base(h) ((h)->alloc_failed ? 0 : (h)->object_base)
+#define obstack_base(h) ((h)->object_base)

 /* Size for allocating ordinary chunks.  */

@@ -249,12 +279,40 @@ int obstack_chunk_size (struct obstack *obstack);

 /* Pointer to next byte not yet allocated in current chunk.  */

-#define obstack_next_free(h)	((h)->alloc_failed ? 0 : (h)->next_free)
+#define obstack_next_free(h)	((h)->next_free)

 /* Mask specifying low bits that should be clear in address of an object.  */

 #define obstack_alignment_mask(h) ((h)->alignment_mask)

+/* To prevent prototype warnings provide complete argument list in
+   standard C version.  */
+#if defined (__STDC__) && __STDC__
+
+#define obstack_init(h) \
+  _obstack_begin ((h), 0, 0, \
+		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
+
+#define obstack_begin(h, size) \
+  _obstack_begin ((h), (size), 0, \
+		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
+
+#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
+  _obstack_begin ((h), (size), (alignment), \
+		    (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun))
+
+#define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
+  _obstack_begin_1 ((h), (size), (alignment), \
+		    (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun), (arg))
+
+#define obstack_chunkfun(h, newchunkfun) \
+  ((h) -> chunkfun = (struct _obstack_chunk *(*)(long)) (newchunkfun))
+
+#define obstack_freefun(h, newfreefun) \
+  ((h) -> freefun = (void (*)(void *)) (newfreefun))
+
+#else
+
 #define obstack_init(h) \
  _obstack_begin ((h), 0, 0, \
 		  (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free)
@@ -277,11 +335,15 @@ int obstack_chunk_size (struct obstack *obstack);
 #define obstack_freefun(h, newfreefun) \
  ((h) -> freefun = (void (*)()) (newfreefun))

+#endif
+
 #define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar)

 #define obstack_blank_fast(h,n) ((h)->next_free += (n))
+
+#define obstack_memory_used(h) _obstack_memory_used (h)

-#if defined (__GNUC__) && defined (__STDC__)
+#if defined (__GNUC__) && defined (__STDC__) && __STDC__
 /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
   does not implement __extension__.  But that compiler doesn't define
   __GNUC_MINOR__.  */
@@ -297,7 +359,6 @@ int obstack_chunk_size (struct obstack *obstack);
 #define obstack_object_size(OBSTACK)					\
  __extension__								\
  ({ struct obstack *__o = (OBSTACK);					\
-     __o->alloc_failed ? 0 :						\
     (unsigned) (__o->next_free - __o->object_base); })

 #define obstack_room(OBSTACK)						\
@@ -305,17 +366,22 @@ int obstack_chunk_size (struct obstack *obstack);
  ({ struct obstack *__o = (OBSTACK);					\
     (unsigned) (__o->chunk_limit - __o->next_free); })

+#define obstack_make_room(OBSTACK,length)				\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   int __len = (length);						\
+   if (__o->chunk_limit - __o->next_free < __len)			\
+     _obstack_newchunk (__o, __len);					\
+   (void) 0; })
+
 #define obstack_grow(OBSTACK,where,length)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
   int __len = (length);						\
   if (__o->next_free + __len > __o->chunk_limit)			\
     _obstack_newchunk (__o, __len);					\
-   if (!__o->alloc_failed)						\
-     {									\
-        bcopy ((char *) (where), __o->next_free, __len);		\
-	__o->next_free += __len;					\
-     }									\
+   _obstack_memcpy (__o->next_free, (char *) (where), __len);		\
+   __o->next_free += __len;						\
   (void) 0; })

 #define obstack_grow0(OBSTACK,where,length)				\
@@ -324,12 +390,9 @@ __extension__								\
   int __len = (length);						\
   if (__o->next_free + __len + 1 > __o->chunk_limit)			\
     _obstack_newchunk (__o, __len + 1);				\
-   if (!__o->alloc_failed)						\
-     {									\
-       bcopy ((char *) (where), __o->next_free, __len);			\
-       __o->next_free += __len;						\
-       *(__o->next_free)++ = 0;						\
-     }									\
+   _obstack_memcpy (__o->next_free, (char *) (where), __len);		\
+   __o->next_free += __len;						\
+   *(__o->next_free)++ = 0;						\
   (void) 0; })

 #define obstack_1grow(OBSTACK,datum)					\
@@ -337,8 +400,7 @@ __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
   if (__o->next_free + 1 > __o->chunk_limit)				\
     _obstack_newchunk (__o, 1);					\
-   if (!__o->alloc_failed)						\
-     *(__o->next_free)++ = (datum);					\
+   *(__o->next_free)++ = (datum);					\
   (void) 0; })

 /* These assume that the obstack alignment is good enough for pointers or ints,
@@ -350,8 +412,7 @@ __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
   if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
     _obstack_newchunk (__o, sizeof (void *));				\
-   if (!__o->alloc_failed)						\
-     *((void **)__o->next_free)++ = ((void *)datum);			\
+   *((void **)__o->next_free)++ = ((void *)datum);			\
   (void) 0; })

 #define obstack_int_grow(OBSTACK,datum)					\
@@ -359,12 +420,11 @@ __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
   if (__o->next_free + sizeof (int) > __o->chunk_limit)		\
     _obstack_newchunk (__o, sizeof (int));				\
-   if (!__o->alloc_failed)						\
-     *((int *)__o->next_free)++ = ((int)datum);				\
+   *((int *)__o->next_free)++ = ((int)datum);				\
   (void) 0; })

-#define obstack_ptr_grow_fast(h,aptr) (*((void **)(h)->next_free)++ = (void *)aptr)
-#define obstack_int_grow_fast(h,aint) (*((int *)(h)->next_free)++ = (int)aint)
+#define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr)
+#define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)

 #define obstack_blank(OBSTACK,length)					\
 __extension__								\
@@ -372,8 +432,7 @@ __extension__								\
   int __len = (length);						\
   if (__o->chunk_limit - __o->next_free < __len)			\
     _obstack_newchunk (__o, __len);					\
-   if (!__o->alloc_failed)						\
-     __o->next_free += __len;						\
+   __o->next_free += __len;						\
   (void) 0; })

 #define obstack_alloc(OBSTACK,length)					\
@@ -400,21 +459,16 @@ __extension__								\
 __extension__								\
 ({ struct obstack *__o1 = (OBSTACK);					\
   void *value;								\
-   if (__o1->alloc_failed)						\
-     value = 0;								\
-   else									\
-     {									\
-       value = (void *) __o1->object_base;				\
-       if (__o1->next_free == value)					\
-         __o1->maybe_empty_object = 1;					\
-       __o1->next_free							\
-	 = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\
-			 & ~ (__o1->alignment_mask));			\
-       if (__o1->next_free - (char *)__o1->chunk			\
-	   > __o1->chunk_limit - (char *)__o1->chunk)			\
-	 __o1->next_free = __o1->chunk_limit;				\
-       __o1->object_base = __o1->next_free;				\
-      }									\
+   value = (void *) __o1->object_base;					\
+   if (__o1->next_free == value)					\
+     __o1->maybe_empty_object = 1;					\
+   __o1->next_free							\
+     = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\
+		     & ~ (__o1->alignment_mask));			\
+   if (__o1->next_free - (char *)__o1->chunk				\
+       > __o1->chunk_limit - (char *)__o1->chunk)			\
+     __o1->next_free = __o1->chunk_limit;				\
+   __o1->object_base = __o1->next_free;					\
   value; })

 #define obstack_free(OBSTACK, OBJ)					\
@@ -428,7 +482,7 @@ __extension__								\
 #else /* not __GNUC__ or not __STDC__ */

 #define obstack_object_size(h) \
- (unsigned) ((h)->alloc_failed ? 0 : (h)->next_free - (h)->object_base)
+ (unsigned) ((h)->next_free - (h)->object_base)

 #define obstack_room(h)		\
 (unsigned) ((h)->chunk_limit - (h)->next_free)
@@ -439,50 +493,49 @@ __extension__								\
   Casting the third operand to void was tried before,
   but some compilers won't accept it.  */

+#define obstack_make_room(h,length)					\
+( (h)->temp = (length),							\
+  (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
+   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0))
+
 #define obstack_grow(h,where,length)					\
 ( (h)->temp = (length),							\
  (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
-  ((h)->alloc_failed ? 0 :						\
-  (bcopy ((char *) (where), (h)->next_free, (h)->temp),			\
-  (h)->next_free += (h)->temp)))
+  _obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp),	\
+  (h)->next_free += (h)->temp)

 #define obstack_grow0(h,where,length)					\
 ( (h)->temp = (length),							\
  (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit)			\
   ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0),			\
-  ((h)->alloc_failed ? 0 :						\
-  (bcopy ((char *) (where), (h)->next_free, (h)->temp),			\
+  _obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp),	\
  (h)->next_free += (h)->temp,						\
-  *((h)->next_free)++ = 0)))
+  *((h)->next_free)++ = 0)

 #define obstack_1grow(h,datum)						\
 ( (((h)->next_free + 1 > (h)->chunk_limit)				\
   ? (_obstack_newchunk ((h), 1), 0) : 0),				\
- ((h)->alloc_failed ? 0 :						\
-  (*((h)->next_free)++ = (datum))))
+  (*((h)->next_free)++ = (datum)))

 #define obstack_ptr_grow(h,datum)					\
 ( (((h)->next_free + sizeof (char *) > (h)->chunk_limit)		\
   ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		\
-  ((h)->alloc_failed ? 0 :						\
-  (*((char **)(((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *)datum))))
+  (*((char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *) datum)))

 #define obstack_int_grow(h,datum)					\
 ( (((h)->next_free + sizeof (int) > (h)->chunk_limit)			\
   ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			\
-  ((h)->alloc_failed ? 0 :						\
-  (*((int *)(((h)->next_free+=sizeof(int))-sizeof(int))) = ((int)datum))))
+  (*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = ((int) datum)))

-#define obstack_ptr_grow_fast(h,aptr) (*((char **)(h)->next_free)++ = (char *)aptr)
-#define obstack_int_grow_fast(h,aint) (*((int *)(h)->next_free)++ = (int)aint)
+#define obstack_ptr_grow_fast(h,aptr) (*((char **) (h)->next_free)++ = (char *) aptr)
+#define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)

 #define obstack_blank(h,length)						\
 ( (h)->temp = (length),							\
  (((h)->chunk_limit - (h)->next_free < (h)->temp)			\
   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
-  ((h)->alloc_failed ? 0 :						\
-  ((h)->next_free += (h)->temp)))
+  ((h)->next_free += (h)->temp))

 #define obstack_alloc(h,length)						\
 (obstack_blank ((h), (length)), obstack_finish ((h)))
@@ -494,30 +547,29 @@ __extension__								\
 (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))

 #define obstack_finish(h)  						\
-( (h)->alloc_failed ? 0 :						\
-  (((h)->next_free == (h)->object_base					\
+( ((h)->next_free == (h)->object_base					\
   ? (((h)->maybe_empty_object = 1), 0)					\
   : 0),								\
  (h)->temp = __PTR_TO_INT ((h)->object_base),				\
  (h)->next_free							\
    = __INT_TO_PTR ((__PTR_TO_INT ((h)->next_free)+(h)->alignment_mask)	\
 		    & ~ ((h)->alignment_mask)),				\
-  (((h)->next_free - (char *)(h)->chunk					\
-    > (h)->chunk_limit - (char *)(h)->chunk)				\
+  (((h)->next_free - (char *) (h)->chunk				\
+    > (h)->chunk_limit - (char *) (h)->chunk)				\
   ? ((h)->next_free = (h)->chunk_limit) : 0),				\
  (h)->object_base = (h)->next_free,					\
-  __INT_TO_PTR ((h)->temp)))
+  __INT_TO_PTR ((h)->temp))

 #if defined (__STDC__) && __STDC__
 #define obstack_free(h,obj)						\
-( (h)->temp = (char *)(obj) - (char *) (h)->chunk,			\
+( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
  (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
   ? (int) ((h)->next_free = (h)->object_base				\
 	    = (h)->temp + (char *) (h)->chunk)				\
   : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
 #else
 #define obstack_free(h,obj)						\
-( (h)->temp = (char *)(obj) - (char *) (h)->chunk,			\
+( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
  (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
   ? (int) ((h)->next_free = (h)->object_base				\
 	    = (h)->temp + (char *) (h)->chunk)				\
--- a/lib/path-concat.c
+++ b/lib/path-concat.c
@@ -33,7 +33,10 @@ char *stpcpy ();
   BASE in the returned concatenation.  */

 char *
-path_concat (const char *dir, const char *base, char **base_in_result)
+path_concat (dir, base, base_in_result)
+     const char *dir;
+     const char *base;
+     char **base_in_result;
 {
  char *p;
  char *p_concat;
--- a/lib/posixtm.y
+++ b/lib/posixtm.y
@@ -67,9 +67,56 @@ static struct tm t;

 time_t mktime ();

-#define yyparse posixtime_yyparse
+/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
+   as well as gratuitiously global symbol names, so we can have multiple
+   yacc generated parsers in the same program.  Note that these are only
+   the variables produced by yacc.  If other parser generators (bison,
+   byacc, etc) produce additional global names that conflict at link time,
+   then those parser generators need to be fixed instead of adding those
+   names to this list. */
+
+#define yymaxdepth pt_maxdepth
+#define yyparse pt_parse
+#define yylex   pt_lex
+#define yyerror pt_error
+#define yylval  pt_lval
+#define yychar  pt_char
+#define yydebug pt_debug
+#define yypact  pt_pact
+#define yyr1    pt_r1
+#define yyr2    pt_r2
+#define yydef   pt_def
+#define yychk   pt_chk
+#define yypgo   pt_pgo
+#define yyact   pt_act
+#define yyexca  pt_exca
+#define yyerrflag pt_errflag
+#define yynerrs pt_nerrs
+#define yyps    pt_ps
+#define yypv    pt_pv
+#define yys     pt_s
+#define yy_yys  pt_yys
+#define yystate pt_state
+#define yytmp   pt_tmp
+#define yyv     pt_v
+#define yy_yyv  pt_yyv
+#define yyval   pt_val
+#define yylloc  pt_lloc
+#define yyreds  pt_reds          /* With YYDEBUG defined */
+#define yytoks  pt_toks          /* With YYDEBUG defined */
+#define yylhs   pt_yylhs
+#define yylen   pt_yylen
+#define yydefred pt_yydefred
+#define yydgoto pt_yydgoto
+#define yysindex pt_yysindex
+#define yyrindex pt_yyrindex
+#define yygindex pt_yygindex
+#define yytable  pt_yytable
+#define yycheck  pt_yycheck
+
 static int yylex ();
 static int yyerror ();
+
 %}

 %token DIGIT
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,33 +1,28 @@
-/* Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 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.

-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,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #include <errno.h>

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

-/* Define-away any (possibly conflicting) prototype of putenv.
-   Many systems omit the `const' attribute on the argument.  */
-#define putenv _sys_putenv
-
 #if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
 # include <stdlib.h>
 #endif
@@ -38,8 +33,6 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <unistd.h>
 #endif

-#undef putenv
-
 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
 # define strchr index
 #endif
@@ -56,7 +49,7 @@ extern char **environ;

 /* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
 int
-putenv (string)
+rpl_putenv (string)
     const char *string;
 {
  const char *const name_end = strchr (string, '=');
--- a/lib/regex.c
+++ b/lib/regex.c
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,4 +1,4 @@
-/* rename.c -- BSD compatible directory function for System V
+/* BSD compatible rename and directory rename function for System V.
   Copyright (C) 1988, 1990 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
@@ -15,8 +15,8 @@
   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>
@@ -26,12 +26,12 @@
 extern int errno;
 #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

 /* Rename file FROM to file TO.
@@ -67,6 +67,12 @@ rename (from, to)
        return -1;
    }

+#ifdef MVDIR
+
+/* If MVDIR is defined, it should be the full filename of a setuid root
+   program able to link and unlink directories.  If MVDIR is not defined,
+   then the capability of renaming directories may be missing.  */
+
  if (S_ISDIR (from_stats.st_mode))
    {
      /* Need a setuid root process to link and unlink directories. */
@@ -90,6 +96,9 @@ rename (from, to)
 	}
    }
  else
+
+#endif /* MVDIR */
+
    {
      if (link (from, to))
 	return -1;
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,4 +1,4 @@
-/* rmdir.c -- BSD compatible remove directory function for System V
+/* BSD compatible remove directory function for System V
   Copyright (C) 1988, 1990 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
@@ -15,8 +15,8 @@
   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>
@@ -27,12 +27,12 @@
 extern int errno;
 #endif

-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
+#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

 /* rmdir adapted from GNU tar.  */
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -1,30 +1,40 @@
-/* rpmatch - determine whether string value is affirmation or negative
-	     response according to current locale's data
-Copyright (C) 1996 Free Software Foundation, Inc.
+/* Determine whether string value is affirmation or negative response
+   according to current locale's data.
+   Copyright (C) 1996 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 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,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

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

 #if STDC_HEADERS || _LIBC
+# include <stddef.h>
 # include <stdlib.h>
+#else
+# ifndef NULL
+#  define NULL 0
+# endif
 #endif

-#include <regex.h>
+#include <sys/types.h>
+#if WITH_REGEX
+# include <regex.h>
+#else
+# include <rx.h>
+#endif

 #if ENABLE_NLS
 # include <libintl.h>
@@ -74,8 +84,8 @@ rpmatch (response)
  static regex_t yesre, nore;
  int result;

-  return ((result = try (response, _("^[yY][[:alpha:]]*"), 1, 0,
+  return ((result = try (response, _("^[yY]"), 1, 0,
 			 &yesexpr, &yesre))
 	  ? result
-	  : try (response, _("^[nN][[:alpha:]]*"), 0, -1, &noexpr, &nore));
+	  : try (response, _("^[nN]"), 0, -1, &noexpr, &nore));
 }
--- a/lib/rx.c
+++ b/lib/rx.c
--- a/lib/rx.h
+++ b/lib/rx.h
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -16,13 +16,13 @@
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */

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

 #include <sys/types.h>

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

--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -1,5 +1,5 @@
 /* save-cwd.c -- Save and restore current working directory.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 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
@@ -38,7 +38,7 @@
 #endif

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

@@ -96,7 +96,7 @@ save_cwd (cwd)
 	}
 # endif /* __sun__ || sun */
 #else
-#define fchdir(x) (abort (), 0)
+# define fchdir(x) (abort (), 0)
      have_working_fchdir = 0;
 #endif
    }
@@ -152,4 +152,3 @@ free_cwd (cwd)
  if (cwd->name)
    free (cwd->name);
 }
-
--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -15,8 +15,8 @@
    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

 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996, 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
@@ -14,11 +14,11 @@
   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
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>
@@ -27,7 +27,7 @@
 # endif
 #endif

-/* Return the length of the maximum inital segment of S
+/* Return the length of the maximum initial segment of S
   which contains no characters from REJECT.  */
 int
 strcspn (s, reject)
--- a/lib/strftime.c
+++ b/lib/strftime.c
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -15,7 +15,7 @@
   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
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -14,8 +14,8 @@
   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 <errno.h>
@@ -26,21 +26,21 @@ extern int errno;
 #include <ctype.h>
 #include <math.h>

-#ifdef HAVE_FLOAT_H
-#include <float.h>
+#if HAVE_FLOAT_H
+# include <float.h>
 #else
-#define DBL_MAX 1.7976931348623159e+308
-#define DBL_MIN 2.2250738585072010e-308
+# define DBL_MAX 1.7976931348623159e+308
+# define DBL_MIN 2.2250738585072010e-308
 #endif

 #if STDC_HEADERS
-#include <stdlib.h>
-#include <string.h>
+# include <stdlib.h>
+# include <string.h>
 #else
-#define NULL 0
-#ifndef HUGE_VAL
-#define HUGE_VAL HUGE
-#endif
+# define NULL 0
+# ifndef HUGE_VAL
+#  define HUGE_VAL HUGE
+# endif
 #endif

 /* Convert NPTR to a double.  If ENDPTR is not NULL, a pointer to the
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -1,24 +1,23 @@
-/* Copyright (C) 1991, 92, 94, 95, 96 Free Software Foundation, Inc.
+/* strtol - Convert string representation of a number into an integer value.
+   Copyright (C) 1991, 92, 94, 95, 96, 97 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.

-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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
-
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

@@ -33,6 +32,9 @@ USA.  */
 #ifndef errno
 extern int errno;
 #endif
+#ifndef __set_errno
+# define __set_errno(Val) errno = (Val)
+#endif

 #ifdef HAVE_LIMITS_H
 # include <limits.h>
@@ -41,6 +43,7 @@ extern int errno;
 #ifdef STDC_HEADERS
 # include <stddef.h>
 # include <stdlib.h>
+# include <string.h>
 #else
 # ifndef NULL
 #  define NULL 0
@@ -108,40 +111,38 @@ extern int errno;
 #else
 # define LONG long

-# ifndef ULONG_MAX
-#  define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
-# endif
-# ifndef LONG_MAX
-#  define LONG_MAX ((long int) (ULONG_MAX >> 1))
-# endif
+#ifndef ULONG_MAX
+# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
+#endif
+#ifndef LONG_MAX
+# define LONG_MAX ((long int) (ULONG_MAX >> 1))
+#endif
 #endif

 #ifdef USE_WIDE_CHAR
 # include <wchar.h>
 # include <wctype.h>
-# define L_(ch) L##ch
+# define L_(Ch) L##Ch
 # define UCHAR_TYPE wint_t
 # define STRING_TYPE wchar_t
-# define ISSPACE(ch) iswspace (ch)
-# define ISALPHA(ch) iswalpha (ch)
-# define TOUPPER(ch) towupper (ch)
+# define ISSPACE(Ch) iswspace (Ch)
+# define ISALPHA(Ch) iswalpha (Ch)
+# define TOUPPER(Ch) towupper (Ch)
 #else
-# define L_(ch) ch
+# define L_(Ch) Ch
 # define UCHAR_TYPE unsigned char
 # define STRING_TYPE char
-# define ISSPACE(ch) isspace (ch)
-# define ISALPHA(ch) isalpha (ch)
-# define TOUPPER(ch) toupper (ch)
+# define ISSPACE(Ch) isspace (Ch)
+# define ISALPHA(Ch) isalpha (Ch)
+# define TOUPPER(Ch) toupper (Ch)
 #endif

 #ifdef __STDC__
-# define INTERNAL(x) INTERNAL1(x)
-# define INTERNAL1(x) __##x##_internal
-# define WEAKNAME(x) WEAKNAME1(x)
-# define WEAKNAME1(x) __##x
+# define INTERNAL(X) INTERNAL1(X)
+# define INTERNAL1(X) __##X##_internal
+# define WEAKNAME(X) WEAKNAME1(X)
 #else
-# define INTERNAL(x) __/**/x/**/_internal
-# define WEAKNAME(x) __/**/x
+# define INTERNAL(X) __/**/X/**/_internal
 #endif

 #ifdef USE_NUMBER_GROUPING
@@ -200,7 +201,10 @@ INTERNAL (strtol) (nptr, endptr, base, group)
 #endif

  if (base < 0 || base == 1 || base > 36)
-    base = 10;
+    {
+      __set_errno (EINVAL);
+      return 0;
+    }

  save = s = nptr;

@@ -251,8 +255,9 @@ INTERNAL (strtol) (nptr, endptr, base, group)
      /* Find the end of the digit string and check its grouping.  */
      end = s;
      for (c = *end; c != L_('\0'); c = *++end)
-	if (c != thousands && (c < L_('0') || c > L_('9'))
-	    && (!ISALPHA (c) || TOUPPER (c) - L_('A') + 10 >= base))
+	if ((wchar_t) c != thousands
+	    && ((wchar_t) c < L_('0') || (wchar_t) c > L_('9'))
+	    && (!ISALPHA (c) || (int) (TOUPPER (c) - L_('A') + 10) >= base))
 	  break;
      if (*s == thousands)
 	end = s;
@@ -278,7 +283,7 @@ INTERNAL (strtol) (nptr, endptr, base, group)
 	c = TOUPPER (c) - L_('A') + 10;
      else
 	break;
-      if (c >= base)
+      if ((int) c >= base)
 	break;
      /* Check for overflow.  */
      if (i > cutoff || (i == cutoff && c > cutlim))
@@ -307,11 +312,13 @@ INTERNAL (strtol) (nptr, endptr, base, group)
 	      ? -((unsigned LONG int) (LONG_MIN + 1)) + 1
 	      : (unsigned LONG int) LONG_MAX))
    overflow = 1;
+#else
+  overflow |= negative;
 #endif

  if (overflow)
    {
-      errno = ERANGE;
+      __set_errno (ERANGE);
 #if UNSIGNED
      return ULONG_MAX;
 #else
@@ -324,7 +331,7 @@ INTERNAL (strtol) (nptr, endptr, base, group)

 noconv:
  /* We must handle a special case here: the base is 0 or 16 and the
-     first two characters and '0' and 'x', but the rest are no
+     first two characters are '0' and 'x', but the rest are no
     hexadecimal digits.  This is no error case.  We return 0 and
     ENDPTR points to the `x`.  */
  if (endptr != NULL)
@@ -340,19 +347,23 @@ noconv:

 /* External user entry point.  */

-#undef __P
-#if defined (__STDC__) && __STDC__
-# define __P(args) args
-#else
-# define __P(args) ()
-#endif
+#if _LIBC - 0 == 0
+# undef PARAMS
+# if defined (__STDC__) && __STDC__
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif

 /* Prototype.  */
-INT strtol __P ((const STRING_TYPE *nptr, STRING_TYPE **endptr,
-			    int base));
+INT strtol PARAMS ((const STRING_TYPE *nptr, STRING_TYPE **endptr, int base));
+#endif


 INT
+#ifdef weak_function
+weak_function
+#endif
 strtol (nptr, endptr, base)
     const STRING_TYPE *nptr;
     STRING_TYPE **endptr;
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996 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
@@ -17,7 +17,7 @@

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

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

@@ -26,14 +26,15 @@
 #ifndef errno
 extern int errno;
 #endif
+
 #include <sys/types.h>
 #include "pathmax.h"

-#ifndef HAVE_GETCWD
-char *getwd ();
-# define getcwd(buf, max) getwd (buf)
-#else
+#if HAVE_GETCWD
 char *getcwd ();
+#else
+char *getwd ();
+# define getcwd(Buf, Max) getwd (Buf)
 #endif

 /* Amount to increase buffer size by in each try. */
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,5 +1,5 @@
 /* xgethostname.c -- return current hostname with unlimited length
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996 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
@@ -15,7 +15,7 @@
   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, meyering@comco.com */
+/* written by Jim Meyering */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -23,12 +23,23 @@

 #include <sys/types.h>

+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#include "error.h"
+
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
 int gethostname ();
 char *xmalloc ();
 char *xrealloc ();

 #ifndef INITIAL_HOSTNAME_LENGTH
-# define INITIAL_HOSTNAME_LENGTH 33
+# define INITIAL_HOSTNAME_LENGTH 34
 #endif

 char *
@@ -42,10 +53,20 @@ xgethostname ()
  hostname = xmalloc (size);
  while (1)
    {
-      hostname[size - 1] = '\0';
+      /* Use size - 2 here rather than size - 1 to work around the bug
+	 in SunOS5.5's gethostname whereby it NUL-terminates HOSTNAME
+	 even when the name is longer than the supplied buffer.  */
+      int k = size - 2;
+
+      errno = 0;
+      hostname[k] = '\0';
      err = gethostname (hostname, size);
-      if (err == 0 && hostname[size - 1] == '\0')
+      if (err == 0 && hostname[k] == '\0')
 	break;
+#ifdef ENAMETOOLONG
+      else if (err != 0 && errno != ENAMETOOLONG && errno != 0)
+	error (EXIT_FAILURE, errno, "gethostname");
+#endif
      size *= 2;
      hostname = xrealloc (hostname, size);
    }
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -1,5 +1,5 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 96 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
@@ -15,7 +15,7 @@
   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
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif

@@ -30,23 +30,35 @@
 #if STDC_HEADERS
 # include <stdlib.h>
 #else
+VOID *calloc ();
 VOID *malloc ();
 VOID *realloc ();
 void free ();
 #endif

-/* This is for other GNU distributions with internationalized messages.
-   The GNU C Library itself does not yet support such messages.  */
-#if HAVE_LIBINTL_H
+#if ENABLE_NLS
 # include <libintl.h>
+# define _(Text) gettext (Text)
 #else
-# define gettext(msgid) (msgid)
+# define textdomain(Domain)
+# define _(Text) Text
 #endif

+#include "error.h"
+
 #ifndef EXIT_FAILURE
 # define EXIT_FAILURE 1
 #endif

+/* Prototypes for functions defined here.  */
+#if defined (__STDC__) && __STDC__
+static VOID *fixup_null_alloc (size_t n);
+VOID *xmalloc (size_t n);
+VOID *xcalloc (size_t n, size_t s);
+VOID *xrealloc (VOID *p, size_t n);
+#endif
+
+
 /* Exit value when the requested amount of memory is not available.
   The caller may set it to some other value.  */
 int xmalloc_exit_failure = EXIT_FAILURE;
@@ -67,7 +79,7 @@ fixup_null_alloc (n)
  if (n == 0)
    p = malloc ((size_t) 1);
  if (p == 0)
-    error (xmalloc_exit_failure, 0, gettext ("Memory exhausted"));
+    error (xmalloc_exit_failure, 0, _("Memory exhausted"));
  return p;
 }

@@ -85,6 +97,20 @@ xmalloc (n)
  return p;
 }

+/* Allocate memory for N elements of S bytes, with error checking.  */
+
+VOID *
+xcalloc (n, s)
+     size_t n, s;
+{
+  VOID *p;
+
+  p = calloc (n, s);
+  if (p == 0)
+    p = fixup_null_alloc (n);
+  return p;
+}
+
 /* Change the size of an allocated block of memory P to N bytes,
   with error checking.
   If P is NULL, run xmalloc.  */
--- a/lib/xstrdup.c
+++ b/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1996 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
@@ -15,16 +15,22 @@
   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 defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
+# include <string.h>
 #else
-#include <strings.h>
+# include <strings.h>
 #endif
+
+#if defined (__STDC__) && __STDC__
+char *xmalloc (size_t);
+char *xstrdup (char *string);
+#else
 char *xmalloc ();
+#endif

 /* Return a newly allocated copy of STRING.  */

--- a/lib/xstrtod.h
+++ b/lib/xstrtod.h
@@ -1,15 +1,14 @@
 #ifndef XSTRTOD_H
 # define XSTRTOD_H 1

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

 int
-  xstrtod __P ((const char *str, const char **ptr, double *result));
+  xstrtod PARAMS ((const char *str, const char **ptr, double *result));

-#endif /* XSTRTOD_H */
+#endif /* not XSTRTOD_H */
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -15,17 +15,17 @@
   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@na-net.ornl.gov) */
+/* Written by Jim Meyering. */

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

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

-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>
@@ -91,19 +91,21 @@ __xstrtol (s, ptr, base, val, valid_suffixes)
    return LONGINT_OVERFLOW;
  if (*p == s)
    return LONGINT_INVALID;
+
+  /* Let valid_suffixes == NULL mean `allow any suffix'.  */
+  /* FIXME: update all callers except the one in tail.c changing
+     last parameter NULL to `""'.  */
  if (!valid_suffixes)
    {
-      if (**p == '\0')
-	{
-	  *val = tmp;
-	  return LONGINT_OK;
-	}
-      else
-	return LONGINT_INVALID_SUFFIX_CHAR;
+      *val = tmp;
+      return LONGINT_OK;
    }

-  if (**p != '\0' && strchr (valid_suffixes, **p))
+  if (**p != '\0')
    {
+      if (!strchr (valid_suffixes, **p))
+	return LONGINT_INVALID_SUFFIX_CHAR;
+
      switch (**p)
 	{
 	case 'b':
@@ -143,8 +145,8 @@ __xstrtol (s, ptr, base, val, valid_suffixes)

 #ifdef TESTING_XSTRTO

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

 char *program_name;

@@ -172,4 +174,5 @@ main (int argc, char** argv)
    }
  exit (0);
 }
+
 #endif /* TESTING_XSTRTO */
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,66 +1,69 @@
-#ifndef _xstrtol_h_
-#define _xstrtol_h_ 1
+#ifndef XSTRTOL_H_
+# define XSTRTOL_H_ 1

-#if STRING_TO_UNSIGNED
-# define __xstrtol xstrtoul
-# define __strtol strtoul
-# define __unsigned unsigned
-# define __ZLONG_MAX ULONG_MAX
-#else
-# define __xstrtol xstrtol
-# define __strtol strtol
-# define __unsigned /* empty */
-# define __ZLONG_MAX LONG_MAX
-#endif
+# if STRING_TO_UNSIGNED
+#  define __xstrtol xstrtoul
+#  define __strtol strtoul
+#  define __unsigned unsigned
+#  define __ZLONG_MAX ULONG_MAX
+# else
+#  define __xstrtol xstrtol
+#  define __strtol strtol
+#  define __unsigned /* empty */
+#  define __ZLONG_MAX LONG_MAX
+# endif

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

+#ifndef _STRTOL_ERROR
 enum strtol_error
  {
    LONGINT_OK, LONGINT_INVALID, LONGINT_INVALID_SUFFIX_CHAR, LONGINT_OVERFLOW
  };
 typedef enum strtol_error strtol_error;
+#endif

 strtol_error
-  __xstrtol __P ((const char *s, char **ptr, int base,
-		  __unsigned long int *val, const char *valid_suffixes));
+  __xstrtol PARAMS ((const char *s, char **ptr, int base,
+		     __unsigned long int *val, const char *valid_suffixes));

-#define _STRTOL_ERROR(exit_code, str, argument_type_string, err)	\
+#undef _STRTOL_ERROR
+# define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)	\
  do									\
    {									\
-      switch ((err))							\
+      switch ((Err))							\
 	{								\
 	case LONGINT_OK:						\
 	  abort ();							\
 									\
 	case LONGINT_INVALID:						\
-	  error ((exit_code), 0, "invalid %s `%s'",			\
-		 (argument_type_string), (str));			\
+	  error ((Exit_code), 0, "invalid %s `%s'",			\
+		 (Argument_type_string), (Str));			\
 	  break;							\
 									\
 	case LONGINT_INVALID_SUFFIX_CHAR:				\
-	  error ((exit_code), 0, "invalid character following %s `%s'",	\
-		 (argument_type_string), (str));			\
+	  error ((Exit_code), 0, "invalid character following %s `%s'",	\
+		 (Argument_type_string), (Str));			\
 	  break;							\
 									\
 	case LONGINT_OVERFLOW:						\
 	  /* FIXME: make this message dependent on STRING_TO_UNSIGNED */\
-	  error ((exit_code), 0, "%s `%s' larger than maximum long int",\
-		 (argument_type_string), (str));			\
+	  error ((Exit_code), 0, "%s `%s' larger than maximum long int",\
+		 (Argument_type_string), (Str));			\
 	  break;							\
 	}								\
    }									\
  while (0)

-#define STRTOL_FATAL_ERROR(str, argument_type_string, err)		\
-  _STRTOL_ERROR (2, str, argument_type_string, err)
+# define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err)		\
+  _STRTOL_ERROR (2, Str, Argument_type_string, Err)

-#define STRTOL_FAIL_WARN(str, argument_type_string, err)		\
-  _STRTOL_ERROR (0, str, argument_type_string, err)
+# define STRTOL_FAIL_WARN(Str, Argument_type_string, Err)		\
+  _STRTOL_ERROR (0, Str, Argument_type_string, Err)

-#endif /* _xstrtol_h_ */
+#endif /* not XSTRTOL_H_ */
--- a/lib/xstrtoul.h
+++ b/lib/xstrtoul.h
@@ -1,7 +1,13 @@
-#ifndef _xstrtoul_h_
-# define _xstrtoul_h_ 1
+#ifndef XSTRTOUL_H_
+# define XSTRTOUL_H_ 1

 # define STRING_TO_UNSIGNED 1
+
+/* Undefine this symbol so we can include xstrtol.h a second time.
+   Otherwise, a program that wanted both xstrtol.h and xstrtoul.h
+   would never get the declaration corresponding to the header file 
+   included after the first one.  */
+# undef XSTRTOL_H_
 # include "xstrtol.h"

-#endif /* _xstrtoul_h_ */
+#endif /* not XSTRTOUL_H_ */
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -0,0 +1,101 @@
+#! /bin/sh
+# ylwrap - wrapper for lex/yacc invocations.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# 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.
+
+# Usage:
+#     ylwrap PROGRAM INPUT [OUTPUT DESIRED]... -- [ARGS]...
+# * PROGRAM is program to run.
+# * INPUT is the input file
+# * OUTPUT is file PROG generates
+# * DESIRED is file we actually want
+# * ARGS are passed to PROG
+# Any number of OUTPUT,DESIRED pairs may be used.
+
+# The program to run.
+prog="$1"
+shift
+
+# The input.
+input="$1"
+shift
+case "$input" in
+ /*)
+    # Absolute path; do nothing.
+    ;;
+ *)
+    # Relative path.  Make it absolute.  Why?  Because otherwise any
+    # debugging info in the generated file will point to the wrong
+    # place.  This is really gross.
+    input="`pwd`/$input"
+    ;;
+esac
+
+pairlist=
+while test "$#" -ne 0; do
+   if test "$1" = "--"; then
+      break
+   fi
+   pairlist="$pairlist $1"
+   shift
+done
+
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines.  But that might take us over the 14-char limit.
+dirname=ylwrap$$
+trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+mkdir $dirname || exit 1
+
+cd $dirname
+$prog ${1+"$@"} "$input"
+status=$?
+
+if test $status -eq 0; then
+   set X $pairlist
+   shift
+   first=yes
+   while test "$#" -ne 0; do
+      if test -f "$1"; then
+         # If $2 is an absolute path name, then just use that,
+         # otherwise prepend `../'.
+         case "$2" in
+	   /*) target="$2";;
+	   *) target="../$2";;
+	 esac
+	 mv "$1" "$target" || status=$?
+      else
+	 # A missing file is only an error for the first file.  This
+	 # is a blatant hack to let us support using "yacc -d".  If -d
+	 # is not specified, we don't want an error when the header
+	 # file is "missing".
+	 if test $first = yes; then
+	    status=1
+	 fi
+      fi
+      shift
+      shift
+      first=no
+   done
+else
+   status=$?
+fi
+
+# Remove the directory.
+cd ..
+rm -rf $dirname
+
+exit $status
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -0,0 +1 @@
+Makefile
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -0,0 +1,8 @@
+## Process this file with automake to produce Makefile.in
+
+# Generate this list with
+# find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \
+#   |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012'
+EXTRA_DIST = README \
+chown.m4 getgroups.m4 getline.m4 getloadavg.m4 jm-mktime.m4 jm-winsz1.m4 \
+jm-winsz2.m4 memcmp.m4 putenv.m4 strftime.m4 uptime.m4
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -0,0 +1,196 @@
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Generate this list with
+# find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \
+#   |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012'
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = true
+PRE_INSTALL = true
+POST_INSTALL = true
+NORMAL_UNINSTALL = true
+PRE_UNINSTALL = true
+POST_UNINSTALL = true
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CPP = @CPP@
+DATADIRNAME = @DATADIRNAME@
+GENCAT = @GENCAT@
+GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNU_PACKAGE = @GNU_PACKAGE@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+KMEM_GROUP = @KMEM_GROUP@
+LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MAN = @MAN@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+NEED_SETGID = @NEED_SETGID@
+OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
+OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
+PACKAGE = @PACKAGE@
+PERL = @PERL@
+POFILES = @POFILES@
+POSUB = @POSUB@
+POW_LIBM = @POW_LIBM@
+RANLIB = @RANLIB@
+SEQ_LIBM = @SEQ_LIBM@
+SQRT_LIBM = @SQRT_LIBM@
+U = @U@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+YACC = @YACC@
+l = @l@
+
+EXTRA_DIST = README \
+chown.m4 getgroups.m4 getline.m4 getloadavg.m4 jm-mktime.m4 jm-winsz1.m4 \
+jm-winsz2.m4 memcmp.m4 putenv.m4 strftime.m4 uptime.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../config.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  README Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP = --best
+default: all
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = m4
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits m4/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: 
+	@$(NORMAL_INSTALL)
+
+install-data: 
+	@$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: 
+
+all: Makefile
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs:
+
+
+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 stamp-h stamp-h[0-9]*
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-generic
+
+clean:  clean-generic mostlyclean
+
+distclean:  distclean-generic clean
+	rm -f config.status
+
+maintainer-clean:  maintainer-clean-generic distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+.PHONY: default tags distdir info dvi installcheck install-exec \
+install-data install uninstall all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- a/m4/README
+++ b/m4/README
@@ -0,0 +1,9 @@
+These files are used by a program called aclocal (part of the GNU automake
+package).  aclocal uses these files to create aclocal.m4 which is in turn
+used by autoconf to create the configure script at the the top level in
+this distribution.
+
+Some of these files are copies of the ones in the automake-1.1l
+distribution.  Others are specific to this package.
+Eventually, I expect that aclocal will evolve so that this directory
+can contain only the .m4 files specific to this package.
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -0,0 +1,40 @@
+#serial 1
+
+dnl From Jim Meyering.
+dnl If you use this macro in a package, you should
+dnl add the following two lines to acconfig.h:
+dnl  /* Define to rpl_chown if the replacement function should be used.  */
+dnl  #undef chown
+dnl
+
+AC_DEFUN(jm_FUNC_CHOWN,
+[AC_REQUIRE([AC_TYPE_UID_T])dnl
+ test -z "$ac_cv_header_unistd_h" \
+   && AC_CHECK_HEADERS(unistd.h)
+ AC_CACHE_CHECK([for working chown], jm_cv_func_working_chown,
+  [AC_TRY_RUN([
+#   include <sys/types.h>
+#   include <fcntl.h>
+#   ifdef HAVE_UNISTD_H
+#    include <unistd.h>
+#   endif
+
+    int
+    main ()
+    {
+      char *f = "conftestchown";
+      if (creat (f, 0600) < 0)
+        exit (1);
+      exit (chown (f, (gid_t) -1, (uid_t) -1) == -1 ? 1 : 0);
+    }
+	      ],
+	     jm_cv_func_working_chown=yes,
+	     jm_cv_func_working_chown=no,
+	     dnl When crosscompiling, assume chown is broken.
+	     jm_cv_func_working_chown=no)
+  ])
+  if test $jm_cv_func_working_chown = no; then
+    LIBOBJS="$LIBOBJS chown.o"
+    AC_DEFINE_UNQUOTED(chown, rpl_chown)
+  fi
+])
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -0,0 +1,49 @@
+#serial 2
+
+dnl From Jim Meyering.
+dnl If you use this macro in a package, you should
+dnl add the following two lines to acconfig.h:
+dnl  /* Define to rpl_getgroups if the replacement function should be used.  */
+dnl  #undef getgroups
+dnl
+dnl Invoking code should check $GETGROUPS_LIB something like this:
+dnl  jm_FUNC_GETGROUPS
+dnl  test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
+dnl
+
+AC_DEFUN(jm_FUNC_GETGROUPS,
+[AC_REQUIRE([AC_TYPE_GETGROUPS])dnl
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+ AC_CHECK_FUNCS(getgroups)
+
+ # If we don't yet have getgroups, see if it's in -lbsd.
+ # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1.
+ if test $ac_cv_func_getgroups = no; then
+   jm_cv_sys_getgroups_saved_lib="$LIBS"
+   AC_CHECK_LIB(bsd, getgroups, [GETGROUPS_LIB=-lbsd])
+   LIBS="$jm_cv_sys_getgroups_saved_lib"
+ fi
+
+ # Run the program to test the functionality of the system-supplied
+ # getgroups function only if there is such a function.
+ if test $ac_cv_func_getgroups = yes; then
+   AC_CACHE_CHECK([for working getgroups], jm_cv_func_working_getgroups,
+    [AC_TRY_RUN([
+      int
+      main ()
+      {
+	/* On Ultrix 4.3, getgroups (0, 0) always fails.  */
+	exit (getgroups (0, 0) == -1 ? 1 : 0);
+      }
+		],
+	       jm_cv_func_working_getgroups=yes,
+	       jm_cv_func_working_getgroups=no,
+	       dnl When crosscompiling, assume getgroups is broken.
+	       jm_cv_func_working_getgroups=no)
+    ])
+    if test $jm_cv_func_working_getgroups = no; then
+      LIBOBJS="$LIBOBJS getgroups.o"
+      AC_DEFINE_UNQUOTED(getgroups, rpl_getgroups)
+    fi
+  fi
+])
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -0,0 +1,45 @@
+#serial 1
+
+dnl See if there's a working, system-supplied version of the getline function.
+dnl We can't just to AC_REPLACE_FUNCS(getline) because some systems
+dnl have a function by that name in -linet that doesn't have anything
+dnl to do with the function we need.
+AC_DEFUN(AM_FUNC_GETLINE,
+[dnl
+  am_getline_needs_run_time_check=no
+  am_cv_func_working_getline=yes
+  AC_CHECK_FUNC(getline,
+		dnl Found it in some library.  Verify that it works.
+		am_getline_needs_run_time_check=yes,
+		am_cv_func_working_getline=no)
+  if test $am_getline_needs_run_time_check = yes; then
+    AC_CACHE_CHECK([for working getline function], am_cv_func_working_getline,
+    [echo fooN |tr -d '\012'|tr N '\012' > conftestdata
+    AC_TRY_RUN([
+#    include <stdio.h>
+#    include <sys/types.h>
+#    if HAVE_STRING_H
+#     include <string.h>
+#    endif
+    int main ()
+    { /* Based on a test program from Karl Heuer.  */
+      char *line = NULL;
+      size_t siz = 0;
+      int len;
+      FILE *in = fopen ("./conftestdata", "r");
+      if (!in)
+	return 1;
+      len = getline (&line, &siz, in);
+      exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
+    }
+    ], am_cv_func_working_getline=yes dnl The library version works.
+    , am_cv_func_working_getline=no dnl The library version does NOT work.
+    , am_cv_func_working_getline=no dnl We're cross compiling.
+    )])
+  fi
+
+  if test $am_cv_func_working_getline = no; then
+    LIBOBJS="$LIBOBJS getline.o"
+    AC_SUBST(LIBOBJS)dnl
+  fi
+])
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -0,0 +1,127 @@
+#serial 3
+
+AC_DEFUN(AM_FUNC_GETLOADAVG,
+[ac_have_func=no # yes means we've found a way to get the load average.
+
+am_cv_saved_LIBS="$LIBS"
+
+# On HPUX9, an unprivileged user can get load averages through this function.
+AC_CHECK_FUNCS(pstat_getdynamic)
+
+# Solaris has libkstat which does not require root.
+AC_CHECK_LIB(kstat, kstat_open)
+if test $ac_cv_lib_kstat_kstat_open = yes ; then ac_have_func=yes ; fi
+
+# Some systems with -lutil have (and need) -lkvm as well, some do not.
+# On Solaris, -lkvm requires nlist from -lelf, so check that first
+# to get the right answer into the cache.
+# For kstat on solaris, we need libelf to force the definition of SVR4 below.
+AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS")
+if test $ac_have_func = no; then
+  AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")
+  # Check for the 4.4BSD definition of getloadavg.
+  AC_CHECK_LIB(util, getloadavg,
+    [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes])
+fi
+
+if test $ac_have_func = no; then
+  # There is a commonly available library for RS/6000 AIX.
+  # Since it is not a standard part of AIX, it might be installed locally.
+  ac_save_LIBS="$LIBS"
+  LIBS="-L/usr/local/lib $LIBS"
+  AC_CHECK_LIB(getloadavg, getloadavg,
+    LIBS="-lgetloadavg $LIBS", LIBS="$ac_save_LIBS")
+fi
+
+# Make sure it is really in the library, if we think we found it.
+AC_REPLACE_FUNCS(getloadavg)
+
+if test $ac_cv_func_getloadavg = yes; then
+  AC_DEFINE(HAVE_GETLOADAVG)
+  ac_have_func=yes
+else
+  AC_DEFINE(C_GETLOADAVG)
+  # Figure out what our getloadavg.c needs.
+  ac_have_func=no
+  AC_CHECK_HEADER(sys/dg_sys_info.h,
+  [ac_have_func=yes; AC_DEFINE(DGUX)
+  AC_CHECK_LIB(dgc, dg_sys_info)])
+
+  # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
+  # uses stabs), but it is still SVR4.  We cannot check for <elf.h> because
+  # Irix 4.0.5F has the header but not the library.
+  if test $ac_have_func = no && test $ac_cv_lib_elf_elf_begin = yes; then
+    ac_have_func=yes; AC_DEFINE(SVR4)
+  fi
+
+  if test $ac_have_func = no; then
+    AC_CHECK_HEADER(inq_stats/cpustats.h,
+    [ac_have_func=yes; AC_DEFINE(UMAX)
+    AC_DEFINE(UMAX4_3)])
+  fi
+
+  if test $ac_have_func = no; then
+    AC_CHECK_HEADER(sys/cpustats.h,
+    [ac_have_func=yes; AC_DEFINE(UMAX)])
+  fi
+
+  if test $ac_have_func = no; then
+    AC_CHECK_HEADERS(mach/mach.h)
+  fi
+
+  AC_CHECK_HEADER(nlist.h,
+  [AC_DEFINE(NLIST_STRUCT)
+  AC_CACHE_CHECK([for n_un in struct nlist], ac_cv_struct_nlist_n_un,
+  [AC_TRY_COMPILE([#include <nlist.h>],
+  [struct nlist n; n.n_un.n_name = 0;],
+  ac_cv_struct_nlist_n_un=yes, ac_cv_struct_nlist_n_un=no)])
+  if test $ac_cv_struct_nlist_n_un = yes; then
+    AC_DEFINE(NLIST_NAME_UNION)
+  fi
+  ])dnl
+fi # Do not have getloadavg in system libraries.
+
+# Some definitions of getloadavg require that the program be installed setgid.
+dnl FIXME Don't hardwire the path of getloadavg.c in the top-level directory.
+AC_CACHE_CHECK(whether getloadavg requires setgid,
+  ac_cv_func_getloadavg_setgid,
+[AC_EGREP_CPP([Yowza Am I SETGID yet],
+[#include "$srcdir/lib/getloadavg.c"
+#ifdef LDAV_PRIVILEGED
+Yowza Am I SETGID yet
+#endif],
+  ac_cv_func_getloadavg_setgid=yes, ac_cv_func_getloadavg_setgid=no)])
+if test $ac_cv_func_getloadavg_setgid = yes; then
+  NEED_SETGID=true; AC_DEFINE(GETLOADAVG_PRIVILEGED)
+else
+  NEED_SETGID=false
+fi
+AC_SUBST(NEED_SETGID)dnl
+
+if test $ac_cv_func_getloadavg_setgid = yes; then
+  AC_CACHE_CHECK(group of /dev/kmem, ac_cv_group_kmem,
+changequote(<<, >>)dnl
+<<
+  # On Solaris, /dev/kmem is a symlink.  Get info on the real file.
+  ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null`
+  # If we got an error (system does not support symlinks), try without -L.
+  test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem`
+  ac_cv_group_kmem=`echo $ac_ls_output \
+    | sed -ne 's/[ 	][ 	]*/ /g;
+	       s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\)  *.*/\1/;
+	       / /s/.* //;p;'`
+>>
+changequote([, ])dnl
+)
+  KMEM_GROUP=$ac_cv_group_kmem
+fi
+AC_SUBST(KMEM_GROUP)dnl
+
+if test x = "x$am_cv_saved_LIBS"; then
+  GETLOADAVG_LIBS="$LIBS"
+else
+  GETLOADAVG_LIBS=`echo "$LIBS"|sed "s!$am_cv_saved_LIBS!!"`
+fi
+AC_SUBST(GETLOADAVG_LIBS)dnl
+LIBS="$am_cv_saved_LIBS"
+])
--- a/m4/jm-mktime.m4
+++ b/m4/jm-mktime.m4
@@ -0,0 +1,14 @@
+#serial 1
+
+dnl From Jim Meyering.
+dnl If you use this macro in a package, you should
+dnl add the following two lines to acconfig.h:
+dnl   /* Define to rpl_mktime if the replacement function should be used.  */
+dnl   #undef mktime
+dnl
+AC_DEFUN(jm_FUNC_MKTIME,
+[AC_REQUIRE([AM_FUNC_MKTIME])dnl
+ if test $am_cv_func_working_mktime = no; then
+   AC_DEFINE_UNQUOTED(mktime, rpl_mktime)
+ fi
+])
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -0,0 +1,19 @@
+dnl From Jim Meyering.
+#serial 1
+AC_DEFUN(jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H,
+[AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
+ AC_CACHE_CHECK([whether use of TIOCGWINSZ requires termios.h],
+	        jm_cv_sys_tiocgwinsz_needs_termios_h,
+  [jm_cv_sys_tiocgwinsz_needs_termios_h=no
+
+   if test $am_cv_sys_posix_termios = yes; then
+     AC_EGREP_CPP([yes],
+     [#include <sys/types.h>
+#      include <termios.h>
+#      ifdef TIOCGWINSZ
+         yes
+#      endif
+     ], jm_cv_sys_tiocgwinsz_needs_termios_h=yes)
+   fi
+  ])
+])
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -0,0 +1,22 @@
+#serial 2
+
+AC_DEFUN(jm_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL,
+[AC_REQUIRE([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
+ AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
+	        jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
+  [jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
+
+  if test $jm_cv_sys_tiocgwinsz_needs_termios_h = no; then
+    AC_EGREP_CPP([yes],
+    [#include <sys/types.h>
+#     include <sys/ioctl.h>
+#     ifdef TIOCGWINSZ
+        yes
+#     endif
+    ], jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes)
+  fi
+  ])
+  if test $jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
+    AC_DEFINE(GWINSZ_IN_SYS_IOCTL)
+  fi
+])
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -0,0 +1,13 @@
+#serial 1
+
+dnl If you use this macro in a package, you should
+dnl add the following two lines to acconfig.h:
+dnl   /* Define to rpl_memcmp if the replacement function should be used.  */
+dnl   #undef memcmp
+dnl
+AC_DEFUN(jm_FUNC_MEMCMP,
+[AC_REQUIRE([AC_FUNC_MEMCMP])dnl
+ if test $ac_cv_func_memcmp_clean = no; then
+   AC_DEFINE_UNQUOTED(memcmp, rpl_memcmp)
+ fi
+])
--- a/Show More
+++ b/Show More