*** empty log message ***

(jm_PREREQ): Use it.

COPYING

@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

GNUmakefile

@@ -4,6 +4,10 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
+# Systems where /bin/sh is not the default shell need this.  The $(shell)
+# command below won't work with e.g. stock DOS/Windows shells.
+SHELL = /bin/sh
+
 have-Makefile := $(shell test -f Makefile && echo yes)
 
 # If the user runs GNU make but has not yet run ./configure,

Makefile.maint

@@ -11,46 +11,82 @@ maintainer-check:
 	$(MAKE) distcheck
 	$(MAKE) my-distcheck
 
+prev-version := $(shell echo $(VERSION)|tr a-z Xa-y)
+tag-package = $(shell echo "$(PACKAGE)" | tr a-z A-Z)
+tag-this-version = $(subst .,_,$(VERSION))
+tag-prev-version = $(subst .,_,$(prev-version))
+this-cvs-tag = $(tag-package)-$(tag-this-version)
+prev-cvs-tag = $(tag-package)-$(tag-prev-version)
+
+# Verify that all source files using _() are listed in po/POTFILES.in.
+po-check:
+	grep -E -v '^(#|$$)' po/POTFILES.in | sort > $@-1
+	grep -E -l '\b_\(' lib/*.c src/*.c | sort > $@-2
+	diff -u $@-1 $@-2
+	rm -f $@-1 $@-2
+
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
+# FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
 cvs-dist: maintainer-check
-	pkg=`echo "$(PACKAGE)" | tr a-z A-Z`; \
-	ver=`echo "$(VERSION)" | sed 's/\./_/g'`; \
-	tag="$$pkg-$$ver"; \
-	echo tag=$$tag; \
-	if cvs -n log -h README| grep -e $$tag > /dev/null; then \
+	echo $(this-cvs-tag); \
+	if cvs -n log -h README| grep -e $(this-cvs-tag): > /dev/null; then \
 	  echo "VERSION not new; not tagging" 1>&2; \
 	  exit 1; \
 	fi; \
 	cvs update po; \
-	cvs tag -c $$tag
+	cvs tag -c $(this-cvs-tag)
 	$(MAKE) dist
 
+# Use this to make sure we don't run these programs when building
+# from a virgin tgz file, below.
+null_AM_MAKEFLAGS = \
+  ACLOCAL=false \
+  AUTOCONF=false \
+  AUTOMAKE=false \
+  AUTOHEADER=false \
+  MAKEINFO=false
+
 t=./=test
-my-distcheck: dist
+my-distcheck: writable-files po-check
 	-rm -rf $(t)
 	mkdir $(t)
-	GZIP=$(GZIP) $(TAR) -C $(t) -zxf $(distdir).tar.gz
+	GZIP=$(GZIP) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
+# Removing $(DEPDIR) like this is a gross kludge to work around a bug
+# in automake.  Remove that line once it's fixed.
 	cd $(t)/$(distdir) \
 	  && ./configure --disable-nls \
-	  && $(MAKE) \
+	  && $(MAKE) CFLAGS='-Wformat -Werror' \
+	      AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
 	  && $(MAKE) dvi \
 	  && $(MAKE) check \
-	  && $(MAKE) distclean
+	  && $(MAKE) distclean \
+	  && rm -rf $(DEPDIR)
 	cd $(t) && mv $(distdir) $(distdir).old \
-	  && $(TAR) -zxf ../$(distdir).tar.gz
+	  && $(AMTAR) -zxf ../$(distdir).tar.gz
 	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
 	-rm -rf $(t)
 	@echo "========================"; \
 	echo "$(distdir).tar.gz is ready for distribution"; \
 	echo "========================"
 
-THIS_VERSION_REGEXP := $(shell echo $(VERSION)|sed 's/\./\\./g')
-# FIXME: this works only for test releases.
-PREV_VERSION := $(shell echo $(VERSION)|tr a-z Xa-y)
+THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
+# FIXME: this works only for Gnits-style test releases.
+PREV_VERSION := $(shell echo $(VERSION)|tr b-z a-y|sed 's/a$$//')
 PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
 v = Version
-url = ftp://alpha.gnu.org/gnu/fetish/$(distdir).tar.gz
+
+a_host=alpha.gnu.org
+b_host=tug.org
+
+a_url_dir=gnu/fetish
+b_url_dir=gnu/fetish
+
+a_real_dir=/fs/share/ftp/gnu/fetish
+b_real_dir=/home/ftp/pub/gnu/fetish
+
+url_dir_list = $(foreach x,a b,ftp://$($(x)_host)/$($(x)_url_dir))
+
 md5 = $(shell md5sum < $(distdir).tar.gz|sed 's/  -//')
 
 rel-check:
@@ -62,13 +98,25 @@ rel-check:
 	echo "$(md5)  -" > $$md5_tmp; \
 	md5sum -c $$md5_tmp < $$tarz
 
+release-archive-dir = ../release
+prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
+xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
+
 announcement: NEWS ChangeLog $(distdir).tar.gz
 	@( \
 	  echo Subject: $(distdir) released; \
 	  echo; \
 	  echo FIXME: put comments here; \
 	  echo; \
-	  echo "  $(url)"; \
+	  for url in $(url_dir_list); do \
+	    echo "  $$url/$(distdir).tar.gz"; \
+	  done; \
+	  echo; \
+	  echo And here are xdelta-style diffs; \
+	  echo; \
+	  for url in $(url_dir_list); do \
+	    echo "  $$url/$(xd-delta)"; \
+	  done; \
 	  echo; \
 	  echo "$(md5)  $(distdir).tar.gz"; \
 	  echo; \
@@ -77,18 +125,35 @@ announcement: NEWS ChangeLog $(distdir).tar.gz
 	    | grep -v '^\['; \
 	  echo; \
 	  echo ChangeLog entries:; \
-	  sed -n "1,/$v $(PREV_VERSION_REGEXP)/p" \
-	    ChangeLog; \
+	  find . -name ChangeLog \
+	    | xargs cvs diff -up -r$(prev-cvs-tag) -rHEAD \
+	    | sed -n 's/^+//p' \
+	    | perl -ne 'm!^\+\+ (\./)?! or print,next;'	\
+	      -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
 	)
 
-alpha:
+writable-files:
+	for file in $(distdir).tar.gz $(xd-delta)			\
+	  ../release/$(distdir).tar.gz ../release/$(xd-delta); do	\
+	  test -e $$file || continue;					\
+	  test -w $$file						\
+	    || { echo ERROR: $$file is not writable; fail=1; };		\
+	done;								\
+	test "$$fail" && exit 1 || :
+
+alpha: writable-files po-check
 	$(MAKE) cvs-dist
-	$(MAKE) -s announcement > /tmp/announcement
+	$(MAKE) -s announcement > /tmp/announce-$(distdir)
 	ln $(distdir).tar.gz ../release
 	chmod a-w $(distdir).tar.gz
+	cd $(release-archive-dir) \
+	  && xdelta delta -9 $(prev-tgz) $(distdir).tar.gz $(xd-delta) || :
+	ln $(release-archive-dir)/$(xd-delta) .
+	chmod a-w $(release-archive-dir)/$(xd-delta)
 	@echo =====================================
-	@echo 'ncftp -u $(dir $(url))/'
-	@echo '#   put $(distdir).tar.gz'
+	@echo =====================================
+	@echo 'scp $(xd-delta) $(distdir).tar.gz \'
+	@echo '  $(b_host):$(b_real_dir)'
 	@echo '# send the /tmp/announcement e-mail'
-	@echo 'pot-mail $(distdir).tar.gz | bash'
+	@echo =====================================
 	@echo =====================================

THANKS

@@ -1,53 +1,253 @@
 This is just a start at listing e-mail addresses of contributors.
 The rest of the addresses are still in the ChangeLog.
 
-Achim Blumensath: blume@corona.oche.de
-Akim Demaille: demaille@inf.enst.fr
-Andreas Schwab: schwab@issan.informatik.uni-dortmund.de
-Andries Brouwer: Andries.Brouwer@cwi.nl
-Arne Henrik Juul: arnej@imf.unit.no
-Bauke Jan Douma: bjdouma@xs4all.nl
-Bengt Martensson: bengt@mathematik.uni-Bremen.de
-Bjorn Helgaas: helgaas@rsn.hp.com
-Brendan O'Dea: bod@compusol.com.au
-Charles Karney: karney@pppl.gov
-Christian von Roques: roques@pond.sub.org
-Dirk Lattermann: dlatt@t-online.de
-Don Parsons: dparsons@synapse.kent.edu
-Eirik Fuller: eirik@netcom.com
-Eli Zaretskii: eliz@is.elta.co.il
-Emile LeBlanc: leblanc@math.toronto.edu
-François Pinard: pinard@iro.umontreal.ca
-Galen Hazelwood: galenh@micron.net
-Göran Uddeborg: goeran@uddeborg.pp.se
-Greg McGary: gkm@eng.ascend.com
-Hugh Daniel: hugh@xanadu.com
-James: james@albion.glarp.com
-James Antill: jmanti%essex.ac.uk@seralph21.essex.ac.uk
-James Tanis: jtt@soscorp.com
-Jesse Thilo: jgt2@eecs.lehigh.edu
-Joakim Rosqvist: dvljrt@cs.umu.se
-John Gatewood Ham: zappaman@alphabox.compsci.buu.ac.th
-Kjetil Torgrim Homme: kjetilho@ifi.uio.no
-Lorne Baker: lbaker@nitro.avint.net
-Marcus Daniels: marcus@sysc.pdx.edu
-Mark A. Thomas: thommark@access.digex.net
-Mark Harris: mark@monitor.designacc.com
-Mark Kettenis: kettenis@phys.uva.nl
-Marty Leisner: leisner@sdsp.mc.xerox.com
-Masami Takikawa: takikawm@CS.ORST.EDU
-Matthew S. Levine: mslevine@theory.lcs.mit.edu
-Miles Bader: miles@gnu.ai.mit.edu
-Noel Cragg: noel@red-bean.com
-Olav Morkrid: olav@funcom.com
-Peter Eriksson: peter@ifm.liu.se
-Paul Eggert: eggert@twinsun.com
-Philippe De Muyter: phdm@macqel.be
-Ross Ridge: rridge@calum.csclub.uwaterloo.ca
-Santiago Vila Doncel: sanvila@unex.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
-Michael Veksler: mveksler@techunix.technion.ac.il
-Wayne Stewart: wstewa@atl.com
+Achim Blumensath                    blume@corona.oche.de
+Adam Klein                          aklein@debian.org
+Akim Demaille                       demaille@inf.enst.fr
+Alain Magloire                      alain@qnx.com
+Alberto Accomazzi                   alberto@cfa0.harvard.edu
+aldomel                             aldomel@ix.netcom.com
+Alen Muzinic                        zveki@fly.cc.fer.hr
+Alexey Solovyov                     alekso@math.uu.se
+Andre Novaes Cunha                  Andre.Cunha@br.global-one.net
+Andreas Jaeger                      jaeger@gnu.org
+Andreas Luik                        luik@isa.de
+Andreas Schwab                      schwab@suse.de
+Andreas Stolcke                     stolcke@ICSI.Berkeley.EDU
+Andres Soolo                        andres@soolo.matti.ee
+Andrew Dalke                        dalke@bioreason.com
+Andrew Tridgell                     tridge@samba.org
+Andries Brouwer                     Andries.Brouwer@cwi.nl
+Andy Longton                        alongton@metamark.com
+Ariel Faigon                        ariel@cthulhu.engr.sgi.com
+Arne H. Juul                        arnej@solan.unit.no
+Arne Henrik Juul                    arnej@imf.unit.no
+Arthur Pool                         pool@commerce.uq.edu.au
+Austin Donnelly                     Austin.Donnelly@cl.cam.ac.uk
+Bauke Jan Douma                     bjdouma@xs4all.nl
+Bengt Martensson                    bengt@mathematik.uni-Bremen.de
+Bernd Leibing                       bernd.leibing@rz.uni-ulm.de
+Bernhard Rosenkraenzer              bero@redhat.de
+Bill Peters                         peters@gaffel.as.arizona.edu
+Bjorn Helgaas                       helgaas@rsn.hp.com
+Bob McCracken                       kerouac@ravenet.com
+Bob Proulx                          rwp@fc.hp.com
+Brendan O'Dea                       bod@compusol.com.au
+Brian Kimball                       bfk@footbag.org
+Bruno Haible                        haible@clisp.cons.org
+Carl Johnson                        carlj@cjlinux.home.org
+Carl Lowenstein                     cdl@mpl.UCSD.EDU
+Carlos Canau                        Carlos.Canau@relay.puug.pt
+Charles Karney                      karney@pppl.gov
+Charles Randall                     crandall@matchlogic.com
+Chip Salzenberg                     chip@valinux.com
+Chris Yeo                           cyeo@biking.org
+Christi Alice Scarborough           christi@chiark.greenend.org.uk
+Christian Krackowizer               kra1@technodat.co.at
+Christian von Roques                roques@pond.sub.org
+Chuck Hedrick                       hedrick@klinzhai.rutgers.edu
+Clark Morgan                        cmorgan@aracnet.com
+Colin Plumb                         colin@nyx.net
+Collin Rogowski                     collin@rogowski.de
+Dan Hagerty                         hag@gnu.ai.it.edu
+Daniel Bergstrom                    noa@melody.se
+David Dyck                          dcd@tc.fluke.COM
+David Godfrey                       dave@delta.demon.co.uk
+Dennis Henriksen                    opus@flamingo.osrl.dk
+Derek Clegg                         dclegg@next.com
+Dick Streefland                     dick_streefland@tasking.com
+Dirk Lattermann                     dlatt@t-online.de
+Dirk-Jan Faber                      djfaber@snow.nl
+Don Parsons                         dparsons@synapse.kent.edu
+Donni Erpel                         donald@appc11.gsi.de
+Doug McLaren                        dougmc@comco.com
+Dragos Harabor                      dharabor@us.oracle.com
+Ed Avis                             epa98@doc.ic.ac.uk
+Edzer Pebesma                       Edzer.Pebesma@rivm.nl
+Eirik Fuller                        eirik@netcom.com
+Eivind                              eivindt@multinet.no
+Eli Zaretskii                       eliz@is.elta.co.il
+Emile LeBlanc                       leblanc@math.toronto.edu
+Eric Backus                         ericb@lsid.hp.com
+Eric G. Miller                      egm2@jps.net
+Erik Bennett                        bennett@cvo.oneworld.com
+Erik Corry                          erik@kroete2.freinet.de
+Felix Lee                           flee@teleport.com
+Fletcher Mattox                     fletcher@cs.utexas.edu
+Florin Iucha                        fiucha@hsys.mic.ro
+Frank T Lofaro                      ftlofaro@snooks.Egr.UNLV.EDU
+François Pinard                     pinard@iro.umontreal.ca
+Fred Fish                           fnf@ninemoons.com
+Gabor Z. Papp                       gzp@gzp.org.hu
+Galen Hazelwood                     galenh@micron.net
+Gary Anderson                       ganderson@clark.net
+Gaël Quéri                          gqueri@mail.dotcom.fr
+Geoff Odhner                        geoff@franklin.com
+Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
+GOTO Masanori                       gotom@debian.or.jp
+Greg McGary                         gkm@gnu.org
+Greg Troxel                         gdt@bbn.com
+Greg Wooledge                       gawooledge@sherwin.com
+Gregory Leblanc                     gleblanc@cu-portland.edu
+Göran Uddeborg                      goeran@uddeborg.pp.se
+H. J. Lu                            hjl@valinux.com
+Hans Verkuil                        hans@wyst.hobby.nl
+Holger Berger                       hberger@ess.nec.de
+Hugh Daniel                         hugh@xanadu.com
+Ian Jackson                         ijackson@chiark.greenend.org.uk
+Ian Lance Taylor                    ian@cygnus.com
+Ian Turner                          vectro@pipeline.com
+James                               james@albion.glarp.com
+James Antill                        jmanti%essex.ac.uk@seralph21.essex.ac.uk
+James Sneeringer                    jvs@ocslink.com
+James Tanis                         jtt@soscorp.com
+James Youngman                      james+usenet@free-lunch.demon.co.uk
+Jamie Lokier                        jamie@imbolc.ucc.ie
+Janos Farkas                        chexum@shadow.banki.hu
+Jarkko Hietaniemi                   jhi@epsilon.hut.fi
+Jeff Moore                          jbm@mordor.com
+Jeff Sheinberg                      jeffsh@erols.com
+Jens Schmidt                        jms@jsds.hamburg.com
+Jerome Abela                        abela@hsc.fr
+Jesse Thilo                         jgt2@eecs.lehigh.edu
+Jie Xu                              xuj@iag.net
+Jim Blandy                          jimb@cyclic.com
+Jim Dennis                          jimd@starshine.org
+Joakim Rosqvist                     dvljrt@cs.umu.se
+Jochen Hein                         jochen@jochen.org
+Joe Orton                           joe@orton.demon.co.uk
+Johan Danielsson                    joda@pdc.kth.se
+John Bley                           jbb6@acpub.duke.edu
+John David Anglin                   dave.anglin@nrc.ca
+John Gatewood Ham                   zappaman@alphabox.compsci.buu.ac.th
+John Gotts                          jgotts@umich.edu
+John Kendall                        kendall@capps.com
+John Kodis                          kodis@acm.org
+John Murphy                         jam@philabs.research.philips.com
+John Roll                           john@panic.harvard.edu
+John Salmon                         johns@mullet.anu.edu.au
+John Summerfield                    summer@OS2.ami.com.au
+Joost van Baal                      joostvb@xs4all.nl
+Joseph S. Myers                     jsm28@cam.ac.uk
+jvogel                              jvogel@linkny.com
+Jürgen Fluk                         louis@dachau.marco.de
+Kai-Uwe Rommel                      rommel@informatik.tu-muenchen.de
+Kalle Olavi Niemitalo               tosi@stekt.oulu.fi
+Kamal Paul Nigam                    Kamal_Paul_Nigam@gs35.sp.cs.cmu.edu
+Karl Heuer                          kwzh@gnu.org
+Karsten Thygesen                    karthy@kom.auc.dk
+Kaveh R. Ghazi                      ghazi@caip.rutgers.edu
+Keith Owens                         kaos@audio.apana.org.au
+Ken Pizzini                         kenp@halcyon.com
+Kjetil Torgrim Homme                kjetilho@ifi.uio.no
+Kristoffer Rose                     kris@diku.dk
+Larry McVoy                         lm@sgi.com
+Lars Hecking                        lhecking@nmrc.ucc.ie
+Lehti Rami                          rammer@cs.tut.fi
+Leonard N. Zubkoff                  lnz@dandelion.com
+Lorne Baker                         lbaker@nitro.avint.net
+Manas Garg                          manas@cygsoft.com
+Manfred Hollstein                   manfred@s-direktnet.de
+Marc Boucher                        marc@mbsi.ca
+Marc Olzheim                        marcolz@stack.nl
+Marco Franzen                       Marco.Franzen@Thyron.com
+Marcus Daniels                      marcus@ee.pdx.edu
+Mark A. Thomas                      thommark@access.digex.net
+Mark Harris                         mark@monitor.designacc.com
+Mark Hewitt                         mhewitt@armature.com
+Mark Kettenis                       kettenis@phys.uva.nl
+Mark W. Eichin                      eichin@cygnus.com
+Markus Demleitner                   msdemlei@auriga.ari.uni-heidelberg.de
+Martin                              martin@dresden.nacamar.de
+Martin Hippe                        martin.hippe@schlund.de
+Martin Mitchell                     martin@debian.org
+Martin P.J. Zinser                  zinser@decus.de
+Marty Leisner                       leisner@sdsp.mc.xerox.com
+Masami Takikawa                     takikawm@CS.ORST.EDU
+Mate Wierdl                         mw@moni.msci.memphis.edu
+Matej Vela                          mvela@public.srce.hr
+Matthew Braun                       matthew@ans.net
+Matthew Clarke                      Matthew_Clarke@mindlink.bc.ca
+Matthew S. Levine                   mslevine@theory.lcs.mit.edu
+Matthew Swift                       swift@alum.mit.edu
+Matthias Urlichs                    smurf@noris.de
+Meelis Roos                         mroos@tartu.cyber.ee
+Michael ???                         michael@roka.net
+Michael Deutschmann                 michael@talamasca.ocis.net
+Michael Hasselberg                  mikelh@zonta.ping.de
+Michael Stone                       mstone@debian.org
+Michael Stutz                       stutz@dsl.org
+Michael Veksler                     mveksler@techunix.technion.ac.il
+Michel Robitaille                   robitail@IRO.UMontreal.CA
+Michiel Bacchiani                   bacchian@raven.bu.edu
+Miles Bader                         miles@gnu.ai.mit.edu
+Minh Tran-Le                        tranle@intellicorp.com
+Morten Welinder                     terra@diku.dk
+Nelson H. F. Beebe                  beebe@math.utah.edu
+Niklas Edmundsson                   nikke@acc.umu.se
+Noah Friedman                       friedman@splode.com
+Noel Cragg                          noel@red-bean.com
+Olav Morkrid                        olav@funcom.com
+Paul Eggert                         eggert@twinsun.com
+Paul Nevai                          nevai@ops.mps.ohio-state.edu
+Paul Slootman                       paul@debian.org
+Per Cederqvist                      ceder@lysator.liu.se
+Per Kristian Hove                   perhov@math.ntnu.no
+Peter Eriksson                      peter@ifm.liu.se
+Peter Moulder                       reiter@netspace.net.au
+Peter Samuelson                     psamuels@sampo.creighton.edu
+Peter Seebach                       seebs@taniemarie.solon.com
+Phil Richards                       phil.richards@vf.vodafone.co.uk
+Philippe De Muyter                  phdm@macqel.be
+Philippe Schnoebelen                Philippe.Schnoebelen@imag.fr
+Rainer Orth                         ro@TechFak.Uni-Bielefeld.DE
+Ralf W. Stephan                     stephan@tmt.de
+Ralph Loader                        loader@maths.ox.ac.uk
+Raul Miller                         moth@magenta.com
+Richard Braakman                    dark@xs4all.nl
+Richard J. Rauenzahn                rrauenza@hairball.cup.hp.com
+Richard Sharman                     rsharman@magmacom.com
+Rick Sladkey                        jrs@world.std.com
+Rik Faith                           faith@cs.unc.edu
+Risto Kankkunen                     kankkune@lingsoft.fi
+Robert H. de Vries                  robert@and.nl
+Rogier Wolff                        R.E.Wolff@BitWizard.nl
+Ronald F. Guilmette                 rfg@netcom.com
+Ross Alexander                      r.alexander@auckland.ac.nz
+Ross Paterson                       rap@doc.ic.ac.uk
+Ross Ridge                          rridge@calum.csclub.uwaterloo.ca
+Sami Farin                          sfarin@ratol.fi
+Samuli Karkkainen                   Samuli.Karkkainen@hut.fi
+Sander van Malssen                  svm@kozmix.ow.nl
+Santiago Vila Doncel                sanvila@unex.es
+Savochkin Andrey Vladimirovich      saw@msu.ru
+Scott Lurndal                       slurn@griffin.engr.sgi.com
+Stephen Gildea                      gildea@x.org
+Steve McConnel                      steve@acadcomp.sil.org
+Stuart Kemp                         skemp@peter.bmc.com
+Tadayoshi Funaba                    tadf@kt.rim.or.jp
+Theodore Ts'o                       tytso@rsts-11.mit.edu
+Thomas Bushnell                     thomas@gnu.ai.mit.edu
+Thomas Quinot                       thomas@Cuivre.FR.EU.ORG
+Tim Smithers                        mouse@dmouse.com.au
+Tim Waugh                           twaugh@redhat
+Tom Quinn                           trq@dionysos.thphys.ox.ac.uk
+Ton Hospel                          thospel@mail.dma.be
+Tony Leneis                         tony@plaza.ds.adp.com
+Tony Robinson                       ajr@eng.cam.ac.uk
+Torbjorn Granlund                   tege@nada.kth.se
+Torbjorn Lindgren                   tl@funcom.no
+Torsten Landschoff                  torsten@pclab.ifg.uni-kiel.de
+Ulrich Drepper                      drepper@gnu.org
+Urs Thuermann                       urs@isnogud.escape.de
+Vin Shelton                         acs@alumni.princeton.edu
+Volker Borchert                     bt@teknon.de
+Wayne Stewart                       wstewa@atl.com
+Wichert Akkerman                    wichert@cistron.nl
+Will Edgington                      wedgingt@acm.org
+William Bader                       william@nscs.fast.net
+William Dowling                     will@franklin.com
+William Lewis                       wiml@omnigroup.com
+Wolfram Kleff                       kleff@cs.uni-bonn.de
+Zvi Har'El                          rl@math.technion.ac.il
+Ørn E. Hansen                       oehansen@daimi.aau.dk

doc/.cvsignore

@@ -1,20 +1,19 @@
 Makefile
-fileutils.info
-version.texi
-fileutils.info*
-fileutils.log
-fileutils.dvi
 fileutils.aux
-fileutils.toc
-fileutils.cp
-fileutils.fn
-fileutils.vr
-fileutils.tp
-fileutils.ky
-fileutils.pg
 fileutils.cm
-fileutils.fl
-fileutils.op
+fileutils.cp
 fileutils.cps
+fileutils.dvi
+fileutils.fl
+fileutils.fn
+fileutils.info
+fileutils.info*
+fileutils.ky
+fileutils.log
+fileutils.op
+fileutils.pg
+fileutils.toc
+fileutils.tp
+fileutils.vr
 stamp-vti
 version.texi

doc/Makefile.am

@@ -3,8 +3,12 @@ info_TEXINFOS = fileutils.texi
 
 EXTRA_DIST = perm.texi getdate.texi
 
-# 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
+# The following is necessary if the package name is 8 characters or longer.
+# If the info documentation would be split into 10 or more separate files,
+# then this is necessary even if the package name is 7 characters long.
+#
+# Tell makeinfo to put everything in a single info file: <package>.info.
+# Otherwise, it would also generate files with names like <package>.info-[123],
+# and those names all map to one 14-byte name (<package>.info-) on some crufty
 # old systems.
 MAKEINFO = makeinfo --no-split

doc/Makefile.in

@@ -1,16 +1,16 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
+
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -31,8 +31,6 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -48,6 +46,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -56,15 +55,29 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+@SET_MAKE@
+host_alias = @host_alias@
+host_triplet = @host@
+AMDEP = @AMDEP@
+AMTAR = @AMTAR@
+AWK = @AWK@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
+DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
+GETCONF = @GETCONF@
+GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
@@ -72,36 +85,53 @@ INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
+KMEM_GROUP = @KMEM_GROUP@
+LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
+LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
+LIB_CRYPT = @LIB_CRYPT@
+LIB_NANOSLEEP = @LIB_NANOSLEEP@
+MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MVDIR_PROG = @MVDIR_PROG@
+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@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+install_sh = @install_sh@
 l = @l@
 
+
 info_TEXINFOS = fileutils.texi
 
 EXTRA_DIST = perm.texi getdate.texi
 
-# 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
+# The following is necessary if the package name is 8 characters or longer.
+# If the info documentation would be split into 10 or more separate files,
+# then this is necessary even if the package name is 7 characters long.
+#
+# Tell makeinfo to put everything in a single info file: <package>.info.
+# Otherwise, it would also generate files with names like <package>.info-[123],
+# and those names all map to one 14-byte name (<package>.info-) on some crufty
 # old systems.
 MAKEINFO = makeinfo --no-split
+subdir = doc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
+DIST_SOURCES = 
 TEXI2DVI = texi2dvi
-TEXINFO_TEX = $(srcdir)/texinfo.tex
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
@@ -109,34 +139,32 @@ DIST_COMMON =  Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
 version.texi
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP = --best
-all: Makefile $(INFO_DEPS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
+GZIP_ENV = --best
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-version.texi: stamp-vti
-	cp $(srcdir)/stamp-vti $(srcdir)/version.texi
+$(srcdir)/version.texi: stamp-vti
+	@:
 
-stamp-vti: fileutils.texi $(top_srcdir)/configure.in
-	@echo "@set UPDATED `cd $(srcdir) \
-	  && $(SHELL) ./mdate-sh fileutils.texi`" > vti.tmp
+$(srcdir)/stamp-vti: fileutils.texi $(top_srcdir)/configure.in
+	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/fileutils.texi`" > vti.tmp
 	@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)
+	@cmp -s vti.tmp $(srcdir)/version.texi \
+	  || (echo "Updating $(srcdir)/version.texi"; \
+	      cp vti.tmp $(srcdir)/version.texi)
 	-@rm -f vti.tmp
+	@cp $(srcdir)/version.texi $@
 
 mostlyclean-vti:
 	-rm -f vti.tmp
@@ -146,7 +174,7 @@ clean-vti:
 distclean-vti:
 
 maintainer-clean-vti:
-	-rm -f stamp-vti version.texi
+	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 
 fileutils.info: fileutils.texi version.texi
 fileutils.dvi: fileutils.texi version.texi
@@ -201,9 +229,10 @@ DVIPS = dvips
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	@for file in $(INFO_DEPS); do \
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
 	  d=$(srcdir); \
-	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 	    if test -f $$d/$$ifile; then \
 	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
 	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
@@ -212,7 +241,8 @@ install-info-am: $(INFO_DEPS)
 	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 \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
 	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
 	  done; \
@@ -221,40 +251,45 @@ install-info-am: $(INFO_DEPS)
 uninstall-info:
 	$(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=$(DESTDIR)$(infodir) --remove $$file; \
-	done
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
+	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
+	  done; \
+	else :; fi
 	@$(NORMAL_UNINSTALL)
-	for file in $(INFO_DEPS); do \
-	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  (if cd $(DESTDIR)$(infodir); then \
+	     echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
+	     rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
+	   else :; fi); \
 	done
 
 dist-info: $(INFO_DEPS)
-	for base in $(INFO_DEPS); do \
+	list='$(INFO_DEPS)'; \
+	for base in $$list; do \
 	  d=$(srcdir); \
-	  for file in `cd $$d && eval echo $$base*`; do \
+	  for file in `CDPATH=: && 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.kys \
-	  fileutils.ps fileutils.log fileutils.pg fileutils.toc \
-	  fileutils.tp fileutils.tps fileutils.vr fileutils.vrs \
-	  fileutils.op fileutils.tr fileutils.cv fileutils.cn
+	  fileutils.fn fileutils.fns fileutils.pgs fileutils.ky \
+	  fileutils.kys fileutils.ps fileutils.log fileutils.pg \
+	  fileutils.toc fileutils.tp fileutils.tps fileutils.vr \
+	  fileutils.vrs fileutils.op fileutils.tr fileutils.cv \
+	  fileutils.cn fileutils.cm fileutils.ov
 
 clean-aminfo:
 
 distclean-aminfo:
 
 maintainer-clean-aminfo:
-	for i in $(INFO_DEPS); do \
+	cd $(srcdir) && for i in $(INFO_DEPS); do \
 	  rm -f $$i; \
 	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
 	    rm -f $$i-[0-9]*; \
@@ -266,74 +301,82 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = doc
-
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(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 $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
 	done
-	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
-info: $(INFO_DEPS)
-dvi: $(DVIS)
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
+info-am: $(INFO_DEPS)
+info: info-am
+dvi-am: $(DVIS)
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
 
-install-data: install-info-am
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-info
+install-data-am: install-info-am
+install-data: install-data-am
 
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-info
+uninstall: uninstall-am
+all-am: Makefile $(INFO_DEPS)
+all-redirect: all-am
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(infodir)
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-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-aminfo mostlyclean-generic
+	-rm -f Makefile.in
+mostlyclean-am:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic
 
-clean:  clean-vti clean-aminfo clean-generic mostlyclean
+mostlyclean: mostlyclean-am
 
-distclean:  distclean-vti distclean-aminfo distclean-generic clean
-	-rm -f config.status
+clean-am:  clean-vti clean-aminfo clean-generic mostlyclean-am
 
-maintainer-clean:  maintainer-clean-vti maintainer-clean-aminfo \
-		maintainer-clean-generic distclean
+clean: clean-am
+
+distclean-am:  distclean-vti distclean-aminfo distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-vti maintainer-clean-aminfo \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
+maintainer-clean: maintainer-clean-am
+
 .PHONY: mostlyclean-vti distclean-vti clean-vti maintainer-clean-vti \
 install-info-am uninstall-info mostlyclean-aminfo distclean-aminfo \
-clean-aminfo maintainer-clean-aminfo tags distdir info dvi installcheck \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
+clean-aminfo maintainer-clean-aminfo tags distdir info-am info dvi-am \
+dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all install-strip \
+installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 

doc/getdate.texi

@@ -113,13 +113,13 @@ specified differently, depending on whether the month is specified
 numerically or literally.  All these strings specify the same calendar date:
 
 @example
-1970-09-17           # ISO 8601.
-70-9-17              # This century assumed by default.
-70-09-17             # Leading zeros are ignored.
-9/17/72              # Common U.S. writing.
+1972-09-24      # ISO 8601.
+72-9-24         # Assume 19xx for 69 through 99, 20xx for 00 through 68.
+72-09-24        # Leading zeros are ignored.
+9/24/72         # Common U.S. writing.
 24 September 1972
-24 Sept 72           # September has a special abbreviation.
-24 Sep 72            # Three-letter abbreviations always allowed.
+24 Sept 72      # September has a special abbreviation.
+24 Sep 72       # Three-letter abbreviations always allowed.
 Sep 24, 1972
 24-sep-72
 24sep72
@@ -129,8 +129,8 @@ The year can also be omitted.  In this case, the last specified year is
 used, or the current year if none.  For example:
 
 @example
-9/17
-sep 17
+9/24
+sep 24
 @end example
 
 Here are the rules.
@@ -141,8 +141,9 @@ For numeric months, the ISO 8601 format
 @samp{@var{year}-@var{month}-@var{day}} is allowed, where @var{year} is
 any positive number, @var{month} is a number between 01 and 12, and
 @var{day} is a number between 01 and 31.  A leading zero must be present
-if a number is less than ten.  If @var{year} is less than 100, then 1900
-is added to it to force a date in this century.  The construct
+if a number is less than ten.  If @var{year} is 68 or smaller, then 2000
+is added to it; otherwise, if @var{year} is less than 100,
+then 1900 is added to it.  The construct
 @samp{@var{month}/@var{day}/@var{year}}, popular in the United States,
 is accepted.  Also @samp{@var{month}/@var{day}}, omitting the year.
 

doc/perm.texi

@@ -430,7 +430,7 @@ the file to all users.
 @cindex numeric modes
 @cindex file permissions, numeric
 @cindex octal numbers for file modes
-File permissions are stored internally as 16 bit integers.  As an
+File permissions are stored internally as integers.  As an
 alternative to giving a symbolic mode, you can give an octal (base 8)
 number that corresponds to the internal representation of the new mode.
 This number is always interpreted in octal; you do not have to add a
@@ -440,12 +440,13 @@ A numeric mode is usually shorter than the corresponding symbolic
 mode, but it is limited in that it can not take into account a file's
 previous permissions; it can only set them absolutely.
 
-The permissions granted to the user, to other users in the file's group,
+On most systems, the permissions granted to the user,
+to other users in the file's group,
 and to other users not in the file's group are each stored as three
 bits, which are represented as one octal digit.  The three special
 permissions are also each stored as one bit, and they are as a group
-represented as another octal digit.  Here is how the bits are arranged
-in the 16 bit integer, starting with the lowest valued bit:
+represented as another octal digit.  Here is how the bits are arranged,
+starting with the lowest valued bit:
 
 @example
 Value in  Corresponding

doc/sh-utils.texi

@@ -34,6 +34,7 @@ START-INFO-DIR-ENTRY
 * factor: (sh-utils)factor invocation.          Print prime factors
 * false: (sh-utils)false invocation.            Do nothing, unsuccessfully.
 * groups: (sh-utils)groups invocation.          Print group names a user is in.
+* hostid: (sh-utils)hostid invocation.          Print numeric host identifier.
 * hostname: (sh-utils)hostname invocation.      Print or set system name.
 * id: (sh-utils)id invocation.                  Print real/effective uid/gid.
 * logname: (sh-utils)logname invocation.        Print current login name.
@@ -113,7 +114,7 @@ by the Foundation.
 @end titlepage
 
 
-@ifinfo
+@ifnottex
 @node Top
 @top GNU shell utilities
 
@@ -140,7 +141,7 @@ This manual documents version @value{VERSION} of the GNU shell utilities.
 
 * Index::                       General index.
 @end menu
-@end ifinfo
+@end ifnottex
 
 
 @node Introduction
@@ -320,6 +321,21 @@ the @var{format} string.
 and @samp{\xhhh} as a hexadecimal number (if @var{hhh} is 1 to 3 hex
 digits) specifying a character to print.
 
+@kindex \uhhhh
+@kindex \Uhhhhhhhh
+@code{printf} interprets two character syntaxes introduced in ISO C 99:
+@samp{\u} for 16-bit Unicode characters, specified as 4 hex digits
+@var{hhhh}, and @samp{\U} for 32-bit Unicode characters, specified as 8 hex
+digits @var{hhhhhhhh}. @code{printf} outputs the Unicode characters
+according to the LC_CTYPE part of the current locale, i.e. depending
+on the values of the environment variables @code{LC_ALL}, @code{LC_CTYPE},
+@code{LANG}.
+
+The processing of @samp{\u} and @samp{\U} requires a full-featured
+@code{iconv} facility. It is activated on systems with glibc 2.2 (or newer),
+or when @code{libiconv} is installed prior to the sh-utils. Otherwise the
+use of @samp{\u} and @samp{\U} will give an error message.
+
 @kindex \c
 An additional escape, @samp{\c}, causes @code{printf} to produce no
 further output.
@@ -327,6 +343,40 @@ further output.
 The only options are a lone @samp{--help} or
 @samp{--version}.  @xref{Common options}.
 
+The Unicode character syntaxes are useful for writing strings in a locale
+independent way. For example, a string containing the Euro currency symbol
+
+@example
+$ /usr/local/bin/printf '\u20AC 14.95'
+@end example
+
+will be output correctly in all locales supporting the Euro symbol
+(ISO-8859-15, UTF-8, and others). Similarly, a Chinese string
+
+@example
+$ /usr/local/bin/printf '\u4e2d\u6587'
+@end example
+
+will be output correctly in all chinese locales (GB2312, BIG5, UTF-8, etc).
+
+Note that in these examples, the full pathname of @code{printf} has been
+given, to distinguish it from the GNU bash builtin function @code{printf}.
+
+For larger strings, you don't need to look up the hexadecimal code values of
+each character one by one. ASCII characters mixed with \u escape sequences
+is also known as the JAVA source file encoding. You can use GNU recode 3.5c
+(or newer) to convert strings to this encoding. Here is how to convert a
+piece of text into a shell script which will output this text in a locale
+independent way:
+
+@smallexample
+$ LC_CTYPE=zh_CN.big5 /usr/local/bin/printf \
+    '\u4e2d\u6587\n' > sample.txt
+$ recode BIG5..JAVA < sample.txt \
+    | sed -e "s|^|/usr/local/bin/printf '|" -e "s|$|\\\\n'|" \
+    > sample.sh
+@end smallexample
+
 
 @node yes invocation
 @section @code{yes}: Print a string until interrupted
@@ -366,15 +416,21 @@ pipeline.
 @section @code{false}: Do nothing, unsuccessfully
 
 @pindex false
-
-@cindex exit status of @code{true}
+@cindex do nothing, unsuccessfully
 @cindex failure exit status
+@cindex exit status of @code{false}
+
 @code{false} does nothing except return an exit status of 1, meaning
 @dfn{failure}.  It can be used as a place holder in shell scripts
 where an unsuccessful command is needed.
 
-Any arguments are ignored, except for a lone @samp{--help} or
-@samp{--version} (@pxref{Common options}).
+@code{false} ignores @emph{all} command line arguments, even @samp{--help}
+and @samp{--version}, since to do otherwise would change expected
+behavior that some programmers may be relying on.
+
+This version of @code{false} is implemented as a C program, and is thus
+more secure and faster than a shell script implementation, and may safely
+be used as a dummy shell for the purpose of disabling accounts.
 
 
 @node true invocation
@@ -384,15 +440,20 @@ Any arguments are ignored, except for a lone @samp{--help} or
 @cindex do nothing, successfully
 @cindex no-op
 @cindex successful exit
-
 @cindex exit status of @code{true}
+
 @code{true} does nothing except return an exit status of 0, meaning
 @dfn{success}.  It can be used as a place holder in shell scripts
 where a successful command is needed, although the shell built-in
-command @code{:} (colon) may be faster.
+command @code{:} (colon) does the same thing faster.
 
-Any arguments are ignored, except for a lone @samp{--help} or
-@samp{--version} (@pxref{Common options}).
+@code{true} ignores @emph{all} command line arguments, even @samp{--help}
+and @samp{--version}, since to do otherwise would change expected
+behavior that some programmers may be relying on.
+
+This version of @code{true} is implemented as a C program, and is thus
+more secure and faster than a shell script implementation, and may safely
+be used as a dummy shell for the purpose of disabling accounts.
 
 
 @node test invocation
@@ -797,7 +858,7 @@ 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.
+the environment variable @env{POSIXLY_CORRECT} is set.
 
 @end table
 
@@ -1165,7 +1226,7 @@ Print all current settings in human-readable form.  This option may not
 be used in combination with any line settings.
 
 @item -F @var{device}
-@itemx --file @var{device}
+@itemx --file=@var{device}
 @opindex -F
 @opindex --file
 Set the line opened by the filename specified in @var{device} instead of
@@ -1560,8 +1621,8 @@ Same as:
 @example
 cread -ignbrk brkint -inlcr -igncr icrnl -ixoff -iuclc -ixany
 imaxbel opost -olcuc -ocrnl onlcr -onocr -onlret -ofill -ofdel
-nl0 cr0 tab0 bs0 vt0 ff0 isig icanon iexten echo echoe echok -echonl
--noflsh -xcase -tostop -echoprt echoctl echoke
+nl0 cr0 tab0 bs0 vt0 ff0 isig icanon iexten echo echoe echok
+-echonl -noflsh -xcase -tostop -echoprt echoctl echoke
 @end example
 @noindent and also sets all special characters to their default values.
 
@@ -1577,8 +1638,8 @@ May be negated.  If negated, same as @code{raw}.
 Same as:
 @example
 -ignbrk -brkint -ignpar -parmrk -inpck -istrip -inlcr -igncr
--icrnl -ixon -ixoff -iuclc -ixany -imaxbel -opost -isig -icanon
--xcase min 1 time 0
+-icrnl -ixon -ixoff -iuclc -ixany -imaxbel -opost -isig
+-icanon -xcase min 1 time 0
 @end example
 @noindent May be negated.  If negated, same as @code{cooked}.
 
@@ -1749,7 +1810,7 @@ Tell the kernel that the terminal has @var{n} columns.  Non-POSIX.
 @vindex COLUMNS
 Print the number of rows and columns that the kernel thinks the
 terminal has.  (Systems that don't support rows and cols in the kernel
-typically use the environment variables @code{LINES} and @code{COLUMNS}
+typically use the environment variables @env{LINES} and @env{COLUMNS}
 instead; however, GNU @code{stty} does not know anything about them.)
 Non-POSIX.
 
@@ -2120,6 +2181,7 @@ information.
 * date invocation::             Print or set system date and time.
 * uname invocation::            Print system information.
 * hostname invocation::         Print or set system name.
+* hostid invocation::           Print numeric host identifier.
 @end menu
 
 
@@ -2390,6 +2452,33 @@ input.  This is useful when you have many dates to process, because the
 system overhead of starting up the @code{date} executable many times can
 be considerable.
 
+@item -I[@var{timespec}]
+@itemx --iso-8601[=@var{timespec}]
+@opindex -I[@var{timespec}]
+@opindex --iso-8601[=@var{timespec}]
+Display the date using the ISO 8601 format, @samp{%Y-%m-%d}.
+
+The optional argument @var{timespec} specifies the number of additional
+terms of the time to include.  It can be one of the following:
+@table @samp
+@item auto
+The default behavior: print just the date.
+
+@item hours
+Append the hour of the day to the date.
+
+@item minutes
+Append the hours and minutes.
+
+@item seconds
+Append the hours, minutes, and seconds.
+@end table
+
+If showing any time terms, then include the time zone using the format
+@samp{%z}.  If @samp{--utc} is also specified, use @samp{%Z} in place of
+@samp{%z}.
+
+@item -R
 @itemx --rfc-822
 @opindex -R
 @opindex --rfc-822
@@ -2627,7 +2716,6 @@ Print the operating system version.
 
 @end table
 
-
 @node hostname invocation
 @section @code{hostname}: Print or set system name
 
@@ -2650,6 +2738,29 @@ The only options are @samp{--help} and @samp{--version}.  @xref{Common
 options}.
 
 
+@node hostid invocation
+@section @code{hostid}: Print numeric host identifier.
+
+@pindex hostid
+@cindex printing the host identifier
+
+@code{hostid} prints the numeric identifier of the current host
+in hexadecimal.  This command accepts no arguments.
+The only options are @samp{--help} and @samp{--version}.
+@xref{Common options}.
+
+For example, here's what it prints on one system I use:
+
+@example
+$ hostid
+1bac013d
+@end example
+
+On that system, the 32-bit quantity happens to be closely
+related to the system's Internet address, but that isn't always
+the case.
+
+
 @node Modified command invocation
 @chapter Modified command invocation
 
@@ -2690,12 +2801,40 @@ Ordinarily, filenames are looked up starting at the root of the
 directory structure, i.e., @file{/}.  @code{chroot} changes the root to
 the directory @var{newroot} (which must exist) and then runs
 @var{command} with optional @var{args}.  If @var{command} is not
-specified, the default is the value of the @code{SHELL} environment
+specified, the default is the value of the @env{SHELL} environment
 variable or @code{/bin/sh} if not set, invoked with the @samp{-i} option.
 
 The only options are @samp{--help} and @samp{--version}.  @xref{Common
 options}.
 
+Here are a few tips to help avoid common problems in using chroot.
+To start with a simple example, make @var{command} refer to a statically
+linked binary.  If you were to use a dynamically linked executable, then
+you'd have to arrange to have the shared libraries in the right place under
+your new root directory.
+
+For example, if you create a statically linked `ls' executable,
+and put it in /tmp/empty, you can run this command as root:
+
+@example
+$ chroot /tmp/empty /ls -Rl /
+@end example
+
+Then you'll see output like this:
+
+@example
+/:
+total 1023
+-rwxr-xr-x    1 0        0         1041745 Aug 16 11:17 ls
+@end example
+
+If you want to use a dynamically linked executable, say @code{bash},
+then first run @samp{ldd bash} to see what shared objects it needs.
+Then, in addition to copying the actual binary, also copy the listed
+files to the required positions under your intended new root directory.
+Finally, if the executable requires any other files (e.g., data, state,
+device files), copy them into place, too.
+
 
 @node env invocation
 @section @code{env}: Run a command in a modified environment
@@ -2720,7 +2859,7 @@ to an empty value is different from unsetting it.
 
 @vindex PATH
 The first remaining argument specifies the program name to invoke; it is
-searched for according to the @code{PATH} environment variable.  Any
+searched for according to the @env{PATH} environment variable.  Any
 remaining arguments are passed as arguments to that program.
 
 @cindex environment, printing
@@ -2864,9 +3003,9 @@ effective user id of zero (the super-user).
 @vindex LOGNAME
 @cindex login shell
 By default, @code{su} does not change the current directory.
-It sets the environment variables @code{HOME} and @code{SHELL}
+It sets the environment variables @env{HOME} and @env{SHELL}
 from the password entry for @var{user}, and if @var{user} is not
-the super-user, sets @code{USER} and @code{LOGNAME} to @var{user}.
+the super-user, sets @env{USER} and @env{LOGNAME} to @var{user}.
 By default, the shell is not a login shell.
 
 Any additional @var{arg}s are passed as additional arguments to the
@@ -2917,10 +3056,10 @@ expansion (globbing), which is not likely to be useful.
 @vindex PATH
 @cindex login shell, creating
 Make the shell a login shell.  This means the following.  Unset all
-environment variables except @code{TERM}, @code{HOME}, and @code{SHELL}
-(which are set as described above), and @code{USER} and @code{LOGNAME}
+environment variables except @env{TERM}, @env{HOME}, and @env{SHELL}
+(which are set as described above), and @env{USER} and @env{LOGNAME}
 (which are set, even for the super-user, as described above), and set
-@code{PATH} to a compiled-in default value.  Change to @var{user}'s home
+@env{PATH} to a compiled-in default value.  Change to @var{user}'s home
 directory.  Prepend @samp{-} to the shell's name, intended to make it
 read its login startup file(s).
 
@@ -2933,9 +3072,9 @@ read its login startup file(s).
 @cindex environment, preserving
 @flindex /etc/shells
 @cindex restricted shell
-Do not change the environment variables @code{HOME}, @code{USER},
-@code{LOGNAME}, or @code{SHELL}.  Run the shell given in the environment
-variable @code{SHELL} instead of the shell from @var{user}'s passwd
+Do not change the environment variables @env{HOME}, @env{USER},
+@env{LOGNAME}, or @env{SHELL}.  Run the shell given in the environment
+variable @env{SHELL} instead of the shell from @var{user}'s passwd
 entry, unless the user running @code{su} is not the superuser and
 @var{user}'s shell is restricted.  A @dfn{restricted shell} is one that
 is not listed in the file @file{/etc/shells}, or in a compiled-in list
@@ -3003,7 +3142,7 @@ the values of the command line arguments.
 Synopsis:
 
 @example
-sleep [@var{number}[smhd]]@dots{}
+sleep @var{number}[smhd]@dots{}
 @end example
 
 @cindex time units
@@ -3021,6 +3160,10 @@ hours
 days
 @end table
 
+Historical implementations of @code{sleep} have required that
+@var{number} be an integer.  However, GNU @code{sleep} accepts
+arbitrary floating point numbers.
+
 The only options are @samp{--help} and @samp{--version}.  @xref{Common
 options}.
 
@@ -3056,6 +3199,24 @@ numbers from standard input, delimited by newlines, tabs, or spaces.
 The only options are @samp{--help} and @samp{--version}.  @xref{Common
 options}.
 
+The algorithm it uses is not very sophisticated, so for some inputs
+@code{factor} runs for a long time.  The hardest numbers to factor are
+the products of large primes.  Factoring the product of the two largest 32-bit
+prime numbers takes over 10 minutes of CPU time on a 400MHz Pentium II.
+
+@example
+$ p=`echo '4294967279 * 4294967291'|bc`
+$ factor $p
+18446743979220271189: 4294967279 4294967291
+@end example
+
+In contrast, @code{factor} factors the largest 64-bit number in just
+over a tenth of a second:
+
+@example
+$ factor `echo '2^64-1'|bc`
+18446744073709551615: 3 5 17 257 641 65537 6700417
+@end example
 
 @node seq invocation
 @section @code{seq}: Print numeric sequences
@@ -3067,13 +3228,13 @@ options}.
 @code{seq} prints a sequence of numbers to standard output.  Synopses:
 
 @example
-seq [@var{option}]@dots{} [@var{first} [@var{step}]] @var{last}@dots{}
+seq [@var{option}]@dots{} [@var{first} [@var{increment}]] @var{last}@dots{}
 @end example
 
 @code{seq} prints the numbers from @var{first} to @var{last} by
-@var{step}.  By default, @var{first} and @var{step} are both 1, and each
-number is printed on its own line.  All numbers can be reals, not just
-integers.
+@var{increment}.  By default, @var{first} and @var{increment} are both 1,
+and each number is printed on its own line.  All numbers can be reals,
+not just integers.
 
 The program accepts the following options.  Also see @ref{Common options}.
 
@@ -3084,8 +3245,8 @@ The program accepts the following options.  Also see @ref{Common options}.
 @opindex --format=@var{format}
 @cindex formatting of numbers in @code{seq}
 Print all numbers using @var{format}; default @samp{%g}.
-@var{format} must contain exactly one of the standarding float output
-formats @samp{%e}, @samp{%f}, or @samp{%g}.
+@var{format} must contain exactly one of the standarding floating point
+output formats @samp{%e}, @samp{%f}, or @samp{%g}.
 
 @item -s @var{string}
 @itemx --separator=@var{string}
@@ -3100,6 +3261,95 @@ Print all numbers with the same width, by padding with leading zeroes.
 
 @end table
 
+If you want to use @code{seq} to print sequences of large integer values,
+don't use the default @samp{%g} format since it can result in
+loss of precision:
+
+@example
+$ seq 1000000 1000001
+1e+06
+1e+06
+@end example
+
+Instead, you can use the format, @samp{%1.f},
+to print large decimal numbers with no exponent and no decimal point.
+
+@example
+$ seq --format=%1.f 1000000 1000001
+1000000
+1000001
+@end example
+
+If you want hexadecimal output, you can use @code{printf}
+to perform the conversion:
+
+@example
+$ printf %x'\n' `seq -f %1.f 1048575 1024 1050623`
+fffff
+1003ff
+1007ff
+@end example
+
+For very long lists of numbers, use xargs to avoid
+system limitations on the length of an argument list:
+
+@example
+$ seq -f %1.f 1000000 | xargs printf %x'\n' |tail -3
+f423e
+f423f
+f4240
+@end example
+
+To generate octal output, use the printf @code{%o} format instead
+of @code{%x}.  Note however that using printf works only for numbers
+smaller than @code{2^32}:
+
+@example
+$ printf "%x\n" `seq -f %1.f 4294967295 4294967296`
+ffffffff
+bash: printf: 4294967296: Numerical result out of range
+@end example
+
+On most systems, seq can produce whole-number output for values up to
+@code{2^53}, so here's a more general approach to base conversion that
+also happens to be more robust for such large numbers.  It works by
+using @code{bc} and setting its output radix variable, @var{obase},
+to @samp{16} in this case to produce hexadecimal output.
+
+@example
+$ (echo obase=16; seq -f %1.f 4294967295 4294967296)|bc
+FFFFFFFF
+100000000
+@end example
+
+Be careful when using @code{seq} with a fractional @var{increment},
+otherwise you may see surprising results.  Most people would expect to
+see @code{0.3} printed as the last number in this example:
+
+@example
+$ seq -s' ' 0 .1 .3
+0 0.1 0.2
+@end example
+
+But doesn't happen on most systems because @code{seq} is implemented using
+binary floating point arithmetic (via the C @code{double} type) -- which
+means some decimal numbers like @code{.1} cannot be represented exactly.
+That in turn means some nonintuitive conditions like @code{.1 * 3 > .3}
+will end up being true.
+
+To work around that in the above example, use a slightly larger number as
+the @var{last} value:
+
+@example
+$ seq -s' ' 0 .1 .31
+0 0.1 0.2 0.3
+@end example
+
+In general, when using an @var{increment} with a fractional part, where
+(@var{last} - @var{first}) / @var{increment} is (mathematically) a whole
+number, specify a slightly larger (or smaller, if @var{increment} is negative)
+value for @var{last} to ensure that @var{last} is the final value printed
+by seq.
 
 @node Index
 @unnumbered Index

lib/.cppi-disable

@@ -0,0 +1,10 @@
+error.h
+fnmatch.h
+getopt.h
+getopt.c
+getopt1.c
+md5.h
+obstack.h
+regex.h
+regex.c
+getpagesize.h

lib/.cvsignore

@@ -1,8 +1,13 @@
+.deps
 Makefile
+charset.alias
 getdate.c
-safe-stat.h
-safe-stat.c
+getdate.tab.c
+lstat.c
+ref-add.sed
+ref-del.sed
 safe-lstat.c
 safe-lstat.h
-getdate.tab.c
-.deps
+safe-stat.c
+safe-stat.h
+stat.c

lib/.gdb-history

@@ -0,0 +1,200 @@
+r 206.65.212.10
+b main
+r
+n
+s
+n
+p addr
+p addr
+p he->h_name
+n
+q
+b canon_host 
+r 206.65.212.10
+n
+p he
+p *he
+n
+n
+p (he->h_addrtype)
+n
+q
+r a:b
+b main
+r a:b
+n
+s
+n
+p separator
+n
+l 128
+c
+q
+r meyering:store
+p *username
+p *username[separator - name]
+p separator - name
+p username[separator - name]
+r ''
+l
+q
+r ''
+l
+q
+r meyering
+b main
+r meyering
+n
+r
+n
+s
+n
+p u
+n
+n
+q
+r ''
+r meyering
+up
+l
+q
+b main
+b a.out 1
+r a.out 1
+n
+s
+fin
+s
+n
+p uid
+p gid
+p euid
+p egid
+n
+p mode
+p path
+fin
+r -v -c 10 -n 20 -x 80 < in-2
+up
+up
+p &dummy
+p *ovp
+p *(int*)*ovp
+p ((struct item*)*ovp)->key
+p old_vec@10
+r -v -c 10 -n 20 -x 80 < in-3
+p *(int*)*ovp
+up
+dow
+p *(int*)*ovp
+up
+p *(int*)*ovp
+i loca
+dow
+p key
+p dummy
+p &dummy
+up
+p old_vec
+p *ovp
+p ovp
+p ovp - old_vec
+p *old_vec@10
+p *old_vec@13
+b hash_insert_item
+r
+b hash_insert_item_at 
+r
+n
+p fail
+p *(ht->vec)@13
+p *(ht->ht_vec)@13
+p ((struct item*)(ht->ht_vec)[10])->key
+b hash_delete_item
+b hash_delete_item_at 
+c
+n
+p slot
+p item
+n
+n
+p *(ht->ht_vec)@13
+p &dummy
+p dummy
+n
+s
+n
+n
+p *(ht->ht_vec)@13
+n
+p new_size
+n
+p *old_vec@13
+p old_vec@13
+n
+p *old_vec@13
+n
+p *old_vec@13
+n
+l
+n
+p ovp - old_vec
+n
+p ovp - old_vec
+n
+p ovp - old_vec
+p *old_vec@13
+p &dummy
+q
+r 444444444444 44444444444
+b human_readable 
+r
+n
+q
+b main
+r 444444444444 44444444444
+n
+p a
+p b
+r 34343434 3434343434
+c
+r
+n
+n
+p a
+p b
+r 343434343 343434343
+c
+q
+b posixtime 
+r
+n
+s
+n
+p len
+n
+p pair
+p len
+n
+b year
+y
+c
+c
+p n
+up
+p len
+q
+complete b user
+complete b user
+complete b pars
+b parse_user_spec 
+r a.b
+n
+n
+p u
+n
+p u
+n
+r -r .aa > k
+pwd
+q

lib/ChangeLog

@@ -0,0 +1,396 @@
+2000-05-18  Jim Meyering  <meyering@lucent.com>
+
+	* hash.c (hash_rehash): Fix a nasty bug: copy the free entry list
+	back, too, since it may have been modified by allocate_entry.
+	(hash_delete): Rewrite to use neither the assignment operator
+	nor the comma operator in an if-expression.
+
+2000-05-15  Paul Eggert  <eggert@twinsun.com>
+
+	* lib/closeout.c:
+	<sys/stat.h>, <sys/types.h>, <unistd.h>, (STDOUT_FILENO):
+	Remove; no longer needed.
+	"quotearg.h": Add include.
+	(file_name): Do not bother to explicitly initialize to NULL; it's less
+	efficient on some hosts.
+	(close_stdout_status): Remove test as to whether stdout was already
+	closed; it breaks for the case "echo x | sort >&-".
+	Quote file name colons.
+	Do not assume that _("write error") lacks format strings.
+
+2000-05-15  Jim Meyering  <meyering@lucent.com>
+
+	* version-etc.c (version_etc_copyright): Update the copyright string
+	used in all --version output.
+
+2000-05-14  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c (close_stdout_set_file_name): New function.
+	(close_stdout_status): Use new file-scoped global.
+	Return right away if fstat says the stdout file descriptor is invalid.
+	* closeout.h (close_stdout_set_file_name): Declare.
+
+2000-05-10  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c [default_exit_status]: New file-scoped variable.
+	(close_stdout_set_status): New function.
+	* closeout.h (close_stdout_set_status): Declare.
+
+2000-05-08  Jim Meyering  <meyering@lucent.com>
+
+	* long-options.c: Don't include closeout.h.
+	(parse_long_options): Don't call close_stdout for --version.
+
+2000-05-06  Jim Meyering  <meyering@lucent.com>
+
+	* strnlen.c: Undefine __strnlen and strnlen.
+	[!weak_alias]: Define __strnlen to strnlen.
+
+	* atexit.c: New file, from libiberty.
+
+2000-05-06  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c (close_stdout_status): Also check for errors on the
+	stderr stream.
+
+2000-05-05  Bruno Haible  <haible@clisp.cons.org>
+
+	* localcharset.c (get_charset_aliases): Use malloc, realloc and memcpy
+	instead of xmalloc, xrealloc, path_concat.
+	(locale_charset): Treat empty environment variables as absent.
+	(DIRECTORY_SEPARATOR, ISSLASH): New macros.
+
+2000-05-04  Jim Meyering  <meyering@lucent.com>
+
+	* getopt.c: Update from glibc.
+	* obstack.c: Likewise.
+	* obstack.h: Likewise.
+	* regex.c: Likewise.  NB: K&R compiler support is dropped for this file
+
+	* regex.h: Likewise.
+	* strndup.c: Likewise.
+	* strnlen.c: New file, from glibc.
+
+2000-05-01  Jim Meyering  <meyering@lucent.com>
+
+	* full-write.c (full_write): Remove `FIXME' part of comment.
+
+2000-04-29  Jim Meyering  <meyering@lucent.com>
+
+	* path-concat.c: Declare strdup only if it's not defined.
+	* canon-host.c: Likewise.
+
+2000-04-28  Jim Meyering  <meyering@lucent.com>
+
+	* rpmatch.c [HAVE_LIMITS_H]: Include limits.h before regex.h to avoid
+	redefinition warning on some systems (HPUX).  Otherwise, regex.h is
+	included first, then limits.h is included by locale.h by libintl.h.
+	From John David Anglin.
+
+2000-04-25  Jim Meyering  <meyering@lucent.com>
+
+	* makepath.c (S_IRWXUGO): Define.
+	(make_path): Always perform explicit chmod if MODE specifies any
+	of the `special' permission bits.  Prompted by a bug report against
+	install from Mate Wierdl and Joost van Baal.
+
+2000-04-18  Jim Meyering  <meyering@lucent.com>
+
+	* README: New file.
+
+	* getpagesize.h [!getpagesize && HAVE_OS_H && B_PAGE_SIZE]: Define
+	getpagesize.  For BeOS.  Based on a patch from Bruno Haible.
+
+2000-04-17  Jim Meyering  <meyering@lucent.com>
+
+	* strftime.c (my_strftime) [strftime]: Declare strftime here, since
+	the definition of it to rpl_strftime also defined-away the system's
+	declaration.
+
+2000-04-15  Jim Meyering  <meyering@lucent.com>
+
+	Use `C' to denote so-called `contiguous' files, the same way
+	that tar does.
+	* filemode.c (S_ISCTG) [!S_ISCTG && S_IFCTG]: Define.
+	(ftypelet): Use S_ISCTG.
+	From Michael Deutschmann.
+
+2000-04-14  Jim Meyering  <meyering@lucent.com>
+
+	* strftime.c (my_strftime) [#ifdef strftime]: Declare strftime.
+
+2000-04-08  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (charset.alias): Use t-$@, not $@-t so the DOS 8.3
+	names don't conflict.  Reported by Eli Zaretskii.
+
+2000-03-28  Bruno Haible  <haible@clisp.cons.org>
+
+	* unicodeio.c (print_unicode_char): Avoid triggering Solaris iconv
+	bug.  Deal with the different error behavior of Irix iconv.
+
+2000-04-07  Jim Meyering  <meyering@lucent.com>
+
+	* putenv.c: Move inclusion of errno.h so it follows that of sys/types.h,
+	to work around system header problems on AIX 3.2.5.  From Bruno Haible.
+
+2000-04-05  Jim Meyering  <meyering@lucent.com>
+
+	Portability tweaks required for ultrix4.3.
+	* readutmp.h [HAVE_UTMPX_H && !HAVE_DECL_GETUTENT]: Declare getutent.
+	* readutmp.c: Include sys/types.h before sys/stat.h.
+	* canon-host.c: Declare strdup.
+	* path-concat.c: Likewise.
+	From John David Anglin.
+
+2000-04-04  Jim Meyering  <meyering@lucent.com>
+
+	Be more DOS 8.3-friendly.
+	* ref-add.sin: Renamed from ref-add.sed.in.
+	* ref-del.sin: Renamed from ref-del.sed.in.
+	* Makefile.am: Reflect renaming.
+	Reported by Eli Zaretskii.
+
+	Use a temporary file name that won't clash with `charset.alias'
+	in the DOS 8.3 name space.
+	* Makefile.am (charset_tmp): Define.
+	(install-exec-local): Use $(charset_tmp) instead of $(charset_alias)-t.
+	(uninstall-local): Likewise.
+	Reported by Eli Zaretskii.
+
+2000-03-29  Paul Eggert  <eggert@twinsun.com>
+
+	* time/strftime.c (my_strftime): Make sure we call the system
+	strftime, not ourselves, when invoking the underlying strftime.
+
+2000-03-24  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (EXTRA_DIST): Add ref-add.sed.in and ref-del.sed.in.
+	(charset_alias): Define.
+	(install-exec-local): Factor out common code.
+	(uninstall-local): Split lines longer than 80.
+	(ref-add.sed, ref-del.sed): Remove rules... (do the following instead)
+	(SUFFIXES): Define.
+	(.sed.in.sed): New rule.  Don't redirect directly to $@.
+	(CLEANFILES): Add ref-add.sed and ref-del.sed.
+
+2000-03-19  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Output a line containing "Packages using this file".
+	* ref-add.sed.in, ref-del.sed.in: New files.
+	* Makefile.am (install-exec-local, uninstall-local, ref-add.sed,
+	ref-del.sed): New rules.
+
+2000-03-17  Jim Meyering  <meyering@lucent.com>
+
+	* unicodeio.c (<string.h>): Include only #if HAVE_STRING_H.
+	Otherwise, include <strings.h>
+
+2000-03-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* unicodeio.c (utf8_wctomb): New function.
+	(print_unicode_char): Pass the Unicode character to iconv in UTF-8
+	format instead of in UCS-4 with platform dependent endianness.
+
+2000-03-07  Paul Eggert  <eggert@twinsun.com>
+
+	* lib/savedir.c (savedir): Work even if directory size is
+	negative; this can happen with some screwy NFS configurations.
+
+2000-03-06  Jim Meyering  <meyering@lucent.com>
+
+	* localcharset.c (get_charset_aliases): Don't try to free file_name
+	if it's NULL (because we ran out of memory).  From Bruno Haible.
+
+2000-03-05  Jim Meyering  <meyering@lucent.com>
+
+	* localcharset.c ("path-concat.h"): Include.
+	(get_charset_aliases): Use path_concat instead of ANSI string
+	concatenation.
+
+	* unicodeio.h (PARAMS): Define.
+	Use it to guard prototype.
+
+2000-03-04  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (install-exec-local): Create $(libdir) before installing
+	into it.
+	(uninstall-local): Uncomment this rule so `make distcheck' works
+	once again.
+
+	* unicodeio.c (<errno.h>): Include it.
+	(errno): Declare if not defined.
+
+	* localcharset.c: Add Bruno's comment justifying use of volatile.
+
+	* config.charset: New version, incorporating remarks from a linux
+	i18n mailing list.  From Bruno Haible.
+
+2000-03-02  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (EXTRA_DIST): Add config.charset.
+
+2000-03-01  Jim Meyering  <meyering@lucent.com>
+
+	* localcharset.c: Guard some #includes with `#if HAVE_...'.
+	* unicodeio.c: Likewise.
+
+2000-02-02  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: New file.
+	* localcharset.c: New file.
+	* unicodeio.h, unicodeio.c: New files.
+	* Makefile.am (DEFS): Add -DLIBDIR=...
+	(libfetish_a_SOURCES): Add localcharset.c and unicodeio.c.
+	(noinst_HEADERS): Add unicodeio.h.
+	(all-local, install-exec-local, charset.alias): New targets.
+
+2000-02-28  Paul Eggert  <eggert@twinsun.com>
+
+	* lib/quotearg.c (ALERT_CHAR): New macro.
+	(quotearg_buffer_restyled): Use it.
+
+2000-02-27  Jim Meyering  <meyering@lucent.com>
+
+	* strtoumax.c: Fix typo in decl of strtoul: s/long long/long/.
+	Guard declaration of strtoull also with `&& HAVE_UNSIGNED_LONG_LONG'.
+
+	* backupfile.c: Guard inclusion of stdlib.h with `#if HAVE_STDLIB_H',
+	not `#if STDC_HEADERS'.
+	Declare malloc if needed.
+
+	* backupfile.c: Use `#if !HAVE_DECL...' instead of `#ifndef HAVE_DECL..'
+	now that autoconf always defines the HAVE_DECL_ symbols.
+	* human.c: Likewise.
+	* same.c: Likewise.
+	* strtoumax.c: Likewise.
+
+	* backupfile.c: Arrange for cpp to fail if the configure-time
+	declaration check was not run.
+	* hash.c: Likewise.
+	* human.c: Likewise.
+	* same.c: Likewise.
+	* strtoumax.c: Likewise.
+
+	* userspec.c (parse_user_spec): If there is no `:' but there is a `.',
+	then first look up the entire `.'-containing string as a login name.
+
+2000-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	* lib/getdate.y: Handle two-digit years with leading zeros correctly.
+	(textint): New typedef.
+	(parser_control): Member year changed from int to textint.
+	All uses changed.
+	(YYSTYPE): Removed; replaced by %union with int and textint members.
+	(tDAY, tDAY_UNIT, tDAYZONE, tHOUR_UNIT, tID, tLOCAL_ZONE, tMERIDIAN,
+	tMINUTE_UNIT, tMONTH, tMONTH_UNIT tSEC_UNIT, tSNUMBER, tUNUMBER,
+	tYEAR_UNIT, tZONE, o_merid): Now of type <intval>.
+	(tSNUMBER, tUNUMBER): Now of type <textintval>.
+	(date, number, to_year): Use width of number in digits, not its value,
+	to determine whether it's a 2-digit year, or a 2-digit time.
+	(yylex): Store number of digits of numeric tokens.
+	Reported by John Kendall.
+
+	(parser_control): Changed from struct parser_control to typedef (for
+	consistency).  All uses changed.
+
+	(tID): Removed; not used.
+	(yylex): Return '?' for unknown identifiers, rather than (unused) tID.
+
+2000-02-14  Paul Eggert  <eggert@twinsun.com>
+
+	* lib/getpagesize.h (getpagesize): Port to VMS for Alpha;
+	adapted from changes to grep getpagesize.h by Martin P.J. Zinser.
+
+2000-02-12  Jim Meyering  <meyering@lucent.com>
+
+	* userspec.c (ISDIGIT): Define it.
+	(isdigit): Remove definition.
+	(is_number): Use ISDIGIT, not isdigit.
+	<libintl.h>: Include.
+	(_ and N_): Define.
+	(parse_user_spec): Mark translatable strings.
+
+2000-02-10  Jim Meyering  <meyering@lucent.com>
+
+	With these changes, nanosleep.[ch] are finally enough like the other
+	lib/* replacement files to compile on a few more losing systems.
+
+	* nanosleep.h: Don't include config.h.
+	Remove prototype from declaration of nanosleep.
+	(PARAMS): Remove now-unneeded definition.
+	* nanosleep.c: #undef nanosleep.
+	(rpl_nanosleep): Rename from nanosleep.
+
+2000-02-03  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.c (read_utmp): Guard with `#ifdef UTMP_NAME_FUNCTION',
+	rather than with `#if HAVE_UTMPNAME'.
+
+2000-02-01  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.h (UT_USER): Add parens.  From Andreas Schwab.
+
+2000-01-31  Jim Meyering  <meyering@lucent.com>
+
+	* nanosleep.h (nanosleep): Guard declaration with
+	`#if ! HAVE_DECL_NANOSLEEP'.
+	Without this, OFS gets a redeclaration error for rpl_nanosleep, due to
+	the declaration in that vendor's sys/timers.h.
+	Reported by Christian Krackowizer.
+
+	* quotearg.c (ISASCII): Add #undef and move definition to follow
+	inclusion of wctype.h to work around solaris2.6 namespace pollution.
+	(ISPRINT): Likewise.
+	Reported by Tom Tromey.
+
+2000-01-30  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.c (extract_trimmed_name): Use UT_USER instead of hard-coding
+	uses of ->ut_name.  The latter doesn't work with new Linux header files
+	where only utmpx.ut_user is declared.
+
+	* readutmp.h (UT_USER): Define.
+
+2000-01-23  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (libfetish_a_SOURCES): Remove explicit mention of
+	obstack.c.
+
+2000-01-22  Jim Meyering  <meyering@lucent.com>
+
+	* strtoumax.c: [! HAVE_DECL_STRTOUL]: Declare strtoul.
+	[! HAVE_DECL_STRTOULL]: Declare strtoull.
+	Required for some AIX systems.  Reported by Christian Krackowizer.
+	[TESTING] (main): New function.
+
+	1997-10-17  Eli Zaretskii  <eliz@is.elta.co.il>
+	* dirname.c (dir_name): Support for DOS-style file names with drive
+	letters.
+
+	* quotearg.c [HAVE_WCTYPE_H]: Include <wctype.h> for decl of iswprint.
+
+	* strverscmp.c (ISDIGIT): Define.
+	(strverscmp): Use ISDIGIT, not isdigit.
+
+2000-01-17  Paul Eggert  <eggert@twinsun.com>
+
+	* nanosleep.c (nanosleep):
+	Don't use SA_INTERRUPT to decide whether to call sigaction, as
+	POSIX.1 doesn't require SA_INTERRUPT and some systems
+	(e.g. Solaris 7) don't define it.  Use SA_NOCLDSTOP instead;
+	it's been part of POSIX.1 since day 1 (in 1988).
+
+2000-01-17  Jim Meyering  <meyering@lucent.com>
+
+	* interlock: Remove unused file.  Reported by François Pinard.
+
+2000-01-16  Paul Eggert  <eggert@twinsun.com>
+
+	* lib/quotearg.c (quotearg_buffer_restyled): Do not quote
+	alert, backslash, formfeed, and vertical tab unnecessarily in
+	shell quoting style.
+
+Local Variables:
+version-control: never
+End:

lib/Makefile.am

@@ -2,26 +2,96 @@
 
 AUTOMAKE_OPTIONS = ../src/ansi2knr
 
-noinst_LIBRARIES = libfu.a
+noinst_LIBRARIES = libfetish.a
 
 INCLUDES = -I.. -I$(srcdir) -I../intl
+DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 
-libfu_a_SOURCES = getdate.y posixtm.c getopt.c getopt1.c \
-addext.c argmatch.c backupfile.c basename.c \
-closeout.c dirname.c exclude.c filemode.c \
-full-write.c human.c idcache.c \
-isdir.c long-options.c makepath.c modechange.c hash.c path-concat.c \
-quotearg.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
+libfetish_a_SOURCES = \
+  getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
+  canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
+  full-write.c getopt.c getopt1.c getugroups.c hard-locale.c hash.c \
+  human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
+  makepath.c md5.c memcasecmp.c memcoll.c modechange.c path-concat.c \
+  quotearg.c readtokens.c readutmp.c safe-read.c same.c save-cwd.c \
+  savedir.c stripslash.c unicodeio.c userspec.c version-etc.c xgetcwd.c \
+  xgethostname.c xmalloc.c xstrdup.c xstrtod.c xstrtol.c xstrtoul.c \
+  xstrtoumax.c yesno.c
 
-libfu_a_LIBADD = @LIBOBJS@ @ALLOCA@
-libfu_a_DEPENDENCIES = $(libfu_a_LIBADD)
+libfetish_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 
-noinst_HEADERS = argmatch.h backupfile.h closeout.h \
-error.h exclude.h filemode.h fnmatch.h fsusage.h \
-getdate.h getline.h getopt.h group-member.h human.h lchown.h long-options.h \
-makepath.h modechange.h mountlist.h hash.h path-concat.h pathmax.h \
-posixtm.h quotearg.h regex.h safe-read.h save-cwd.h savedir.h strverscmp.h \
-xalloc.h xstrtol.h xstrtoul.h
+noinst_HEADERS = \
+  argmatch.h backupfile.h bumpalloc.h closeout.h diacrit.h dirname.h error.h \
+  exclude.h filemode.h fnmatch.h fsusage.h getdate.h getline.h getopt.h \
+  getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
+  linebuffer.h long-options.h md5.h memcasecmp.h memcoll.h \
+  makepath.h modechange.h mountlist.h nanosleep.h obstack.h \
+  path-concat.h pathmax.h posixtm.h quotearg.h readtokens.h \
+  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h \
+  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h
 
-BUILT_SOURCES = getdate.c
+BUILT_SOURCES = getdate.c lstat.c stat.c
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = lstat.c stat.c
+
+EXTRA_DIST = xstat.in config.charset ref-add.sin ref-del.sin
+lstat.c: xstat.in
+	sed \
+	  -e '/@IGNORE@/d' \
+	  -e 's/@xstat@/lstat/g' \
+	  -e '/_LSTAT_ONLY@/d' \
+	  -e '/@BEGIN_STAT_ONLY@/,/@END_STAT_ONLY@/d' \
+	  $(srcdir)/xstat.in > $@-t
+	mv $@-t $@
+
+stat.c: xstat.in
+	sed \
+	  -e '/@IGNORE@/d' \
+	  -e 's/@xstat@/stat/g' \
+	  -e '/_STAT_ONLY@/d' \
+	  -e '/@BEGIN_LSTAT_ONLY@/,/@END_LSTAT_ONLY@/d' \
+	  $(srcdir)/xstat.in > $@-t
+	mv $@-t $@
+
+
+# The following is needed in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+
+all-local: charset.alias ref-add.sed ref-del.sed
+
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+install-exec-local: all-local
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -f $(charset_alias) \
+	  && orig=$(charset_alias) \
+	  || orig=charset.alias; \
+	sed -f ref-add.sed $$orig > $(charset_tmp)
+	$(INSTALL_DATA) $(charset_tmp) $(charset_alias)
+	rm -f $(charset_tmp)
+
+uninstall-local: all-local
+	if test -f $(charset_alias); then \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+	      > /dev/null; then \
+	    rm -f $(charset_alias); \
+	  else \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+	  fi; \
+	  rm -f $(charset_tmp); \
+	fi
+
+charset.alias: config.charset
+	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	mv t-$@ $@
+
+SUFFIXES = .sed .sin
+.sin.sed:
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > $@-t
+	mv $@-t $@
+
+CLEANFILES = charset.alias ref-add.sed ref-del.sed

lib/README

@@ -0,0 +1,6 @@
+The files in this directory are shared between the fileutils, sh-utils,
+and textutils packages.  Not all files are used by each package.
+The autoconf tests required for these files are in ../m4.
+
+The library name, fetish, is a permutation of the first two
+letters of each of the package names: FIleutils, TExtutils, SH-utils.

lib/addext.c

@@ -1,5 +1,5 @@
 /* addext.c -- add an extension to a file name
-   Copyright (C) 1990, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@
 #endif
 
 #ifndef HAVE_DOS_FILE_NAMES
-#define HAVE_DOS_FILE_NAMES 0
+# define HAVE_DOS_FILE_NAMES 0
 #endif
 #ifndef HAVE_LONG_FILE_NAMES
-#define HAVE_LONG_FILE_NAMES 0
+# define HAVE_LONG_FILE_NAMES 0
 #endif
 
 #include <backupfile.h>
@@ -35,7 +35,7 @@
 # include <limits.h>
 #endif
 #ifndef _POSIX_NAME_MAX
-#define _POSIX_NAME_MAX 14
+# define _POSIX_NAME_MAX 14
 #endif
 
 #include <sys/types.h>
@@ -49,14 +49,13 @@
 # include <unistd.h>
 #endif
 
+char *base_name PARAMS ((char const *));
+
 /* Append to FILENAME the extension EXT, unless the result would be too long,
    in which case just append the character E.  */
 
 void
-addext (filename, ext, e)
-     char *filename;
-     char const *ext;
-     int e;
+addext (char *filename, char const *ext, int e)
 {
   char *s = base_name (filename);
   size_t slen = strlen (s), extlen = strlen (ext);

lib/alloca.c

@@ -25,6 +25,13 @@
 # include <config.h>
 #endif
 
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
 #ifdef emacs
 # include "blockinput.h"
 #endif
@@ -161,8 +168,7 @@ static header *last_alloca_header = NULL;	/* -> last alloca header.  */
    implementations of C, for example under Gould's UTX/32.  */
 
 pointer
-alloca (size)
-     unsigned size;
+alloca (unsigned size)
 {
   auto char probe;		/* Probes stack depth: */
   register char *depth = ADDRESS_FUNCTION (probe);
@@ -211,6 +217,9 @@ alloca (size)
     register pointer new = malloc (sizeof (header) + size);
     /* Address of header.  */
 
+    if (new == 0)
+      abort();
+
     ((header *) new)->h.next = last_alloca_header;
     ((header *) new)->h.deep = depth;
 

lib/argmatch.c

@@ -1,5 +1,5 @@
 /* argmatch.c -- find a match for a string in an array
-   Copyright (C) 1990, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,36 +12,86 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
+/* Written by David MacKenzie <djm@ai.mit.edu>
+   Modified by Akim Demaille <demaille@inf.enst.fr> */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <argmatch.h>
-
-#include <sys/types.h>
+#include "argmatch.h"
 
 #include <stdio.h>
-#if HAVE_STRING_H
+#ifdef STDC_HEADERS
 # include <string.h>
-#else
-# include <strings.h>
 #endif
 
-/* If ARG is an unambiguous match for an element of the
-   null-terminated array OPTLIST, return the index in OPTLIST
-   of the matched element, else -1 if it does not match any element
-   or -2 if it is ambiguous (is a prefix of more than one element).  */
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
 
-int
-argmatch (const char *arg, const char *const *optlist)
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+
+#include "error.h"
+#include "quotearg.h"
+
+/* When reporting an invalid argument, show nonprinting characters
+   by using the quoting style ARGMATCH_QUOTING_STYLE.  Do not use
+   literal_quoting_style.  */
+#ifndef ARGMATCH_QUOTING_STYLE
+# define ARGMATCH_QUOTING_STYLE locale_quoting_style
+#endif
+
+/* The following test is to work around the gross typo in
+   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
+   is defined to 0, not 1.  */
+#if !EXIT_FAILURE
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+/* Non failing version of argmatch call this function after failing. */
+#ifndef ARGMATCH_DIE
+# define ARGMATCH_DIE exit (EXIT_FAILURE)
+#endif
+
+#ifdef ARGMATCH_DIE_DECL
+ARGMATCH_DIE_DECL;
+#endif
+
+static void
+__argmatch_die (void)
 {
-  int i;			/* Temporary index in OPTLIST.  */
+  ARGMATCH_DIE;
+}
+
+/* Used by XARGMATCH and XARGCASEMATCH.  See description in argmatch.h.
+   Default to __argmatch_die, but allow caller to change this at run-time. */
+argmatch_exit_fn argmatch_die = __argmatch_die;
+
+
+/* If ARG is an unambiguous match for an element of the
+   null-terminated array ARGLIST, return the index in ARGLIST
+   of the matched element, else -1 if it does not match any element
+   or -2 if it is ambiguous (is a prefix of more than one element).
+   If SENSITIVE, comparison is case sensitive.
+
+   If VALLIST is none null, use it to resolve ambiguities limited to
+   synonyms, i.e., for
+     "yes", "yop" -> 0
+     "no", "nope" -> 1
+   "y" is a valid argument, for `0', and "n" for `1'.  */
+
+static int
+__argmatch_internal (const char *arg, const char *const *arglist,
+		     const char *vallist, size_t valsize,
+		     int case_sensitive)
+{
+  int i;			/* Temporary index in ARGLIST.  */
   size_t arglen;		/* Length of ARG.  */
   int matchind = -1;		/* Index of first nonexact match.  */
   int ambiguous = 0;		/* If nonzero, multiple nonexact match(es).  */
@@ -49,19 +99,30 @@ argmatch (const char *arg, const char *const *optlist)
   arglen = strlen (arg);
 
   /* Test all elements for either exact match or abbreviated matches.  */
-  for (i = 0; optlist[i]; i++)
+  for (i = 0; arglist[i]; i++)
     {
-      if (!strncmp (optlist[i], arg, arglen))
+      if (case_sensitive
+	  ? !strncmp (arglist[i], arg, arglen)
+	  : !strncasecmp (arglist[i], arg, arglen))
 	{
-	  if (strlen (optlist[i]) == arglen)
+	  if (strlen (arglist[i]) == arglen)
 	    /* Exact match found.  */
 	    return i;
 	  else if (matchind == -1)
 	    /* First nonexact match found.  */
 	    matchind = i;
 	  else
-	    /* Second nonexact match found.  */
-	    ambiguous = 1;
+	    {
+	      /* Second nonexact match found.  */
+	      if (vallist == NULL
+		  || memcmp (vallist + valsize * matchind,
+			     vallist + valsize * i, valsize))
+		{
+		  /* There is a real ambiguity, or we could not
+		     disambiguate. */
+		  ambiguous = 1;
+		}
+	    }
 	}
     }
   if (ambiguous)
@@ -70,16 +131,176 @@ argmatch (const char *arg, const char *const *optlist)
     return matchind;
 }
 
+/* argmatch - case sensitive version */
+int
+argmatch (const char *arg, const char *const *arglist,
+	  const char *vallist, size_t valsize)
+{
+  return __argmatch_internal (arg, arglist, vallist, valsize, 1);
+}
+
+/* argcasematch - case insensitive version */
+int
+argcasematch (const char *arg, const char *const *arglist,
+	      const char *vallist, size_t valsize)
+{
+  return __argmatch_internal (arg, arglist, vallist, valsize, 0);
+}
+
 /* Error reporting for argmatch.
-   KIND is a description of the type of entity that was being matched.
+   CONTEXT is a description of the type of entity that was being matched.
    VALUE is the invalid value that was given.
    PROBLEM is the return value from argmatch.  */
 
 void
-invalid_arg (const char *kind, const char *value, int problem)
+argmatch_invalid (const char *context, const char *value, int problem)
 {
-  const char *fmt = (problem == -1
-		     ? "%s: invalid %s `%s'\n"
-		     : "%s: ambiguous %s `%s'\n");
-  fprintf (stderr, fmt, program_name, kind, value);
+  char const *format = (problem == -1
+			? _("invalid argument %s for `%s'")
+			: _("ambiguous argument %s for `%s'"));
+
+  error (0, 0, format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context);
 }
+
+/* List the valid arguments for argmatch.
+   ARGLIST is the same as in argmatch.
+   VALLIST is a pointer to an array of values.
+   VALSIZE is the size of the elements of VALLIST */
+void
+argmatch_valid (const char *const *arglist,
+		const char *vallist, size_t valsize)
+{
+  int i;
+  const char *last_val = NULL;
+
+  /* We try to put synonyms on the same line.  The assumption is that
+     synonyms follow each other */
+  fprintf (stderr, _("Valid arguments are:"));
+  for (i = 0; arglist[i]; i++)
+    if ((i == 0)
+	|| memcmp (last_val, vallist + valsize * i, valsize))
+      {
+	fprintf (stderr, "\n  - `%s'", arglist[i]);
+	last_val = vallist + valsize * i;
+      }
+    else
+      {
+	fprintf (stderr, ", `%s'", arglist[i]);
+      }
+  putc ('\n', stderr);
+}
+
+/* Never failing versions of the previous functions.
+
+   CONTEXT is the context for which argmatch is called (e.g.,
+   "--version-control", or "$VERSION_CONTROL" etc.).  Upon failure,
+   calls the (supposed never to return) function EXIT_FN. */
+
+int
+__xargmatch_internal (const char *context,
+		      const char *arg, const char *const *arglist,
+		      const char *vallist, size_t valsize,
+		      int case_sensitive,
+		      argmatch_exit_fn exit_fn)
+{
+  int res = __argmatch_internal (arg, arglist,
+				 vallist, valsize,
+				 case_sensitive);
+  if (res >= 0)
+    /* Success. */
+    return res;
+
+  /* We failed.  Explain why. */
+  argmatch_invalid (context, arg, res);
+  argmatch_valid (arglist, vallist, valsize);
+  (*exit_fn) ();
+
+  return -1; /* To please the compilers. */
+}
+
+/* Look for VALUE in VALLIST, an array of objects of size VALSIZE and
+   return the first corresponding argument in ARGLIST */
+const char *
+argmatch_to_argument (const char *value,
+		      const char *const *arglist,
+		      const char *vallist, size_t valsize)
+{
+  int i;
+
+  for (i = 0; arglist[i]; i++)
+    if (!memcmp (value, vallist + valsize * i, valsize))
+      return arglist[i];
+  return NULL;
+}
+
+#ifdef TEST
+/*
+ * Based on "getversion.c" by David MacKenzie <djm@gnu.ai.mit.edu>
+ */
+char *program_name;
+extern const char *getenv ();
+
+/* When to make backup files.  */
+enum backup_type
+{
+  /* Never make backups.  */
+  none,
+
+  /* Make simple backups of every file.  */
+  simple,
+
+  /* Make numbered backups of files that already have numbered backups,
+     and simple backups of the others.  */
+  numbered_existing,
+
+  /* Make numbered backups of every file.  */
+  numbered
+};
+
+/* Two tables describing arguments (keys) and their corresponding
+   values */
+static const char *const backup_args[] =
+{
+  "no", "none", "off",
+  "simple", "never",
+  "existing", "nil",
+  "numbered", "t",
+  0
+};
+
+static const enum backup_type backup_vals[] =
+{
+  none, none, none,
+  simple, simple,
+  numbered_existing, numbered_existing,
+  numbered, numbered
+};
+
+int
+main (int argc, const char *const *argv)
+{
+  const char *cp;
+  enum backup_type backup_type = none;
+
+  program_name = (char *) argv[0];
+
+  if (argc > 2)
+    {
+      fprintf (stderr, "Usage: %s [VERSION_CONTROL]\n", program_name);
+      exit (1);
+    }
+
+  if ((cp = getenv ("VERSION_CONTROL")))
+    backup_type = XARGCASEMATCH ("$VERSION_CONTROL", cp,
+				 backup_args, backup_vals);
+
+  if (argc == 2)
+    backup_type = XARGCASEMATCH (program_name, argv[1],
+				 backup_args, backup_vals);
+
+  printf ("The version control is `%s'\n",
+	  ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
+
+  return 0;
+}
+#endif

lib/argmatch.h

@@ -1,12 +1,129 @@
-/* argmatch.h -- declarations for matching arguments against option lists */
+/* argmatch.h -- definitions and prototypes for argmatch.c
+   Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.
 
-#if defined __STDC__ || __GNUC__
-# define __ARGMATCH_P(args) args
-#else
-# define __ARGMATCH_P(args) ()
-#endif
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-int argmatch __ARGMATCH_P ((const char *, const char * const *));
-void invalid_arg __ARGMATCH_P ((const char *, const char *, int));
+   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.
 
-extern char *program_name;
+   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@ai.mit.edu>
+   Modified by Akim Demaille <demaille@inf.enst.fr> */
+
+#ifndef ARGMATCH_H_
+# define ARGMATCH_H_ 1
+
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# include <sys/types.h>
+
+# ifndef PARAMS
+#  if PROTOTYPES || (defined (__STDC__) && __STDC__)
+#   define PARAMS(args) args
+#  else
+#   define PARAMS(args) ()
+#  endif  /* GCC.  */
+# endif  /* Not PARAMS.  */
+
+/* Assert there are as many real arguments as there are values
+   (argument list ends with a NULL guard).  There is no execution
+   cost, since it will be statically evalauted to `assert (0)' or
+   `assert (1)'.  Unfortunately there is no -Wassert-0. */
+
+# undef ARRAY_CARDINALITY
+# define ARRAY_CARDINALITY(Array) (sizeof ((Array)) / sizeof (*(Array)))
+
+# define ARGMATCH_ASSERT(Arglist, Vallist)      \
+  assert (ARRAY_CARDINALITY ((Arglist)) == ARRAY_CARDINALITY ((Vallist)) + 1)
+
+/* Return the index of the element of ARGLIST (NULL terminated) that
+   matches with ARG.  If VALLIST is not NULL, then use it to resolve
+   false ambiguities (i.e., different matches of ARG but corresponding
+   to the same values in VALLIST).  */
+
+int argmatch
+  PARAMS ((const char *arg, const char *const *arglist,
+	   const char *vallist, size_t valsize));
+int argcasematch
+  PARAMS ((const char *arg, const char *const *arglist,
+	   const char *vallist, size_t valsize));
+
+# define ARGMATCH(Arg, Arglist, Vallist) \
+  argmatch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
+
+# define ARGCASEMATCH(Arg, Arglist, Vallist) \
+  argcasematch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
+
+/* xargmatch calls this function when it fails.  This function should not
+   return.  By default, this is a function that calls ARGMATCH_DIE which
+   in turn defaults to `exit (EXIT_FAILURE)'.  */
+typedef void (*argmatch_exit_fn) PARAMS ((void));
+extern argmatch_exit_fn argmatch_die;
+
+/* Report on stderr why argmatch failed.  Report correct values. */
+
+void argmatch_invalid
+  PARAMS ((const char *context, const char *value, int problem));
+
+/* Left for compatibility with the old name invalid_arg */
+
+# define invalid_arg(Context, Value, Problem) \
+  argmatch_invalid ((Context), (Value), (Problem))
+
+
+
+/* Report on stderr the list of possible arguments.  */
+
+void argmatch_valid
+  PARAMS ((const char *const *arglist,
+	   const char *vallist, size_t valsize));
+
+# define ARGMATCH_VALID(Arglist, Vallist) \
+  argmatch_valid (Arglist, (const char *) Vallist, sizeof (*(Vallist)))
+
+
+
+/* Same as argmatch, but upon failure, reports a explanation on the
+   failure, and exits using the function EXIT_FN. */
+
+int __xargmatch_internal
+  PARAMS ((const char *context,
+	   const char *arg, const char *const *arglist,
+	   const char *vallist, size_t valsize,
+	   int case_sensitive, argmatch_exit_fn exit_fn));
+
+/* Programmer friendly interface to __xargmatch_internal. */
+
+# define XARGMATCH(Context, Arg, Arglist, Vallist)			\
+  (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist),	\
+                                  (const char *) (Vallist),	\
+				  sizeof (*(Vallist)),		\
+				  1, argmatch_die)])
+
+# define XARGCASEMATCH(Context, Arg, Arglist, Vallist)		\
+  (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist),	\
+                                  (const char *) (Vallist),	\
+				  sizeof (*(Vallist)),		\
+				  0, argmatch_die)])
+
+/* Convert a value into a corresponding argument. */
+
+const char *argmatch_to_argument
+  PARAMS ((char const *value, const char *const *arglist,
+	   const char *vallist, size_t valsize));
+
+# define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist)			\
+  argmatch_to_argument ((char const *) &(Value), (Arglist), 		\
+		        (const char *) (Vallist), sizeof (*(Vallist)))
+
+#endif /* ARGMATCH_H_ */

lib/atexit.c

@@ -0,0 +1,14 @@
+/* Wrapper to implement ANSI C's atexit using SunOS's on_exit. */
+/* This function is in the public domain.  --Mike Stump. */
+
+#include "config.h"
+
+int
+atexit(f)
+     void (*f)();
+{
+  /* If the system doesn't provide a definition for atexit, use on_exit
+     if the system provides that.  */
+  on_exit (f, 0);
+  return 0;
+}

lib/backupfile.c

@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -58,12 +58,26 @@
 # define CLOSEDIR(d) closedir (d)
 #endif
 
-#if STDC_HEADERS
+#if HAVE_STDLIB_H
 # include <stdlib.h>
-#else
+#endif
+
+#ifndef HAVE_DECL_GETENV
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_GETENV
+char *getenv ();
+#endif
+
+#ifndef HAVE_DECL_MALLOC
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_MALLOC
 char *malloc ();
 #endif
 
+char *base_name PARAMS ((char const *));
+
 #if HAVE_DIRENT_H || HAVE_NDIR_H || HAVE_SYS_DIR_H || HAVE_SYS_NDIR_H
 # define HAVE_DIR 1
 #else
@@ -214,29 +228,49 @@ version_number (const char *base, const char *backup, size_t base_length)
 
 static const char * const backup_args[] =
 {
-  "never", "simple", "nil", "existing", "t", "numbered", 0
+  /* In a series of synonyms, present the most meaning full first, so
+     that argmatch_valid be more readable. */
+  "none", "off",
+  "simple", "never",
+  "existing", "nil",
+  "numbered", "t",
+  0
 };
 
 static const enum backup_type backup_types[] =
 {
-  simple, simple, numbered_existing, numbered_existing, numbered, numbered
+  none, none,
+  simple, simple,
+  numbered_existing, numbered_existing,
+  numbered, numbered
 };
 
-/* Return the type of backup indicated by VERSION.
-   Unique abbreviations are accepted. */
+/* Return the type of backup specified by VERSION.
+   If VERSION is NULL or the empty string, return numbered_existing.
+   If VERSION is invalid or ambiguous, fail with a diagnostic appropriate
+   for the specified CONTEXT.  Unambiguous abbreviations are accepted.  */
 
 enum backup_type
-get_version (const char *version)
+get_version (const char *context, 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];
+  else
+    return XARGMATCH (context, version, backup_args, backup_types);
+}
+
+
+/* Return the type of backup specified by VERSION.
+   If VERSION is NULL, use the value of the envvar VERSION_CONTROL.
+   If the specified string is invalid or ambiguous, fail with a diagnostic
+   appropriate for the specified CONTEXT.
+   Unambiguous abbreviations are accepted.  */
+
+enum backup_type
+xget_version (const char *context, const char *version)
+{
+  if (version && *version)
+    return get_version (context, version);
+  else
+    return get_version ("$VERSION_CONTROL", getenv ("VERSION_CONTROL"));
 }

lib/backupfile.h

@@ -1,5 +1,5 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
-   Copyright (C) 1990, 1991, 1992, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990-1992, 1997-1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -52,9 +52,9 @@ extern char const *simple_backup_suffix;
 #  endif
 # endif
 
-char *base_name PARAMS ((char const *));
 char *find_backup_file_name PARAMS ((char const *, enum backup_type));
-enum backup_type get_version PARAMS ((char const *));
+enum backup_type get_version PARAMS ((char const *context, char const *arg));
+enum backup_type xget_version PARAMS ((char const *context, char const *arg));
 void addext PARAMS ((char *, char const *, int));
 
 #endif /* ! BACKUPFILE_H_ */

lib/basename.c

@@ -1,5 +1,5 @@
 /* basename.c -- return the last element in a path
-   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,22 +23,43 @@
 # define FILESYSTEM_PREFIX_LEN(Filename) 0
 #endif
 
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
 #ifndef ISSLASH
 # define ISSLASH(C) ((C) == '/')
 #endif
 
+char *base_name PARAMS ((char const *name));
+
 /* In general, we can't use the builtin `basename' function if available,
    since it has different meanings in different environments.
-   In some environments the builtin `basename' modifies its argument.  */
+   In some environments the builtin `basename' modifies its argument.
+   If NAME is all slashes, be sure to return `/'.  */
 
 char *
 base_name (char const *name)
 {
   char const *base = name += FILESYSTEM_PREFIX_LEN (name);
+  int all_slashes = 1;
+  char const *p;
 
-  for (; *name; name++)
-    if (ISSLASH (*name))
-      base = name + 1;
+  for (p = name; *p; p++)
+    {
+      if (ISSLASH (*p))
+	base = p + 1;
+      else
+	all_slashes = 0;
+    }
+
+  /* If NAME is all slashes, arrange to return `/'.  */
+  if (*base == '\0' && ISSLASH (*name) && all_slashes)
+    --base;
 
   return (char *) base;
 }

lib/canon-host.c

@@ -1,6 +1,6 @@
 /* Host name canonicalization
 
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1999, 2000 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -43,11 +43,15 @@
 # include <arpa/inet.h>
 #endif
 
+#ifndef strdup
+char *strdup ();
+#endif
+void free ();
+
 /* Returns the canonical hostname associated with HOST (allocated in a static
    buffer), or 0 if it can't be determined.  */
 char *
-canon_host (host)
-     char *host;
+canon_host (const char *host)
 {
 #ifdef HAVE_GETHOSTBYNAME
   struct hostent *he = gethostbyname (host);
@@ -68,9 +72,23 @@ canon_host (host)
 	}
 
       if (addr && strcmp (he->h_name, addr) == 0)
-	/* gethostbyname() cheated!  Lookup the host name via the address
-	   this time to get the actual host name.  */
-	he = gethostbyaddr (he->h_addr, he->h_length, he->h_addrtype);
+	{
+	  /* gethostbyname has returned a string representation of the IP
+	     address, for example, "127.0.0.1".  So now, look up the host
+	     name via the address.  Although it may seem reasonable to look
+	     up the host name via the address, we must not pass `he->h_addr'
+	     directly to gethostbyaddr because on some systems he->h_addr
+	     is located in a static library buffer that is reused in the
+	     gethostbyaddr call.  Make a copy and use that instead.  */
+	  char *h_addr_copy = strdup (he->h_addr);
+	  if (h_addr_copy == NULL)
+	    he = NULL;
+	  else
+	    {
+	      he = gethostbyaddr (h_addr_copy, he->h_length, he->h_addrtype);
+	      free (h_addr_copy);
+	    }
+	}
 # endif /* HAVE_GETHOSTBYADDR */
 
       if (he)
@@ -79,3 +97,17 @@ canon_host (host)
 #endif /* HAVE_GETHOSTBYNAME */
   return 0;
 }
+
+#ifdef TEST_CANON_HOST
+int
+main (int argc, char **argv)
+{
+  int i;
+  for (i = 1; i < argc; i++)
+    {
+      char *s = canon_host (argv[i]);
+      printf ("%s: %s\n", argv[i], (s ? s : "<undef>"));
+    }
+  exit (0);
+}
+#endif /* TEST_CANON_HOST */

lib/chown.c

@@ -34,10 +34,7 @@
 /* FIXME: describe.  */
 
 int
-rpl_chown (file, uid, gid)
-     const char *file;
-     uid_t uid;
-     gid_t gid;
+rpl_chown (const char *file, uid_t uid, gid_t gid)
 {
   if (gid == (gid_t) -1 || uid == (uid_t) -1)
     {

lib/closeout.c

@@ -1,5 +1,5 @@
 /* closeout.c - close standard output
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,28 +33,80 @@
 # define EXIT_FAILURE 1
 #endif
 
+#include <stdio.h>
+
 #include <errno.h>
 #ifndef errno
 extern int errno;
 #endif
 
-#include <stdio.h>
 #include "closeout.h"
 #include "error.h"
+#include "quotearg.h"
 
-/* Close standard output, exiting with status STATUS on failure.  */
+static int default_exit_status = EXIT_FAILURE;
+static const char *file_name;
+
+/* Set the value to be used for the exit status when close_stdout is called.
+   This is useful when it is not convenient to call close_stdout_status,
+   e.g., when close_stdout is called via atexit.  */
+void
+close_stdout_set_status (int status)
+{
+  default_exit_status = status;
+}
+
+/* Set the file name to be reported in the event an error is detected
+   by close_stdout_status.  */
+void
+close_stdout_set_file_name (const char *file)
+{
+  file_name = file;
+}
+
+/* Close standard output, exiting with status STATUS on failure.
+   If a program writes *anything* to stdout, that program should `fflush'
+   stdout and make sure that it succeeds before exiting.  Otherwise,
+   suppose that you go to the extreme of checking the return status
+   of every function that does an explicit write to stdout.  The last
+   printf can succeed in writing to the internal stream buffer, and yet
+   the fclose(stdout) could still fail (due e.g., to a disk full error)
+   when it tries to write out that buffered data.  Thus, you would be
+   left with an incomplete output file and the offending program would
+   exit successfully.
+
+   FIXME: note the fflush suggested above is implicit in the fclose
+   we actually do below.  Consider doing only the fflush and/or using
+   setvbuf to inhibit buffering.
+
+   Besides, it's wasteful to check the return value from every call
+   that writes to stdout -- just let the internal stream state record
+   the failure.  That's what the ferror test is checking below.
+
+   It's important to detect such failures and exit nonzero because many
+   tools (most notably `make' and other build-management systems) depend
+   on being able to detect failure in other tools via their exit status.  */
 void
 close_stdout_status (int status)
 {
-  if (ferror (stdout))
-    error (status, 0, _("write error"));
+  int e = ferror (stdout) ? 0 : -1;
+
   if (fclose (stdout) != 0)
-    error (status, errno, _("write error"));
+    e = errno;
+
+  if (0 <= e)
+    {
+      char const *write_error = _("write error");
+      if (file_name)
+	error (status, e, "%s: %s", quotearg_colon (file_name), write_error);
+      else
+	error (status, e, "%s", write_error);
+    }
 }
 
 /* Close standard output, exiting with status EXIT_FAILURE on failure.  */
 void
 close_stdout (void)
 {
-  close_stdout_status (EXIT_FAILURE);
+  close_stdout_status (default_exit_status);
 }

lib/closeout.h

@@ -6,5 +6,7 @@
 # endif
 #endif
 
+void close_stdout_set_status PARAMS ((int status));
+void close_stdout_set_file_name PARAMS ((const char *file));
 void close_stdout PARAMS ((void));
 void close_stdout_status PARAMS ((int status));

lib/config.charset

@@ -0,0 +1,182 @@
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+#   Copyright (C) 2000 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Library General Public License as published
+#   by the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Library General Public License for more details.
+#
+#   You should have received a copy of the GNU Library General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   USA.
+#
+# The table consists of lines of the form
+#    ALIAS  CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+#       name                         used by which systems         a MIME name?
+#   ASCII                     glibc solaris
+#   ISO-8859-1                glibc aix hpux irix osf solaris           yes
+#   ISO-8859-2                glibc aix hpux irix solaris               yes
+#   ISO-8859-4                solaris                                   yes
+#   ISO-8859-5                glibc aix hpux irix solaris               yes
+#   ISO-8859-6                aix hpux solaris                          yes
+#   ISO-8859-7                glibc aix hpux irix osf solaris           yes
+#   ISO-8859-8                glibc aix hpux solaris                    yes
+#   ISO-8859-9                glibc aix hpux irix osf solaris           yes
+#   ISO-8859-13               glibc
+#   ISO-8859-15               aix solaris
+#   KOI8-R                    glibc solaris                             yes
+#   KOI8-U                    glibc                                     yes
+#   CP850                     aix osf
+#   CP856                     aix
+#   CP922                     aix
+#   CP932                     aix
+#   CP943                     aix
+#   CP1046                    aix
+#   CP1124                    aix
+#   CP1129                    aix
+#   CP1252                    aix
+#   EUC-CN                    aix hpux solaris
+#   EUC-JP                    aix hpux solaris                          yes
+#   EUC-KR                    aix hpux solaris                          yes
+#   EUC-TW                    aix hpux solaris
+#   BIG5                      aix hpux solaris                          yes
+#   GBK                       aix
+#   SJIS                      hpux solaris
+#   TIS-620                   aix hpux solaris
+#   HP-ROMAN8                 hpux
+#   HP-ARABIC8                hpux
+#   HP-GREEK8                 hpux
+#   HP-HEBREW8                hpux
+#   HP-TURKISH8               hpux
+#   HP-KANA8                  hpux
+#   UTF-8                     glibc aix hpux solaris                    yes
+#
+# Note: Names which are not marked as being a MIME name should not be used in
+# Internet protocols for information interchange (mail, news, etc.).
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+    linux* | *-gnu*)
+	# With glibc we don't need any canonicalization, because glibc
+	# supports all GNU canonical names directly.
+	echo "ANSI_X3.4-1968 ASCII" # this is a nop
+	echo "ISO_646.IRV:1983 ASCII" # this is a nop
+	echo "BALTIC ISO-8859-13" # in glibc-2.2 or newer, this is a nop
+	;;
+    aix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "IBM-850 CP850"
+	echo "IBM-856 CP856"
+	echo "IBM-921 ISO-8859-13"
+	echo "IBM-922 CP922"
+	echo "IBM-932 CP932"
+	echo "IBM-943 CP943"
+	echo "IBM-1046 CP1046"
+	echo "IBM-1124 CP1124"
+	echo "IBM-1129 CP1129"
+	echo "IBM-1252 CP1252"
+	echo "IBM-eucCN EUC-CN"
+	echo "IBM-eucJP EUC-JP"
+	echo "IBM-eucKR EUC-KR"
+	echo "IBM-eucTW EUC-TW"
+	echo "big5 BIG5"
+	echo "GBK GBK"
+	echo "TIS-620 TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    hpux*)
+	echo "iso88591 ISO-8859-1"
+	echo "iso88592 ISO-8859-2"
+	echo "iso88595 ISO-8859-5"
+	echo "iso88596 ISO-8859-6"
+	echo "iso88597 ISO-8859-7"
+	echo "iso88598 ISO-8859-8"
+	echo "iso88599 ISO-8859-9"
+	echo "roman8 HP-ROMAN8"
+	echo "arabic8 HP-ARABIC8"
+	echo "greek8 HP-GREEK8"
+	echo "hebrew8 HP-HEBREW8"
+	echo "turkish8 HP-TURKISH8"
+	echo "kana8 HP-KANA8"
+	echo "tis620 TIS-620"
+	echo "big5 BIG5"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "hp15CN EUC-CN"
+	#echo "ccdc ?" # what is this?
+	echo "SJIS SJIS"
+	echo "utf8 UTF-8"
+	;;
+    irix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	;;
+    osf*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "cp850 CP850"
+	;;
+    solaris*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "koi8-r KOI8-R"
+	echo "BIG5 BIG5"
+	echo "gb2312 EUC-CN"
+	echo "cns11643 EUC-TW"
+	echo "5601 EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "PCK SJIS"
+	echo "TIS620.2533 TIS-620"
+	#echo "sun_eu_greek ?" # what is this?
+	echo "UTF-8 UTF-8"
+	;;
+esac

lib/dirname.c

@@ -33,14 +33,15 @@ char *malloc ();
 # endif
 #endif
 
+#include "dirname.h"
+
 /* Return the leading directories part of PATH,
    allocated with malloc.  If out of memory, return 0.
    Assumes that trailing slashes have already been
    removed.  */
 
 char *
-dirname (path)
-     char *path;
+dir_name (const char *path)
 {
   char *newpath;
   char *slash;
@@ -56,8 +57,17 @@ dirname (path)
   else
     {
       /* Remove any trailing slashes from the result.  */
+#ifdef MSDOS
+      char *lim = (path[0] >= 'A' && path[0] <= 'z' && path[1] == ':')
+		  ? path + 2 : path;
+
+      /* If canonicalized "d:/path", leave alone the root case "d:/".  */
+      while (slash > lim && *slash == '/')
+	--slash;
+#else
       while (slash > path && *slash == '/')
 	--slash;
+#endif
 
       length = slash - path + 1;
     }

lib/dirname.h

@@ -0,0 +1,31 @@
+/*  Copyright (C) 1998 Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef DIRNAME_H_
+# define DIRNAME_H_ 1
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+char *
+dir_name PARAMS ((const char *path));
+
+#endif /* not DIRNAME_H_ */

lib/dup2.c

@@ -0,0 +1,66 @@
+/* Duplicate an open file descriptor to a specified file descriptor.
+   Copyright 1999 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* written by Paul Eggert */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#if HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef F_DUPFD
+static int
+dupfd (int fd, int desired_fd)
+{
+  int duplicated_fd = dup (fd);
+  if (duplicated_fd < 0 || duplicated_fd == desired_fd)
+    return duplicated_fd;
+  else
+    {
+      int r = dupfd (fd, desired_fd);
+      int e = errno;
+      close (duplicated_fd);
+      errno = e;
+      return r;
+    }
+}
+#endif
+
+int
+dup2 (int fd, int desired_fd)
+{
+  if (fd == desired_fd)
+    return fd;
+  close (desired_fd);
+#ifdef F_DUPFD
+  return fcntl (fd, F_DUPFD, desired_fd);
+#else
+  return dupfd (fd, desired_fd);
+#endif
+}

lib/error.c

@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990,91,92,93,94,95,96,97,98 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000 Free Software Foundation, Inc.
 
    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.
@@ -150,9 +150,16 @@ error (status, errnum, message, va_alist)
   ++error_message_count;
   if (errnum)
     {
-#if defined HAVE_STRERROR_R || defined _LIBC
+#if defined HAVE_STRERROR_R || _LIBC
       char errbuf[1024];
+# if HAVE_WORKING_STRERROR_R || _LIBC
       fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
+# else
+      /* Don't use __strerror_r's return value because on some systems
+	 (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'.  */
+      __strerror_r (errnum, errbuf, sizeof errbuf);
+      fprintf (stderr, ": %s", errbuf);
+# endif
 #else
       fprintf (stderr, ": %s", strerror (errnum));
 #endif
@@ -225,9 +232,16 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
   ++error_message_count;
   if (errnum)
     {
-#if defined HAVE_STRERROR_R || defined _LIBC
+#if defined HAVE_STRERROR_R || _LIBC
       char errbuf[1024];
+# if HAVE_WORKING_STRERROR_R || _LIBC
       fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
+# else
+      /* Don't use __strerror_r's return value because on some systems
+	 (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'.  */
+      __strerror_r (errnum, errbuf, sizeof errbuf);
+      fprintf (stderr, ": %s", errbuf);
+# endif
 #else
       fprintf (stderr, ": %s", strerror (errnum));
 #endif

lib/error.h

@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
 
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.

lib/euidaccess.c

@@ -1,5 +1,5 @@
 /* euidaccess -- check if effective user id can access file
-   Copyright (C) 1990, 1991, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1995, 1998, 2000 Free Software Foundation, Inc.
 
 This file is part of the GNU C Library.
 
@@ -66,6 +66,9 @@ gid_t getegid ();
 #ifndef errno
 extern int errno;
 #endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
 
 #if defined(EACCES) && !defined(EACCESS)
 # define EACCESS EACCES
@@ -93,6 +96,7 @@ extern int errno;
 #ifdef _LIBC
 
 # define group_member __group_member
+# define euidaccess __euidaccess
 
 #else
 
@@ -102,15 +106,6 @@ static uid_t uid;
 /* The user's real group id. */
 static gid_t gid;
 
-/* The user's effective user id. */
-static uid_t euid;
-
-/* The user's effective group id. */
-static gid_t egid;
-
-/* Nonzero if UID, GID, EUID, and EGID have valid values. */
-static int have_ids = 0;
-
 # if HAVE_GETGROUPS
 int group_member ();
 # else
@@ -119,6 +114,15 @@ int group_member ();
 
 #endif
 
+/* The user's effective user id. */
+static uid_t euid;
+
+/* The user's effective group id. */
+static gid_t egid;
+
+/* Nonzero if UID, GID, EUID, and EGID have valid values. */
+static int have_ids;
+
 
 /* Return 0 if the user has permission of type MODE on file PATH;
    otherwise, return -1 and set `errno' to EACCESS.
@@ -127,16 +131,15 @@ int group_member ();
    filesystem, text busy, etc. */
 
 int
-euidaccess (path, mode)
-     const char *path;
-     int mode;
+euidaccess (const char *path, int mode)
 {
   struct stat stats;
   int granted;
 
 #ifdef	_LIBC
-  uid_t uid = getuid (), euid = geteuid ();
-  gid_t gid = getgid (), egid = getegid ();
+  if (! __libc_enable_secure)
+    /* If we are not set-uid or set-gid, access does the same.  */
+    return __access (path, mode);
 #else
   if (have_ids == 0)
     {
@@ -146,11 +149,11 @@ euidaccess (path, mode)
       euid = geteuid ();
       egid = getegid ();
     }
-#endif
 
   if (uid == euid && gid == egid)
     /* If we are not set-uid or set-gid, access does the same.  */
     return access (path, mode);
+#endif
 
   if (stat (path, &stats))
     return -1;
@@ -163,6 +166,16 @@ euidaccess (path, mode)
   if (mode == F_OK)
     return 0;			/* The file exists. */
 
+#ifdef	_LIBC
+  /* Now we need the IDs.  */
+  if (have_ids == 0)
+    {
+      have_ids = 1;
+      euid = __geteuid ();
+      egid = __getegid ();
+    }
+#endif
+
   /* The super-user can read and write any file, and execute any file
      that anyone can execute. */
   if (euid == 0 && ((mode & X_OK) == 0
@@ -177,6 +190,40 @@ euidaccess (path, mode)
     granted = (stats.st_mode & mode);
   if (granted == mode)
     return 0;
-  errno = EACCESS;
+  __set_errno (EACCESS);
   return -1;
 }
+#undef euidaccess
+#ifdef weak_alias
+weak_alias (__euidaccess, euidaccess)
+#endif
+
+#ifdef TEST
+# include <stdio.h>
+# include <errno.h>
+# include "error.h"
+
+char *program_name;
+
+int
+main (argc, argv)
+     int argc;
+     char **argv;
+{
+  char *file;
+  int mode;
+  int err;
+
+  program_name = argv[0];
+  if (argc < 3)
+    abort ();
+  file = argv[1];
+  mode = atoi (argv[2]);
+
+  err = euidaccess (file, mode);
+  printf ("%d\n", err);
+  if (err != 0)
+    error (0, errno, "%s", file);
+  exit (0);
+}
+#endif

lib/exclude.c

@@ -1,5 +1,5 @@
 /* exclude.c -- exclude file names
-   Copyright 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 1997, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -54,14 +54,14 @@ new_exclude (void)
 }
 
 int
-excluded_filename (struct exclude const *ex, char const *f)
+excluded_filename (struct exclude const *ex, char const *f, int options)
 {
   char const * const *exclude = ex->exclude;
   int exclude_count = ex->exclude_count;
   int i;
 
   for (i = 0;  i < exclude_count;  i++)
-    if (fnmatch (exclude[i], f, 0) == 0)
+    if (fnmatch (exclude[i], f, options) == 0)
       return 1;
 
   return 0;
@@ -79,7 +79,8 @@ add_exclude (struct exclude *ex, char const *pattern)
 }
 
 int
-add_exclude_file (struct exclude *ex, char const *filename, char line_end)
+add_exclude_file (void (*add_func) PARAMS ((struct exclude *, char const *)),
+		  struct exclude *ex, char const *filename, char line_end)
 {
   int use_stdin = filename[0] == '-' && !filename[1];
   FILE *in;
@@ -118,7 +119,7 @@ add_exclude_file (struct exclude *ex, char const *filename, char line_end)
     if (p < lim ? *p == line_end : buf < p && p[-1])
       {
 	*p = '\0';
-	add_exclude (ex, pattern);
+	(*add_func) (ex, pattern);
 	pattern = p + 1;
       }
 

lib/exclude.h

@@ -1,5 +1,5 @@
 /* exclude.h -- declarations for excluding file names
-   Copyright 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 1997, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,5 +30,6 @@ struct exclude;
 
 struct exclude *new_exclude PARAMS ((void));
 void add_exclude PARAMS ((struct exclude *, char const *));
-int add_exclude_file PARAMS ((struct exclude *, char const *, char));
-int excluded_filename PARAMS ((struct exclude const *, char const *));
+int add_exclude_file PARAMS ((void (*) (struct exclude *, char const *),
+			      struct exclude *, char const *, char));
+int excluded_filename PARAMS ((struct exclude const *, char const *, int));

lib/fatal.c

@@ -0,0 +1,70 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* FIXME: define EXIT_FAILURE */
+
+#include <stdio.h>
+
+#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
+# if __STDC__
+#  include <stdarg.h>
+#  define VA_START(args, lastarg) va_start(args, lastarg)
+# else
+#  include <varargs.h>
+#  define VA_START(args, lastarg) va_start(args)
+# endif
+#else
+# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
+# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
+#endif
+
+#if STDC_HEADERS || _LIBC
+# include <stdlib.h>
+# include <string.h>
+#else
+void exit ();
+#endif
+
+#ifdef _LIBC
+# define program_name program_invocation_name
+#else /* not _LIBC */
+/* The calling program should define program_name and set it to the
+   name of the executing program.  */
+extern char *program_name;
+#endif
+
+#include "fatal.h"
+
+/* Like error, but always exit with EXIT_FAILURE.  */
+
+void
+#if defined VA_START && __STDC__
+fatal (int errnum, const char *message, ...)
+#else
+fatal (errnum, message, va_alist)
+     int errnum;
+     char *message;
+     va_dcl
+#endif
+{
+#ifdef VA_START
+  va_list args;
+#endif
+
+  if (error_print_progname)
+    (*error_print_progname) ();
+  else
+    {
+      fflush (stdout);
+      fprintf (stderr, "%s: ", program_name);
+    }
+
+#ifdef VA_START
+  VA_START (args, message);
+  error (EXIT_FAILURE, errnum, message, args);
+  va_end (args);
+#else
+  error (EXIT_FAILURE, errnum, message, a1, a2, a3, a4, a5, a6, a7, a8);
+#endif
+}

lib/fatal.h

@@ -0,0 +1,68 @@
+#include "error.h"
+
+/* FIXME: this is all from ansidecl.  better to simply swipe
+   that file from egcs/include and include it from here.  */
+
+/* Using MACRO(x,y) in cpp #if conditionals does not work with some
+   older preprocessors.  Thus we can't define something like this:
+
+#define HAVE_GCC_VERSION(MAJOR, MINOR) \
+  (__GNUC__ > (MAJOR) || (__GNUC__ == (MAJOR) && __GNUC_MINOR__ >= (MINOR)))
+
+and then test "#if HAVE_GCC_VERSION(2,7)".
+
+So instead we use the macro below and test it against specific values.  */
+
+/* This macro simplifies testing whether we are using gcc, and if it
+   is of a particular minimum version. (Both major & minor numbers are
+   significant.)  This macro will evaluate to 0 if we are not using
+   gcc at all.  */
+#ifndef GCC_VERSION
+# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
+#endif /* GCC_VERSION */
+
+/* Define macros for some gcc attributes.  This permits us to use the
+   macros freely, and know that they will come into play for the
+   version of gcc in which they are supported.  */
+
+#if (GCC_VERSION < 2007)
+# define __attribute__(x)
+#endif
+
+/* Attribute __malloc__ on functions was valid as of gcc 2.96. */
+#ifndef ATTRIBUTE_MALLOC
+# if (GCC_VERSION >= 2096)
+#  define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+#  define ATTRIBUTE_MALLOC
+# endif /* GNUC >= 2.96 */
+#endif /* ATTRIBUTE_MALLOC */
+
+/* Attributes on labels were valid as of gcc 2.93. */
+#ifndef ATTRIBUTE_UNUSED_LABEL
+# if (GCC_VERSION >= 2093)
+#  define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
+# else
+#  define ATTRIBUTE_UNUSED_LABEL
+# endif /* GNUC >= 2.93 */
+#endif /* ATTRIBUTE_UNUSED_LABEL */
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif /* ATTRIBUTE_UNUSED */
+
+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif /* ATTRIBUTE_NORETURN */
+
+#ifndef ATTRIBUTE_PRINTF
+# define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+# define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
+# define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
+# define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
+# define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
+# define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
+#endif /* ATTRIBUTE_PRINTF */
+
+extern void fatal (int errnum, const char *format, ...)
+     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF_2;

lib/fileblocks.c

@@ -1,5 +1,5 @@
 /* Convert file size to number of blocks on System V-like machines.
-   Copyright (C) 1990, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 # include <sys/param.h>
 #endif
 
-#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
+#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
 
 # if HAVE_UNISTD_H
 #  include <unistd.h>
@@ -50,8 +50,7 @@ typedef long daddr_t; /* for disk address */
 /* Return the number of 512-byte blocks in a file of SIZE bytes. */
 
 off_t
-st_blocks (size)
-     off_t size;
+st_blocks (off_t size)
 {
   off_t datablks = size / 512 + (size % 512 != 0);
   off_t indrblks = 0;

lib/filemode.c

@@ -1,5 +1,5 @@
 /* filemode.c -- make a string describing file modes
-   Copyright (C) 1985, 1990, 1993, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1990, 1993, 1998-2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
+
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -48,6 +48,25 @@
 # endif
 #endif
 
+#if !S_IRGRP
+# define S_IRGRP (S_IRUSR >> 3)
+#endif
+#if !S_IWGRP
+# define S_IWGRP (S_IWUSR >> 3)
+#endif
+#if !S_IXGRP
+# define S_IXGRP (S_IXUSR >> 3)
+#endif
+#if !S_IROTH
+# define S_IROTH (S_IRUSR >> 6)
+#endif
+#if !S_IWOTH
+# define S_IWOTH (S_IWUSR >> 6)
+#endif
+#if !S_IXOTH
+# define S_IXOTH (S_IXUSR >> 6)
+#endif
+
 #ifdef STAT_MACROS_BROKEN
 # undef S_ISBLK
 # undef S_ISCHR
@@ -61,51 +80,48 @@
 # undef S_ISSOCK
 #endif /* STAT_MACROS_BROKEN.  */
 
-#if !defined(S_ISBLK) && defined(S_IFBLK)
+#if !defined S_ISBLK && defined S_IFBLK
 # define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
 #endif
-#if !defined(S_ISCHR) && defined(S_IFCHR)
+#if !defined S_ISCHR && defined S_IFCHR
 # define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
 #endif
-#if !defined(S_ISDIR) && defined(S_IFDIR)
+#if !defined S_ISDIR && defined S_IFDIR
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
-#if !defined(S_ISREG) && defined(S_IFREG)
+#if !defined S_ISREG && defined S_IFREG
 # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
-#if !defined(S_ISFIFO) && defined(S_IFIFO)
+#if !defined S_ISFIFO && defined S_IFIFO
 # define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
 #endif
-#if !defined(S_ISLNK) && defined(S_IFLNK)
+#if !defined S_ISLNK && defined S_IFLNK
 # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 #endif
-#if !defined(S_ISSOCK) && defined(S_IFSOCK)
+#if !defined S_ISSOCK && defined S_IFSOCK
 # define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
 #endif
-#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */
+#if !defined S_ISMPB && defined S_IFMPB /* V7 */
 # define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB)
 # define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC)
 #endif
-#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */
+#if !defined S_ISNWK && defined S_IFNWK /* HP/UX */
 # define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
 #endif
+#if !defined S_ISDOOR && defined S_IFDOOR /* Solaris 2.5 and up */
+# define S_ISDOOR(m) (((m) & S_IFMT) == S_IFDOOR)
+#endif
+#if !defined S_ISCTG && defined S_IFCTG /* MassComp */
+# define S_ISCTG(m) (((m) & S_IFMT) == S_IFCTG)
+#endif
 
-/* Look at read, write, and execute bits in BITS and set
-   flags in CHARS accordingly.  */
 
-static void
-rwx (short unsigned int bits, char *chars)
-{
-  chars[0] = (bits & S_IRUSR) ? 'r' : '-';
-  chars[1] = (bits & S_IWUSR) ? 'w' : '-';
-  chars[2] = (bits & S_IXUSR) ? 'x' : '-';
-}
 
 /* Set the 's' and 't' flags in file attributes string CHARS,
    according to the file mode BITS.  */
 
 static void
-setst (short unsigned int bits, char *chars)
+setst (mode_t bits, char *chars)
 {
 #ifdef S_ISUID
   if (bits & S_ISUID)
@@ -142,18 +158,21 @@ setst (short unsigned int bits, char *chars)
 /* Return a character indicating the type of file described by
    file mode BITS:
    'd' for directories
+   'D' for doors
    'b' for block special files
    'c' for character special files
+   'n' for network special files
    'm' for multiplexor files
    'M' for an off-line (regular) file
    'l' for symbolic links
    's' for sockets
    'p' for fifos
+   'C' for contigous data files
    '-' for regular files
    '?' for any other file type.  */
 
 static char
-ftypelet (long int bits)
+ftypelet (mode_t bits)
 {
 #ifdef S_ISBLK
   if (S_ISBLK (bits))
@@ -185,6 +204,14 @@ ftypelet (long int bits)
   if (S_ISNWK (bits))
     return 'n';
 #endif
+#ifdef S_ISDOOR
+  if (S_ISDOOR (bits))
+    return 'D';
+#endif
+#ifdef S_ISCTG
+  if (S_ISCTG (bits))
+    return 'C';
+#endif
 
   /* The following two tests are for Cray DMF (Data Migration
      Facility), which is a HSM file system.  A migrated file has a
@@ -208,12 +235,18 @@ ftypelet (long int bits)
    is given as an argument.  */
 
 void
-mode_string (short unsigned int mode, char *str)
+mode_string (mode_t mode, char *str)
 {
-  str[0] = ftypelet ((long) mode);
-  rwx ((mode & 0700) << 0, &str[1]);
-  rwx ((mode & 0070) << 3, &str[4]);
-  rwx ((mode & 0007) << 6, &str[7]);
+  str[0] = ftypelet (mode);
+  str[1] = mode & S_IRUSR ? 'r' : '-';
+  str[2] = mode & S_IWUSR ? 'w' : '-';
+  str[3] = mode & S_IXUSR ? 'x' : '-';
+  str[4] = mode & S_IRGRP ? 'r' : '-';
+  str[5] = mode & S_IWGRP ? 'w' : '-';
+  str[6] = mode & S_IXGRP ? 'x' : '-';
+  str[7] = mode & S_IROTH ? 'r' : '-';
+  str[8] = mode & S_IWOTH ? 'w' : '-';
+  str[9] = mode & S_IXOTH ? 'x' : '-';
   setst (mode, str);
 }
 

lib/filemode.h

@@ -1,9 +1,19 @@
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
+#ifndef FILEMODE_H_
 
-void mode_string PARAMS ((short unsigned int mode, char *str));
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# include <sys/types.h>
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+void mode_string PARAMS ((mode_t mode, char *str));
+
+#endif

lib/fnmatch.c

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

lib/fsusage.c

@@ -1,5 +1,5 @@
 /* fsusage.c -- return space usage of mounted filesystems
-   Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1996, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -101,10 +101,7 @@ int safe_read ();
    ERRNO is either a system error value, or zero if DISK is NULL
    on a system that requires a non-NULL value.  */
 int
-get_fs_usage (path, disk, fsp)
-     const char *path;
-     const char *disk;
-     struct fs_usage *fsp;
+get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
 {
 #ifdef STAT_STATFS3_OSF1
 
@@ -187,7 +184,7 @@ get_fs_usage (path, disk, fsp)
      truncation, presumably without botching the 4.1.1 case, in which
      the values are not truncated.  The correct counts are stored in
      undocumented spare fields.  */
-  if (fsd.f_blocks == 0x1fffff && fsd.f_spare[0] > 0)
+  if (fsd.f_blocks == 0x7fffffff / fsd.f_bsize && fsd.f_spare[0] > 0)
     {
       fsd.f_blocks = fsd.f_spare[0];
       fsd.f_bfree = fsd.f_spare[1];
@@ -262,9 +259,7 @@ get_fs_usage (path, disk, fsp)
 /* AIX PS/2 does not supply statfs.  */
 
 int
-statfs (path, fsb)
-     char *path;
-     struct statfs *fsb;
+statfs (char *path, struct statfs *fsb)
 {
   struct stat stats;
   struct dustat fsd;

lib/ftruncate.c

@@ -11,9 +11,7 @@
 #ifdef F_CHSIZE
 
 int
-ftruncate (fd, length)
-     int fd;
-     off_t length;
+ftruncate (int fd, off_t length)
 {
   return fcntl (fd, F_CHSIZE, length);
 }
@@ -30,9 +28,7 @@ ftruncate (fd, length)
 #  endif
 
 int
-ftruncate (fd, length)
-     int fd;
-     off_t length;
+ftruncate (int fd, off_t length)
 {
   struct flock fl;
   struct stat filebuf;
@@ -75,9 +71,7 @@ ftruncate (fd, length)
 #  if HAVE_CHSIZE
 
 int
-ftruncate (fd, length)
-     int fd;
-     off_t length;
+ftruncate (int fd, off_t length)
 {
   return chsize (fd, length);
 }
@@ -90,9 +84,7 @@ extern int errno;
 #   endif
 
 int
-ftruncate (fd, length)
-     int fd;
-     off_t length;
+ftruncate (int fd, off_t length)
 {
   errno = EIO;
   return -1;

lib/full-write.c

@@ -1,5 +1,5 @@
 /* full-write.c -- an interface to write that retries after interrupts
-   Copyright (C) 1993, 1994, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1997, 1998, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,10 +45,11 @@ full_write (int desc, const char *ptr, size_t len)
   while (len > 0)
     {
       int written = write (desc, ptr, len);
-      /* FIXME: write on my slackware Linux 1.2.13 returns zero when
+      /* write on an old Slackware Linux 1.2.13 returns zero when
 	 I try to write more data than there is room on a floppy disk.
 	 This puts dd into an infinite loop.  Reproduce with
-	 dd if=/dev/zero of=/dev/fd0.  */
+	 dd if=/dev/zero of=/dev/fd0.  If you have this problem,
+	 consider upgrading to a newer kernel.  */
       if (written < 0)
 	{
 #ifdef EINTR

lib/getgroups.c

@@ -1,5 +1,5 @@
 /* provide consistent interface to getgroups for systems that don't allow N==0
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,14 +25,11 @@ 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.  */
+   process.  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;
+getgroups (size_t n, GETGROUPS_T *group)
 {
   int n_groups;
   GETGROUPS_T *gbuf;

lib/getline.c

@@ -1,6 +1,6 @@
 /* getline.c -- Replacement for GNU C library function getline
 
-Copyright (C) 1993, 1996, 1997 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -34,10 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #if defined __GNU_LIBRARY__ && HAVE_GETDELIM
 
 int
-getline (lineptr, n, stream)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
+getline (char **lineptr, size_t *n, FILE *stream)
 {
   return getdelim (lineptr, n, '\n', stream);
 }
@@ -64,12 +61,7 @@ char *malloc (), *realloc ();
    null terminator), or -1 on error or EOF.  */
 
 int
-getstr (lineptr, n, stream, terminator, offset)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
-     char terminator;
-     size_t offset;
+getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset)
 {
   int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
   char *read_pos;		/* Where we're reading into *LINEPTR. */
@@ -138,20 +130,13 @@ getstr (lineptr, n, stream, terminator, offset)
 }
 
 int
-getline (lineptr, n, stream)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
+getline (char **lineptr, size_t *n, FILE *stream)
 {
   return getstr (lineptr, n, stream, '\n', 0);
 }
 
 int
-getdelim (lineptr, n, delimiter, stream)
-     char **lineptr;
-     size_t *n;
-     int delimiter;
-     FILE *stream;
+getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream)
 {
   return getstr (lineptr, n, stream, delimiter, 0);
 }

lib/getline.h

@@ -1,4 +1,4 @@
-/*  Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/*  Copyright (C) 1995, 1997, 1999 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,10 +27,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #  endif
 # endif
 
+# if __GLIBC__ < 2
 int
 getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
 
 int
 getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+# endif
 
 #endif /* not GETLINE_H_ */

lib/getloadavg.c

@@ -98,8 +98,14 @@
 extern int errno;
 #endif
 
-#ifndef HAVE_GETLOADAVG
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+#if !HAVE_SETLOCALE
+# define setlocale(Category, Locale) /* empty */
+#endif
 
+#ifndef HAVE_GETLOADAVG
 
 /* The existing Emacs configuration files define a macro called
    LOAD_AVE_CVT, which accepts a value of type LOAD_AVE_TYPE, and
@@ -638,8 +644,11 @@ getloadavg (loadavg, nelem)
   if (count <= 0)
     return -1;
 
+  /* The following sscanf must use the C locale.  */
+  setlocale (LC_NUMERIC, "C");
   count = sscanf (ldavgbuf, "%lf %lf %lf",
 		  &load_ave[0], &load_ave[1], &load_ave[2]);
+  setlocale (LC_NUMERIC, "");
   if (count < 1)
     return -1;
 

lib/getopt.c

@@ -1,47 +1,40 @@
 /* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
-   before changing it!
+   NOTE: The canonical source of this file is maintained with the GNU
+   C Library.  Bugs can be reported to bug-glibc@gnu.org.
 
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
+   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
    	Free Software Foundation, Inc.
 
-   the C library, however.  The master source lives in /gd/gnu/lib.
+   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.
 
-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 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 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.  */
+   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>.  */
 #ifndef _NO_PROTO
-#define _NO_PROTO
+# define _NO_PROTO
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if !defined (__STDC__) || !__STDC__
+# include <config.h>
+#else
+# if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
+#  ifndef const
+#   define const
+#  endif
+# endif
 #endif
 
 #include <stdio.h>
@@ -55,11 +48,11 @@ USA.  */
    it is simpler to just do this in the source for each such file.  */
 
 #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
+#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
@@ -70,32 +63,26 @@ USA.  */
 #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>
-#include <unistd.h>
+# include <stdlib.h>
+# include <unistd.h>
 #endif	/* GNU C library.  */
 
 #ifdef VMS
-#include <unixlib.h>
-#if HAVE_STRING_H - 0
-#include <string.h>
-#endif
-#endif
-
-#if defined (WIN32) && !defined (__CYGWIN32__)
-/* It's not Unix, really.  See?  Capital letters.  */
-#include <windows.h>
-#define getpid() GetCurrentProcessId()
+# include <unixlib.h>
+# if HAVE_STRING_H - 0
+#  include <string.h>
+# endif
 #endif
 
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
-#ifdef HAVE_LIBINTL_H
-# include <libintl.h>
-# define _(msgid)	gettext (msgid)
-#else
-# define _(msgid)	(msgid)
-#endif
+# ifdef HAVE_LIBINTL_H
+#  include <libintl.h>
+#  define _(msgid)	gettext (msgid)
+# else
+#  define _(msgid)	(msgid)
+# endif
 #endif
 
 /* This version of `getopt' appears to the caller like standard Unix `getopt'
@@ -120,7 +107,7 @@ USA.  */
    Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
-char *optarg = NULL;
+char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
@@ -141,7 +128,7 @@ int optind = 1;
    causes problems with re-calling getopt as programs generally don't
    know that. */
 
-int __getopt_initialized = 0;
+int __getopt_initialized;
 
 /* The next char to be scanned in the option-element
    in which the last option character we returned was found.
@@ -205,14 +192,22 @@ static char *posixly_correct;
    because there are many ways it can cause trouble.
    On some systems, it contains special magic macros that don't work
    in GCC.  */
-#include <string.h>
-#define	my_index	strchr
+# include <string.h>
+# define my_index	strchr
 #else
 
+# if HAVE_STRING_H
+#  include <string.h>
+# else
+#  include <strings.h>
+# endif
+
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
 
-char *getenv ();
+#ifndef getenv
+extern char *getenv ();
+#endif
 
 static char *
 my_index (str, chr)
@@ -233,11 +228,11 @@ my_index (str, chr)
 #ifdef __GNUC__
 /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
    That was relevant to code that was here before.  */
-#if !defined (__STDC__) || !__STDC__
+# if (!defined __STDC__ || !__STDC__) && !defined strlen
 /* gcc with -traditional declares the built-in strlen to return int,
    and has done so at least since version 2.4.5. -- rms.  */
 extern int strlen (const char *);
-#endif /* not __STDC__ */
+# endif /* not __STDC__ */
 #endif /* __GNUC__ */
 
 #endif /* not __GNU_LIBRARY__ */
@@ -264,8 +259,6 @@ 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.  */
@@ -278,7 +271,9 @@ store_args_and_env (int argc, char *const *argv)
   original_argc = argc;
   original_argv = argv;
 }
+# ifdef text_set_element
 text_set_element (__libc_subinit, store_args_and_env);
+# endif /* text_set_element */
 
 # define SWAP_FLAGS(ch1, ch2) \
   if (nonoption_flags_len > 0)						      \
@@ -300,7 +295,7 @@ text_set_element (__libc_subinit, store_args_and_env);
    `first_nonopt' and `last_nonopt' are relocated so that they describe
    the new indices of the non-options in ARGV after they are moved.  */
 
-#if defined (__STDC__) && __STDC__
+#if defined __STDC__ && __STDC__
 static void exchange (char **);
 #endif
 
@@ -331,9 +326,9 @@ exchange (argv)
 	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);
+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+			     nonoption_flags_max_len),
+		  '\0', top + 1 - nonoption_flags_max_len);
 	  nonoption_flags_max_len = top + 1;
 	  __getopt_nonoption_flags = new_str;
 	}
@@ -386,7 +381,7 @@ exchange (argv)
 
 /* Initialize the internal data when the first call is made.  */
 
-#if defined (__STDC__) && __STDC__
+#if defined __STDC__ && __STDC__
 static const char *_getopt_initialize (int, char *const *, const char *);
 #endif
 static const char *
@@ -442,11 +437,8 @@ _getopt_initialize (argc, argv, optstring)
 	      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);
-		}
+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', nonoption_flags_max_len - len);
 	    }
 	}
       nonoption_flags_len = nonoption_flags_max_len;
@@ -523,6 +515,13 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      int *longind;
      int long_only;
 {
+  int print_errors = opterr;
+  if (optstring[0] == ':')
+    print_errors = 0;
+
+  if (argc < 1)
+    return -1;
+
   optarg = NULL;
 
   if (optind == 0 || !__getopt_initialized)
@@ -538,11 +537,11 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      from the shell indicating it is not an option.  The later information
      is only used when the used in the GNU libc.  */
 #ifdef _LIBC
-#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
-		     || (optind < nonoption_flags_len			      \
-			 && __getopt_nonoption_flags[optind] == '1'))
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
+		      || (optind < nonoption_flags_len			      \
+			  && __getopt_nonoption_flags[optind] == '1'))
 #else
-#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
 #endif
 
   if (nextchar == NULL || *nextchar == '\0')
@@ -679,7 +678,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 
       if (ambig && !exact)
 	{
-	  if (opterr)
+	  if (print_errors)
 	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
 		     argv[0], argv[optind]);
 	  nextchar += strlen (nextchar);
@@ -700,17 +699,17 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		optarg = nameend + 1;
 	      else
 		{
-		  if (opterr)
+		  if (print_errors)
 		    {
 		      if (argv[optind - 1][1] == '-')
 			/* --option */
 			fprintf (stderr,
-			     _("%s: option `--%s' doesn't allow an argument\n"),
+				 _("%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"),
+				 _("%s: option `%c%s' doesn't allow an argument\n"),
 				 argv[0], argv[optind - 1][0], pfound->name);
 		    }
 
@@ -726,7 +725,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		optarg = argv[optind++];
 	      else
 		{
-		  if (opterr)
+		  if (print_errors)
 		    fprintf (stderr,
 			   _("%s: option `%s' requires an argument\n"),
 			   argv[0], argv[optind - 1]);
@@ -753,7 +752,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
       if (!long_only || argv[optind][1] == '-'
 	  || my_index (optstring, *nextchar) == NULL)
 	{
-	  if (opterr)
+	  if (print_errors)
 	    {
 	      if (argv[optind][1] == '-')
 		/* --option */
@@ -783,7 +782,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 
     if (temp == NULL || c == ':')
       {
-	if (opterr)
+	if (print_errors)
 	  {
 	    if (posixly_correct)
 	      /* 1003.2 specifies the format of this message.  */
@@ -817,7 +816,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	  }
 	else if (optind == argc)
 	  {
-	    if (opterr)
+	    if (print_errors)
 	      {
 		/* 1003.2 specifies the format of this message.  */
 		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
@@ -866,7 +865,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	    }
 	if (ambig && !exact)
 	  {
-	    if (opterr)
+	    if (print_errors)
 	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
 		       argv[0], argv[optind]);
 	    nextchar += strlen (nextchar);
@@ -884,7 +883,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		  optarg = nameend + 1;
 		else
 		  {
-		    if (opterr)
+		    if (print_errors)
 		      fprintf (stderr, _("\
 %s: option `-W %s' doesn't allow an argument\n"),
 			       argv[0], pfound->name);
@@ -899,7 +898,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		  optarg = argv[optind++];
 		else
 		  {
-		    if (opterr)
+		    if (print_errors)
 		      fprintf (stderr,
 			       _("%s: option `%s' requires an argument\n"),
 			       argv[0], argv[optind - 1]);
@@ -946,12 +945,12 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	      }
 	    else if (optind == argc)
 	      {
-		if (opterr)
+		if (print_errors)
 		  {
 		    /* 1003.2 specifies the format of this message.  */
 		    fprintf (stderr,
-			   _("%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] == ':')

lib/getopt.h

@@ -1,28 +1,27 @@
 /* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   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.
-
-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.  */
+   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
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
 
 #ifdef	__cplusplus
 extern "C" {
@@ -59,6 +58,7 @@ extern int opterr;
 
 extern int optopt;
 
+#ifndef __need_getopt
 /* Describe the long-named options requested by the application.
    The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
    of `struct option' terminated by an element containing a name which is
@@ -82,11 +82,11 @@ extern int optopt;
 
 struct option
 {
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
   const char *name;
-#else
+# else
   char *name;
-#endif
+# endif
   /* has_arg can't be an enum because some compilers complain about
      type mismatches in all the code that assumes it is an int.  */
   int has_arg;
@@ -96,40 +96,74 @@ struct option
 
 /* Names for the values of the `has_arg' field of `struct option'.  */
 
-#define	no_argument		0
-#define required_argument	1
-#define optional_argument	2
+# define no_argument		0
+# define required_argument	1
+# define optional_argument	2
+#endif	/* need getopt */
 
-#if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, `optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in `optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU `getopt'.
+
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
+   options.
+
+   If OPTS begins with `--', then non-option arguments are treated as
+   arguments to the option '\0'.  This behavior is specific to the GNU
+   `getopt'.  */
+
+#if defined __STDC__ && __STDC__
+# ifdef __GNU_LIBRARY__
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
+extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
+# else /* not __GNU_LIBRARY__ */
 extern int getopt ();
-#endif /* __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-		        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind);
+# endif /* __GNU_LIBRARY__ */
+
+# ifndef __need_getopt
+extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
+		        const struct option *__longopts, int *__longind);
+extern int getopt_long_only (int __argc, char *const *__argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind);
 
 /* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind,
-			     int long_only);
+extern int _getopt_internal (int __argc, char *const *__argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind,
+			     int __long_only);
+# endif
 #else /* not __STDC__ */
 extern int getopt ();
+# ifndef __need_getopt
 extern int getopt_long ();
 extern int getopt_long_only ();
 
 extern int _getopt_internal ();
+# endif
 #endif /* __STDC__ */
 
 #ifdef	__cplusplus
 }
 #endif
 
-#endif /* _GETOPT_H */
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
+
+#endif /* getopt.h */

lib/getopt1.c

@@ -1,39 +1,36 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
+     Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.
 
-   the C library, however.  The master source lives in /gd/gnu/lib.
+   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.
 
-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 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 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.  */
+   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
-
-#include "getopt.h"
-
-#if !defined (__STDC__) || !__STDC__
+#else
+#if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
 #ifndef const
 #define const
 #endif
 #endif
+#endif
+
+#include "getopt.h"
 
 #include <stdio.h>
 
@@ -46,7 +43,7 @@ USA.  */
    it is simpler to just do this in the source for each such file.  */
 
 #define GETOPT_INTERFACE_VERSION 2
-#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
 #include <gnu-versions.h>
 #if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
 #define ELIDE_CODE

lib/getpagesize.h

@@ -0,0 +1,49 @@
+/* Emulate getpagesize on systems that lack it.  */
+
+#ifndef HAVE_GETPAGESIZE
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#if !defined getpagesize && defined _SC_PAGESIZE
+# if !(defined VMS && __VMS_VER < 70000000)
+#  define getpagesize() sysconf (_SC_PAGESIZE)
+# endif
+#endif
+
+#if !defined getpagesize && defined VMS
+# ifdef __ALPHA
+#  define getpagesize() 8192
+# else
+#  define getpagesize() 512
+# endif
+#endif
+
+/* This is for BeOS.  */
+#if !defined getpagesize && HAVE_OS_H
+# include <OS.h>
+# if defined B_PAGE_SIZE
+#  define getpagesize() B_PAGE_SIZE
+# endif
+#endif
+
+#ifndef getpagesize
+# include <sys/param.h>
+# ifdef EXEC_PAGESIZE
+#  define getpagesize() EXEC_PAGESIZE
+# else
+#  ifdef NBPG
+#   ifndef CLSIZE
+#    define CLSIZE 1
+#   endif
+#   define getpagesize() (NBPG * CLSIZE)
+#  else
+#   ifdef NBPC
+#    define getpagesize() NBPC
+#   endif
+#  endif
+# endif
+#endif
+
+#endif /* not HAVE_GETPAGESIZE */

lib/getugroups.c

@@ -1,5 +1,5 @@
 /* getugroups.c -- return a list of the groups a user is in
-   Copyright (C) 1990, 1991, 1998 Free Software Foundation.
+   Copyright (C) 1990, 1991, 1998, 1999 Free Software Foundation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,26 +41,42 @@ struct group *getgrent ();
 # include <strings.h>
 #endif
 
-/* Like `getgroups', but for user USERNAME instead of for
-   the current process. */
+#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+
+/* Like `getgroups', but for user USERNAME instead of for the current
+   process.  Store at most MAXCOUNT group IDs in the GROUPLIST array.
+   If GID is not -1, store it first (if possible).  GID should be the
+   group ID (pw_gid) obtained from getpwuid, in case USERNAME is not
+   listed in /etc/groups.
+   Always return the number of groups of which USERNAME is a member.  */
 
 int
-getugroups (int maxcount, GETGROUPS_T *grouplist, char *username)
+getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
 {
   struct group *grp;
   register char **cp;
   register int count = 0;
 
+  if (gid != -1)
+    {
+      if (maxcount != 0)
+	grouplist[count] = gid;
+      ++count;
+    }
+
   setgrent ();
   while ((grp = getgrent ()) != 0)
-    for (cp = grp->gr_mem; *cp; ++cp)
-      if (!strcmp (username, *cp))
+    {
+      for (cp = grp->gr_mem; *cp; ++cp)
 	{
 	  int n;
 
+	  if ( ! STREQ (username, *cp))
+	    continue;
+
 	  /* See if this group number is already on the list.  */
 	  for (n = 0; n < count; ++n)
-	    if (grouplist[n] == grp->gr_gid)
+	    if (grouplist && grouplist[n] == grp->gr_gid)
 	      break;
 
 	  /* If it's a new group number, then try to add it to the list.  */
@@ -78,6 +94,8 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username)
 	      count++;
 	    }
 	}
+    }
   endgrent ();
+
   return count;
 }

lib/getversion.c

@@ -1,5 +1,5 @@
 /* getversion.c -- select backup filename type
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,8 +46,7 @@ static const enum backup_type backup_types[] =
    Unique abbreviations are accepted. */
 
 enum backup_type
-get_version (version)
-     char *version;
+get_version (const char *version)
 {
   int i;
 

lib/hard-locale.c

@@ -0,0 +1,85 @@
+/* hard-locale.c -- Determine whether a locale is hard.
+   Copyright 1997, 1998, 1999 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifndef __GNUC__
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #  pragma alloca
+#  else
+#   ifdef _WIN32
+#    include <malloc.h>
+#    include <io.h>
+#   else
+#    ifndef alloca
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+
+/* Return nonzero if the current CATEGORY locale is hard, i.e. if you
+   can't get away with assuming traditional C or POSIX behavior.  */
+int
+hard_locale (int category)
+{
+#if ! (defined ENABLE_NLS && HAVE_SETLOCALE)
+  return 0;
+#else
+
+  int hard = 1;
+  char const *p = setlocale (category, 0);
+
+  if (p)
+    {
+# if defined __GLIBC__ && __GLIBC__ >= 2
+      if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+	hard = 0;
+# else
+      char *locale = alloca (strlen (p) + 1);
+      strcpy (locale, p);
+
+      /* Temporarily set the locale to the "C" and "POSIX" locales to
+	 find their names, so that we can determine whether one or the
+	 other is the caller's locale.  */
+      if (((p = setlocale (category, "C")) && strcmp (p, locale) == 0)
+	  || ((p = setlocale (category, "POSIX")) && strcmp (p, locale) == 0))
+	hard = 0;
+
+      /* Restore the caller's locale.  */
+      setlocale (category, locale);
+# endif
+    }
+
+  return hard;
+
+#endif
+}

lib/hard-locale.h

@@ -0,0 +1,18 @@
+#ifndef HARD_LOCALE_H_
+# define HARD_LOCALE_H_ 1
+
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+int hard_locale PARAMS ((int));
+
+#endif /* HARD_LOCALE_H_ */

lib/hash.c

@@ -1,5 +1,5 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
    Written by Jim Meyering, 1992.
 
    This program is free software; you can redistribute it and/or modify
@@ -35,9 +35,16 @@ typedef enum {false = 0, true = 1} bool;
 #include <stdio.h>
 #include <assert.h>
 
+#ifndef HAVE_DECL_FREE
+"this configure-time declaration test was not run"
+#endif
 #if !HAVE_DECL_FREE
 void free ();
 #endif
+
+#ifndef HAVE_DECL_MALLOC
+"this configure-time declaration test was not run"
+#endif
 #if !HAVE_DECL_MALLOC
 char *malloc ();
 #endif
@@ -54,10 +61,10 @@ char *malloc ();
 
 #include "hash.h"
 
-/* An hash table contains many internal entries, each holding a pointer to
+/* A hash table contains many internal entries, each holding a pointer to
    some user provided data (also called a user entry).  An entry indistinctly
    refers to both the internal entry and its associated user entry.  A user
-   entry contents may be hashed by a randomisation function (the hashing
+   entry contents may be hashed by a randomization function (the hashing
    function, or just `hasher' for short) into a number (or `slot') between 0
    and the current table size.  At each slot position in the hash table,
    starts a linked chain of entries for which the user data all hash to this
@@ -66,32 +73,58 @@ char *malloc ();
    A good `hasher' function will distribute entries rather evenly in buckets.
    In the ideal case, the length of each bucket is roughly the number of
    entries divided by the table size.  Finding the slot for a data is usually
-   done at constant speed by the `hasher', and the later finding of a precise
+   done in constant time by the `hasher', and the later finding of a precise
    entry is linear in time with the size of the bucket.  Consequently, a
-   bigger hash table size (that is, a bigger number of buckets) is prone to
-   yielding shorter buckets, *given* the `hasher' function behaves properly.
+   larger hash table size (that is, a larger number of buckets) is prone to
+   yielding shorter chains, *given* the `hasher' function behaves properly.
 
    Long buckets slow down the lookup algorithm.  One might use big hash table
    sizes in hope to reduce the average length of buckets, but this might
    become inordinate, as unused slots in the hash table take some space.  The
    best bet is to make sure you are using a good `hasher' function (beware
-   that those are not that easy to write! :-), and to use a table size at
-   least bigger than the actual number of entries.
+   that those are not that easy to write! :-), and to use a table size
+   larger than the actual number of entries.  */
 
-   Currently, whenever the addition of an entry gets 80% of buckets to be
-   non-empty, this package automatically doubles the number of buckets.  */
+/* If an insertion makes the ratio of nonempty buckets to table size larger
+   than the growth threshold (a number between 0.0 and 1.0), then increase
+   the table size by multiplying by the growth factor (a number greater than
+   1.0).  The growth threshold defaults to 0.8, and the growth factor
+   defaults to 1.414, meaning that the table will have doubled its size
+   every second time 80% of the buckets get used.  */
+#define DEFAULT_GROWTH_THRESHOLD 0.8
+#define DEFAULT_GROWTH_FACTOR 1.414
+
+/* If a deletion empties a bucket and causes the ratio of used buckets to
+   table size to become smaller than the shrink threshold (a number between
+   0.0 and 1.0), then shrink the table by multiplying by the shrink factor (a
+   number greater than the shrink threshold but smaller than 1.0).  The shrink
+   threshold and factor default to 0.0 and 1.0, meaning that the table never
+   shrinks.  */
+#define DEFAULT_SHRINK_THRESHOLD 0.0
+#define DEFAULT_SHRINK_FACTOR 1.0
+
+/* Use this to initialize or reset a TUNING structure to
+   some sensible values. */
+static const Hash_tuning default_tuning =
+  {
+    DEFAULT_SHRINK_THRESHOLD,
+    DEFAULT_SHRINK_FACTOR,
+    DEFAULT_GROWTH_THRESHOLD,
+    DEFAULT_GROWTH_FACTOR,
+    false
+  };
 
 /* Information and lookup.  */
 
 /* The following few functions provide information about the overall hash
-   table organisation: the number of entries, number of buckets and maximum
+   table organization: the number of entries, number of buckets and maximum
    length of buckets.  */
 
 /* Return the number of buckets in the hash table.  The table size, the total
    number of buckets (used plus unused), or the maximum number of slots, are
    the same quantity.  */
 
-unsigned int
+unsigned
 hash_get_n_buckets (const Hash_table *table)
 {
   return table->n_buckets;
@@ -99,7 +132,7 @@ hash_get_n_buckets (const Hash_table *table)
 
 /* Return the number of slots in use (non-empty buckets).  */
 
-unsigned int
+unsigned
 hash_get_n_buckets_used (const Hash_table *table)
 {
   return table->n_buckets_used;
@@ -107,26 +140,26 @@ hash_get_n_buckets_used (const Hash_table *table)
 
 /* Return the number of active entries.  */
 
-unsigned int
+unsigned
 hash_get_n_entries (const Hash_table *table)
 {
   return table->n_entries;
 }
 
-/* Return the length of the most lenghty chain (bucket).  */
+/* Return the length of the longest chain (bucket).  */
 
-unsigned int
+unsigned
 hash_get_max_bucket_length (const Hash_table *table)
 {
   struct hash_entry *bucket;
-  unsigned int max_bucket_length = 0;
+  unsigned max_bucket_length = 0;
 
   for (bucket = table->bucket; bucket < table->bucket_limit; bucket++)
     {
       if (bucket->data)
 	{
 	  struct hash_entry *cursor = bucket;
-	  unsigned int bucket_length = 1;
+	  unsigned bucket_length = 1;
 
 	  while (cursor = cursor->next, cursor)
 	    bucket_length++;
@@ -139,15 +172,15 @@ hash_get_max_bucket_length (const Hash_table *table)
   return max_bucket_length;
 }
 
-/* Do a mild validation of an hash table, by traversing it and checking two
+/* Do a mild validation of a hash table, by traversing it and checking two
    statistics.  */
 
 bool
 hash_table_ok (const Hash_table *table)
 {
   struct hash_entry *bucket;
-  unsigned int n_buckets_used = 0;
-  unsigned int n_entries = 0;
+  unsigned n_buckets_used = 0;
+  unsigned n_entries = 0;
 
   for (bucket = table->bucket; bucket < table->bucket_limit; bucket++)
     {
@@ -174,10 +207,10 @@ hash_table_ok (const Hash_table *table)
 void
 hash_print_statistics (const Hash_table *table, FILE *stream)
 {
-  unsigned int n_entries = hash_get_n_entries (table);
-  unsigned int n_buckets = hash_get_n_buckets (table);
-  unsigned int n_buckets_used = hash_get_n_buckets_used (table);
-  unsigned int max_bucket_length = hash_get_max_bucket_length (table);
+  unsigned n_entries = hash_get_n_entries (table);
+  unsigned n_buckets = hash_get_n_buckets (table);
+  unsigned n_buckets_used = hash_get_n_buckets_used (table);
+  unsigned max_bucket_length = hash_get_max_bucket_length (table);
 
   fprintf (stream, "# entries:         %u\n", n_entries);
   fprintf (stream, "# buckets:         %u\n", n_buckets);
@@ -186,8 +219,8 @@ hash_print_statistics (const Hash_table *table, FILE *stream)
   fprintf (stream, "max bucket length: %u\n", max_bucket_length);
 }
 
-/* Return the user entry from the hash table, if some entry in the hash table
-   compares equally with ENTRY, or NULL otherwise. */
+/* If ENTRY matches an entry already in the hash table, return the
+   entry from the table.  Otherwise, return NULL.  */
 
 void *
 hash_lookup (const Hash_table *table, const void *entry)
@@ -229,7 +262,7 @@ hash_get_first (const Hash_table *table)
     if (bucket->data)
       return bucket->data;
 
-  abort ();
+  assert (0);
 }
 
 /* Return the user data for the entry following ENTRY, where ENTRY has been
@@ -263,11 +296,11 @@ hash_get_next (const Hash_table *table, const void *entry)
    return the number of pointers copied.  Do not copy more than BUFFER_SIZE
    pointers.  */
 
-unsigned int
+unsigned
 hash_get_entries (const Hash_table *table, void **buffer,
-		  unsigned int buffer_size)
+		  unsigned buffer_size)
 {
-  unsigned int counter = 0;
+  unsigned counter = 0;
   struct hash_entry *bucket;
   struct hash_entry *cursor;
 
@@ -287,7 +320,7 @@ hash_get_entries (const Hash_table *table, void **buffer,
   return counter;
 }
 
-/* Call a PROCESSOR function for each entry of an hash table, and return the
+/* Call a PROCESSOR function for each entry of a hash table, and return the
    number of entries for which the processor function returned success.  A
    pointer to some PROCESSOR_DATA which will be made available to each call to
    the processor function.  The PROCESSOR accepts two arguments: the first is
@@ -295,11 +328,11 @@ hash_get_entries (const Hash_table *table, void **buffer,
    as received.  The walking continue for as long as the PROCESSOR function
    returns nonzero.  When it returns zero, the walking is interrupted.  */
 
-unsigned int
+unsigned
 hash_do_for_each (const Hash_table *table, Hash_processor processor,
 		  void *processor_data)
 {
-  unsigned int counter = 0;
+  unsigned counter = 0;
   struct hash_entry *bucket;
   struct hash_entry *cursor;
 
@@ -332,8 +365,8 @@ hash_do_for_each (const Hash_table *table, Hash_processor processor,
    algorithms tend to be domain-specific, so what's good for [diffutils'] io.c
    may not be good for your application."  */
 
-unsigned int
-hash_string (const char *string, unsigned int n_buckets)
+unsigned
+hash_string (const char *string, unsigned n_buckets)
 {
 # ifndef CHAR_BIT
 #  define CHAR_BIT 8
@@ -360,8 +393,8 @@ hash_string (const char *string, unsigned int n_buckets)
    very old Cyber `snoop', itself written in typical Greg Mansfield style.
    (By the way, what happened to this excellent man?  Is he still alive?)  */
 
-unsigned int
-hash_string (const char *string, unsigned int n_buckets)
+unsigned
+hash_string (const char *string, unsigned n_buckets)
 {
   unsigned value = 0;
 
@@ -376,7 +409,7 @@ hash_string (const char *string, unsigned int n_buckets)
 /* Return true if CANDIDATE is a prime number.  CANDIDATE should be an odd
    number at least equal to 11.  */
 
-static int
+static bool
 is_prime (unsigned long candidate)
 {
   unsigned long divisor = 3;
@@ -393,12 +426,14 @@ is_prime (unsigned long candidate)
 }
 
 /* Round a given CANDIDATE number up to the nearest prime, and return that
-   prime.  CANDIDATE should be at least equal to 10.  */
+   prime.  Primes lower than 10 are merely skipped.  */
 
 static unsigned long
 next_prime (unsigned long candidate)
 {
-  assert (candidate >= 10);
+  /* Skip small primes.  */
+  if (candidate < 10)
+    candidate = 10;
 
   /* Make it definitely odd.  */
   candidate |= 1;
@@ -409,33 +444,72 @@ next_prime (unsigned long candidate)
   return candidate;
 }
 
-/* Allocate and return a new hash table, or NULL if an error is met.  The
-   initial number of buckets would be at least CANDIDATE (which need not be
-   prime).
+void
+hash_reset_tuning (Hash_tuning *tuning)
+{
+  *tuning = default_tuning;
+}
 
-   If DATA_FREER is not NULL, this function may be later called with the data
-   as an argument, just before they entry containing the data gets freed.  The
-   HASHER function should be supplied, and FIXME.  The COMPARATOR function
-   should also be supplied, and FIXME.  */
+/* For the given hash TABLE, check the user supplied tuning structure for
+   reasonable values, and return true if there is no gross error with it.
+   Otherwise, definitively reset the TUNING field to some acceptable default
+   in the hash table (that is, the user loses the right of further modifying
+   tuning arguments), and return false.  */
 
-    /* User-supplied function for freeing datas.  It is specified in
-       hash_initialize.  If non-null, it is used by hash_free and hash_clear.
-       You should specify `free' here only if you want these functions to free
-       all of your `data' data.  This is typically the case when your data is
-       simply an auxilliary struct that you have malloc'd to aggregate several
-       values.  */
+static bool
+check_tuning (Hash_table *table)
+{
+  const Hash_tuning *tuning = table->tuning;
 
-    /* User-supplied hash function that hashes entry ENTRY to an integer in
-       the range 0..TABLE_SIZE-1.  */
+  if (tuning->growth_threshold > 0.0
+      && tuning->growth_threshold < 1.0
+      && tuning->growth_factor > 1.0
+      && tuning->shrink_threshold >= 0.0
+      && tuning->shrink_threshold < 1.0
+      && tuning->shrink_factor > tuning->shrink_threshold
+      && tuning->shrink_factor <= 1.0
+      && tuning->shrink_threshold < tuning->growth_threshold)
+    return true;
 
-    /* User-supplied function that determines whether a new entry is unique by
-       comparing the new entry to entries that hashed to the same bucket
-       index.  It should return zero for a pair of entries that compare equal,
-       non-zero otherwise.  */
+  table->tuning = &default_tuning;
+  return false;
+}
+
+/* Allocate and return a new hash table, or NULL upon failure.  The initial
+   number of buckets is automatically selected so as to _guarantee_ that you
+   may insert at least CANDIDATE different user entries before any growth of
+   the hash table size occurs.  So, if have a reasonably tight a-priori upper
+   bound on the number of entries you intend to insert in the hash table, you
+   may save some table memory and insertion time, by specifying it here.  If
+   the IS_N_BUCKETS field of the TUNING structure is true, the CANDIDATE
+   argument has its meaning changed to the wanted number of buckets.
+
+   TUNING points to a structure of user-supplied values, in case some fine
+   tuning is wanted over the default behavior of the hasher.  If TUNING is
+   NULL, the default tuning parameters are used instead.
+
+   The user-supplied HASHER function should be provided.  It accepts two
+   arguments ENTRY and TABLE_SIZE.  It computes, by hashing ENTRY contents, a
+   slot number for that entry which should be in the range 0..TABLE_SIZE-1.
+   This slot number is then returned.
+
+   The user-supplied COMPARATOR function should be provided.  It accepts two
+   arguments pointing to user data, it then returns true for a pair of entries
+   that compare equal, or false otherwise.  This function is internally called
+   on entries which are already known to hash to the same bucket index.
+
+   The user-supplied DATA_FREER function, when not NULL, may be later called
+   with the user data as an argument, just before the entry containing the
+   data gets freed.  This happens from within `hash_free' or `hash_clear'.
+   You should specify this function only if you want these functions to free
+   all of your `data' data.  This is typically the case when your data is
+   simply an auxiliary struct that you have malloc'd to aggregate several
+   values.  */
 
 Hash_table *
-hash_initialize (unsigned int candidate, Hash_hasher hasher,
-		 Hash_comparator comparator, Hash_data_freer data_freer)
+hash_initialize (unsigned candidate, const Hash_tuning *tuning,
+		 Hash_hasher hasher, Hash_comparator comparator,
+		 Hash_data_freer data_freer)
 {
   Hash_table *table;
   struct hash_entry *bucket;
@@ -447,7 +521,24 @@ hash_initialize (unsigned int candidate, Hash_hasher hasher,
   if (table == NULL)
     return NULL;
 
-  table->n_buckets = next_prime (candidate < 10 ? 10 : candidate);
+  if (!tuning)
+    tuning = &default_tuning;
+  table->tuning = tuning;
+  if (!check_tuning (table))
+    {
+      /* Fail if the tuning options are invalid.  This is the only occasion
+	 when the user gets some feedback about it.  Once the table is created,
+	 if the user provides invalid tuning options, we silently revert to
+	 using the defaults, and ignore further request to change the tuning
+	 options.  */
+      free (table);
+      return NULL;
+    }
+
+  table->n_buckets
+    = next_prime (tuning->is_n_buckets ? candidate
+		  : (unsigned) (candidate / tuning->growth_threshold));
+
   table->bucket = (struct hash_entry *)
     malloc (table->n_buckets * sizeof (struct hash_entry));
   if (table->bucket == NULL)
@@ -515,7 +606,7 @@ hash_clear (Hash_table *table)
   table->n_entries = 0;
 }
 
-/* Reclaim all storage associated with an hash table.  If a data_freer
+/* Reclaim all storage associated with a hash table.  If a data_freer
    function has been supplied by the user when the hash table was created,
    this function applies it to the data of each entry before freeing that
    entry.  */
@@ -632,7 +723,7 @@ hash_find_entry (Hash_table *table, const void *entry,
   if (bucket->data == NULL)
     return NULL;
 
-  /* Check if then entry is found as the bucket head.  */
+  /* See if the entry is the first in the bucket.  */
   if ((*table->comparator) (entry, bucket->data))
     {
       void *data = bucket->data;
@@ -682,21 +773,23 @@ hash_find_entry (Hash_table *table, const void *entry,
   return NULL;
 }
 
-/* For an already existing hash table, change the number of buckets and make
-   it NEW_TABLE_SIZE.  The contents of the hash table are preserved.  */
+/* For an already existing hash table, change the number of buckets through
+   specifying CANDIDATE.  The contents of the hash table are preserved.  The
+   new number of buckets is automatically selected so as to _guarantee_ that
+   the table may receive at least CANDIDATE different user entries, including
+   those already in the table, before any other growth of the hash table size
+   occurs.  If TUNING->IS_N_BUCKETS is true, then CANDIDATE specifies the
+   exact number of buckets desired.  */
 
 bool
-hash_rehash (Hash_table *table, unsigned int new_n_buckets)
+hash_rehash (Hash_table *table, unsigned candidate)
 {
   Hash_table *new_table;
   struct hash_entry *bucket;
   struct hash_entry *cursor;
   struct hash_entry *next;
 
-  if (table->n_buckets <= 0 || new_n_buckets == 0)
-    return false;
-
-  new_table = hash_initialize (new_n_buckets, table->hasher,
+  new_table = hash_initialize (candidate, table->tuning, table->hasher,
 			       table->comparator, table->data_freer);
   if (new_table == NULL)
     return false;
@@ -709,26 +802,23 @@ hash_rehash (Hash_table *table, unsigned int new_n_buckets)
   new_table->free_entry_list = table->free_entry_list;
 
   for (bucket = table->bucket; bucket < table->bucket_limit; bucket++)
-    {
-      if (bucket->data)
+    if (bucket->data)
+      for (cursor = bucket; cursor; cursor = next)
 	{
-	  for (cursor = bucket; cursor; cursor = next)
+	  void *data = cursor->data;
+	  struct hash_entry *new_bucket
+	    = (new_table->bucket
+	       + new_table->hasher (data, new_table->n_buckets));
+
+	  assert (new_bucket < new_table->bucket_limit);
+	  next = cursor->next;
+
+	  if (new_bucket->data)
 	    {
-	      void *data = cursor->data;
-	      struct hash_entry *new_bucket
-		= new_table->bucket + new_table->hasher (data, new_n_buckets);
-
-	      assert (new_bucket < new_table->bucket_limit);
-
-	      /* Free overflow entries as soon as possible, moving them from the
-		 old hash table into the new one, as they may be needed now.  */
-	      next = cursor->next;
-	      if (cursor != bucket)
-		free_entry (new_table, cursor);
-
-	      /* Insert the entry into the new hash table.  */
-	      if (new_bucket->data)
+	      if (cursor == bucket)
 		{
+		  /* Allocate or recycle an entry, when moving from a bucket
+		     header into a bucket overflow.  */
 		  struct hash_entry *new_entry = allocate_entry (new_table);
 
 		  if (new_entry == NULL)
@@ -740,18 +830,31 @@ hash_rehash (Hash_table *table, unsigned int new_n_buckets)
 		}
 	      else
 		{
-		  new_bucket->data = data;
-		  new_table->n_buckets_used++;
+		  /* Merely relink an existing entry, when moving from a
+		     bucket overflow into a bucket overflow.  */
+		  cursor->next = new_bucket->next;
+		  new_bucket->next = cursor;
 		}
 	    }
+	  else
+	    {
+	      /* Free an existing entry, when moving from a bucket
+		 overflow into a bucket header.  Also take care of the
+		 simple case of moving from a bucket header into a bucket
+		 header.  */
+	      new_bucket->data = data;
+	      new_table->n_buckets_used++;
+	      if (cursor != bucket)
+		free_entry (new_table, cursor);
+	    }
 	}
-    }
 
   free (table->bucket);
   table->bucket = new_table->bucket;
   table->bucket_limit = new_table->bucket_limit;
   table->n_buckets = new_table->n_buckets;
   table->n_buckets_used = new_table->n_buckets_used;
+  table->free_entry_list = new_table->free_entry_list;
   /* table->n_entries already holds its value.  */
 #if USE_OBSTACK
   table->entry_stack = new_table->entry_stack;
@@ -761,68 +864,74 @@ hash_rehash (Hash_table *table, unsigned int new_n_buckets)
   return true;
 }
 
-/* If ENTRY matches an entry already in the hash table, don't modify the table
-   and return the matched entry.  Otherwise, insert ENTRY and return NULL.
-   *DONE is set to true in all cases, unless the storage required for
-   insertion cannot be allocated.  */
+/* If ENTRY matches an entry already in the hash table, return the pointer
+   to the entry from the table.  Otherwise, insert ENTRY and return ENTRY.
+   Return NULL if the storage required for insertion cannot be allocated.  */
 
 void *
-hash_insert (Hash_table *table, const void *entry, bool *done)
+hash_insert (Hash_table *table, const void *entry)
 {
   void *data;
   struct hash_entry *bucket;
 
-  assert (entry);		/* cannot insert a NULL data */
+  assert (entry);		/* cannot insert a NULL entry */
 
-  if (data = hash_find_entry (table, entry, &bucket, false), data)
-    {
-      *done = true;
-      return data;
-    }
+  /* If there's a matching entry already in the table, return that.  */
+  if ((data = hash_find_entry (table, entry, &bucket, false)) != NULL)
+    return data;
 
   /* ENTRY is not matched, it should be inserted.  */
 
-  table->n_entries++;
-
   if (bucket->data)
     {
       struct hash_entry *new_entry = allocate_entry (table);
 
       if (new_entry == NULL)
-	{
-	  *done = false;
-	  return NULL;
-	}
+	return NULL;
 
       /* Add ENTRY in the overflow of the bucket.  */
 
       new_entry->data = (void *) entry;
       new_entry->next = bucket->next;
       bucket->next = new_entry;
-      *done = true;
-      return NULL;
+      table->n_entries++;
+      return (void *) entry;
     }
 
   /* Add ENTRY right in the bucket head.  */
 
   bucket->data = (void *) entry;
+  table->n_entries++;
   table->n_buckets_used++;
 
-  /* If more than 80% of the buckets are in use, rehash the table two
-     times bigger.  It's no real use checking the number of entries, as if
-     the hashing function is ill-conditioned, rehashing is not likely to
-     improve it.  */
+  /* If the growth threshold of the buckets in use has been reached, increase
+     the table size and rehash.  There's no point in checking the number of
+     entries:  if the hashing function is ill-conditioned, rehashing is not
+     likely to improve it.  */
 
-  if (5 * table->n_buckets_used > 4 * table->n_buckets)
+  if (table->n_buckets_used
+      > table->tuning->growth_threshold * table->n_buckets)
     {
-      unsigned int new_n_buckets = next_prime (2 * table->n_buckets + 1);
+      /* Check more fully, before starting real work.  If tuning arguments
+	 became invalid, the second check will rely on proper defaults.  */
+      check_tuning (table);
+      if (table->n_buckets_used
+	  > table->tuning->growth_threshold * table->n_buckets)
+	{
+	  const Hash_tuning *tuning = table->tuning;
+	  unsigned candidate
+	    = (unsigned) (tuning->is_n_buckets
+			  ? (table->n_buckets * tuning->growth_factor)
+			  : (table->n_buckets * tuning->growth_factor
+			     * tuning->growth_threshold));
 
-      *done = hash_rehash (table, new_n_buckets);
-      return NULL;
+	  /* If the rehash fails, arrange to return NULL.  */
+	  if (!hash_rehash (table, candidate))
+	    entry = NULL;
+	}
     }
 
-  *done = true;
-  return NULL;
+  return (void *) entry;
 }
 
 /* If ENTRY is already in the table, remove it and return the just-deleted
@@ -835,12 +944,38 @@ hash_delete (Hash_table *table, const void *entry)
   void *data;
   struct hash_entry *bucket;
 
-  if (data = hash_find_entry (table, entry, &bucket, true), !data)
+  data = hash_find_entry (table, entry, &bucket, true);
+  if (!data)
     return NULL;
 
-  if (!bucket->data)
-    table->n_buckets_used--;
   table->n_entries--;
+  if (!bucket->data)
+    {
+      table->n_buckets_used--;
+
+      /* If the shrink threshold of the buckets in use has been reached,
+	 rehash into a smaller table.  */
+
+      if (table->n_buckets_used
+	  < table->tuning->shrink_threshold * table->n_buckets)
+	{
+	  /* Check more fully, before starting real work.  If tuning arguments
+	     became invalid, the second check will rely on proper defaults.  */
+	  check_tuning (table);
+	  if (table->n_buckets_used
+	      < table->tuning->shrink_threshold * table->n_buckets)
+	    {
+	      const Hash_tuning *tuning = table->tuning;
+	      unsigned candidate
+		= (unsigned) (tuning->is_n_buckets
+			      ? table->n_buckets * tuning->shrink_factor
+			      : (table->n_buckets * tuning->shrink_factor
+				 * tuning->growth_threshold));
+
+	      hash_rehash (table, candidate);
+	    }
+	}
+    }
 
   return data;
 }

lib/hash.h

@@ -1,5 +1,5 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    Written by Jim Meyering <meyering@ascend.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 # endif
 #endif
 
-typedef unsigned int (*Hash_hasher) PARAMS ((const void *, unsigned int));
+typedef unsigned (*Hash_hasher) PARAMS ((const void *, unsigned));
 typedef bool (*Hash_comparator) PARAMS ((const void *, const void *));
 typedef void (*Hash_data_freer) PARAMS ((void *));
 typedef bool (*Hash_processor) PARAMS ((void *, void *));
@@ -40,6 +40,20 @@ struct hash_entry
     struct hash_entry *next;
   };
 
+struct hash_tuning
+  {
+    /* This structure is mainly used for `hash_initialize', see the block
+       documentation of `hash_reset_tuning' for more complete comments.  */
+
+    float shrink_threshold;	/* ratio of used buckets to trigger a shrink */
+    float shrink_factor;	/* ratio of new smaller size to original size */
+    float growth_threshold;	/* ratio of used buckets to trigger a growth */
+    float growth_factor;	/* ratio of new bigger size to original size */
+    bool is_n_buckets;		/* if CANDIDATE really means table size */
+  };
+
+typedef struct hash_tuning Hash_tuning;
+
 struct hash_table
   {
     /* The array of buckets starts at BUCKET and extends to BUCKET_LIMIT-1,
@@ -47,9 +61,12 @@ struct hash_table
        are not empty, there are N_ENTRIES active entries in the table.  */
     struct hash_entry *bucket;
     struct hash_entry *bucket_limit;
-    unsigned int n_buckets;
-    unsigned int n_buckets_used;
-    unsigned int n_entries;
+    unsigned n_buckets;
+    unsigned n_buckets_used;
+    unsigned n_entries;
+
+    /* Tuning arguments, kept in a physicaly separate structure.  */
+    const Hash_tuning *tuning;
 
     /* Three functions are given to `hash_initialize', see the documentation
        block for this function.  In a word, HASHER randomizes a user entry
@@ -74,10 +91,10 @@ struct hash_table
 typedef struct hash_table Hash_table;
 
 /* Information and lookup.  */
-unsigned int hash_get_n_buckets PARAMS ((const Hash_table *));
-unsigned int hash_get_n_buckets_used PARAMS ((const Hash_table *));
-unsigned int hash_get_n_entries PARAMS ((const Hash_table *));
-unsigned int hash_get_max_bucket_length PARAMS ((const Hash_table *));
+unsigned hash_get_n_buckets PARAMS ((const Hash_table *));
+unsigned hash_get_n_buckets_used PARAMS ((const Hash_table *));
+unsigned hash_get_n_entries PARAMS ((const Hash_table *));
+unsigned hash_get_max_bucket_length PARAMS ((const Hash_table *));
 bool hash_table_ok PARAMS ((const Hash_table *));
 void hash_print_statistics PARAMS ((const Hash_table *, FILE *));
 void *hash_lookup PARAMS ((const Hash_table *, const void *));
@@ -85,19 +102,19 @@ void *hash_lookup PARAMS ((const Hash_table *, const void *));
 /* Walking.  */
 void *hash_get_first PARAMS ((const Hash_table *));
 void *hash_get_next PARAMS ((const Hash_table *, const void *));
-unsigned int hash_get_entries PARAMS ((const Hash_table *, void **,
-				       unsigned int));
-unsigned int hash_do_for_each PARAMS ((const Hash_table *, Hash_processor,
-				       void *));
+unsigned hash_get_entries PARAMS ((const Hash_table *, void **, unsigned));
+unsigned hash_do_for_each PARAMS ((const Hash_table *, Hash_processor, void *));
 
 /* Allocation and clean-up.  */
-unsigned int hash_string PARAMS ((const char *, unsigned int));
-Hash_table *hash_initialize PARAMS ((unsigned int, Hash_hasher,
-				     Hash_comparator, Hash_data_freer));
+unsigned hash_string PARAMS ((const char *, unsigned));
+void hash_reset_tuning PARAMS ((Hash_tuning *));
+Hash_table *hash_initialize PARAMS ((unsigned, const Hash_tuning *,
+				     Hash_hasher, Hash_comparator,
+				     Hash_data_freer));
 void hash_clear PARAMS ((Hash_table *));
 void hash_free PARAMS ((Hash_table *));
 
 /* Insertion and deletion.  */
-bool hash_rehash PARAMS ((Hash_table *, unsigned int));
-void *hash_insert PARAMS ((Hash_table *, const void *, bool *));
+bool hash_rehash PARAMS ((Hash_table *, unsigned));
+void *hash_insert PARAMS ((Hash_table *, const void *));
 void *hash_delete PARAMS ((Hash_table *, const void *));

lib/human.c

@@ -1,5 +1,5 @@
 /* human.c -- print human readable file size
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,10 +23,6 @@
 # include <config.h>
 #endif
 
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
 #include <sys/types.h>
 #include <stdio.h>
 
@@ -34,6 +30,12 @@
 # include <limits.h>
 #endif
 
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
 #ifndef CHAR_BIT
 # define CHAR_BIT 8
 #endif
@@ -42,6 +44,9 @@
 #endif
 
 #ifndef HAVE_DECL_GETENV
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_GETENV
 char *getenv ();
 #endif
 
@@ -54,7 +59,7 @@ char *getenv ();
 
 #include <argmatch.h>
 #include <error.h>
-#include <xstrtoul.h>
+#include <xstrtol.h>
 
 #include "human.h"
 
@@ -71,15 +76,27 @@ static const char suffixes[] =
   'Y'	/* Yotta */
 };
 
+/* Like human_readable_inexact, except always round to even.  */
+char *
+human_readable (uintmax_t n, char *buf,
+		int from_block_size, int output_block_size)
+{
+  return human_readable_inexact (n, buf, from_block_size, output_block_size,
+				 human_round_to_even);
+}
+
 /* Convert N to a human readable format in BUF.
 
    N is expressed in units of FROM_BLOCK_SIZE.  FROM_BLOCK_SIZE must
-   be positive.
+   be nonnegative.
 
    If OUTPUT_BLOCK_SIZE is positive, use units of OUTPUT_BLOCK_SIZE in
    the output number.  OUTPUT_BLOCK_SIZE must be a multiple of
    FROM_BLOCK_SIZE or vice versa.
 
+   Use INEXACT_STYLE to determine whether to take the ceiling or floor
+   of any result that cannot be expressed exactly.
+
    If OUTPUT_BLOCK_SIZE is negative, use a format like "127k" if
    possible, using powers of -OUTPUT_BLOCK_SIZE; otherwise, use
    ordinary decimal format.  Normally -OUTPUT_BLOCK_SIZE is either
@@ -93,13 +110,14 @@ static const char suffixes[] =
    than -OUTPUT_BLOCK_SIZE aren't modified.  */
 
 char *
-human_readable (uintmax_t n, char *buf,
-		int from_block_size, int output_block_size)
+human_readable_inexact (uintmax_t n, char *buf,
+			int from_block_size, int output_block_size,
+			enum human_inexact_style inexact_style)
 {
   uintmax_t amt;
   int base;
   int to_block_size;
-  int tenths;
+  int tenths = 0;
   int power;
   char *p;
 
@@ -107,7 +125,7 @@ human_readable (uintmax_t n, char *buf,
      1 means AMT.TENTHS < adjusted N < AMT.TENTHS + 0.05;
      2 means adjusted N == AMT.TENTHS + 0.05;
      3 means AMT.TENTHS + 0.05 < adjusted N < AMT.TENTHS + 0.1.  */
-  int rounding;
+  int rounding = 0;
 
   if (output_block_size < 0)
     {
@@ -134,7 +152,6 @@ human_readable (uintmax_t n, char *buf,
     {
       int multiplier = from_block_size / to_block_size;
       amt = n * multiplier;
-      tenths = rounding = 0;
 
       if (amt / multiplier != n)
 	{
@@ -170,6 +187,8 @@ human_readable (uintmax_t n, char *buf,
 	  return buf;
 	}
     }
+  else if (from_block_size == 0)
+    amt = 0;
   else
     {
       int divisor = to_block_size / from_block_size;
@@ -204,24 +223,33 @@ human_readable (uintmax_t n, char *buf,
 
       if (amt < 10)
 	{
-	  tenths += 2 < rounding + (tenths & 1);
-
-	  if (tenths == 10)
+	  if (2 * (1 - (int) inexact_style)
+	      < rounding + (tenths & (inexact_style == human_round_to_even)))
 	    {
-	      amt++;
-	      tenths = 0;
+	      tenths++;
+	      rounding = 0;
+
+	      if (tenths == 10)
+		{
+		  amt++;
+		  tenths = 0;
+		}
 	    }
 
 	  if (amt < 10)
 	    {
 	      *--p = '0' + tenths;
 	      *--p = '.';
-	      tenths = 0;
+	      tenths = rounding = 0;
 	    }
 	}
     }
 
-  if (5 < tenths + (2 < rounding + (amt & 1)))
+  if (inexact_style == human_ceiling
+      ? 0 < tenths + rounding
+      : inexact_style == human_round_to_even
+      ? 5 < tenths + (2 < rounding + (amt & 1))
+      : /* inexact_style == human_floor */ 0)
     {
       amt++;
 
@@ -251,14 +279,20 @@ human_readable (uintmax_t n, char *buf,
 static char const *const block_size_args[] = { "human-readable", "si", 0 };
 static int const block_size_types[] = { -1024, -1000 };
 
+static int
+default_block_size (void)
+{
+  return getenv ("POSIXLY_CORRECT") ? 512 : DEFAULT_BLOCK_SIZE;
+}
+
 static strtol_error
 humblock (char const *spec, int *block_size)
 {
   int i;
 
   if (! spec && ! (spec = getenv ("BLOCK_SIZE")))
-    *block_size = getenv ("POSIXLY_CORRECT") ? 512 : DEFAULT_BLOCK_SIZE;
-  else if (0 <= (i = argmatch (spec, block_size_args)))
+    *block_size = default_block_size ();
+  else if (0 <= (i = ARGMATCH (spec, block_size_args, block_size_types)))
     *block_size = block_size_types[i];
   else
     {
@@ -281,6 +315,11 @@ void
 human_block_size (char const *spec, int report_errors, int *block_size)
 {
   strtol_error e = humblock (spec, block_size);
+  if (*block_size == 0)
+    {
+      *block_size = default_block_size ();
+      e = LONGINT_INVALID;
+    }
   if (e != LONGINT_OK && report_errors)
     STRTOL_FATAL_ERROR (spec, _("block size"), e);
 }

lib/human.h

@@ -1,6 +1,14 @@
 #ifndef HUMAN_H_
 # define HUMAN_H_ 1
 
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# if HAVE_INTTYPES_H
+#  include <inttypes.h>
+# endif
+
 /* A conservative bound on the maximum length of a human-readable string.
    The output can be the product of the largest uintmax_t and the largest int,
    so add their sizes before converting to a bound on digits.  */
@@ -15,7 +23,16 @@
 #  endif
 # endif
 
+enum human_inexact_style
+{
+  human_floor = -1,
+  human_round_to_even = 0,
+  human_ceiling = 1
+};
+
 char *human_readable PARAMS ((uintmax_t, char *, int, int));
+char *human_readable_inexact PARAMS ((uintmax_t, char *, int, int,
+				      enum human_inexact_style));
 
 void human_block_size PARAMS ((char const *, int, int *));
 

lib/idcache.c

@@ -1,5 +1,6 @@
 /* idcache.c -- map user and group IDs, cached for speed
-   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/interlock

@@ -1,46 +0,0 @@
-#! /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

lib/isdir.c

@@ -34,8 +34,7 @@
    return nonzero, else 0.  */
 
 int
-isdir (path)
-     char *path;
+isdir (const char *path)
 {
   struct stat stats;
 

lib/lchown.c

@@ -1,5 +1,5 @@
 /* Provide a stub lchown function for systems that lack it.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,6 +27,17 @@ extern int errno;
 #endif
 #include "lchown.h"
 
+#ifdef STAT_MACROS_BROKEN
+# undef S_ISLNK
+#endif
+#if !defined(S_ISLNK) && defined(S_IFLNK)
+# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+#endif
+
+/* Declare chown to avoid a warning.  Don't include unistd.h,
+   because it may have a conflicting prototype for lchown.  */
+int chown ();
+
 /* Work just like chown, except when FILE is a symbolic link.
    In that case, set errno to ENOSYS and return -1.  */
 

lib/lchown.h

@@ -4,6 +4,6 @@
 #  define ENOSYS ENOTSUP
 # else
 /* Some systems don't have ENOTSUP either.  */
-#  define ENOSYS ENOMSG
+#  define ENOSYS EINVAL
 # endif
 #endif

lib/linebuffer.c

@@ -1,5 +1,5 @@
 /* linebuffer.c -- read arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #endif
 
 #include <stdio.h>
+#include <sys/types.h>
 #include "linebuffer.h"
 
 char *xmalloc ();
@@ -39,9 +40,9 @@ initbuffer (struct linebuffer *linebuffer)
 }
 
 /* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
-   Remove any newline.  Does not null terminate.
-   Return zero upon error or upon end of file.
-   Otherwise, return LINEBUFFER.  */
+   Keep the newline; append a newline if it's the last line of a file
+   that ends in a non-newline character.  Do not null terminate.
+   Return LINEBUFFER, except at end of file return 0.  */
 
 struct linebuffer *
 readline (struct linebuffer *linebuffer, FILE *stream)
@@ -52,33 +53,32 @@ readline (struct linebuffer *linebuffer, FILE *stream)
   char *end = buffer + linebuffer->size; /* Sentinel. */
 
   if (feof (stream) || ferror (stream))
-    {
-      linebuffer->length = 0;
-      return 0;
-    }
+    return 0;
 
-  while (1)
+  do
     {
       c = getc (stream);
+      if (c == EOF)
+	{
+	  if (p == buffer)
+	    return 0;
+	  if (p[-1] == '\n')
+	    break;
+	  c = '\n';
+	}
       if (p == end)
 	{
 	  linebuffer->size *= 2;
 	  buffer = (char *) xrealloc (buffer, linebuffer->size);
-	  p += buffer - linebuffer->buffer;
+	  p = p - linebuffer->buffer + buffer;
 	  linebuffer->buffer = buffer;
 	  end = buffer + linebuffer->size;
 	}
-      if (c == EOF || c == '\n')
-	break;
       *p++ = c;
     }
+  while (c != '\n');
 
-  if (feof (stream) && p == buffer)
-    {
-      linebuffer->length = 0;
-      return 0;
-    }
-  linebuffer->length = p - linebuffer->buffer;
+  linebuffer->length = p - buffer;
   return linebuffer;
 }
 

lib/linebuffer.h

@@ -1,5 +1,5 @@
 /* linebuffer.h -- declarations for reading arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@
 
 struct linebuffer
 {
-  long size;			/* Allocated. */
-  long length;			/* Used. */
+  size_t size;			/* Allocated. */
+  size_t length;		/* Used. */
   char *buffer;
 };
 
@@ -39,7 +39,8 @@ struct linebuffer
 void initbuffer PARAMS ((struct linebuffer *linebuffer));
 
 /* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
-   Remove any newline.  Does not null terminate.
+   Keep the newline; append a newline if it's the last line of a file
+   that ends in a non-newline character.  Do not null terminate.
    Return LINEBUFFER, except at end of file return 0.  */
 struct linebuffer *readline PARAMS ((struct linebuffer *linebuffer,
 				     FILE *stream));

lib/localcharset.c

@@ -0,0 +1,228 @@
+/* Determine a canonical name for the current locale's character encoding.
+
+   Copyright (C) 2000 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+/* Written by Bruno Haible <haible@clisp.cons.org>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#include <stdio.h>
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#else
+# if HAVE_SETLOCALE
+#  include <locale.h>
+# endif
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+   possible multithread problem in the function get_charset_aliases. If we
+   are running in a threaded environment, and if two threads initialize
+   'charset_aliases' simultaneously, both will produce the same value,
+   and everything will be ok if the two assignments to 'charset_aliases'
+   are atomic. But I don't know what will happen if the two assignments mix.  */
+/* Pointer to the contents of the charset.alias file, if it has already been
+   read, else NULL.  Its format is:
+   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
+static char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file.  */
+static const char *
+get_charset_aliases ()
+{
+  char *cp;
+
+  cp = charset_aliases;
+  if (cp == NULL)
+    {
+      FILE *fp;
+      const char *dir = LIBDIR;
+      const char *base = "charset.alias";
+      char *file_name;
+
+      /* Concatenate dir and base into freshly allocated file_name.  */
+      {
+	size_t dir_len = strlen (dir);
+	size_t base_len = strlen (base);
+	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+	if (file_name != NULL)
+	  {
+	    memcpy (file_name, dir, dir_len);
+	    if (add_slash)
+	      file_name[dir_len] = DIRECTORY_SEPARATOR;
+	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+	  }
+      }
+
+      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+	/* Out of memory or file not found, treat it as empty.  */
+	cp = "";
+      else
+	{
+	  /* Parse the file's contents.  */
+	  int c;
+	  char buf1[50+1];
+	  char buf2[50+1];
+	  char *res_ptr = NULL;
+	  size_t res_size = 0;
+	  size_t l1, l2;
+
+	  for (;;)
+	    {
+	      c = getc (fp);
+	      if (c == EOF)
+		break;
+	      if (c == '\n' || c == ' ' || c == '\t')
+		continue;
+	      if (c == '#')
+		{
+		  /* Skip comment, to end of line.  */
+		  do
+		    c = getc (fp);
+		  while (!(c == EOF || c == '\n'));
+		  if (c == EOF)
+		    break;
+		  continue;
+		}
+	      ungetc (c, fp);
+	      if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
+		break;
+	      l1 = strlen (buf1);
+	      l2 = strlen (buf2);
+	      if (res_size == 0)
+		{
+		  res_size = l1 + 1 + l2 + 1;
+		  res_ptr = malloc (res_size + 1);
+		}
+	      else
+		{
+		  res_size += l1 + 1 + l2 + 1;
+		  res_ptr = realloc (res_ptr, res_size + 1);
+		}
+	      if (res_ptr == NULL)
+		{
+		  /* Out of memory. */
+		  res_size = 0;
+		  break;
+		}
+	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
+	    }
+	  fclose (fp);
+	  if (res_size == 0)
+	    cp = "";
+	  else
+	    {
+	      *(res_ptr + res_size) = '\0';
+	      cp = res_ptr;
+	    }
+	}
+
+      charset_aliases = cp;
+      if (file_name != NULL)
+	free (file_name);
+    }
+
+  return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name or NULL.  */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset ()
+{
+  const char *codeset;
+  const char *aliases;
+
+#if HAVE_LANGINFO_CODESET
+
+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+  codeset = nl_langinfo (CODESET);
+
+#else
+
+  /* On old systems which lack it, use setlocale and getenv.  */
+  const char *locale = NULL;
+
+# if HAVE_SETLOCALE
+  locale = setlocale (LC_CTYPE, NULL);
+# endif
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+    }
+
+  /* On some old systems, one used to set locale = "iso8859_1". On others,
+     you set it to "language_COUNTRY.charset". In any case, we resolve it
+     through the charset.alias file.  */
+  codeset = locale;
+
+#endif
+
+  if (codeset != NULL && codeset[0] != '\0')
+    {
+      /* Resolve alias. */
+      for (aliases = get_charset_aliases ();
+	   *aliases != '\0';
+	   aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+	if (!strcmp (codeset, aliases))
+	  {
+	    codeset = aliases + strlen (aliases) + 1;
+	    break;
+	  }
+    }
+
+  return codeset;
+}

lib/long-options.c

@@ -1,5 +1,5 @@
 /* Utility to accept --help and --version options as unobtrusively as possible.
-   Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,8 +23,15 @@
 
 #include <stdio.h>
 #include <getopt.h>
-#include "closeout.h"
 #include "long-options.h"
+#include "version-etc.h"
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
 
 static struct option const long_options[] =
 {
@@ -37,13 +44,13 @@ static struct option const long_options[] =
    Be careful not to gobble up `--'.  */
 
 void
-parse_long_options (argc, argv, command_name, package, version, usage)
-     int argc;
-     char **argv;
-     const char *command_name;
-     const char *package;
-     const char *version;
-     void (*usage)();
+parse_long_options (int argc,
+		    char **argv,
+		    const char *command_name,
+		    const char *package,
+		    const char *version,
+		    const char *authors,
+		    void (*usage_func)())
 {
   int c;
   int saved_opterr;
@@ -59,12 +66,10 @@ parse_long_options (argc, argv, command_name, package, version, usage)
       switch (c)
 	{
 	case 'h':
-	  (*usage) (0);
+	  (*usage_func) (0);
 
 	case 'v':
-	  printf ("%s (%s) %s\n", command_name, package, version);
-	  close_stdout (); /* FIXME: output failure exit status
-			      should be settable via an arg.  */
+	  version_etc (stdout, command_name, package, version, authors);
 	  exit (0);
 
 	default:

lib/long-options.h

@@ -1,5 +1,5 @@
 /* long-options.h -- declaration for --help- and --version-handling function.
-   Copyright (C) 1993, 1994, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,7 +26,10 @@
 #endif
 
 void
-  parse_long_options PARAMS ((int _argc, char **_argv,
+  parse_long_options PARAMS ((int _argc,
+			      char **_argv,
 			      const char *_command_name,
 			      const char *_package,
-			      const char *_version, void (*_usage) (int)));
+			      const char *_version,
+			      const char *_authors,
+			      void (*_usage) (int)));

lib/lstat.c

@@ -1,50 +0,0 @@
-/* Work around the bug in some systems whereby lstat succeeds when
-   given the zero-length file name argument.  The lstat from SunOS4.1.4
-   has this bug.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* written by Jim Meyering */
-
-#include <config.h>
-
-/* Disable the definition of lstat to rpl_lstat (from config.h) in this
-   file.  Otherwise, we'd get conflicting prototypes for rpl_lstat on
-   most systems.  */
-#undef lstat
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-/* FIXME: describe.  */
-
-int
-rpl_lstat (file, sbuf)
-     const char *file;
-     struct stat *sbuf;
-{
-  if (file && *file == 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  return lstat (file, sbuf);
-}

lib/makepath.c

@@ -1,5 +1,5 @@
 /* makepath.c -- Ensure that a directory path exists.
-   Copyright (C) 1990, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,6 +50,10 @@ char *alloca ();
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
+#ifndef S_IRWXUGO
+# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
+#endif
+
 #if STDC_HEADERS
 # include <stdlib.h>
 #endif
@@ -71,23 +75,51 @@ extern int errno;
 # endif
 #endif
 
+#ifndef S_ISUID
+# define S_ISUID 04000
+#endif
+#ifndef S_ISGID
+# define S_ISGID 02000
+#endif
+#ifndef S_ISVTX
+# define S_ISVTX 01000
+#endif
+#ifndef S_IRUSR
+# define S_IRUSR 0200
+#endif
 #ifndef S_IWUSR
 # define S_IWUSR 0200
 #endif
-
 #ifndef S_IXUSR
 # define S_IXUSR 0100
 #endif
 
+#ifndef S_IRWXU
+# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
+#endif
+
 #define WX_USR (S_IWUSR | S_IXUSR)
 
+/* Include this before libintl.h so we get our definition of PARAMS. */
+#include "makepath.h"
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+
 #ifdef __MSDOS__
 typedef int uid_t;
 typedef int gid_t;
 #endif
 
 #include "save-cwd.h"
-#include "makepath.h"
 #include "error.h"
 
 void strip_trailing_slashes ();
@@ -99,9 +131,9 @@ void strip_trailing_slashes ();
 	 Restore working directory.  */			\
       if (do_chdir)					\
 	{						\
-	  int fail = restore_cwd (&cwd, NULL, NULL);	\
+	  int _fail = restore_cwd (&cwd, NULL, NULL);	\
 	  free_cwd (&cwd);				\
-	  if (fail)					\
+	  if (_fail)					\
 	    return 1;					\
 	}						\
     }							\
@@ -115,6 +147,57 @@ void strip_trailing_slashes ();
     }							\
   while (0)
 
+/* Attempt to create directory DIR (aka DIRPATH) with the specified MODE.
+   If CREATED_DIR_P is non-NULL, set *CREATED_DIR_P to non-zero if this
+   function creates DIR and to zero otherwise.  Give a diagnostic and
+   return non-zero if DIR cannot be created or cannot be determined to
+   exist already.  Use DIRPATH in any diagnostic, not DIR.
+   Note that if DIR already exists, this function will return zero
+   (indicating success) and will set *CREATED_DIR_P to zero.  */
+
+static int
+make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
+{
+  int fail = 0;
+  int created_dir;
+
+  created_dir = (mkdir (dir, mode) == 0);
+
+  if (!created_dir)
+    {
+      struct stat stats;
+      int saved_errno = errno;
+
+      /* The mkdir and stat calls below may appear to be reversed.
+	 They are not.  It is important to call mkdir first and then to
+	 call stat (to distinguish the three cases) only if mkdir fails.
+	 The alternative to this approach is to `stat' each directory,
+	 then to call mkdir if it doesn't exist.  But if some other process
+	 were to create the directory between the stat & mkdir, the mkdir
+	 would fail with EEXIST.  */
+
+      if (stat (dir, &stats))
+	{
+	  error (0, saved_errno, _("cannot create directory `%s'"), dirpath);
+	  fail = 1;
+	}
+      else if (!S_ISDIR (stats.st_mode))
+	{
+	  error (0, 0, _("`%s' exists but is not a directory"), dirpath);
+	  fail = 1;
+	}
+      else
+	{
+	  /* DIR (aka DIRPATH) already exists and is a directory. */
+	}
+    }
+
+  if (created_dir_p)
+    *created_dir_p = created_dir;
+
+  return fail;
+}
+
 /* Ensure that the directory ARGPATH exists.
    Remove any trailing slashes from ARGPATH before calling this function.
 
@@ -162,7 +245,7 @@ make_path (const char *argpath,
       char *dirpath;
 
       /* Temporarily relax umask in case it's overly restrictive.  */
-      int oldmask = umask (0);
+      mode_t oldmask = umask (0);
 
       /* Make a copy of ARGPATH that we can scribble NULs on.  */
       dirpath = (char *) alloca (strlen (argpath) + 1);
@@ -174,9 +257,9 @@ make_path (const char *argpath,
 	 their owners, we need to fix their permissions after making them.  */
       if (((parent_mode & WX_USR) != WX_USR)
 	  || ((owner != (uid_t) -1 || group != (gid_t) -1)
-	      && (parent_mode & 07000) != 0))
+	      && (parent_mode & (S_ISUID | S_ISGID | S_ISVTX)) != 0))
 	{
-	  tmp_mode = 0700;
+	  tmp_mode = S_IRWXU;
 	  re_protect = 1;
 	}
       else
@@ -203,7 +286,8 @@ make_path (const char *argpath,
 
       while (1)
 	{
-	  int newly_created_dir = 1;
+	  int newly_created_dir;
+	  int fail;
 
 	  /* slash points to the leftmost unprocessed component of dirpath.  */
 	  basename_dir = slash;
@@ -217,40 +301,18 @@ make_path (const char *argpath,
 	  if (!do_chdir)
 	    basename_dir = dirpath;
 
-	  /* The mkdir and stat calls below appear to be reversed.
-	     They are not.  It is important to call mkdir first and then to
-	     call stat (to distinguish the three cases) only if mkdir fails.
-	     The alternative to this approach is to `stat' each directory,
-	     then to call mkdir if it doesn't exist.  But if some other process
-	     were to create the directory between the stat & mkdir, the mkdir
-	     would fail with EEXIST.  */
-
 	  *slash = '\0';
-	  if (mkdir (basename_dir, tmp_mode))
+	  fail = make_dir (basename_dir, dirpath, tmp_mode, &newly_created_dir);
+	  if (fail)
 	    {
-	      if (stat (basename_dir, &stats))
-		{
-		  error (0, errno, "cannot create directory `%s'", dirpath);
-		  CLEANUP;
-		  return 1;
-		}
-	      else if (!S_ISDIR (stats.st_mode))
-		{
-		  error (0, 0, "`%s' exists but is not a directory", dirpath);
-		  CLEANUP;
-		  return 1;
-		}
-	      else
-		{
-		  /* DIRPATH already exists and is a directory. */
-		  newly_created_dir = 0;
-		}
+	      CLEANUP;
+	      return 1;
 	    }
 
 	  if (newly_created_dir)
 	    {
 	      if (verbose_fmt_string)
-		fprintf (stderr, verbose_fmt_string, dirpath);
+		error (0, 0, verbose_fmt_string, dirpath);
 
 	      if ((owner != (uid_t) -1 || group != (gid_t) -1)
 		  && chown (basename_dir, owner, group)
@@ -280,7 +342,7 @@ make_path (const char *argpath,
 	     stat and mkdir process O(n^2) file name components.  */
 	  if (do_chdir && chdir (basename_dir) < 0)
 	    {
-	      error (0, errno, "cannot chdir to directory, %s", dirpath);
+	      error (0, errno, _("cannot chdir to directory, %s"), dirpath);
 	      CLEANUP;
 	      return 1;
 	    }
@@ -299,12 +361,8 @@ make_path (const char *argpath,
       /* 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 (basename_dir, &stats) && mkdir (basename_dir, mode))
+      if (make_dir (basename_dir, dirpath, mode, NULL))
 	{
-	  error (0, errno, "cannot create directory `%s'", dirpath);
 	  CLEANUP;
 	  return 1;
 	}
@@ -315,7 +373,7 @@ make_path (const char *argpath,
       if (verbose_fmt_string != NULL)
 	error (0, 0, verbose_fmt_string, dirpath);
 
-      if (owner != (uid_t) -1 && group != (gid_t) -1)
+      if (owner != (uid_t) -1 || group != (gid_t) -1)
 	{
 	  if (chown (basename_dir, owner, group)
 #ifdef AFS
@@ -323,17 +381,23 @@ make_path (const char *argpath,
 #endif
 	      )
 	    {
-	      error (0, errno, "cannot chown %s", dirpath);
-	      retval = 1;
-	    }
-	  /* chown may have turned off some permission bits we wanted.  */
-	  if ((mode & 07000) != 0 && chmod (basename_dir, mode))
-	    {
-	      error (0, errno, "cannot chmod %s", dirpath);
+	      error (0, errno, _("cannot chown %s"), dirpath);
 	      retval = 1;
 	    }
 	}
 
+      /* The above chown may have turned off some permission bits in MODE.
+	 Another reason we may have to use chmod here is that mkdir(2) is
+	 required to honor only the file permission bits.  In particular,
+	 it need not honor the `special' bits, so if MODE includes any
+	 special bits, set them here.  */
+      if ((mode & ~S_IRWXUGO)
+	  && chmod (basename_dir, mode))
+	{
+	  error (0, errno, _("cannot chmod %s"), dirpath);
+	  retval = 1;
+	}
+
       CLEANUP_CWD;
 
       /* If the mode for leading directories didn't include owner "wx"
@@ -357,7 +421,7 @@ make_path (const char *argpath,
 
       if (!S_ISDIR (stats.st_mode))
 	{
-	  error (0, 0, "`%s' exists but is not a directory", dirpath);
+	  error (0, 0, _("`%s' exists but is not a directory"), dirpath);
 	  return 1;
 	}
 

lib/malloc.c

@@ -1,5 +1,5 @@
 /* Work around bug on some systems where malloc (0) fails.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,8 +30,7 @@ char *malloc ();
    If N is zero, allocate a 1-byte block.  */
 
 char *
-rpl_malloc (n)
-     size_t n;
+rpl_malloc (size_t n)
 {
   if (n == 0)
     n = 1;

lib/md5.h

@@ -1,6 +1,6 @@
 /* md5.h - Declaration of functions and data types used for MD5 sum
    computing library functions.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1999 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.
 
@@ -118,7 +118,7 @@ extern void md5_process_bytes __P ((const void *buffer, size_t len,
    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
+   IMPORTANT: On some systems it is required that RESBUF be correctly
    aligned for a 32 bits value.  */
 extern void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf));
 

lib/memcasecmp.c

@@ -1,5 +1,5 @@
 /* Case-insensitive buffer comparator.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +15,9 @@
    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
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
@@ -25,16 +25,16 @@
 #include <ctype.h>
 
 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
+# define IN_CTYPE_DOMAIN(Char) 1
 #else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
+# define IN_CTYPE_DOMAIN(Char) isascii(Char)
 #endif
-#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c))
+#define ISLOWER(Char) (IN_CTYPE_DOMAIN (Char) && islower (Char))
 
 #if _LIBC || STDC_HEADERS
-# define TOUPPER(c) toupper (c)
+# define TOUPPER(Char) toupper (Char)
 #else
-# define TOUPPER(c) (ISLOWER (c) ? toupper (c) : (c))
+# define TOUPPER(Char) (ISLOWER (Char) ? toupper (Char) : (Char))
 #endif
 
 #include "memcasecmp.h"
@@ -44,14 +44,11 @@
    join -i works with sort -f.  */
 
 int
-memcasecmp (vs1, vs2, n)
-     const void *vs1;
-     const void *vs2;
-     size_t n;
+memcasecmp (const void *vs1, const void *vs2, size_t n)
 {
   unsigned int i;
-  unsigned char *s1 = (unsigned char *) vs1;
-  unsigned char *s2 = (unsigned char *) vs2;
+  unsigned char const *s1 = (unsigned char const *) vs1;
+  unsigned char const *s2 = (unsigned char const *) vs2;
   for (i = 0; i < n; i++)
     {
       unsigned char u1 = *s1++;

lib/memchr.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1997, 1999 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);
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #undef __ptr_t
@@ -45,7 +45,7 @@ USA.  */
 #define LONG_MAX_32_BITS 2147483647
 
 #ifndef LONG_MAX
-#define LONG_MAX LONG_MAX_32_BITS
+# define LONG_MAX LONG_MAX_32_BITS
 #endif
 
 #include <sys/types.h>

lib/memcmp.c

@@ -104,8 +104,7 @@ static int memcmp_bytes __P((op_t, op_t));
 __inline
 # endif
 static int
-memcmp_bytes (a, b)
-     op_t a, b;
+memcmp_bytes (long unsigned int a, long unsigned int b)
 {
   long int srcp1 = (long int) &a;
   long int srcp2 = (long int) &b;
@@ -132,10 +131,7 @@ static int memcmp_common_alignment __P((long, long, size_t));
 __inline
 #endif
 static int
-memcmp_common_alignment (srcp1, srcp2, len)
-     long int srcp1;
-     long int srcp2;
-     size_t len;
+memcmp_common_alignment (long int srcp1, long int srcp2, size_t len)
 {
   op_t a0, a1;
   op_t b0, b1;
@@ -222,10 +218,7 @@ static int memcmp_not_common_alignment __P((long, long, size_t));
 __inline
 #endif
 static int
-memcmp_not_common_alignment (srcp1, srcp2, len)
-     long int srcp1;
-     long int srcp2;
-     size_t len;
+memcmp_not_common_alignment (long int srcp1, long int srcp2, size_t len)
 {
   op_t a0, a1, a2, a3;
   op_t b0, b1, b2, b3;
@@ -325,10 +318,7 @@ memcmp_not_common_alignment (srcp1, srcp2, len)
 }
 
 int
-rpl_memcmp (s1, s2, len)
-     const __ptr_t s1;
-     const __ptr_t s2;
-     size_t len;
+rpl_memcmp (const void *s1, const void *s2, size_t len)
 {
   op_t a0;
   op_t b0;

lib/memcoll.c

@@ -0,0 +1,71 @@
+/* Locale-specific memory comparison.
+   Copyright 1999 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Contributed by Paul Eggert <eggert@twinsun.com>.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+
+/* Compare S1 (with length S1LEN) and S2 (with length S2LEN) according
+   to the LC_COLLATE locale.  S1 and S2 do not overlap, and are not
+   adjacent.  Temporarily modify the bytes after S1 and S2, but
+   restore their original contents before returning.  */
+int
+memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
+{
+  int diff;
+  char n1 = s1[s1len];
+  char n2 = s2[s2len];
+
+  s1[s1len++] = '\0';
+  s2[s2len++] = '\0';
+
+  while (! (diff = strcoll (s1, s2)))
+    {
+      /* strcoll found no difference, but perhaps it was fooled by NUL
+	 characters in the data.  Work around this problem by advancing
+	 past the NUL chars.  */
+      size_t size1 = strlen (s1) + 1;
+      size_t size2 = strlen (s2) + 1;
+      s1 += size1;
+      s2 += size2;
+      s1len -= size1;
+      s2len -= size2;
+
+      if (s1len == 0)
+	{
+	  if (s2len != 0)
+	    diff = -1;
+	  break;
+	}
+      else if (s2len == 0)
+	{
+	  diff = 1;
+	  break;
+	}
+    }
+
+  s1[s1len - 1] = n1;
+  s2[s2len - 1] = n2;
+
+  return diff;
+}

lib/memcoll.h

@@ -0,0 +1,18 @@
+#ifndef MEMCOLL_H_
+# define MEMCOLL_H_ 1
+
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+int memcoll PARAMS ((char *, size_t, char *, size_t));
+
+#endif /* MEMCOLL_H_ */

lib/memcpy.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,10 +25,7 @@
    Return DESTADDR. */
 
 char *
-memcpy (destaddr, srcaddr, len)
-     char *destaddr;
-     const char *srcaddr;
-     int len;
+memcpy (char *destaddr, const char *srcaddr, int len)
 {
   char *dest = destaddr;
 

lib/memset.c

@@ -16,10 +16,7 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 char *
-memset (str, c, len)
-     char *str;
-     int c;
-     unsigned len;
+memset (char *str, int c, unsigned int len)
 {
   register char *st = str;
 

lib/mkdir.c

@@ -1,5 +1,5 @@
 /* BSD compatible make directory function for System V
-   Copyright (C) 1988, 1990 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1990, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,6 +34,16 @@ extern int errno;
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
+#ifndef S_IRWXU
+# define S_IRWXU 0700
+#endif
+#ifndef S_IRWXG
+# define S_IRWXG 0070
+#endif
+#ifndef S_IRWXO
+# define S_IRWXO 0007
+#endif
+
 /* mkdir adapted from GNU tar.  */
 
 /* Make directory DPATH, with permission mode DMODE.
@@ -48,11 +58,11 @@ extern int errno;
    subroutine didn't return EEXIST.  It does now.  */
 
 int
-mkdir (dpath, dmode)
-     char *dpath;
-     int dmode;
+mkdir (const char *dpath, mode_t dmode)
 {
-  int cpid, status;
+  pid_t cpid;
+  mode_t mode;
+  int status;
   struct stat statbuf;
 
   if (stat (dpath, &statbuf) == 0)
@@ -76,8 +86,9 @@ mkdir (dpath, dmode)
 	 process is going away anyway, we zap its umask.
 	 This won't suffice to set SUID, SGID, etc. on this
 	 directory, so the parent process calls chmod afterward.  */
-      status = umask (0);	/* Get current umask.  */
-      umask (status | (0777 & ~dmode));	/* Set for mkdir.  */
+      mode = umask (0);	/* Get current umask.  */
+      /* Set for mkdir.  */
+      umask (mode | ((S_IRWXU | S_IRWXG | S_IRWXO) & ~dmode));
       execl ("/bin/mkdir", "mkdir", dpath, (char *) 0);
       _exit (1);
 
@@ -86,7 +97,7 @@ mkdir (dpath, dmode)
       while (wait (&status) != cpid)
 	/* Do nothing.  */ ;
 
-      if (status & 0xFFFF)
+      if (status)
 	{
 	  /* /bin/mkdir failed.  */
 	  errno = EIO;

lib/mktime.c

@@ -1,24 +1,22 @@
-/* mktime: convert a `struct tm' to a time_t value  zzzzzz
-   Copyright (C) 1993-1997, 1998 Free Software Foundation, Inc.
+/* Convert a `struct tm' to a time_t value.
+   Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
    Contributed by Paul Eggert (eggert@twinsun.com).
 
-   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.
-
-   This program is distributed in the hope that it will be useful,
+   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 General Public License for more details.
+   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 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 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.  */
 
 /* Define this to have a standalone program to test this implementation of
    mktime.  */
@@ -28,14 +26,8 @@
 # include <config.h>
 #endif
 
-/* Some systems need this in order to declare localtime_r properly.  */
-#ifndef _REENTRANT
-# define _REENTRANT 1
-#endif
-
 #ifdef _LIBC
 # define HAVE_LIMITS_H 1
-# define HAVE_LOCALTIME_R 1
 # define STDC_HEADERS 1
 #endif
 
@@ -63,7 +55,7 @@
 #endif /* DEBUG */
 
 #ifndef __P
-# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+# if defined __GNUC__ || (defined __STDC__ && __STDC__)
 #  define __P(args) args
 # else
 #  define __P(args) ()
@@ -115,26 +107,15 @@ const unsigned short int __mon_yday[2][13] =
     { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
   };
 
-static struct tm *ranged_convert __P ((struct tm *(*) __P ((const time_t *,
-							    struct tm *)),
-				       time_t *, struct tm *));
-static time_t ydhms_tm_diff __P ((int, int, int, int, int, const struct tm *));
-time_t __mktime_internal __P ((struct tm *,
-			       struct tm *(*) (const time_t *, struct tm *),
-			       time_t *));
-
 
 #ifdef _LIBC
-# define localtime_r __localtime_r
+# define my_mktime_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_mktime_localtime_r
-static struct tm *localtime_r __P ((const time_t *, struct tm *));
+/* If we're a mktime substitute in a GNU program, then prefer
+   localtime to localtime_r, since many localtime_r implementations
+   are buggy.  */
 static struct tm *
-localtime_r (t, tp)
-     const time_t *t;
-     struct tm *tp;
+my_mktime_localtime_r (const time_t *t, struct tm *tp)
 {
   struct tm *l = localtime (t);
   if (! l)
@@ -142,7 +123,6 @@ localtime_r (t, tp)
   *tp = *l;
   return tp;
 }
-# endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */
 #endif /* ! _LIBC */
 
 
@@ -153,9 +133,8 @@ localtime_r (t, tp)
    If TP is null, return a nonzero value.
    If overflow occurs, yield the low order bits of the correct answer.  */
 static time_t
-ydhms_tm_diff (year, yday, hour, min, sec, tp)
-     int year, yday, hour, min, sec;
-     const struct tm *tp;
+ydhms_tm_diff (int year, int yday, int hour, int min, int sec,
+	       const struct tm *tp)
 {
   if (!tp)
     return 1;
@@ -182,32 +161,12 @@ 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;
-{
-#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);
-}
-
 /* Use CONVERT to convert *T to a broken down time in *TP.
    If *T is out of range for conversion, adjust it so that
    it is the nearest in-range value and then convert that.  */
 static struct tm *
-ranged_convert (convert, t, tp)
-     struct tm *(*convert) __P ((const time_t *, struct tm *));
-     time_t *t;
-     struct tm *tp;
+ranged_convert (struct tm *(*convert) (const time_t *, struct tm *),
+		time_t *t, struct tm *tp)
 {
   struct tm *r;
 
@@ -254,19 +213,18 @@ ranged_convert (convert, t, tp)
    compared to what the result would be for UTC without leap seconds.
    If *OFFSET's guess is correct, only one CONVERT call is needed.  */
 time_t
-__mktime_internal (tp, convert, offset)
-     struct tm *tp;
-     struct tm *(*convert) __P ((const time_t *, struct tm *));
-     time_t *offset;
+__mktime_internal (struct tm *tp,
+		   struct tm *(*convert) (const time_t *, struct tm *),
+		   time_t *offset)
 {
-  time_t t, dt, t0;
+  time_t t, dt, t0, t1, t2;
   struct tm tm;
 
   /* The maximum number of probes (calls to CONVERT) should be enough
      to handle any combinations of time zone rule changes, solar time,
-     and leap seconds.  POSIX.1 prohibits leap seconds, but some hosts
-     have them anyway.  */
-  int remaining_probes = 4;
+     leap seconds, and oscillations around a spring-forward gap.
+     POSIX.1 prohibits leap seconds, but some hosts have them anyway.  */
+  int remaining_probes = 6;
 
   /* Time requested.  Copy it in case CONVERT modifies *TP; this can
      occur if TP is localtime's returned value and CONVERT is localtime.  */
@@ -312,36 +270,52 @@ __mktime_internal (tp, convert, offset)
   tm.tm_yday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
   t0 = ydhms_tm_diff (year, yday, hour, min, sec, &tm);
 
-  for (t = t0 + *offset;
+  for (t = t1 = t2 = t0 + *offset;
        (dt = ydhms_tm_diff (year, yday, hour, min, sec,
 			    ranged_convert (convert, &t, &tm)));
-       t += dt)
-    if (--remaining_probes == 0)
+       t1 = t2, t2 = t, t += dt)
+    if (t == t1 && t != t2
+	&& (isdst < 0 || tm.tm_isdst < 0
+	    || (isdst != 0) != (tm.tm_isdst != 0)))
+      /* We can't possibly find a match, as we are oscillating
+	 between two values.  The requested time probably falls
+	 within a spring-forward gap of size DT.  Follow the common
+	 practice in this case, which is to return a time that is DT
+	 away from the requested time, preferring a time whose
+	 tm_isdst differs from the requested value.  In practice,
+	 this is more useful than returning -1.  */
+      break;
+    else if (--remaining_probes == 0)
       return -1;
 
-  /* Check whether tm.tm_isdst has the requested value, if any.  */
-  if (0 <= isdst && 0 <= tm.tm_isdst)
+  /* If we have a match, check whether tm.tm_isdst has the requested
+     value, if any.  */
+  if (dt == 0 && isdst != tm.tm_isdst && 0 <= isdst && 0 <= tm.tm_isdst)
     {
-      int dst_diff = (isdst != 0) - (tm.tm_isdst != 0);
-      if (dst_diff)
+      /* tm.tm_isdst has the wrong value.  Look for a neighboring
+	 time with the right value, and use its UTC offset.
+	 Heuristic: probe the previous three calendar quarters (approximately),
+	 looking for the desired isdst.  This isn't perfect,
+	 but it's good enough in practice.  */
+      int quarter = 7889238; /* seconds per average 1/4 Gregorian year */
+      int i;
+
+      /* If we're too close to the time_t limit, look in future quarters.  */
+      if (t < TIME_T_MIN + 3 * quarter)
+	quarter = -quarter;
+
+      for (i = 1; i <= 3; i++)
 	{
-	  /* Move two hours in the direction indicated by the disagreement,
-	     probe some more, and switch to a new time if found.
-	     The largest known fallback due to daylight savings is two hours:
-	     once, in Newfoundland, 1988-10-30 02:00 -> 00:00.  */
-	  time_t ot = t - 2 * 60 * 60 * dst_diff;
-	  while (--remaining_probes != 0)
+	  time_t ot = t - i * quarter;
+	  struct tm otm;
+	  ranged_convert (convert, &ot, &otm);
+	  if (otm.tm_isdst == isdst)
 	    {
-	      struct tm otm;
-	      if (! (dt = ydhms_tm_diff (year, yday, hour, min, sec,
-					 ranged_convert (convert, &ot, &otm))))
-		{
-		  t = ot;
-		  tm = otm;
-		  break;
-		}
-	      if ((ot += dt) == t)
-		break;  /* Avoid a redundant probe.  */
+	      /* We found the desired tm_isdst.
+		 Extrapolate back to the desired time.  */
+	      t = ot + ydhms_tm_diff (year, yday, hour, min, sec, &otm);
+	      ranged_convert (convert, &t, &tm);
+	      break;
 	    }
 	}
     }
@@ -387,6 +361,24 @@ __mktime_internal (tp, convert, offset)
   return t;
 }
 
+
+static time_t localtime_offset;
+
+/* Convert *TP to a time_t value.  */
+time_t
+mktime (tp)
+     struct tm *tp;
+{
+#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, my_mktime_localtime_r, &localtime_offset);
+}
+
 #ifdef weak_alias
 weak_alias (mktime, timelocal)
 #endif
@@ -531,6 +523,6 @@ main (argc, argv)
 
 /*
 Local Variables:
-compile-command: "gcc -DDEBUG -D__EXTENSIONS__ -DHAVE_LIMITS_H -DHAVE_LOCALTIME_R -DSTDC_HEADERS -Wall -W -O -g mktime.c -o mktime"
+compile-command: "gcc -DDEBUG -DHAVE_LIMITS_H -DSTDC_HEADERS -Wall -W -O -g mktime.c -o mktime"
 End:
 */

lib/modechange.c

@@ -1,5 +1,5 @@
 /* modechange.c -- file mode manipulation
-   Copyright (C) 1989, 1990, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1997-2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,9 +28,9 @@
 # include <config.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "modechange.h"
+#include <sys/stat.h>
+#include "xstrtol.h"
 
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -50,26 +50,93 @@ char *malloc ();
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
+#ifndef S_ISUID
+# define S_ISUID 04000
+#endif
+#ifndef S_ISGID
+# define S_ISGID 04000
+#endif
+#ifndef S_ISVTX
+# define S_ISVTX 01000
+#endif
+#ifndef S_IRUSR
+# define S_IRUSR 0400
+#endif
+#ifndef S_IWUSR
+# define S_IWUSR 0200
+#endif
+#ifndef S_IXUSR
+# define S_IXUSR 0100
+#endif
+#ifndef S_IRGRP
+# define S_IRGRP 0040
+#endif
+#ifndef S_IWGRP
+# define S_IWGRP 0020
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0010
+#endif
+#ifndef S_IROTH
+# define S_IROTH 0004
+#endif
+#ifndef S_IWOTH
+# define S_IWOTH 0002
+#endif
+#ifndef S_IXOTH
+# define S_IXOTH 0001
+#endif
+#ifndef S_IRWXU
+# define S_IRWXU 0700
+#endif
+#ifndef S_IRWXG
+# define S_IRWXG 0070
+#endif
+#ifndef S_IRWXO
+# define S_IRWXO 0007
+#endif
+
+/* All the mode bits that can be affected by chmod.  */
+#define CHMOD_MODE_BITS \
+  (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
+
 /* Return newly allocated memory to hold one element of type TYPE. */
 #define talloc(type) ((type *) malloc (sizeof (type)))
 
-#define isodigit(c) ((c) >= '0' && (c) <= '7')
+/* Create a mode_change entry with the specified `=ddd'-style
+   mode change operation, where NEW_MODE is `ddd'.  Return the
+   new entry, or NULL upon failure.  */
 
-/* Return a positive integer containing the value of the ASCII
-   octal number S.  If S is not an octal number, return -1.  */
-
-static int
-oatoi (const char *s)
+static struct mode_change *
+make_node_op_equals (mode_t new_mode)
 {
-  register int i;
+  struct mode_change *p;
+  p = talloc (struct mode_change);
+  if (p == NULL)
+    return p;
+  p->next = NULL;
+  p->op = '=';
+  p->flags = 0;
+  p->value = new_mode;
+  p->affected = CHMOD_MODE_BITS;	/* Affect all permissions. */
+  return p;
+}
 
-  if (*s == 0)
-    return -1;
-  for (i = 0; isodigit (*s); ++s)
-    i = i * 8 + *s - '0';
-  if (*s)
-    return -1;
-  return i;
+/* Append entry E to the end of the link list with the specified
+   HEAD and TAIL.  */
+
+static void
+mode_append_entry (struct mode_change **head,
+		   struct mode_change **tail,
+		   struct mode_change *e)
+{
+  if (*head == NULL)
+    *head = *tail = e;
+  else
+    {
+      (*tail)->next = e;
+      *tail = e;
+    }
 }
 
 /* Return a linked list of file mode change operations created from
@@ -89,41 +156,44 @@ struct mode_change *
 mode_compile (const char *mode_string, unsigned int masked_ops)
 {
   struct mode_change *head;	/* First element of the linked list. */
-  struct mode_change *change;	/* An element of the linked list. */
-  int i;			/* General purpose temporary. */
-  int umask_value;		/* The umask value (surprise). */
-  unsigned short affected_bits;	/* Which bits in the mode are operated on. */
-  unsigned short affected_masked; /* `affected_bits' modified by umask. */
-  unsigned ops_to_mask;		/* Operators to actually use umask on. */
+  struct mode_change *tail;	/* An element of the linked list. */
+  uintmax_t mode_value;		/* The mode value, if octal.  */
+  char *string_end;		/* Pointer to end of parsed value.  */
+  mode_t umask_value;		/* The umask value (surprise). */
 
-  i = oatoi (mode_string);
-  if (i >= 0)
+  head = NULL;
+#ifdef lint
+  tail = NULL;
+#endif
+
+  if (xstrtoumax (mode_string, &string_end, 8, &mode_value, "") == LONGINT_OK)
     {
-      if (i > 07777)
+      struct mode_change *p;
+      if (mode_value != (mode_value & CHMOD_MODE_BITS))
 	return MODE_INVALID;
-      head = talloc (struct mode_change);
-      if (head == NULL)
+      p = make_node_op_equals ((mode_t) mode_value);
+      if (p == NULL)
 	return MODE_MEMORY_EXHAUSTED;
-      head->next = NULL;
-      head->op = '=';
-      head->flags = 0;
-      head->value = i;
-      head->affected = 07777;	/* Affect all permissions. */
+      mode_append_entry (&head, &tail, p);
       return head;
     }
 
   umask_value = umask (0);
   umask (umask_value);		/* Restore the old value. */
-
-  head = NULL;
-#ifdef lint
-  change = NULL;
-#endif
   --mode_string;
 
   /* One loop iteration for each "ugoa...=+-rwxXstugo...[=+-rwxXstugo...]". */
   do
     {
+      /* Which bits in the mode are operated on. */
+      mode_t affected_bits = 0;
+      /* `affected_bits' modified by umask. */
+      mode_t affected_masked;
+      /* Operators to actually use umask on. */
+      unsigned ops_to_mask = 0;
+
+      int who_specified_p;
+
       affected_bits = 0;
       ops_to_mask = 0;
       /* Turn on all the bits in `affected_bits' for each group given. */
@@ -131,16 +201,16 @@ mode_compile (const char *mode_string, unsigned int masked_ops)
 	switch (*mode_string)
 	  {
 	  case 'u':
-	    affected_bits |= 04700;
+	    affected_bits |= S_ISUID | S_IRWXU;
 	    break;
 	  case 'g':
-	    affected_bits |= 02070;
+	    affected_bits |= S_ISGID | S_IRWXG;
 	    break;
 	  case 'o':
-	    affected_bits |= 01007;
+	    affected_bits |= S_ISVTX | S_IRWXO;
 	    break;
 	  case 'a':
-	    affected_bits |= 07777;
+	    affected_bits |= CHMOD_MODE_BITS;
 	    break;
 	  default:
 	    goto no_more_affected;
@@ -149,37 +219,39 @@ mode_compile (const char *mode_string, unsigned int masked_ops)
     no_more_affected:
       /* If none specified, affect all bits, except perhaps those
 	 set in the umask. */
-      if (affected_bits == 0)
+      if (affected_bits)
+	who_specified_p = 1;
+      else
 	{
-	  affected_bits = 07777;
+	  who_specified_p = 0;
+	  affected_bits = CHMOD_MODE_BITS;
 	  ops_to_mask = masked_ops;
 	}
 
       while (*mode_string == '=' || *mode_string == '+' || *mode_string == '-')
 	{
-	  /* Add the element to the tail of the list, so the operations
-	     are performed in the correct order. */
-	  if (head == NULL)
+	  struct mode_change *change = talloc (struct mode_change);
+	  if (change == NULL)
 	    {
-	      head = talloc (struct mode_change);
-	      if (head == NULL)
-		return MODE_MEMORY_EXHAUSTED;
-	      change = head;
-	    }
-	  else
-	    {
-	      change->next = talloc (struct mode_change);
-	      if (change->next == NULL)
-		{
-		  mode_free (change);
-		  return MODE_MEMORY_EXHAUSTED;
-		}
-	      change = change->next;
+	      mode_free (head);
+	      return MODE_MEMORY_EXHAUSTED;
 	    }
 
 	  change->next = NULL;
 	  change->op = *mode_string;	/* One of "=+-". */
 	  affected_masked = affected_bits;
+
+	  /* Per the Single Unix Spec, if `who' is not specified and the
+	     `=' operator is used, then clear all the bits first.  */
+	  if (!who_specified_p &&
+	      ops_to_mask & (*mode_string == '=' ? MODE_MASK_EQUALS : 0))
+	    {
+	      struct mode_change *p = make_node_op_equals (0);
+	      if (p == NULL)
+		return MODE_MEMORY_EXHAUSTED;
+	      mode_append_entry (&head, &tail, p);
+	    }
+
 	  if (ops_to_mask & (*mode_string == '=' ? MODE_MASK_EQUALS
 			     : *mode_string == '+' ? MODE_MASK_PLUS
 			     : MODE_MASK_MINUS))
@@ -188,36 +260,43 @@ mode_compile (const char *mode_string, unsigned int masked_ops)
 	  change->value = 0;
 	  change->flags = 0;
 
+	  /* Add the element to the tail of the list, so the operations
+	     are performed in the correct order. */
+	  mode_append_entry (&head, &tail, change);
+
 	  /* Set `value' according to the bits set in `affected_masked'. */
 	  for (++mode_string;; ++mode_string)
 	    switch (*mode_string)
 	      {
 	      case 'r':
-		change->value |= 00444 & affected_masked;
+		change->value |= ((S_IRUSR | S_IRGRP | S_IROTH)
+				  & affected_masked);
 		break;
 	      case 'w':
-		change->value |= 00222 & affected_masked;
+		change->value |= ((S_IWUSR | S_IWGRP | S_IWOTH)
+				  & affected_masked);
 		break;
 	      case 'X':
 		change->flags |= MODE_X_IF_ANY_X;
 		/* Fall through. */
 	      case 'x':
-		change->value |= 00111 & affected_masked;
+		change->value |= ((S_IXUSR | S_IXGRP | S_IXOTH)
+				  & affected_masked);
 		break;
 	      case 's':
 		/* Set the setuid/gid bits if `u' or `g' is selected. */
-		change->value |= 06000 & affected_masked;
+		change->value |= (S_ISUID | S_ISGID) & affected_masked;
 		break;
 	      case 't':
 		/* Set the "save text image" bit if `o' is selected. */
-		change->value |= 01000 & affected_masked;
+		change->value |= S_ISVTX & affected_masked;
 		break;
 	      case 'u':
 		/* Set the affected bits to the value of the `u' bits
 		   on the same file.  */
 		if (change->value)
 		  goto invalid;
-		change->value = 00700;
+		change->value = S_IRWXU;
 		change->flags |= MODE_COPY_EXISTING;
 		break;
 	      case 'g':
@@ -225,7 +304,7 @@ mode_compile (const char *mode_string, unsigned int masked_ops)
 		   on the same file.  */
 		if (change->value)
 		  goto invalid;
-		change->value = 00070;
+		change->value = S_IRWXG;
 		change->flags |= MODE_COPY_EXISTING;
 		break;
 	      case 'o':
@@ -233,7 +312,7 @@ mode_compile (const char *mode_string, unsigned int masked_ops)
 		   on the same file.  */
 		if (change->value)
 		  goto invalid;
-		change->value = 00007;
+		change->value = S_IRWXO;
 		change->flags |= MODE_COPY_EXISTING;
 		break;
 	      default:
@@ -268,7 +347,7 @@ mode_create_from_ref (const char *ref_file)
 
   change->op = '=';
   change->flags = 0;
-  change->affected = 07777;
+  change->affected = CHMOD_MODE_BITS;
   change->value = ref_stats.st_mode;
   change->next = NULL;
 
@@ -280,13 +359,13 @@ mode_create_from_ref (const char *ref_file)
    change affects it even if no execute bits were set in OLDMODE.
    The returned value has the S_IFMT bits cleared. */
 
-unsigned short
-mode_adjust (unsigned int oldmode, const struct mode_change *changes)
+mode_t
+mode_adjust (mode_t oldmode, const struct mode_change *changes)
 {
-  unsigned short newmode;	/* The adjusted mode and one operand. */
-  unsigned short value;		/* The other operand. */
+  mode_t newmode;	/* The adjusted mode and one operand. */
+  mode_t value;		/* The other operand. */
 
-  newmode = oldmode & 07777;
+  newmode = oldmode & CHMOD_MODE_BITS;
 
   for (; changes; changes = changes->next)
     {
@@ -296,15 +375,21 @@ mode_adjust (unsigned int oldmode, const struct mode_change *changes)
 	     the mask `changes->value'. */
 	  value = newmode & changes->value;
 
-	  if (changes->value & 00700)
+	  if (changes->value & S_IRWXU)
 	    /* Copy `u' permissions onto `g' and `o'. */
-	    value |= (value >> 3) | (value >> 6);
-	  else if (changes->value & 00070)
+	    value |= ((value & S_IRUSR ? S_IRGRP | S_IROTH : 0)
+		      | (value & S_IWUSR ? S_IWGRP | S_IROTH : 0)
+		      | (value & S_IXUSR ? S_IXGRP | S_IXOTH : 0));
+	  else if (changes->value & S_IRWXG)
 	    /* Copy `g' permissions onto `u' and `o'. */
-	    value |= (value << 3) | (value >> 3);
+	    value |= ((value & S_IRGRP ? S_IRUSR | S_IROTH : 0)
+		      | (value & S_IWGRP ? S_IWUSR | S_IROTH : 0)
+		      | (value & S_IXGRP ? S_IXUSR | S_IXOTH : 0));
 	  else
 	    /* Copy `o' permissions onto `u' and `g'. */
-	    value |= (value << 3) | (value << 6);
+	    value |= ((value & S_IROTH ? S_IRUSR | S_IRGRP : 0)
+		      | (value & S_IWOTH ? S_IWUSR | S_IRGRP : 0)
+		      | (value & S_IXOTH ? S_IXUSR | S_IXGRP : 0));
 
 	  /* In order to change only `u', `g', or `o' permissions,
 	     or some combination thereof, clear unselected bits.
@@ -320,8 +405,9 @@ mode_adjust (unsigned int oldmode, const struct mode_change *changes)
 	     directory and no execute bits are already set. */
 	  if ((changes->flags & MODE_X_IF_ANY_X)
 	      && !S_ISDIR (oldmode)
-	      && (newmode & 00111) == 0)
-	    value &= ~00111;	/* Clear the execute bits. */
+	      && (newmode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0)
+	    /* Clear the execute bits. */
+	    value &= ~ (S_IXUSR | S_IXGRP | S_IXOTH);
 	}
 
       switch (changes->op)

lib/modechange.h

@@ -20,6 +20,12 @@
 #if ! defined MODECHANGE_H_
 # define MODECHANGE_H_
 
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# include <sys/types.h>
+
 /* Affect the execute bits only if at least one execute bit is set already,
    or if the file is a directory. */
 # define MODE_X_IF_ANY_X 01
@@ -33,8 +39,8 @@ struct mode_change
 {
   char op;			/* One of "=+-". */
   char flags;			/* Special operations. */
-  unsigned short affected;	/* Set for u/g/o/s/s/t, if to be affected. */
-  unsigned short value;		/* Bits to add/remove. */
+  mode_t affected;		/* Set for u/g/o/s/s/t, if to be affected. */
+  mode_t value;			/* Bits to add/remove. */
   struct mode_change *next;	/* Link to next change in list. */
 };
 
@@ -59,7 +65,7 @@ struct mode_change
 
 struct mode_change *mode_compile PARAMS ((const char *, unsigned));
 struct mode_change *mode_create_from_ref PARAMS ((const char *));
-unsigned short mode_adjust PARAMS ((unsigned, const struct mode_change *));
+mode_t mode_adjust PARAMS ((mode_t, const struct mode_change *));
 void mode_free PARAMS ((struct mode_change *));
 
 #endif

lib/mountlist.c

@@ -1,5 +1,5 @@
 /* mountlist.c -- return a list of mounted filesystems
-   Copyright (C) 1991, 1992, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -85,6 +85,11 @@ extern int errno;
 # include <sys/fs_types.h>
 #endif
 
+#ifdef MOUNTED_NEXT_DEV		/* BeOS.  */
+# include <fs_info.h>
+# include <dirent.h>
+#endif
+
 #ifdef MOUNTED_FREAD		/* SVR2.  */
 # include <mnttab.h>
 #endif
@@ -413,6 +418,111 @@ read_filesystem_list (int need_fs_type)
   }
 #endif /* MOUNTED_GETMNT. */
 
+#if defined (MOUNTED_NEXT_DEV) /* BeOS */
+  {
+    /* The next_dev() and fs_stat_dev() system calls give the list of
+       all filesystems, including the information returned by statvfs()
+       (fs type, total blocks, free blocks etc.), but without the mount
+       point. But on BeOS all filesystems except / are mounted in the
+       rootfs, directly under /.
+       The directory name of the mount point is often, but not always,
+       identical to the volume name of the device.
+       We therefore get the list of subdirectories of /, and the list
+       of all filesystems, and match the two lists.  */
+
+    DIR *dirp;
+    struct rootdir_entry
+      {
+        char *name;
+        dev_t dev;
+        ino_t ino;
+        struct rootdir_entry *next;
+      };
+    struct rootdir_entry *rootdir_list;
+    struct rootdir_entry **rootdir_tail;
+    int32 pos;
+    dev_t dev;
+    fs_info fi;
+
+    /* All volumes are mounted in the rootfs, directly under /. */
+    rootdir_list = NULL;
+    rootdir_tail = &rootdir_list;
+    dirp = opendir ("/");
+    if (dirp)
+      {
+        struct dirent *d;
+
+        while ((d = readdir (dirp)) != NULL)
+          {
+            char *name;
+            struct stat statbuf;
+
+            if (strcmp (d->d_name, "..") == 0)
+              continue;
+
+            if (strcmp (d->d_name, ".") == 0)
+              name = xstrdup ("/");
+            else
+              {
+                name = xmalloc (1 + strlen (d->d_name) + 1);
+                name[0] = '/';
+                strcpy (name + 1, d->d_name);
+              }
+
+            if (stat (name, &statbuf) >= 0 && S_ISDIR (statbuf.st_mode))
+              {
+                struct rootdir_entry *re;
+
+                re = (struct rootdir_entry *) xmalloc (sizeof (struct rootdir_entry));
+                re->name = name;
+                re->dev = statbuf.st_dev;
+                re->ino = statbuf.st_ino;
+
+                /* Add to the linked list.  */
+                *rootdir_tail = re;
+                rootdir_tail = &re->next;
+              }
+            else
+              free (name);
+          }
+        closedir (dirp);
+      }
+    *rootdir_tail = NULL;
+
+    for (pos = 0; (dev = next_dev (&pos)) >= 0; )
+      if (fs_stat_dev (dev, &fi) >= 0)
+        {
+          /* Note: fi.dev == dev. */
+          struct rootdir_entry *re;
+
+          for (re = rootdir_list; re; re = re->next)
+            if (re->dev == fi.dev && re->ino == fi.root)
+              break;
+
+          me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
+          me->me_devname = xstrdup (fi.device_name[0] != '\0' ? fi.device_name : fi.fsh_name);
+          me->me_mountdir = xstrdup (re != NULL ? re->name : fi.fsh_name);
+          me->me_type = xstrdup (fi.fsh_name);
+          me->me_dev = fi.dev;
+          me->me_dummy = 0;
+          me->me_remote = (fi.flags & B_FS_IS_SHARED) != 0;
+
+          /* Add to the linked list. */
+          *mtail = me;
+          mtail = &me->me_next;
+        }
+    *mtail = NULL;
+
+    while (rootdir_list != NULL)
+      {
+        struct rootdir_entry *re = rootdir_list;
+        rootdir_list = re->next;
+        free (re->name);
+        free (re);
+      }
+  }
+#endif /* MOUNTED_NEXT_DEV */
+
 #if defined (MOUNTED_GETFSSTAT)	/* __alpha running OSF_1 */
   {
     int numsys, counter, bufsize;

lib/nanosleep.c

@@ -0,0 +1,107 @@
+/* Provide a replacement for the POSIX nanosleep function.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* written by Jim Meyering */
+
+#include <config.h>
+
+/* Undefine nanosleep here so any prototype is not redefined to be a
+   prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2)  */
+#undef nanosleep
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <signal.h>
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include "nanosleep.h"
+
+static int suspended;
+int first_call = 1;
+
+/* Handle SIGCONT. */
+
+static void
+sighandler (int sig)
+{
+  suspended = 1;
+}
+
+/* FIXME: comment */
+
+static void
+my_usleep (const struct timespec *ts_delay)
+{
+  struct timeval tv_delay;
+  tv_delay.tv_sec = ts_delay->tv_sec;
+  tv_delay.tv_usec = ts_delay->tv_nsec / 1000;
+  select (0, (void *) 0, (void *) 0, (void *) 0, &tv_delay);
+}
+
+/* FIXME: comment */
+
+int
+rpl_nanosleep (const struct timespec *requested_delay,
+	       struct timespec *remaining_delay)
+{
+#ifdef SA_NOCLDSTOP
+  struct sigaction oldact, newact;
+#endif
+
+  suspended = 0;
+
+  /* set up sig handler */
+  if (first_call)
+    {
+#ifdef SA_NOCLDSTOP
+      newact.sa_handler = sighandler;
+      sigemptyset (&newact.sa_mask);
+      newact.sa_flags = 0;
+
+      sigaction (SIGCONT, NULL, &oldact);
+      if (oldact.sa_handler != SIG_IGN)
+	sigaction (SIGCONT, &newact, NULL);
+#else
+      if (signal (SIGCONT, SIG_IGN) != SIG_IGN)
+	signal (SIGCONT, sighandler);
+#endif
+      first_call = 0;
+    }
+
+  my_usleep (requested_delay);
+
+  if (suspended)
+    {
+      /* Calculate time remaining.  */
+      /* FIXME: the code in sleep doesn't use this, so there's no
+	 rush to implement it.  */
+
+      errno = EINTR;
+    }
+
+  /* FIXME: Restore sig handler?  */
+
+  return suspended;
+}

lib/nanosleep.h

@@ -0,0 +1,49 @@
+/*  Copyright (C) 2000 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if ! defined NANOSLEEP_H
+# define NANOSLEEP_H
+
+/* You must include config.h before including this file.  */
+
+# include <sys/types.h>
+# if TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+# else
+#  if HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#  else
+#   include <time.h>
+#  endif
+# endif
+
+# if ! HAVE_STRUCT_TIMESPEC
+/* Some systems don't define this struct, e.g., AIX 4.1, Ultrix 4.3.  */
+struct timespec
+{
+  time_t tv_sec;
+  long tv_nsec;
+};
+# endif
+
+# if ! HAVE_DECL_NANOSLEEP
+/* Don't specify a prototype here.  Some systems (e.g., OSF) declare
+   nanosleep with a conflicting one (const-less first parameter).  */
+int nanosleep ();
+# endif
+
+#endif

lib/obstack.c

@@ -1,5 +1,5 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988,89,90,91,92,93,94,96 Free Software Foundation, Inc.
+   Copyright (C) 1988-1994,96,97,98,99 Free Software Foundation, Inc.
 
    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.
@@ -19,6 +19,10 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "obstack.h"
 
 /* NOTE BEFORE MODIFYING THIS FILE: This version number must be
@@ -37,60 +41,62 @@
 
 #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
+# include <gnu-versions.h>
+# if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
+#  define ELIDE_CODE
+# endif
 #endif
 
 
 #ifndef ELIDE_CODE
 
 
-#if defined (__STDC__) && __STDC__
-#define POINTER void *
-#else
-#define POINTER char *
-#endif
+# if defined (__STDC__) && __STDC__
+#  define POINTER void *
+# else
+#  define POINTER char *
+# endif
 
 /* Determine default alignment.  */
 struct fooalign {char x; double d;};
-#define DEFAULT_ALIGNMENT  \
+# define DEFAULT_ALIGNMENT  \
   ((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.  */
 union fooround {long x; double d;};
-#define DEFAULT_ROUNDING (sizeof (union fooround))
+# define DEFAULT_ROUNDING (sizeof (union fooround))
 
 /* When we copy a long block of data, this is the unit to do it with.
    On some machines, copying successive ints does not work;
    in such a case, redefine COPYING_UNIT to `long' (if that works)
    or `char' as a last resort.  */
-#ifndef COPYING_UNIT
-#define COPYING_UNIT int
-#endif
+# ifndef COPYING_UNIT
+#  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
+   This can be set to a user defined function which should either
+   abort gracefully or use longjump - but shouldn't return.  This
+   variable by default points to the internal function
    `print_and_abort'.  */
-#if defined (__STDC__) && __STDC__
+# if defined (__STDC__) && __STDC__
 static void print_and_abort (void);
 void (*obstack_alloc_failed_handler) (void) = print_and_abort;
-#else
+# else
 static void print_and_abort ();
 void (*obstack_alloc_failed_handler) () = print_and_abort;
-#endif
+# endif
 
 /* Exit value used when `print_and_abort' is used.  */
-#if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
+# if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
+#  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
@@ -104,33 +110,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) \
+# if defined (__STDC__) && __STDC__
+#  define CALL_CHUNKFUN(h, size) \
   (((h) -> use_extra_arg) \
    ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
    : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
 
-#define CALL_FREEFUN(h, old_chunk) \
+#  define CALL_FREEFUN(h, old_chunk) \
   do { \
     if ((h) -> use_extra_arg) \
       (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
     else \
       (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
   } while (0)
-#else
-#define CALL_CHUNKFUN(h, size) \
+# 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) \
+#  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
+# endif
 
 
 /* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
@@ -138,27 +144,26 @@ struct obstack *_obstack;
    CHUNKFUN is the function to use to allocate chunks,
    and FREEFUN the function to free them.
 
-   Return nonzero if successful, zero if out of memory.
-   To recover from an out of memory error,
-   free up some memory, then call this again.  */
+   Return nonzero if successful, calls obstack_alloc_failed_handler if
+   allocation fails.  */
 
 int
 _obstack_begin (h, size, alignment, chunkfun, freefun)
      struct obstack *h;
      int size;
      int alignment;
-#if defined (__STDC__) && __STDC__
+# if defined (__STDC__) && __STDC__
      POINTER (*chunkfun) (long);
      void (*freefun) (void *);
-#else
+# else
      POINTER (*chunkfun) ();
      void (*freefun) ();
-#endif
+# endif
 {
   register struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
-    alignment = DEFAULT_ALIGNMENT;
+    alignment = (int) DEFAULT_ALIGNMENT;
   if (size == 0)
     /* Default size is what GNU malloc can fit in a 4096-byte block.  */
     {
@@ -176,13 +181,13 @@ _obstack_begin (h, size, alignment, chunkfun, freefun)
       size = 4096 - extra;
     }
 
-#if defined (__STDC__) && __STDC__
+# if defined (__STDC__) && __STDC__
   h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
   h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
-#else
+# else
   h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
   h->freefun = freefun;
-#endif
+# endif
   h->chunk_size = size;
   h->alignment_mask = alignment - 1;
   h->use_extra_arg = 0;
@@ -205,19 +210,19 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
      struct obstack *h;
      int size;
      int alignment;
-#if defined (__STDC__) && __STDC__
+# if defined (__STDC__) && __STDC__
      POINTER (*chunkfun) (POINTER, long);
      void (*freefun) (POINTER, POINTER);
-#else
+# else
      POINTER (*chunkfun) ();
      void (*freefun) ();
-#endif
+# endif
      POINTER arg;
 {
   register struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
-    alignment = DEFAULT_ALIGNMENT;
+    alignment = (int) DEFAULT_ALIGNMENT;
   if (size == 0)
     /* Default size is what GNU malloc can fit in a 4096-byte block.  */
     {
@@ -235,13 +240,13 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
       size = 4096 - extra;
     }
 
-#if defined(__STDC__) && __STDC__
+# if defined(__STDC__) && __STDC__
   h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun;
   h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
-#else
+# else
   h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
   h->freefun = freefun;
-#endif
+# endif
   h->chunk_size = size;
   h->alignment_mask = alignment - 1;
   h->extra_arg = arg;
@@ -274,9 +279,9 @@ _obstack_newchunk (h, length)
   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;
-  int already;
+  register long obj_size = h->next_free - h->object_base;
+  register long i;
+  long already;
 
   /* Compute size for new chunk.  */
   new_size = (obj_size + length) + (obj_size >> 3) + 100;
@@ -330,11 +335,11 @@ _obstack_newchunk (h, length)
    This is here for debugging.
    If you use it in a program, you are probably losing.  */
 
-#if defined (__STDC__) && __STDC__
+# if defined (__STDC__) && __STDC__
 /* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
    obstack.h because it is just for debugging.  */
 int _obstack_allocated_p (struct obstack *h, POINTER obj);
-#endif
+# endif
 
 int
 _obstack_allocated_p (h, obj)
@@ -359,7 +364,7 @@ _obstack_allocated_p (h, obj)
 /* Free objects in obstack H, including OBJ and everything allocate
    more recently than OBJ.  If OBJ is zero, free everything in H.  */
 
-#undef obstack_free
+# undef obstack_free
 
 /* This function has two names with identical definitions.
    This is the first one, called from non-ANSI code.  */
@@ -445,32 +450,37 @@ _obstack_memory_used (h)
 }
 
 /* Define the error handler.  */
-#ifndef _
-# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-#  ifndef _
-#   define _(Str) gettext (Str)
+# ifndef _
+#  ifdef HAVE_LIBINTL_H
+#   include <libintl.h>
+#   ifndef _
+#    define _(Str) gettext (Str)
+#   endif
+#  else
+#   define _(Str) (Str)
 #  endif
-# else
-#  define _(Str) (Str)
 # endif
-#endif
+# if defined _LIBC && defined USE_IN_LIBIO
+#  include <libio/iolibio.h>
+#  define fputs(s, f) _IO_fputs (s, f)
+# endif
 
 static void
 print_and_abort ()
 {
-  fputs (_("memory exhausted\n"), stderr);
+  fputs (_("memory exhausted"), stderr);
+  fputc ('\n', stderr);
   exit (obstack_exit_failure);
 }
 
-#if 0
+# 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.  */
 
 /* Now define the functional versions of the obstack macros.
    Define them to simply use the corresponding macros to do the job.  */
 
-#if defined (__STDC__) && __STDC__
+#  if defined (__STDC__) && __STDC__
 /* These function definitions do not work with non-ANSI preprocessors;
    they won't pass through the macro names in parentheses.  */
 
@@ -581,8 +591,8 @@ POINTER (obstack_copy0) (obstack, pointer, length)
   return obstack_copy0 (obstack, pointer, length);
 }
 
-#endif /* __STDC__ */
+#  endif /* __STDC__ */
 
-#endif /* 0 */
+# endif /* 0 */
 
 #endif	/* !ELIDE_CODE */

lib/obstack.h

@@ -1,5 +1,5 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+   Copyright (C) 1988,89,90,91,92,93,94,96,97,98,99 Free Software Foundation, Inc.
 
    the C library, however.  The master source lives in /gd/gnu/lib.
 
@@ -118,45 +118,39 @@ extern "C" {
    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
-   but in traditional C it is usually long.  If we are in ANSI C and
-   don't already have ptrdiff_t get it.  */
+/* We need the type of the resulting object.  If __PTRDIFF_TYPE__ is
+   defined, as with GNU C, use that; that way we don't pollute the
+   namespace with <stddef.h>'s symbols.  Otherwise, if <stddef.h> is
+   available, include it and use ptrdiff_t.  In traditional C, long is
+   the best that we can do.  */
 
-#if defined (__STDC__) && __STDC__ && ! defined (offsetof)
-#if defined (__GNUC__) && defined (IN_GCC)
-/* On Next machine, the system's stddef.h screws up if included
-   after we have defined just ptrdiff_t, so include all of stddef.h.
-   Otherwise, define just ptrdiff_t, which is all we need.  */
-#ifndef __NeXT__
-#define __need_ptrdiff_t
-#endif
-#endif
-
-#include <stddef.h>
-#endif
-
-#if defined (__STDC__) && __STDC__
-#define PTR_INT_TYPE ptrdiff_t
+#ifdef __PTRDIFF_TYPE__
+# define PTR_INT_TYPE __PTRDIFF_TYPE__
 #else
-#define PTR_INT_TYPE long
+# ifdef HAVE_STDDEF_H
+#  include <stddef.h>
+#  define PTR_INT_TYPE ptrdiff_t
+# else
+#  define PTR_INT_TYPE long
+# endif
 #endif
 
-#if defined (_LIBC) || defined (HAVE_STRING_H)
-#include <string.h>
-#define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
+#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
+# 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. */
@@ -175,7 +169,7 @@ struct obstack		/* control current object in current chunk */
   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__
+#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.  */
@@ -199,7 +193,7 @@ struct obstack		/* control current object in current chunk */
 
 /* Declare the external functions we use; they are in obstack.c.  */
 
-#if defined (__STDC__) && __STDC__
+#if defined __STDC__ && __STDC__
 extern void _obstack_newchunk (struct obstack *, int);
 extern void _obstack_free (struct obstack *, void *);
 extern int _obstack_begin (struct obstack *, int, int,
@@ -216,7 +210,7 @@ extern int _obstack_begin_1 ();
 extern int _obstack_memory_used ();
 #endif
 
-#if defined (__STDC__) && __STDC__
+#if defined __STDC__ && __STDC__
 
 /* Do the function-declarations after the structs
    but before defining the macros.  */
@@ -262,9 +256,10 @@ int obstack_memory_used (struct obstack *obstack);
    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__
+   more memory.  This can be set to a user defined function which
+   should either abort gracefully or use longjump - but shouldn't
+   return.  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) ();
@@ -293,53 +288,53 @@ extern int obstack_exit_failure;
 
 /* To prevent prototype warnings provide complete argument list in
    standard C version.  */
-#if defined (__STDC__) && __STDC__
+#if defined __STDC__ && __STDC__
 
-#define obstack_init(h) \
+# define obstack_init(h) \
   _obstack_begin ((h), 0, 0, \
 		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
 
-#define obstack_begin(h, size) \
+# 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) \
+# 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) \
+# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
   _obstack_begin_1 ((h), (size), (alignment), \
 		    (void *(*) (void *, long)) (chunkfun), \
 		    (void (*) (void *, void *)) (freefun), (arg))
 
-#define obstack_chunkfun(h, newchunkfun) \
+# define obstack_chunkfun(h, newchunkfun) \
   ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
 
-#define obstack_freefun(h, newfreefun) \
+# define obstack_freefun(h, newfreefun) \
   ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
 
 #else
 
-#define obstack_init(h) \
+# define obstack_init(h) \
   _obstack_begin ((h), 0, 0, \
 		  (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free)
 
-#define obstack_begin(h, size) \
+# define obstack_begin(h, size) \
   _obstack_begin ((h), (size), 0, \
 		  (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free)
 
-#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
+# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
   _obstack_begin ((h), (size), (alignment), \
 		    (void *(*) ()) (chunkfun), (void (*) ()) (freefun))
 
-#define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
+# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
   _obstack_begin_1 ((h), (size), (alignment), \
 		    (void *(*) ()) (chunkfun), (void (*) ()) (freefun), (arg))
 
-#define obstack_chunkfun(h, newchunkfun) \
+# define obstack_chunkfun(h, newchunkfun) \
   ((h) -> chunkfun = (struct _obstack_chunk *(*)()) (newchunkfun))
 
-#define obstack_freefun(h, newfreefun) \
+# define obstack_freefun(h, newfreefun) \
   ((h) -> freefun = (void (*)()) (newfreefun))
 
 #endif
@@ -350,30 +345,30 @@ extern int obstack_exit_failure;
 
 #define obstack_memory_used(h) _obstack_memory_used (h)
 
-#if defined (__GNUC__) && defined (__STDC__) && __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__.  */
-#if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
-#define __extension__
-#endif
+# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
+#  define __extension__
+# endif
 
 /* For GNU C, if not -traditional,
    we can define these macros to compute all args only once
    without using a global variable.
    Also, we can avoid using the `temp' slot, to make faster code.  */
 
-#define obstack_object_size(OBSTACK)					\
+# define obstack_object_size(OBSTACK)					\
   __extension__								\
   ({ struct obstack *__o = (OBSTACK);					\
      (unsigned) (__o->next_free - __o->object_base); })
 
-#define obstack_room(OBSTACK)						\
+# define obstack_room(OBSTACK)						\
   __extension__								\
   ({ struct obstack *__o = (OBSTACK);					\
      (unsigned) (__o->chunk_limit - __o->next_free); })
 
-#define obstack_make_room(OBSTACK,length)				\
+# define obstack_make_room(OBSTACK,length)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    int __len = (length);						\
@@ -381,12 +376,12 @@ __extension__								\
      _obstack_newchunk (__o, __len);					\
    (void) 0; })
 
-#define obstack_empty_p(OBSTACK)					\
+# define obstack_empty_p(OBSTACK)					\
   __extension__								\
   ({ struct obstack *__o = (OBSTACK);					\
      (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); })
 
-#define obstack_grow(OBSTACK,where,length)				\
+# define obstack_grow(OBSTACK,where,length)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    int __len = (length);						\
@@ -396,7 +391,7 @@ __extension__								\
    __o->next_free += __len;						\
    (void) 0; })
 
-#define obstack_grow0(OBSTACK,where,length)				\
+# define obstack_grow0(OBSTACK,where,length)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    int __len = (length);						\
@@ -407,7 +402,7 @@ __extension__								\
    *(__o->next_free)++ = 0;						\
    (void) 0; })
 
-#define obstack_1grow(OBSTACK,datum)					\
+# define obstack_1grow(OBSTACK,datum)					\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + 1 > __o->chunk_limit)				\
@@ -419,7 +414,7 @@ __extension__								\
    and that the data added so far to the current object
    shares that much alignment.  */
 
-#define obstack_ptr_grow(OBSTACK,datum)					\
+# define obstack_ptr_grow(OBSTACK,datum)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
@@ -427,7 +422,7 @@ __extension__								\
    *((void **)__o->next_free)++ = ((void *)datum);			\
    (void) 0; })
 
-#define obstack_int_grow(OBSTACK,datum)					\
+# define obstack_int_grow(OBSTACK,datum)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + sizeof (int) > __o->chunk_limit)		\
@@ -435,10 +430,10 @@ __extension__								\
    *((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)					\
+# define obstack_blank(OBSTACK,length)					\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    int __len = (length);						\
@@ -447,19 +442,19 @@ __extension__								\
    __o->next_free += __len;						\
    (void) 0; })
 
-#define obstack_alloc(OBSTACK,length)					\
+# define obstack_alloc(OBSTACK,length)					\
 __extension__								\
 ({ struct obstack *__h = (OBSTACK);					\
    obstack_blank (__h, (length));					\
    obstack_finish (__h); })
 
-#define obstack_copy(OBSTACK,where,length)				\
+# define obstack_copy(OBSTACK,where,length)				\
 __extension__								\
 ({ struct obstack *__h = (OBSTACK);					\
    obstack_grow (__h, (where), (length));				\
    obstack_finish (__h); })
 
-#define obstack_copy0(OBSTACK,where,length)				\
+# define obstack_copy0(OBSTACK,where,length)				\
 __extension__								\
 ({ struct obstack *__h = (OBSTACK);					\
    obstack_grow0 (__h, (where), (length));				\
@@ -467,7 +462,7 @@ __extension__								\
 
 /* The local variable is named __o1 to avoid a name conflict
    when obstack_blank is called.  */
-#define obstack_finish(OBSTACK)  					\
+# define obstack_finish(OBSTACK)  					\
 __extension__								\
 ({ struct obstack *__o1 = (OBSTACK);					\
    void *value;								\
@@ -483,23 +478,23 @@ __extension__								\
    __o1->object_base = __o1->next_free;					\
    value; })
 
-#define obstack_free(OBSTACK, OBJ)					\
+# define obstack_free(OBSTACK, OBJ)					\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    void *__obj = (OBJ);							\
    if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
-     __o->next_free = __o->object_base = __obj;				\
+     __o->next_free = __o->object_base = (char *)__obj;			\
    else (obstack_free) (__o, __obj); })
 
 #else /* not __GNUC__ or not __STDC__ */
 
-#define obstack_object_size(h) \
+# define obstack_object_size(h) \
  (unsigned) ((h)->next_free - (h)->object_base)
 
-#define obstack_room(h)		\
+# define obstack_room(h)		\
  (unsigned) ((h)->chunk_limit - (h)->next_free)
 
-#define obstack_empty_p(h) \
+# define obstack_empty_p(h) \
  ((h)->chunk->prev == 0 && (h)->next_free - (h)->chunk->contents == 0)
 
 /* Note that the call to _obstack_newchunk is enclosed in (..., 0)
@@ -508,19 +503,19 @@ __extension__								\
    Casting the third operand to void was tried before,
    but some compilers won't accept it.  */
 
-#define obstack_make_room(h,length)					\
+# 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)					\
+# define obstack_grow(h,where,length)					\
 ( (h)->temp = (length),							\
   (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
    ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
   _obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp),	\
   (h)->next_free += (h)->temp)
 
-#define obstack_grow0(h,where,length)					\
+# 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),			\
@@ -528,40 +523,40 @@ __extension__								\
   (h)->next_free += (h)->temp,						\
   *((h)->next_free)++ = 0)
 
-#define obstack_1grow(h,datum)						\
+# define obstack_1grow(h,datum)						\
 ( (((h)->next_free + 1 > (h)->chunk_limit)				\
    ? (_obstack_newchunk ((h), 1), 0) : 0),				\
   (*((h)->next_free)++ = (datum)))
 
-#define obstack_ptr_grow(h,datum)					\
+# define obstack_ptr_grow(h,datum)					\
 ( (((h)->next_free + sizeof (char *) > (h)->chunk_limit)		\
    ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		\
   (*((char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *) datum)))
 
-#define obstack_int_grow(h,datum)					\
+# define obstack_int_grow(h,datum)					\
 ( (((h)->next_free + sizeof (int) > (h)->chunk_limit)			\
    ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			\
   (*((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)						\
+# define obstack_blank(h,length)					\
 ( (h)->temp = (length),							\
   (((h)->chunk_limit - (h)->next_free < (h)->temp)			\
    ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
   ((h)->next_free += (h)->temp))
 
-#define obstack_alloc(h,length)						\
+# define obstack_alloc(h,length)					\
  (obstack_blank ((h), (length)), obstack_finish ((h)))
 
-#define obstack_copy(h,where,length)					\
+# define obstack_copy(h,where,length)					\
  (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
 
-#define obstack_copy0(h,where,length)					\
+# define obstack_copy0(h,where,length)					\
  (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
 
-#define obstack_finish(h)  						\
+# define obstack_finish(h)  						\
 ( ((h)->next_free == (h)->object_base					\
    ? (((h)->maybe_empty_object = 1), 0)					\
    : 0),								\
@@ -575,21 +570,21 @@ __extension__								\
   (h)->object_base = (h)->next_free,					\
   __INT_TO_PTR ((h)->temp))
 
-#if defined (__STDC__) && __STDC__
-#define obstack_free(h,obj)						\
+# if defined __STDC__ && __STDC__
+#  define obstack_free(h,obj)						\
 ( (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)						\
+# else
+#  define obstack_free(h,obj)						\
 ( (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)))
-#endif
+# endif
 
 #endif /* not __GNUC__ or not __STDC__ */
 

lib/path-concat.c

@@ -1,5 +1,5 @@
 /* path-concat.c -- concatenate two arbitrary pathnames
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,25 +32,53 @@
 #include <sys/types.h>
 
 char *malloc ();
+#ifndef strdup
+char *strdup ();
+#endif
 
-/* Concatenate two pathname components, DIR and BASE, in newly-allocated
-   storage and return the result.  Return 0 if out of memory.  Add a slash
-   between DIR and BASE in the result if neither would contribute one.
-   If each would contribute at least one, elide one from the end of DIR.
-   Otherwise, simply concatenate DIR and BASE.  In any case, if
-   BASE_IN_RESULT is non-NULL, set *BASE_IN_RESULT to point to the copy of
-   BASE in the returned concatenation.  */
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+#include "xalloc.h"
+#include "path-concat.h"
+
+/* Concatenate two pathname components, DIR and BASE, in
+   newly-allocated storage and return the result.  Return 0 if out of
+   memory.  Add a slash between DIR and BASE in the result if neither
+   would contribute one.  If each would contribute at least one, elide
+   one from the end of DIR.  Otherwise, simply concatenate DIR and
+   BASE.  In any case, if BASE_IN_RESULT is non-NULL, set
+   *BASE_IN_RESULT to point to the copy of BASE in the returned
+   concatenation.
+
+   DIR may be NULL, BASE must not be.
+
+   Return NULL if memory is exhausted.  */
 
 char *
-path_concat (dir, base, base_in_result)
-     const char *dir;
-     const char *base;
-     char **base_in_result;
+path_concat (const char *dir, const char *base, char **base_in_result)
 {
   char *p;
   char *p_concat;
-  size_t base_len = strlen (base);
-  size_t dir_len = strlen (dir);
+  size_t base_len;
+  size_t dir_len;
+
+  if (!dir)
+    {
+      p_concat = strdup (base);
+      if (base_in_result)
+        *base_in_result = p_concat;
+      return p_concat;
+    }
+
+  /* DIR is not empty. */
+  base_len = strlen (base);
+  dir_len = strlen (dir);
 
   p_concat = malloc (dir_len + base_len + 2);
   if (!p_concat)
@@ -58,10 +86,10 @@ path_concat (dir, base, base_in_result)
 
   p = mempcpy (p_concat, dir, dir_len);
 
-  if (*(p - 1) == '/' && *base == '/')
+  if (ISSLASH (*(p - 1)) && ISSLASH(*base))
     --p;
-  else if (*(p - 1) != '/' && *base != '/')
-    *p++ = '/';
+  else if (!ISSLASH (*(p - 1)) && !ISSLASH(*base))
+    *p++ = DIRECTORY_SEPARATOR;
 
   if (base_in_result)
     *base_in_result = p;
@@ -70,3 +98,14 @@ path_concat (dir, base, base_in_result)
 
   return p_concat;
 }
+
+/* Same, but die when memory is exhausted. */
+
+char *
+xpath_concat (const char *dir, const char *base, char **base_in_result)
+{
+  char *res = path_concat (dir, base, base_in_result);
+  if (res)
+    return res;
+  xalloc_die ();
+}

lib/pathmax.h

@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,38 +16,39 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef _PATHMAX_H
-#define _PATHMAX_H
+# define _PATHMAX_H
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 
 /* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
    PATH_MAX but might cause redefinition warnings when sys/param.h is
    later included (as on MORE/BSD 4.3).  */
-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
-#include <limits.h>
-#endif
+# if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
+#  include <limits.h>
+# endif
 
-#ifndef _POSIX_PATH_MAX
-#define _POSIX_PATH_MAX 255
-#endif
+# ifndef _POSIX_PATH_MAX
+#  define _POSIX_PATH_MAX 255
+# endif
 
-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
-#define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
+# if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
+#  define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 \
+		    : pathconf ("/", _PC_PATH_MAX))
+# endif
 
 /* Don't include sys/param.h if it already has been.  */
-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
-#include <sys/param.h>
-#endif
+# if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
+#  include <sys/param.h>
+# endif
 
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-#define PATH_MAX MAXPATHLEN
-#endif
+# if !defined(PATH_MAX) && defined(MAXPATHLEN)
+#  define PATH_MAX MAXPATHLEN
+# endif
 
-#ifndef PATH_MAX
-#define PATH_MAX _POSIX_PATH_MAX
-#endif
+# ifndef PATH_MAX
+#  define PATH_MAX _POSIX_PATH_MAX
+# endif
 
 #endif /* _PATHMAX_H */

lib/posixtm.c

@@ -1,4 +1,4 @@
-/* Parse dates for touch.
+/* Parse dates for touch and date.
    Copyright (C) 1989, 1990, 1991, 1998 Free Software Foundation Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -117,7 +117,7 @@ posix_time_parse (const char *s, unsigned int syntax_bits)
   const char *dot = NULL;
   int pair[6];
   int *p;
-  int i;
+  unsigned int i;
 
   size_t s_len = strlen (s);
   size_t len = (((syntax_bits & PDS_SECONDS) && (dot = strchr (s, '.')))

lib/posixtm.y

@@ -1,242 +0,0 @@
-/* Parse dates for touch.
-   Copyright (C) 1989, 1990, 1991 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 Kingdon and David MacKenzie. */
-%{
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* The following block of alloca-related preprocessor directives is here
-   solely to allow compilation by non GNU-C compilers of the C parser
-   produced from this file by old versions of bison.  Newer versions of
-   bison include a block similar to this one in bison.simple.  */
-
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
- #pragma alloca
-#else
-void *alloca ();
-#endif
-#endif
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef TM_IN_SYS_TIME
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-
-/* Some old versions of bison generate parsers that use bcopy.
-   That loses on systems that don't provide the function, so we have
-   to redefine it here.  */
-#if !defined (HAVE_BCOPY) && defined (HAVE_MEMCPY) && !defined (bcopy)
-#define bcopy(from, to, len) memcpy ((to), (from), (len))
-#endif
-
-#define YYDEBUG 1
-
-/* Lexical analyzer's current scan position in the input string. */
-static char *curpos;
-
-/* The return value. */
-static struct tm t;
-
-time_t mktime ();
-
-/* 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
-
-%%
-date :
-       digitpair /* month */
-       digitpair /* day */
-       digitpair /* hours */
-       digitpair /* minutes */
-       year
-       seconds {
-	         if ($1 >= 1 && $1 <= 12)
-		   t.tm_mon = $1 - 1;
-		 else {
-		   YYABORT;
-		 }
-		 if ($2 >= 1 && $2 <= 31)
-		   t.tm_mday = $2;
-		 else {
-		   YYABORT;
-		 }
-		 if ($3 >= 0 && $3 <= 23)
-		   t.tm_hour = $3;
-		 else {
-		   YYABORT;
-		 }
-		 if ($4 >= 0 && $4 <= 59)
-		   t.tm_min = $4;
-		 else {
-		   YYABORT;
-		 }
-	       }
-
-year : digitpair {
-                   t.tm_year = $1;
-		   /* Deduce the century based on the year.
-		      See POSIX.2 section 4.63.3.  */
-		   if ($1 <= 68)
-		     t.tm_year += 100;
-		 }
-    | digitpair digitpair {
-                            t.tm_year = $1 * 100 + $2;
-			    if (t.tm_year < 1900) {
-			      YYABORT;
-			    } else
-			      t.tm_year -= 1900;
-			  }
-    | /* empty */ {
-                    time_t now;
-		    struct tm *tmp;
-
-                    /* Use current year.  */
-                    time (&now);
-		    tmp = localtime (&now);
-		    t.tm_year = tmp->tm_year;
-		  }
-    ;
-
-seconds : /* empty */ {
-                        t.tm_sec = 0;
-		      }
-        | '.' digitpair {
-	                  if ($2 >= 0 && $2 <= 61)
-			    t.tm_sec = $2;
-			  else {
-			    YYABORT;
-			  }
-			}
-        ;
-
-digitpair : DIGIT DIGIT {
-                          $$ = $1 * 10 + $2;
-			}
-          ;
-%%
-static int
-yylex ()
-{
-  char ch = *curpos++;
-
-  if (ch >= '0' && ch <= '9')
-    {
-      yylval = ch - '0';
-      return DIGIT;
-    }
-  else if (ch == '.' || ch == 0)
-    return ch;
-  else
-    return '?';			/* Cause an error.  */
-}
-
-static int
-yyerror ()
-{
-  return 0;
-}
-
-/* Parse a POSIX-style date and return it, or (time_t)-1 for an error.  */
-
-time_t
-posixtime (s)
-     char *s;
-{
-  curpos = s;
-  /* Let mktime decide whether it is daylight savings time.  */
-  t.tm_isdst = -1;
-  if (yyparse ())
-    return (time_t)-1;
-  else
-    return mktime (&t);
-}
-
-/* Parse a POSIX-style date and return it, or NULL for an error.  */
-
-struct tm *
-posixtm (s)
-     char *s;
-{
-  if (posixtime (s) == -1)
-    return NULL;
-  return &t;
-}