*** empty log message ***

(alpha): Depend on it.

GNUmakefile

@@ -25,3 +25,8 @@ all:
 	@exit 1
 
 endif
+
+# Tell version 3.79 and up of GNU make to not build goals in this
+# directory in parallel.  This is necessary in case someone tries to
+# build multiple targets on one command line.
+.NOTPARALLEL:

Makefile.maint

@@ -11,12 +11,18 @@ 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)
+prev_version_file = .prev-version
+
+THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
+PREV_VERSION := $(shell cat $(prev_version_file))
+PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
+
+tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
 tag-this-version = $(subst .,_,$(VERSION))
-tag-prev-version = $(subst .,_,$(prev-version))
+tag-prev-version = $(subst .,_,$(PREV_VERSION))
 this-cvs-tag = $(tag-package)-$(tag-this-version)
 prev-cvs-tag = $(tag-package)-$(tag-prev-version)
+my_distdir = $(PACKAGE)-$(VERSION)
 
 # Verify that all source files using _() are listed in po/POTFILES.in.
 po-check:
@@ -25,6 +31,9 @@ po-check:
 	diff -u $@-1 $@-2
 	rm -f $@-1 $@-2
 
+# Do not save the original name or timestamp in the .tar.gz file.
+GZIP_ENV = --no-name
+
 # 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.
@@ -70,25 +79,21 @@ my-distcheck: writable-files po-check
 	echo "$(distdir).tar.gz is ready for distribution"; \
 	echo "========================"
 
-THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
-# FIXME: this works only for Gnits-style test releases.
-PREV_VERSION := $(shell echo $(VERSION)|tr b-z a-y|sed 's/a$$//')
-PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
-v = Version
-
 a_host = alpha.gnu.org
-b_host = tug.org
+b_host = freefriends.org
 
 alpha_subdir = gnu/fetish
 a_url_dir = $(alpha_subdir)
 b_url_dir = $(alpha_subdir)
 
-a_real_dir = /fs/share/ftp/$(alpha_subdir)
-b_real_dir = /home/ftp/pub/$(alpha_subdir)
+# This must be the same name on both hosts.
+# Make it a symlink that points to the right place.
+real_dir = fetish-ftp
 
 url_dir_list = $(foreach x,a b,ftp://$($(x)_host)/$($(x)_url_dir))
 
-md5 = $(shell md5sum < $(distdir).tar.gz|sed 's/  -//')
+md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/  -//')
+sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/  -//')
 
 rel-check:
 	tarz=/tmp/rel-check-tarz-$$$$; \
@@ -105,12 +110,12 @@ xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
 
 announcement: NEWS ChangeLog $(distdir).tar.gz
 	@( \
-	  echo Subject: $(distdir) released; \
+	  echo Subject: $(my_distdir) released; \
 	  echo; \
 	  echo FIXME: put comments here; \
 	  echo; \
 	  for url in $(url_dir_list); do \
-	    echo "  $$url/$(distdir).tar.gz"; \
+	    echo "  $$url/$(my_distdir).tar.gz"; \
 	  done; \
 	  echo; \
 	  echo And here are xdelta-style diffs; \
@@ -119,17 +124,20 @@ announcement: NEWS ChangeLog $(distdir).tar.gz
 	    echo "  $$url/$(xd-delta)"; \
 	  done; \
 	  echo; \
-	  echo "$(md5)  $(distdir).tar.gz"; \
+	  echo "Here are the MD5 and SHA1 signatures for the .tar.gz file"; \
+	  echo; \
+	  echo "$(md5)  $(my_distdir).tar.gz"; \
+	  echo "$(sha1)  $(my_distdir).tar.gz"; \
 	  echo; \
 	  echo NEWS:; \
-	  sed -n "/$(THIS_VERSION_REGEXP)/,/$(PREV_VERSION_REGEXP)/p" NEWS \
+	  sed -n "/$(THIS_VERSION_REGEXP)/,/^\[$(PREV_VERSION_REGEXP)/p" NEWS \
 	    | grep -v '^\['; \
 	  echo; \
 	  echo ChangeLog entries:; \
-	  find . -name ChangeLog \
+	  find . -name ChangeLog -maxdepth 2 \
 	    | xargs cvs diff -up -r$(prev-cvs-tag) -rHEAD \
 	    | sed -n 's/^+//p' \
-	    | perl -ne 'm!^\+\+ (\./)?! or print,next;'	\
+	    | perl -ne 'm!^\+\+ (\./)?! or print,next;' \
 	      -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
 	)
 
@@ -145,25 +153,44 @@ writable-files:
 WGET = wget
 ftp-gnu = ftp://ftp.gnu.org/gnu
 
+automake_repo=:pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake
 .PHONY: wget-update
 wget-update:
 	$(WGET) $(ftp-gnu)/texinfo/texinfo.tex -O $(srcdir)/doc/texinfo.tex
-	$(WGET) $(ftp-gnu)/config/config.guess -O $(srcdir)/config.guess
-	$(WGET) $(ftp-gnu)/config/config.sub -O $(srcdir)/config.sub
+	for f in config.guess config.sub; do \
+	  $(WGET) $(ftp-gnu)/config/$$f -O $(srcdir)/$$f; \
+	done
+	for f in depcomp missing; do \
+	  echo checking out $$f...; \
+	  cvs -d $(automake_repo) co -p automake/$$f > t$$$$ \
+	    && mv t$$$$ $$f; \
+	done
 
-alpha: writable-files po-check
+define emit-rsync-commands
+	echo =====================================
+	echo =====================================
+	echo 'for host in $(a_host) $(b_host); do \'
+	echo '  rsync -e ssh --pro -av $(xd-delta) $(my_distdir).tar.gz \'
+	echo '    $$host:$(real_dir); done'
+	echo '# send the /tmp/announcement e-mail'
+	echo =====================================
+	echo =====================================
+endef
+
+# Make sure that the copyright date in lib/version-etc.c is up to date.
+check-copyright: lib/version-etc.c
+	@grep 'N_("Copyright (C) $(shell date +%Y) Free' $< > /dev/null \
+	  || { echo 'out of date copyright in $<; update it' 1>&2; exit 1; }
+
+alpha: writable-files po-check check-copyright
 	$(MAKE) cvs-dist
-	$(MAKE) -s announcement > /tmp/announce-$(distdir)
+	$(MAKE) -s announcement > /tmp/announce-$(my_distdir)
 	ln $(distdir).tar.gz ../release
 	chmod a-w $(distdir).tar.gz
 	cd $(release-archive-dir) \
 	  && xdelta delta -9 $(prev-tgz) $(distdir).tar.gz $(xd-delta) || :
 	ln $(release-archive-dir)/$(xd-delta) .
 	chmod a-w $(release-archive-dir)/$(xd-delta)
-	@echo =====================================
-	@echo =====================================
-	@echo 'scp $(xd-delta) $(distdir).tar.gz \'
-	@echo '  $(b_host):$(b_real_dir)'
-	@echo '# send the /tmp/announcement e-mail'
-	@echo =====================================
-	@echo =====================================
+	echo $(VERSION) > $(prev_version_file)
+	cvs ci -m. $(prev_version_file)
+	@$(emit-rsync-commands)

THANKS

@@ -14,8 +14,10 @@ Alan Iwi                            iwi@atm.ox.ac.uk
 Alberto Accomazzi                   alberto@cfa0.harvard.edu
 aldomel                             aldomel@ix.netcom.com
 Alen Muzinic                        zveki@fly.cc.fer.hr
+Alexandre Duret-Lutz                duret_g@epita.fr
 Alexey Solovyov                     alekso@math.uu.se
 Andre Novaes Cunha                  Andre.Cunha@br.global-one.net
+Andreas Gruenbacher                 ag@bestbits.at
 Andreas Jaeger                      jaeger@gnu.org
 Andreas Luik                        luik@isa.de
 Andreas Schwab                      schwab@suse.de
@@ -26,11 +28,13 @@ Andrew Dalke                        dalke@bioreason.com
 Andrew Tridgell                     tridge@samba.org
 Andries Brouwer                     Andries.Brouwer@cwi.nl
 Andy Longton                        alongton@metamark.com
+Antonio Rendas                      ajrendas@yahoo.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
+Axel Kittenberger                   Anshil@gmx.net
 Bauke Jan Douma                     bjdouma@xs4all.nl
 Bengt Martensson                    bengt@mathematik.uni-Bremen.de
 Bernd Leibing                       bernd.leibing@rz.uni-ulm.de
@@ -50,30 +54,36 @@ Carlos Canau                        Carlos.Canau@relay.puug.pt
 Charles Karney                      karney@pppl.gov
 Charles Randall                     crandall@matchlogic.com
 Chip Salzenberg                     chip@valinux.com
+Chris Sylvain                       csylvain@umm.edu
 Chris Yeo                           cyeo@biking.org
 Christi Alice Scarborough           christi@chiark.greenend.org.uk
-Christian Krackowizer               kra1@technodat.co.at
+Christian Krackowizer               ckrackowiz@std.schuler-ag.com
+Christian Rose                      menthos@menthos.com
 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
+Dan Pascu                           dan@services.iiruc.ro
 Daniel Bergstrom                    noa@melody.se
+Darren Salt                         ds@youmustbejoking.demon.co.uk
 David Dyck                          dcd@tc.fluke.COM
 David Godfrey                       dave@delta.demon.co.uk
+David Luyer                         david_luyer@pacific.net.au
 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
+Dan Jacobson                        http://www.geocities.com/jidani
 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
+Eirik Fuller                        eirik@hackrat.com
 Eivind                              eivindt@multinet.no
 Eli Zaretskii                       eliz@is.elta.co.il
 Emile LeBlanc                       leblanc@math.toronto.edu
@@ -84,6 +94,7 @@ Erik Corry                          erik@kroete2.freinet.de
 Felix Lee                           flee@teleport.com
 Fletcher Mattox                     fletcher@cs.utexas.edu
 Florin Iucha                        fiucha@hsys.mic.ro
+Frank Adler                         fadler@allesklar.de
 Frank T Lofaro                      ftlofaro@snooks.Egr.UNLV.EDU
 François Pinard                     pinard@iro.umontreal.ca
 Fred Fish                           fnf@ninemoons.com
@@ -96,6 +107,7 @@ Geoff Odhner                        geoff@franklin.com
 Gerhard Poul                        gpoul@gnu.org
 Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
 GOTO Masanori                       gotom@debian.or.jp
+Greg Louis                          glouis@dynamicro.on.ca
 Greg McGary                         gkm@gnu.org
 Greg Troxel                         gdt@bbn.com
 Greg Wooledge                       gawooledge@sherwin.com
@@ -116,6 +128,8 @@ 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
+Jan Fedak                           J.Fedak@sh.cvut.cz
+Jan Nieuwenhuizen                   janneke@gnu.org
 Janos Farkas                        chexum@shadow.banki.hu
 Jarkko Hietaniemi                   jhi@epsilon.hut.fi
 Jeff Moore                          jbm@mordor.com
@@ -141,13 +155,18 @@ 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
+Jorge Stolfi                        stolfi@ic.unicamp.br
 Joseph S. Myers                     jsm28@cam.ac.uk
-jvogel                              jvogel@linkny.com
+Jungshik Shin                       jshin@pantheon.yale.edu
 Jürgen Fluk                         louis@dachau.marco.de
+jvogel                              jvogel@linkny.com
 Kai-Uwe Rommel                      rommel@informatik.tu-muenchen.de
+Kai Henningsen                      kai@debian.org
 Kalle Olavi Niemitalo               tosi@stekt.oulu.fi
 Kamal Paul Nigam                    Kamal_Paul_Nigam@gs35.sp.cs.cmu.edu
+Karl Eichwalder                     keichwa@gmx.net
 Karl Heuer                          kwzh@gnu.org
+Karl-Michael Schneider              schneide@phil.uni-passau.de
 Karsten Thygesen                    karthy@kom.auc.dk
 Kaveh R. Ghazi                      ghazi@caip.rutgers.edu
 Keith Owens                         kaos@audio.apana.org.au
@@ -159,6 +178,7 @@ Lars Hecking                        lhecking@nmrc.ucc.ie
 Lehti Rami                          rammer@cs.tut.fi
 Leonard N. Zubkoff                  lnz@dandelion.com
 Lorne Baker                         lbaker@nitro.avint.net
+M. P. Suzuki                        mpsuzuki@hiroshima-u.ac.jp
 Maciej Kwapulinski                  pikpok@univ.gda.pl
 Manas Garg                          manas@cygsoft.com
 Manfred Hollstein                   manfred@s-direktnet.de
@@ -170,10 +190,13 @@ Mark A. Thomas                      thommark@access.digex.net
 Mark D. Roth                        roth@uiuc.edu
 Mark Harris                         mark@monitor.designacc.com
 Mark Hewitt                         mhewitt@armature.com
+Mark Hounschell                     markh@compro.net
 Mark Kettenis                       kettenis@phys.uva.nl
+Mark Nudelman                       marknu@flash.net
 Mark W. Eichin                      eichin@cygnus.com
 Markus Demleitner                   msdemlei@auriga.ari.uni-heidelberg.de
 Martin                              martin@dresden.nacamar.de
+Martin Gallant                      martyg@goodbit.net
 Martin Hippe                        martin.hippe@schlund.de
 Martin Mitchell                     martin@debian.org
 Martin P.J. Zinser                  zinser@decus.de
@@ -181,16 +204,22 @@ 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
+Matt Perry                          matt@primefactor.com
+Matt Schalit                        mschalit@pacbell.net
 Matthew Braun                       matthew@ans.net
 Matthew Clarke                      Matthew_Clarke@mindlink.bc.ca
 Matthew S. Levine                   mslevine@theory.lcs.mit.edu
+Matthew Smith                       matts@bluesguitar.org
 Matthew Swift                       swift@alum.mit.edu
+Mattias Wadenstein                  maswan@acc.umu.se
 Matthias Urlichs                    smurf@noris.de
 Meelis Roos                         mroos@tartu.cyber.ee
 Michael ???                         michael@roka.net
 Michael Deutschmann                 michael@talamasca.ocis.net
 Michael Hasselberg                  mikelh@zonta.ping.de
 Michael Hohn                        hohn@math.utah.edu
+Michael J. Croghan                  mcroghan@usatoday.com
+Michael Steffens                    michael.steffens@s.netic.de
 Michael Stone                       mstone@debian.org
 Michael Stutz                       stutz@dsl.org
 Michael Veksler                     mveksler@techunix.technion.ac.il
@@ -204,6 +233,8 @@ Niklas Edmundsson                   nikke@acc.umu.se
 Noah Friedman                       friedman@splode.com
 Noel Cragg                          noel@red-bean.com
 Olav Morkrid                        olav@funcom.com
+Ole Laursen                         olau@hardworking.dk
+Oskar Liljeblad                     osk@hem.passagen.se
 Ørn E. Hansen                       oehansen@daimi.aau.dk
 Paul Eggert                         eggert@twinsun.com
 Paul Nevai                          nevai@ops.mps.ohio-state.edu
@@ -226,6 +257,7 @@ Ralf W. Stephan                     stephan@tmt.de
 Ralph Loader                        loader@maths.ox.ac.uk
 Raul Miller                         moth@magenta.com
 Richard Braakman                    dark@xs4all.nl
+Richard Dawe                        richdawe@bigfoot.com
 Richard J. Rauenzahn                rrauenza@hairball.cup.hp.com
 Richard Sharman                     rsharman@magmacom.com
 Rick Sladkey                        jrs@world.std.com
@@ -263,13 +295,17 @@ Torbjorn Lindgren                   tl@funcom.no
 Torsten Landschoff                  torsten@pclab.ifg.uni-kiel.de
 Ulrich Drepper                      drepper@gnu.org
 Urs Thuermann                       urs@isnogud.escape.de
+Vesselin Atanasov                   vesselin@bgnet.bg
 Vin Shelton                         acs@alumni.princeton.edu
 Volker Borchert                     bt@teknon.de
 Wayne Stewart                       wstewa@atl.com
+Wenjun Zheng                        zwj@yahoo.com
+Werner Almesberger                  Werner.Almesberger@epfl.ch
 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
+Won-kyu Park                        wkpark@chem.skku.ac.kr
 Zvi Har'El                          rl@math.technion.ac.il

doc/Makefile.in

@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
 
-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -46,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -56,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 
-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -66,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -81,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -105,11 +107,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@
 
@@ -127,34 +131,35 @@ EXTRA_DIST = perm.texi getdate.texi
 # and those names all map to one 14-byte name (<package>.info-) on some crufty
 # old systems.
 MAKEINFO = makeinfo --no-split
+EXEEXT =
+OBJEXT = o
 subdir = doc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
 TEXI2DVI = texi2dvi
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
-DIST_COMMON =  Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
+DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
 version.texi
 
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  doc/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
-
-$(srcdir)/version.texi: stamp-vti
+$(srcdir)/version.texi: $(srcdir)/stamp-vti
 	@:
 
 $(srcdir)/stamp-vti: fileutils.texi $(top_srcdir)/configure.in
@@ -172,18 +177,11 @@ $(srcdir)/stamp-vti: fileutils.texi $(top_srcdir)/configure.in
 mostlyclean-vti:
 	-rm -f vti.tmp
 
-clean-vti:
-
-distclean-vti:
-
 maintainer-clean-vti:
 	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 
-fileutils.info: fileutils.texi version.texi
-fileutils.dvi: fileutils.texi version.texi
-
-
-DVIPS = dvips
+fileutils.info: fileutils.texi $(srcdir)/version.texi
+fileutils.dvi: fileutils.texi $(srcdir)/version.texi
 
 .texi.info:
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
@@ -199,59 +197,11 @@ DVIPS = dvips
 	cd $(srcdir) \
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
-.texinfo.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.txi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+DVIPS = dvips
 .dvi.ps:
 	$(DVIPS) $< -o $@
 
-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  d=$(srcdir); \
-	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $$d/$$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
-	    else : ; fi; \
-	  done; \
-	done
-	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
-	  done; \
-	else : ; fi
-
-uninstall-info:
+uninstall-info-am:
 	$(PRE_UNINSTALL)
 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
@@ -280,19 +230,13 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -f fileutils.aux fileutils.cp fileutils.cps fileutils.dvi \
-	  fileutils.fn fileutils.fns fileutils.pgs fileutils.ky \
-	  fileutils.kys fileutils.ps fileutils.log fileutils.pg \
-	  fileutils.toc fileutils.tp fileutils.tps fileutils.vr \
-	  fileutils.vrs fileutils.op fileutils.tr fileutils.cv \
-	  fileutils.cn fileutils.cm fileutils.ov
-
-clean-aminfo:
-
-distclean-aminfo:
+	-rm -f fileutils.aux fileutils.cp fileutils.cps fileutils.dvi fileutils.fn \
+	  fileutils.ky fileutils.log fileutils.op fileutils.pg \
+	  fileutils.ps fileutils.toc fileutils.tp fileutils.vr
 
 maintainer-clean-aminfo:
-	cd $(srcdir) && for i in $(INFO_DEPS); do \
+	cd $(srcdir) && \
+	for i in $(INFO_DEPS); do \
 	  rm -f $$i; \
 	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
 	    rm -f $$i-[0-9]*; \
@@ -302,7 +246,10 @@ tags: TAGS
 TAGS:
 
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -316,33 +263,29 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
-info-am: $(INFO_DEPS)
-info: info-am
-dvi-am: $(DVIS)
-dvi: dvi-am
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
+	  dist-info
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(INFO_DEPS)
 
-install-data-am: install-info-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-info
-uninstall: uninstall-am
-all-am: Makefile $(INFO_DEPS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(infodir)
 
+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 
 mostlyclean-generic:
 
@@ -353,34 +296,78 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-vti clean-aminfo clean-generic mostlyclean-am
-
 clean: clean-am
 
-distclean-am:  distclean-vti distclean-aminfo distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-vti maintainer-clean-aminfo \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am: $(DVIS)
+
+info: info-am
+
+info-am: $(INFO_DEPS)
+
+install-data-am: install-info-am
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-info-am: $(INFO_DEPS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  d=$(srcdir); \
+	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    if test -f $$d/$$ifile; then \
+	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+	    else : ; fi; \
+	  done; \
+	done
+	@$(POST_INSTALL)
+	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+	  done; \
+	else : ; fi
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-vti distclean-vti clean-vti maintainer-clean-vti \
-install-info-am uninstall-info mostlyclean-aminfo distclean-aminfo \
-clean-aminfo maintainer-clean-aminfo tags distdir info-am info dvi-am \
-dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all install-strip \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+	maintainer-clean-generic maintainer-clean-vti
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic dist-info \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-aminfo \
+	maintainer-clean-generic maintainer-clean-vti mostlyclean \
+	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti \
+	uninstall uninstall-am uninstall-info-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

doc/getdate.texi

@@ -30,27 +30,32 @@ or a week from Sunday, with feelings of helpless confusion.  @dots{}
 --- Robert Grudin, @cite{Time and the Art of Living}.
 @end quotation
 
-This section describes the textual date representations that GNU
+This section describes the textual date representations that @sc{gnu}
 programs accept.  These are the strings you, as a user, can supply as
 arguments to the various programs.  The C interface (via the
 @code{getdate} function) is not described here.
 
-@cindex beginning of time, for Unix
-@cindex epoch, for Unix
-Although the date syntax here can represent any possible time since zero
-A.D., computer integers are not big enough for such a (comparatively)
-long time.  The earliest date semantically allowed on Unix systems is
-midnight, 1 January 1970 UCT.
+@cindex beginning of time, for @sc{posix}
+@cindex epoch, for @sc{posix}
+Although the date syntax here can represent any possible time since the
+year zero, computer integers often cannot represent such a wide range of
+time.  On @sc{posix} systems, the clock starts at 1970-01-01 00:00:00
+@sc{utc}: @sc{posix} does not require support for times before the
+@sc{posix} Epoch and times far in the future.  Traditional Unix systems
+have 32-bit signed @code{time_t} and can represent times from 1901-12-13
+20:45:52 through 2038-01-19 03:14:07 @sc{utc}.  Systems with 64-bit
+signed @code{time_t} can represent all the times in the known
+lifetime of the universe.
 
 @menu
 * General date syntax::            Common rules.
-* Calendar date items::             19 Dec 1994.
-* Time of day items::               9:20pm.
-* Time zone items::                 EST, DST, BST, UTC, ...
-* Day of week items::               Monday and others.
-* Relative items in date strings::  next tuesday, 2 years ago.
+* Calendar date items::            19 Dec 1994.
+* Time of day items::              9:20pm.
+* Time zone items::                @sc{est}, @sc{pdt}, @sc{gmt}, ...
+* Day of week items::              Monday and others.
+* Relative items in date strings:: next tuesday, 2 years ago.
 * Pure numbers in date strings::   19931219, 1440.
-* Authors of getdate::             Bellovin, Salz, Berets, et al.
+* Authors of getdate::             Bellovin, Eggert, Salz, Berets, et al.
 @end menu
 
 
@@ -95,6 +100,34 @@ When a month is written this way, it is still considered to be written
 numerically, instead of being ``spelled in full''; this changes the
 allowed strings.
 
+@cindex language, in dates
+In the current implementation, only English is supported for words and
+abbreviations like @samp{AM}, @samp{DST}, @samp{EST}, @samp{first},
+@samp{January}, @samp{Sunday}, @samp{tomorrow}, and @samp{year}.
+
+@cindex language, in dates
+@cindex time zone item
+The output of @command{date} is not always acceptable as a date string,
+not only because of the language problem, but also because there is no
+standard meaning for time zone items like @samp{IST}.  When using
+@command{date} to generate a date string intended to be parsed later,
+specify a date format that is independent of language and that does not
+use time zone items other than @samp{UTC} and @samp{Z}.  Here are some
+ways to do this:
+
+@example
+$ LC_ALL=C TZ=UTC0 date
+Fri Dec 15 19:48:05 UTC 2000
+$ TZ=UTC0 date +"%Y-%m-%d %H:%M:%SZ"
+2000-12-15 19:48:05Z
+$ date --iso-8601=seconds  # a GNU extension
+2000-12-15T11:48:05-0800
+$ date --rfc-822  # a GNU extension
+Fri, 15 Dec 2000 11:48:05 -0800
+$ date +"%Y-%m-%d %H:%M:%S %z"  # %z is a GNU extension.
+2000-12-15 11:48:05 -0800
+@end example
+
 @cindex case, ignored in dates
 @cindex comments, in dates
 Alphabetic case is completely ignored in dates.  Comments may be introduced
@@ -113,7 +146,7 @@ specified differently, depending on whether the month is specified
 numerically or literally.  All these strings specify the same calendar date:
 
 @example
-1972-09-24     # ISO 8601.
+1972-09-24     # @sc{iso} 8601.
 72-9-24        # Assume 19xx for 69 through 99,
                # 20xx for 00 through 68.
 72-09-24       # Leading zeros are ignored.
@@ -136,9 +169,9 @@ sep 24
 
 Here are the rules.
 
-@cindex ISO 8601 date format
-@cindex date format, ISO 8601
-For numeric months, the ISO 8601 format
+@cindex @sc{iso} 8601 date format
+@cindex date format, @sc{iso} 8601
+For numeric months, the @sc{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
@@ -186,7 +219,7 @@ day.  Here are some examples, all of which represent the same time:
 20:02:0
 20:02
 8:02pm
-20:02-0500      # In EST (Eastern U.S. Standard Time).
+20:02-0500      # In @sc{est} (U.S. Eastern Standard Time).
 @end example
 
 More generally, the time of the day may be given as
@@ -206,6 +239,9 @@ or @samp{p.m.}), @var{hour} is restricted to run from 1 to 12, and
 indicates the first half of the day, @samp{pm} indicates the second
 half of the day.  In this notation, 12 is the predecessor of 1:
 midnight is @samp{12am} while noon is @samp{12pm}.
+(This is the zero-oriented interpretation of @samp{12am} and @samp{12pm},
+as opposed to the old tradition derived from Latin
+which uses @samp{12m} for noon and @samp{12pm} for midnight.)
 
 @cindex time zone correction
 @cindex minutes, time zone correction by
@@ -214,10 +250,10 @@ expressed as @samp{@var{s}@var{hh}@var{mm}}, where @var{s} is @samp{+}
 or @samp{-}, @var{hh} is a number of zone hours and @var{mm} is a number
 of zone minutes.  When a time zone correction is given this way, it
 forces interpretation of the time relative to
-Coordinated Universal Time (UTC), overriding any previous
+Coordinated Universal Time (@sc{utc}), overriding any previous
 specification for the time zone or the local time zone.  The @var{minute}
 part of the time of the day may not be elided when a time zone correction
-is used.  This is the only way to specify a time zone correction by
+is used.  This is the best way to specify a time zone correction by
 fractional parts of an hour.
 
 Either @samp{am}/@samp{pm} or a time zone correction may be specified,
@@ -229,119 +265,20 @@ but not both.
 
 @cindex time zone item
 
-A @dfn{time zone item} specifies an international time zone, indicated by
-a small set of letters.  They are supported for backward compatibility reasons,
-but they are not recommended because they are ambiguous in practice:
-for example, the abbreviation @samp{EST} has different meanings in
-Australia and the United States.  Any included period is ignored.  Military
-time zone designations use a single letter.  Currently, only integral
-zone hours may be represented in a time zone item.  See the previous
-section for a finer control over the time zone correction.
+A @dfn{time zone item} specifies an international time zone, indicated
+by a small set of letters, e.g., @samp{UTC} or @samp{Z}
+for Coordinated Universal
+Time.  Any included periods are ignored.  By following a
+non-daylight-saving time zone by the string @samp{DST} in a separate
+word (that is, separated by some white space), the corresponding
+daylight saving time zone may be specified.
 
-Here are many non-daylight-saving-time time zones, indexed by the zone
-hour value.
-
-@table @asis
-@item -1200
-@samp{Y} for militaries.
-@item -1100
-@samp{X} for militaries.
-@item -1000
-@samp{W} for militaries.
-@item -0900
-@samp{V} for militaries.
-@item -0800
-@samp{PST} for Pacific Standard, and
-@samp{U} for militaries.
-@item -0700
-@samp{MST} for Mountain Standard, and
-@samp{T} for militaries.
-@item -0600
-@samp{CST} for Central Standard, and
-@samp{S} for militaries.
-@item -0500
-@samp{EST} for Eastern Standard, and
-@samp{R} for militaries.
-@item -0400
-@samp{AST} for Atlantic Standard, and
-@samp{Q} for militaries.
-@item -0300
-@samp{P} for militaries.
-@item -0200
-@samp{O} for militaries.
-@item -0100
-@samp{N} for militaries.
-@item +0000
-@cindex Greenwich Mean Time
-@cindex Coordinated Universal Time
-@cindex Universal Coordinated Time
-@cindex Universal Time (Coordinated)
-@samp{GMT} for Greenwich Mean,
-@samp{UT} for Universal,
-@samp{UTC} for Coordinated Universal,
-@samp{WET} for Western European, and
-@samp{Z} for ISO 8601 and militaries.
-@item +0100
-@samp{A} for militaries,
-@samp{CET} for Central European,
-@samp{MET} for Midden Europesche Tijd (Dutch), and
-@samp{MEZ} for Mittel-Europ@"aische Zeit (German).
-@item +0200
-@samp{B} for militaries, and
-@samp{EET} for Eastern European.
-@item +0300
-@samp{C} for militaries.
-@item +0400
-@samp{D} for militaries.
-@item +0500
-@samp{E} for militaries.
-@item +0600
-@samp{F} for militaries.
-@item +0700
-@samp{G} for militaries.
-@item +0800
-@samp{H} for militaries.
-@item +0900
-@samp{I} for militaries, and
-@samp{JST} for Japan Standard.
-@item +1000
-@samp{GST} for Guam Standard, and
-@samp{K} for militaries.
-@item +1100
-@samp{L} for militaries.
-@item +1200
-@samp{M} for militaries, and
-@samp{NZST} for New Zealand Standard.
-@end table
-
-@cindex daylight-saving time
-Here are many daylight-saving time (DST) time zones,
-indexed by the zone hour value.  Also, by
-following a non-DST time zone by the string @samp{DST} in a separate word
-(that is, separated by some whitespace), the corresponding DST time zone
-may be specified.
-
-@table @asis
-@item -0700
-@samp{PDT} for Pacific Daylight.
-@item -0600
-@samp{MDT} for Mountain Daylight.
-@item -0500
-@samp{CDT} for Central Daylight.
-@item -0400
-@samp{EDT} for Eastern Daylight.
-@item -0300
-@samp{ADT} for Atlantic Daylight.
-@item +0100
-@samp{BST} for British Summer, and
-@samp{WEST} for Western European Summer.
-@item +0200
-@samp{CEST} for Central European Summer,
-@samp{MEST} for Midden Europesche S. Tijd (Dutch), and
-@samp{MESZ} for Mittel-Europ@"aische Sommerzeit (German).
-@item +1300
-@samp{NZDT} for New Zealand Daylight.
-@end table
+Time zone items other than @samp{UTC} and @samp{Z}
+are obsolescent and are not recommended, because they
+are ambiguous; for example, @samp{EST} has a different meaning in
+Australia than in the United States.  Instead, it's better to use
+unambiguous numeric time zone corrections like @samp{-0500}, as
+described in the previous section.
 
 
 @node Day of week items
@@ -409,7 +346,7 @@ The unit of time may be preceded by a multiplier, given as an optionally
 signed number.  Unsigned numbers are taken as positively signed.  No
 number at all implies 1 for a multiplier.  Following a relative item by
 the string @samp{ago} is equivalent to preceding the unit by a
-multiplicator with value @math{-1}.
+multiplier with value @math{-1}.
 
 @findex day @r{in date strings}
 @findex tomorrow @r{in date strings}
@@ -429,9 +366,9 @@ items, like in @samp{12:00 today}.  The string @samp{this} also has
 the meaning of a zero-valued time displacement, but is preferred in
 date strings like @samp{this thursday}.
 
-When a relative item causes the resulting date to cross the boundary
-between DST and non-DST (or vice-versa), the hour is adjusted according
-to the local time.
+When a relative item causes the resulting date to cross a boundary
+where the clocks were adjusted, typically for daylight-saving time,
+the resulting date and time are adjusted accordingly.
 
 
 @node Pure numbers in date strings
@@ -439,8 +376,8 @@ to the local time.
 
 @cindex pure numbers in date strings
 
-The precise intepretation of a pure decimal number depends
-the context in the date string.
+The precise interpretation of a pure decimal number depends
+on the context in the date string.
 
 If the decimal number is of the form @var{yyyy}@var{mm}@var{dd} and no
 other calendar date item (@pxref{Calendar date items}) appears before it
@@ -468,13 +405,14 @@ year.
 @cindex Berets, Jim
 @cindex MacKenzie, David
 @cindex Meyering, Jim
+@cindex Eggert, Paul
 @code{getdate} was originally implemented by Steven M. Bellovin
 (@email{smb@@research.att.com}) while at the University of North Carolina
 at Chapel Hill.  The code was later tweaked by a couple of people on
 Usenet, then completely overhauled by Rich $alz (@email{rsalz@@bbn.com})
 and Jim Berets (@email{jberets@@bbn.com}) in August, 1990.  Various
-revisions for the GNU system were made by David MacKenzie, Jim Meyering,
-and others.
+revisions for the @sc{gnu} system were made by David MacKenzie, Jim Meyering,
+Paul Eggert and others.
 
 @cindex Pinard, F.
 @cindex Berry, K.

doc/perm.texi

@@ -69,11 +69,12 @@ matter what group the user who creates them is in.
 @cindex sticky
 @cindex swap space, saving text image in
 @cindex text image, saving in swap space
-@cindex append-only directories
+@cindex restricted deletion flag
 save the program's text image on the swap device so it will load more
 quickly when run (called the @dfn{sticky bit}).  For directories on some
-systems, prevent users from removing files that they do not own in the
-directory; this is called making the directory @dfn{append-only}.
+systems, prevent users from removing or renaming a file in a directory
+unless they own the file or the directory; this is called the
+@dfn{restriction deletion flag} for the directory.
 @end enumerate
 
 @node Symbolic Modes
@@ -118,7 +119,7 @@ format:
 
 @noindent
 The spaces between the three parts above are shown for readability only;
-symbolic modes can not contain spaces.
+symbolic modes cannot contain spaces.
 
 The @var{users} part tells which users' access to the file is changed.
 It consists of one or more of the following letters (or it can be empty;
@@ -276,18 +277,8 @@ o+t
 
 Remember that the special permissions only affect files that are
 executable, plus, on some systems, directories (on which they have
-different meanings; @pxref{Mode Structure}).  Using @samp{a}
-in the @var{users} part of a symbolic mode does not cause the special
-permissions to be affected; thus,
-
-@example
-a+s
-@end example
-
-@noindent
-has @emph{no effect}.  You must use @samp{u}, @samp{g}, and @samp{o}
-explicitly to affect the special permissions.  Also, the
-combinations @samp{u+t}, @samp{g+t}, and @samp{o+s} have no effect.
+different meanings; @pxref{Mode Structure}).
+Also, the combinations @samp{u+t}, @samp{g+t}, and @samp{o+s} have no effect.
 
 The @samp{=} operator is not very useful with special permissions; for
 example, the mode:
@@ -437,7 +428,7 @@ This number is always interpreted in octal; you do not have to add a
 leading 0, as you do in C.  Mode 0055 is the same as mode 55.
 
 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
+mode, but it is limited in that it cannot take into account a file's
 previous permissions; it can only set them absolutely.
 
 On most systems, the permissions granted to the user,

doc/sh-utils.texi

@@ -64,7 +64,7 @@ END-INFO-DIR-ENTRY
 @ifinfo
 This file documents the GNU shell utilities.
 
-Copyright (C) 1994, 95, 96 Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 2000 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -96,7 +96,7 @@ by the Foundation.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1994, 95, 96 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 1995, 1996, 2000 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -350,6 +350,7 @@ independent way. For example, a string containing the Euro currency symbol
 $ /usr/local/bin/printf '\u20AC 14.95'
 @end example
 
+@noindent
 will be output correctly in all locales supporting the Euro symbol
 (ISO-8859-15, UTF-8, and others). Similarly, a Chinese string
 
@@ -357,18 +358,19 @@ will be output correctly in all locales supporting the Euro symbol
 $ /usr/local/bin/printf '\u4e2d\u6587'
 @end example
 
-will be output correctly in all chinese locales (GB2312, BIG5, UTF-8, etc).
+@noindent
+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 @code{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:
+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 \
@@ -2196,15 +2198,17 @@ information.
 @cindex time, printing or setting
 @cindex printing the current time
 
-@code{date} with no arguments prints the current time and date, in the
-format of the @samp{%c} directive (described below).  Synopses:
+Synopses:
 
 @example
 date [@var{option}]@dots{} [+@var{format}]
 date [-u|--utc|--universal] @c this avoids a newline in the output
-[ @var{MMDDhhmm}[[@var{CC}]@var{YY}][.@var{ss}] ]
+[ MMDDhhmm[[CC]YY][.ss] ]
 @end example
 
+Invoking @code{date} with no @var{format} argument is equivalent to invoking
+@samp{date '+%a %b %e %H:%M:%S %Z %Y'}.
+
 @findex strftime @r{and @code{date}}
 @cindex time formats
 @cindex formatting times
@@ -2258,7 +2262,7 @@ Note that this value is the number of seconds between the epoch
 and the current date as defined by the localtime system call.
 It isn't changed by the @samp{--date} option.
 @item %S
-second (00@dots{}61)
+second (00@dots{}60)
 @item %T
 time, 24-hour (hh:mm:ss)
 @item %X
@@ -2294,6 +2298,8 @@ locale's abbreviated month name (Jan@dots{}Dec)
 locale's full month name, variable length (January@dots{}December)
 @item %c
 locale's date and time (Sat Nov 04 12:02:33 EST 1989)
+@item %C
+century (year divided by 100 and truncated to an integer) (00@dots{}99)
 @item %d
 day of month (01@dots{}31)
 @item %D
@@ -2400,7 +2406,7 @@ zone.
 The argument must consist entirely of digits, which have the following
 meaning:
 
-@table @var
+@table @samp
 @item MM
 month
 @item DD
@@ -2479,16 +2485,14 @@ 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
-Display the time and date using the RFC-822-specified
+Display the time and date using the RFC-822-conforming
 format, @samp{%a, %_d %b %Y %H:%M:%S %z}.
-If @samp{--utc} is also specified, use @samp{GMT} in place of @samp{%z}.
 
 @item -r @var{file}
 @itemx --reference=@var{file}
@@ -2501,7 +2505,7 @@ time of @var{file}, instead of the current time and date.
 @itemx --set=@var{datestr}
 @opindex -s
 @opindex --set
-Set the time and date to @var{datestr},  See @samp{-d} above.
+Set the time and date to @var{datestr}.  See @samp{-d} above.
 
 @item -u
 @itemx --utc
@@ -2509,11 +2513,16 @@ Set the time and date to @var{datestr},  See @samp{-d} above.
 @opindex -u
 @opindex --utc
 @opindex --universal
-@cindex coordinated universal time
+@cindex Coordinated Universal Time
+@cindex UTC
 @cindex Greenwich Mean Time
-Print or set the time and date in Universal Coordinated Time instead of
-in local (wall clock) time.
-
+@cindex GMT
+Use Coordinated Universal Time (@sc{utc}) by operating as if the
+@env{TZ} environment variable was set to the string @samp{UTC0}.
+Normally, @command{date} operates in the time zone indicated by
+@env{TZ}, or the system default if @env{TZ} is not set.  Coordinated
+Universal Time is often called ``Greenwich Mean Time'' (@sc{gmt}) for
+historical reasons.
 @end table
 
 
@@ -2561,7 +2570,7 @@ To print a date without the leading zero for one-digit days
 of the month, you can use the (GNU extension) @code{-} modifier to suppress
 the padding altogether.
 @example
-date -d=1may '+%B %-d'
+date -d 1may '+%B %-d'
 @end example
 
 @item
@@ -2590,31 +2599,31 @@ To convert a date string to the number of seconds since the epoch
 (which is 1970-01-01 00:00:00 UTC), use the @samp{--date} option with
 the @samp{%s} format.  That can be useful in sorting and/or graphing
 and/or comparing data by date.  The following command outputs the
-number of the seconds since the epoch for the time one second later
-than the epoch, but in time zone five hours later (Cambridge, Massachusetts),
-thus a total of five hours and one second after the epoch:
+number of the seconds since the epoch for the time two minutes after the
+epoch:
 
 @example
-date --date='1970-01-01 00:00:01 UTC +5 hours' +%s
-18001
+date --date='1970-01-01 00:02:00 +0000' +%s
+120
 @end example
 
-Suppose you had @emph{not} specified time zone information in the example above.
-Then, @code{date} would have used your computer's idea of the time zone when
-interpreting the string.  Here's what you would get if you were in
-Greenwich, England:
+If you do not specify time zone information in the date string,
+@command{date} uses your computer's idea of the time zone when
+interpreting the string.  For example, if your computer's time zone is
+that of Cambridge, Massachusetts, which was then 5 hours (i.e., 18,000
+seconds) behind UTC:
 
 @example
 # local time zone used
-date --date='1970-01-01 00:00:01' +%s
-1
+date --date='1970-01-01 00:02:00' +%s
+18120
 @end example
 
 @item
 If you're sorting or graphing dated data, your raw date values may be
 represented as seconds since the epoch.  But few people can look at
 the date @samp{946684800} and casually note ``Oh, that's the first second
-of the year 2000.''
+of the year 2000 in Greenwich, England.''
 
 @example
 date --date='2000-01-01 UTC' +%s
@@ -2625,8 +2634,9 @@ To convert such an unwieldy number of seconds back to
 a more readable form, use a command like this:
 
 @smallexample
-date -d '1970-01-01 946684800 sec' +"%Y-%m-%d %T %z"
-2000-01-01 00:00:00 +0000
+# local time zone used
+date -d '1970-01-01 UTC 946684800 seconds' +"%Y-%m-%d %T %z"
+1999-12-31 19:00:00 -0500
 @end smallexample
 
 @end itemize
@@ -2956,7 +2966,7 @@ nohup @var{command} [@var{arg}]@dots{}
 
 @flindex nohup.out
 @code{nohup} increases the scheduling priority of @var{command} by 5, so
-it has a slightly smaller change to run.  If standard output is a terminal,
+it has a slightly smaller chance to run.  If standard output is a terminal,
 it and standard error are redirected so that they are appended to the
 file @file{nohup.out}; if that cannot be written to, they are appended
 to the file @file{$HOME/nohup.out}.  If that cannot be written to, the
@@ -3335,11 +3345,11 @@ $ 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.
+But that 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:

doc/texinfo.tex

@@ -3,9 +3,9 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2000-05-28.15}
+\def\texinfoversion{2000-12-11.07}
 %
-% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
 % Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software; you can redistribute it and/or
@@ -688,16 +688,54 @@ where each line of input produces a line of output.}
 \def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount
 \leftline{\hskip\leftskip{\rm#1}}}}
 
-% @inmargin{TEXT} puts TEXT in the margin next to the current paragraph.
-
-\def\inmargin#1{%
-\strut\vadjust{\nobreak\kern-\strutdepth
-  \vtop to \strutdepth{\baselineskip\strutdepth\vss
-  \llap{\rightskip=\inmarginspacing \vbox{\noindent #1}}\null}}}
+% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
+% paragraph.  For more general purposes, use the \margin insertion
+% class.  WHICH is `l' or `r'.
+%
 \newskip\inmarginspacing \inmarginspacing=1cm
 \def\strutdepth{\dp\strutbox}
-
-%\hbox{{\rm#1}}\hfil\break}}
+%
+\def\doinmargin#1#2{\strut\vadjust{%
+  \nobreak
+  \kern-\strutdepth
+  \vtop to \strutdepth{%
+    \baselineskip=\strutdepth
+    \vss
+    % if you have multiple lines of stuff to put here, you'll need to
+    % make the vbox yourself of the appropriate size.
+    \ifx#1l%
+      \llap{\ignorespaces #2\hskip\inmarginspacing}%
+    \else
+      \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
+    \fi
+    \null
+  }%
+}}
+\def\inleftmargin{\doinmargin l}
+\def\inrightmargin{\doinmargin r}
+%
+% @inmargin{TEXT [, RIGHT-TEXT]}
+% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
+% else use TEXT for both).
+% 
+\def\inmargin#1{\parseinmargin #1,,\finish}
+\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
+  \setbox0 = \hbox{\ignorespaces #2}% 
+  \ifdim\wd0 > 0pt
+    \def\lefttext{#1}%  have both texts
+    \def\righttext{#2}%
+  \else
+    \def\lefttext{#1}%  have only one text
+    \def\righttext{#1}%
+  \fi
+  %
+  \ifodd\pageno
+    \def\temp{\inleftmargin\lefttext}%
+  \else
+    \def\temp{\inrightmargin\righttext}%
+  \fi
+  \temp
+}
 
 % @include file    insert text of that file as input.
 % Allow normal characters that  we make active in the argument (a file name).
@@ -2593,42 +2631,48 @@ width0pt\relax} \fi
 }
 
 % @defindex foo  ==  \newindex{foo}
-
+%
 \def\defindex{\parsearg\newindex}
 
 % Define @defcodeindex, like @defindex except put all entries in @code.
-
+%
+\def\defcodeindex{\parsearg\newcodeindex}
+%
 \def\newcodeindex#1{%
   \iflinks
     \expandafter\newwrite \csname#1indfile\endcsname
     \openout \csname#1indfile\endcsname \jobname.#1
   \fi
   \expandafter\xdef\csname#1index\endcsname{%
-    \noexpand\docodeindex{#1}}
+    \noexpand\docodeindex{#1}}%
 }
 
-\def\defcodeindex{\parsearg\newcodeindex}
 
 % @synindex foo bar    makes index foo feed into index bar.
 % Do this instead of @defindex foo if you don't want it as a separate index.
-% The \closeout helps reduce unnecessary open files; the limit on the
-% Acorn RISC OS is a mere 16 files.
-\def\synindex#1 #2 {%
-  \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
-  \expandafter\closeout\csname#1indfile\endcsname
-  \expandafter\let\csname#1indfile\endcsname=\synindexfoo
-  \expandafter\xdef\csname#1index\endcsname{% define \xxxindex
-    \noexpand\doindex{#2}}%
-}
-
+% 
 % @syncodeindex foo bar   similar, but put all entries made for index foo
 % inside @code.
-\def\syncodeindex#1 #2 {%
-  \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
-  \expandafter\closeout\csname#1indfile\endcsname
-  \expandafter\let\csname#1indfile\endcsname=\synindexfoo
-  \expandafter\xdef\csname#1index\endcsname{% define \xxxindex
-    \noexpand\docodeindex{#2}}%
+% 
+\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
+\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
+
+% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
+% #3 the target index (bar).
+\def\dosynindex#1#2#3{%
+  % Only do \closeout if we haven't already done it, else we'll end up
+  % closing the target index.
+  \expandafter \ifx\csname donesynindex#2\endcsname \undefined
+    % The \closeout helps reduce unnecessary open files; the limit on the
+    % Acorn RISC OS is a mere 16 files.
+    \expandafter\closeout\csname#2indfile\endcsname
+    \expandafter\let\csname\donesynindex#2\endcsname = 1
+  \fi
+  % redefine \fooindfile:
+  \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
+  \expandafter\let\csname#2indfile\endcsname=\temp
+  % redefine \fooindex:
+  \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}%
 }
 
 % Define \doindex, the driver for all \fooindex macros.
@@ -3155,7 +3199,6 @@ width0pt\relax} \fi
   %
   % Double the \vsize as well.  (We don't need a separate register here,
   % since nobody clobbers \vsize.)
-  \advance\vsize by -\ht\partialpage
   \vsize = 2\vsize
 }
 
@@ -3169,6 +3212,7 @@ width0pt\relax} \fi
   % previous page.
   \dimen@ = \vsize
   \divide\dimen@ by 2
+  \advance\dimen@ by -\ht\partialpage
   %
   % box0 will be the left-hand column, box2 the right.
   \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
@@ -3176,15 +3220,18 @@ width0pt\relax} \fi
   \unvbox255
   \penalty\outputpenalty
 }
+%
+% Re-output the contents of the output page -- any previous material,
+% followed by the two boxes we just split, in box0 and box2.
 \def\pagesofar{%
-  % Re-output the contents of the output page -- any previous material,
-  % followed by the two boxes we just split, in box0 and box2.
   \unvbox\partialpage
   %
   \hsize = \doublecolumnhsize
   \wd0=\hsize \wd2=\hsize
   \hbox to\pagewidth{\box0\hfil\box2}%
 }
+% 
+% All done with double columns.
 \def\enddoublecolumns{%
   \output = {%
     % Split the last of the double-column material.  Leave it on the
@@ -3209,8 +3256,9 @@ width0pt\relax} \fi
   % \endgroup where \vsize got restored).
   \pagegoal = \vsize
 }
+%
+% Called at the end of the double column material.
 \def\balancecolumns{%
-  % Called at the end of the double column material.
   \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
   \dimen@ = \ht0
   \advance\dimen@ by \topskip
@@ -4271,6 +4319,7 @@ width0pt\relax} \fi
   \gobble
 }
 
+
 % @quotation does normal linebreaking (hence we can't use \nonfillstart)
 % and narrows the margins.
 %
@@ -4293,6 +4342,158 @@ width0pt\relax} \fi
 }
 
 
+% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
+% If we want to allow any <char> as delimiter, 
+% we need the curly braces so that makeinfo sees the @verb command, eg:
+% `@verbx...x' would look like the '@verbx' command.  --janneke@gnu.org
+%
+% [Knuth]: Donald Ervin Knuth, 1996.  The TeXbook.
+%
+% [Knuth] p. 344; only we need to do '@' too
+\def\dospecials{%
+  \do\ \do\\\do\@\do\{\do\}\do\$\do\&%
+  \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~}
+%
+% [Knuth] p. 380
+\def\uncatcodespecials{%
+  \def\do##1{\catcode`##1=12}\dospecials}
+%
+% [Knuth] pp. 380,381,391
+% Disable Spanish ligatures ?` and !` of \tt font
+\begingroup
+  \catcode`\`=\active\gdef`{\relax\lq}
+\endgroup
+%
+% Setup for the @verb command.
+%
+% Eight spaces for a tab
+\begingroup
+  \catcode`\^^I=\active
+  \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }}
+\endgroup
+%
+\def\setupverb{%
+  \tt  % easiest (and conventionally used) font for verbatim
+  \def\par{\leavevmode\endgraf}%
+  \catcode`\`=\active
+  \tabeightspaces
+  % Respect line breaks,
+  % print special symbols as themselves, and
+  % make each space count
+  % must do in this order:
+  \obeylines \uncatcodespecials \sepspaces
+}
+
+% Setup for the @verbatim environment
+%
+% Real tab expansion
+\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
+%
+\def\starttabbox{\setbox0=\hbox\bgroup}
+\begingroup
+  \catcode`\^^I=\active
+  \gdef\tabexpand{%
+    \catcode`\^^I=\active
+    \def^^I{\leavevmode\egroup
+      \dimen0=\wd0 % the width so far, or since the previous tab
+      \divide\dimen0 by\tabw
+      \multiply\dimen0 by\tabw % compute previous multiple of \tabw
+      \advance\dimen0 by\tabw  % advance to next multiple of \tabw
+      \wd0=\dimen0 \box0 \starttabbox
+    }%
+  }
+\endgroup
+\def\setupverbatim{%
+  % Easiest (and conventionally used) font for verbatim
+  \tt
+  \def\par{\leavevmode\egroup\box0\endgraf}%
+  \catcode`\`=\active
+  \tabexpand
+  % Respect line breaks,
+  % print special symbols as themselves, and
+  % make each space count
+  % must do in this order:
+  \obeylines \uncatcodespecials \sepspaces
+  \everypar{\starttabbox}%
+}
+
+% Do the @verb magic: verbatim text is quoted by unique 
+% delimiter characters.  Before first delimiter expect a 
+% right brace, after last delimiter expect closing brace:
+%
+%    \def\doverb'{'<char>#1<char>'}'{#1}
+%
+% [Knuth] p. 382; only eat outer {}
+\begingroup
+  \catcode`[=1\catcode`]=2\catcode`\{=12\catcode`\}=12
+  \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
+\endgroup
+%
+\def\verb{\begingroup\setupverb\doverb}
+%
+%
+% Do the @verbatim magic: define the macro \doverbatim so that
+% the (first) argument ends when '@end verbatim' is reached, ie:
+%
+%     \def\doverbatim#1@end verbatim{#1}
+%
+% For Texinfo it's a lot easier than for LaTeX, 
+% because texinfo's \verbatim doesn't stop at '\end{verbatim}':
+% we need not redefine '\', '{' and '}'
+%
+% Inspired by LaTeX's verbatim command set [latex.ltx]
+%% Include LaTeX hack for completeness -- never know
+%% \begingroup
+%% \catcode`|=0 \catcode`[=1
+%% \catcode`]=2\catcode`\{=12\catcode`\}=12\catcode`\ =\active
+%% \catcode`\\=12|gdef|doverbatim#1@end verbatim[
+%% #1|endgroup|def|Everbatim[]|end[verbatim]]
+%% |endgroup
+\begingroup
+  \catcode`\ =\active
+  \gdef\doverbatim#1@end verbatim{#1\end{verbatim}}
+\endgroup
+%
+\def\verbatim{%
+  \def\Everbatim{\nonfillfinish\endgroup}%
+  \begingroup
+    \nonfillstart
+    \advance\leftskip by -\defbodyindent
+    \begingroup\setupverbatim\doverbatim
+}
+
+% @verbatiminclude FILE - insert text of file in verbatim environment.
+%
+% Allow normal characters that we make active in the argument (a file name).
+\def\verbatiminclude{%
+  \begingroup
+    \catcode`\\=12
+    \catcode`~=12
+    \catcode`^=12
+    \catcode`_=12
+    \catcode`|=12
+    \catcode`<=12
+    \catcode`>=12
+    \catcode`+=12
+    \parsearg\doverbatiminclude
+}
+\def\setupverbatiminclude{%
+  \begingroup
+    \nonfillstart
+    \advance\leftskip by -\defbodyindent
+    \begingroup\setupverbatim
+}
+%
+\def\doverbatiminclude#1{%
+     % Restore active chars for included file.
+  \endgroup
+  \begingroup
+  \def\thisfile{#1}%
+  \expandafter\expandafter\setupverbatiminclude\input\thisfile
+  \endgroup\nonfillfinish\endgroup
+}
+
+
 \message{defuns,}
 % @defun etc.
 

doc/textutils.texi

@@ -1,7 +1,7 @@
 \input texinfo
 @c %**start of header
 @setfilename textutils.info
-@settitle GNU text utilities
+@settitle @sc{gnu} text utilities
 @c %**end of header
 
 @include version.texi
@@ -20,7 +20,7 @@
 @ifinfo
 @format
 START-INFO-DIR-ENTRY
-* Text utilities: (textutils).          GNU text utilities.
+* Text utilities: (textutils).                  GNU text utilities.
 * cat: (textutils)cat invocation.               Concatenate and write files.
 * cksum: (textutils)cksum invocation.           Print @sc{posix} CRC checksum.
 * comm: (textutils)comm invocation.             Compare sorted files by line.
@@ -56,30 +56,18 @@ This file documents the GNU text utilities.
 
 Copyright (C) 1994, 95, 96 Free Software Foundation, Inc.
 
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, with no
+Front-Cover Texts, and with no Back-Cover Texts.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
 
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the Foundation.
 @end ifinfo
 
 @titlepage
-@title GNU @code{textutils}
+@title @sc{gnu} @code{textutils}
 @subtitle A set of text utilities
 @subtitle for version @value{VERSION}, @value{UPDATED}
 @author David MacKenzie et al.
@@ -88,19 +76,13 @@ by the Foundation.
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1994, 95, 96 Free Software Foundation, Inc.
 
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the Foundation.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, with no
+Front-Cover Texts, and with no Back-Cover Texts.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
 @end titlepage
 
 
@@ -114,7 +96,7 @@ by the Foundation.
 @cindex text utilities
 @cindex utilities for text handling
 
-This manual documents version @value{VERSION} of the GNU text utilities.
+This manual documents version @value{VERSION} of the @sc{gnu} text utilities.
 
 @menu
 * Introduction::                       Caveats, overview, and authors.
@@ -217,11 +199,12 @@ Opening the software toolbox
 
 This manual is incomplete: No attempt is made to explain basic concepts
 in a way suitable for novices.  Thus, if you are interested, please get
-involved in improving this manual.  The entire GNU community will
+involved in improving this manual.  The entire @sc{gnu} community will
 benefit.
 
 @cindex POSIX.2
-The GNU text utilities are mostly compatible with the @sc{posix.2} standard.
+The @sc{gnu} text utilities are mostly compatible with the @sc{posix.2}
+standard.
 
 @c This paragraph appears in all of fileutils.texi, textutils.texi, and
 @c sh-utils.texi too -- so be sure to keep them consistent.
@@ -251,7 +234,7 @@ overall process.
 
 Certain options are available in all of these programs.  Rather than
 writing identical descriptions for each of the programs, they are
-described here.  (In fact, every GNU program accepts (or should accept)
+described here.  (In fact, every @sc{gnu} program accepts (or should accept)
 these options.)
 
 Some of these programs recognize the @samp{--help} and @samp{--version}
@@ -692,19 +675,19 @@ to the output line generated by the type specification.
 
 @table @samp
 @item a
-named character,
+named character
 @item c
 @sc{ascii} character or backslash escape,
 @item d
-signed decimal,
+signed decimal
 @item f
-floating point,
+floating point
 @item o
-octal,
+octal
 @item u
-unsigned decimal,
+unsigned decimal
 @item x
-hexadecimal.
+hexadecimal
 @end table
 
 The type @code{a} outputs things like @samp{sp} for space, @samp{nl} for
@@ -722,24 +705,24 @@ one of the following characters.  For integers (@samp{d}, @samp{o},
 
 @table @samp
 @item C
-char,
+char
 @item S
-short,
+short
 @item I
-int,
+int
 @item L
-long.
+long
 @end table
 
 For floating point (@code{f}):
 
 @table @asis
 @item F
-float,
+float
 @item D
-double,
+double
 @item L
-long double.
+long double
 @end table
 
 @item -v
@@ -763,7 +746,8 @@ is not given at all, the default is 16.
 @end table
 
 The next several options map the old, pre-@sc{posix} format specification
-options to the corresponding @sc{posix} format specs.  GNU @code{od} accepts
+options to the corresponding @sc{posix} format specs.
+@sc{gnu} @code{od} accepts
 any combination of old- and new-style options.  Format specification
 options accumulate.
 
@@ -964,15 +948,22 @@ optionally outputting in multicolumn format; optionally merges all
 pr [@var{option}]@dots{} [@var{file}]@dots{}
 @end example
 
+@vindex LC_MESSAGES
 By default, a 5-line header is printed at each page: two blank lines;
 a line with the date, the filename, and the page count; and two more
 blank lines.  A footer of five blank lines is also printed.  With the @samp{-F}
 option, a 3-line header is printed: the leading two blank lines are
 omitted; no footer is used.  The default @var{page_length} in both cases is 66
 lines.  The default number of text lines changes from 56 (without @samp{-F})
-to 63 (with @samp{-F}).  The text line of the header takes up the full
-@var{page_width} in the form @samp{yyyy-mm-dd HH:MM string Page nnnn}.
-String is a centered header string.
+to 63 (with @samp{-F}).  The text line of the header takes the form
+@samp{@var{date} @var{string} @var{page}}, with spaces inserted around
+@var{string} so that the line takes up the full @var{page_width}.  Here,
+@var{date} is the date (see the @option{-D} or @option{--date-format}
+option for details), @var{string} is the centered header string, and
+@var{page} identifies the page number.  The @env{LC_MESSAGES} locale
+category affects the spelling of @var{page}; in the default C locale, it
+is @samp{Page @var{number}} where @var{number} is the decimal page
+number.
 
 Form feeds in the input cause page breaks in the output.  Multiple form
 feeds produce empty pages.
@@ -983,27 +974,35 @@ is @samp{space}).  For multicolumn output, lines will always be truncated to
 column output no line truncation occurs by default.  Use @samp{-W} option to
 truncate lines in that case.
 
-@c FIXME:???  Should this be something like "Starting with version 1.22i,..."
-   Including version 1.22i:
-
+The following changes were made in version 1.22i and apply to later
+versions of @command{pr}:
 @c FIXME: this whole section here sounds very awkward to me. I
 @c made a few small changes, but really it all needs to be redone. - Brian
-Some small @var{letter options} (@samp{-s}, @samp{-w}) have been redefined
-with the object of a better @sc{posix} compliance.  The output of some
-further cases has been adapted to other Unix systems.  These changes are
-not compatible with earlier versions of the program.
+@c OK, I fixed another sentence or two, but some of it I just don't understand.
+@ - Brian
+@itemize @bullet
 
+@item
+Some small @var{letter options} (@samp{-s}, @samp{-w}) have been
+redefined for better @sc{posix} compliance.  The output of some further
+cases has been adapted to other Unix systems.  These changes are not
+compatible with earlier versions of the program.
+
+@item
 Some @var{new capital letter} options (@samp{-J}, @samp{-S}, @samp{-W})
 have been introduced to turn off unexpected interferences of small letter
 options.  The @samp{-N} option and the second argument @var{last_page}
 of @samp{+FIRST_PAGE} offer more flexibility.  The detailed handling of
 form feeds set in the input files requires the @samp{-T} option.
 
+@item
 Capital letter options override small letter ones.
 
+@item
 Some of the option-arguments (compare @samp{-s}, @samp{-S}, @samp{-e},
 @samp{-i}, @samp{-n}) cannot be specified as separate arguments from the
 preceding option letter (already stated in the @sc{posix} specification).
+@end itemize
 
 The program accepts the following options.  Also see @ref{Common options}.
 
@@ -1062,6 +1061,25 @@ unprintable characters are not changed.
 @cindex double spacing
 Double space the output.
 
+@item -D @var{format}
+@itemx --date-format=@var{format}
+@cindex time formats
+@cindex formatting times
+Format header dates using @var{format}, using the same conventions as
+for the the command @samp{date +@var{format}}; @xref{date invocation, ,
+,sh-utils,GNU shell utilities}.  Except for directives, which start with
+@samp{%}, characters in @var{format} are printed unchanged.  You can use
+this option to specify an arbitrary string in place of the header date,
+e.g., @samp{--date-format="Monday morning"}.
+
+@vindex POSIXLY_CORRECT
+@vindex LC_TIME
+If the @env{POSIXLY_CORRECT} environment variable is not set, the date
+format defaults to @samp{%Y-%m-%d %H:%M} (for example, @samp{2001-12-04
+23:59}); otherwise, the format depends on the @env{LC_TIME} locale
+category, with the default being @samp{%b %e %H:%M %Y} (for example,
+@samp{Dec@ @ 4 23:59 2001}.
+
 @item -e[@var{in-tabchar}[@var{in-tabwidth}]]
 @itemx --expand-tabs[=@var{in-tabchar}[@var{in-tabwidth}]]
 @opindex -e
@@ -1087,12 +1105,8 @@ per page changes from default 56 to 63 lines.
 @opindex -h
 @opindex --header
 Replace the filename in the header with the centered string @var{header}.
-Left-hand-side truncation (marked by a @samp{*}) may occur if the total
-header line @samp{yyyy-mm-dd HH:MM HEADER Page nnnn} becomes larger than
-@var{page_width}.  @samp{-h ""} prints a blank line header.  Don't use
-@samp{-h""}.
-A space between the @samp{-h} option and the argument is always
-indispensable.
+When using the shell, @var{header} should be quoted and should be
+separated from @option{-h} by a space.
 
 @item -i[@var{out-tabchar}[@var{out-tabwidth}]]
 @itemx --output-tabs[=@var{out-tabchar}[@var{out-tabwidth}]]
@@ -1138,8 +1152,9 @@ some @var{file}s (form feeds set) produce empty columns, still marked
 by @var{string}.  The result is a continuous line numbering and column
 marking throughout the whole merged file.  Completely empty merged pages
 show no separators or line numbers.  The default header becomes
-@samp{yyyy-mm-dd HH:MM <blanks> Page nnnn}; may be used with
-@samp{-h @var{header}} to fill up the middle blank part.
+@samp{@var{date} @var{page}} with spaces inserted in the middle; this
+may be used with the @option{-h} or @option{--header} option to fill up
+the middle blank part.
 
 @item -n[@var{number-separator}[@var{digits}]]
 @itemx --number-lines[=@var{number-separator}[@var{digits}]]
@@ -1194,12 +1209,12 @@ opened.  (The exit status will still be nonzero, however.)
 @itemx --separator[=@var{char}]
 @opindex -s
 @opindex --separator
-Separate columns by a single character @var{char}.  Default for @var{char}
-is the TAB character without @samp{-w} and @samp{no character} with
-@samp{-w}.  Without @samp{-s} default separator @samp{space} is set.
-@samp{-s[char]} turns off line truncation of all three column options
-(@samp{-COLUMN}|@samp{-a -COLUMN}|@samp{-m}) except @samp{-w} is set.
-That is a @sc{posix}-compliant formulation.
+Separate columns by a single character @var{char}.  The default for
+@var{char} is the TAB character without @samp{-w} and @samp{no
+character} with @samp{-w}.  Without @samp{-s} the default separator
+@samp{space} is set.  @samp{-s[char]} turns off line truncation of all
+three column options (@samp{-COLUMN}|@samp{-a -COLUMN}|@samp{-m}) unless
+@samp{-w} is set.  This is a @sc{posix}-compliant formulation.
 
 
 @item -S[@var{string}]
@@ -1268,9 +1283,8 @@ alignment is always used.  The separator options @samp{-S} or @samp{-s}
 don't affect the @samp{-W} option.  Default is 72 characters.  Without
 @samp{-W @var{page_width}} and without any of the column options NO line
 truncation is used (defined to keep downward compatibility and to meet
-most frequent tasks).  That's equivalent to @samp{-W 72 -J}.  With and
-without @samp{-W @var{page_width}} the header line is always truncated
-to avoid line overflow.
+most frequent tasks).  That's equivalent to @samp{-W 72 -J}.  The header
+line is never truncated.
 
 @end table
 
@@ -1425,7 +1439,7 @@ when given a @var{file} of @samp{-}.  Synopses:
 @example
 tail [@var{option}]@dots{} [@var{file}]@dots{}
 tail -@var{number} [@var{option}]@dots{} [@var{file}]@dots{}
-tail +@var{number} [@var{option}]@dots{} [@var{file}]@dots{}
+tail +@var{number} [@var{option}]@dots{} [@var{file}]@dots{} # obsolescent
 @end example
 
 If more than one @var{file} is specified, @code{tail} prints a
@@ -1437,17 +1451,19 @@ one-line header consisting of
 before the output for each @var{file}.
 
 @cindex BSD @code{tail}
-GNU @code{tail} can output any amount of data (some other versions of
+@sc{gnu} @code{tail} can output any amount of data (some other versions of
 @code{tail} cannot).  It also has no @samp{-r} option (print in
 reverse), since reversing a file is really a different job from printing
 the end of a file; BSD @code{tail} (which is the one with @code{-r}) can
 only reverse files that are at most as large as its buffer, which is
 typically 32k.  A more reliable and versatile way to reverse files is
-the GNU @code{tac} command.
+the @sc{gnu} @code{tac} command.
 
 @code{tail} accepts two option formats: the new one, in which numbers
-are arguments to the options (@samp{-n 1}), and the old one, in which
-the number precedes any option letters (@samp{-1} or @samp{+1}).
+are arguments to the options (@samp{-n 1}), and the obsolescent one, in
+which the number precedes any option letters (@samp{-1} or @samp{+1}).
+Warning: support for the @samp{+1} form will be withdrawn, as future
+versions of @sc{posix} will not allow it.
 
 If any option-argument is a number @var{n} starting with a @samp{+},
 @code{tail} begins printing with the @var{n}th item from the start of
@@ -1466,6 +1482,10 @@ a decimal number optionally followed by a size letter (@samp{b},
 @samp{k}, @samp{m}) as in @code{-c}, or @samp{l} to mean count by lines,
 or other option letters (@samp{cfqv}).
 
+Warning: the @samp{+@var{count}} usage is obsolescent.  Future versions
+of @sc{posix} will require that support for it be withdrawn.  Use
+@samp{-n +@var{count}} instead.
+
 @item -c @var{bytes}
 @itemx --bytes=@var{bytes}
 @opindex -c
@@ -1702,9 +1722,9 @@ exhausted.
 
 The output files' names consist of a prefix (@samp{xx} by default)
 followed by a suffix.  By default, the suffix is an ascending sequence
-of two-digit decimal numbers from @samp{00} and up to @samp{99}.  In any
-case, concatenating the output files in sorted order by filename
-produces the original input file.
+of two-digit decimal numbers from @samp{00} to @samp{99}.  In any case,
+concatenating the output files in sorted order by filename produces the
+original input file.
 
 By default, if @code{csplit} encounters an error or receives a hangup,
 interrupt, quit, or terminate signal, it removes any output files
@@ -1821,9 +1841,9 @@ in columns.  However, @sc{posix} requires that there be exactly one space
 separating columns.  You can make @code{wc} use the @sc{posix}-mandated
 output format by setting the @env{POSIXLY_CORRECT} environment variable.
 
-By default, @code{wc} prints three counts: the newline, words, byte counts.
-Options can specify that only certain counts be printed.  Options do not
-undo others previously given, so
+By default, @code{wc} prints three counts: the newline, words, and byte
+counts.  Options can specify that only certain counts be printed.
+Options do not undo others previously given, so
 
 @example
 wc --bytes --words
@@ -1890,10 +1910,10 @@ sum [@var{option}]@dots{} [@var{file}]@dots{}
 @code{sum} prints the checksum for each @var{file} followed by the
 number of blocks in the file (rounded up).  If more than one @var{file}
 is given, file names are also printed (by default).  (With the
-@samp{--sysv} option, corresponding file name are printed when there is
+@samp{--sysv} option, corresponding file names are printed when there is
 at least one file argument.)
 
-By default, GNU @code{sum} computes checksums using an algorithm
+By default, @sc{gnu} @code{sum} computes checksums using an algorithm
 compatible with BSD @code{sum} and prints file sizes in units of
 1024-byte blocks.
 
@@ -2125,9 +2145,9 @@ disables this last-resort comparison so that lines in which all fields
 compare equal are left in their original relative order.  If no fields
 or global options are specified, @samp{-s} has no effect.
 
-GNU @code{sort} (as specified for all GNU utilities) has no limits on
+@sc{gnu} @code{sort} (as specified for all @sc{gnu} utilities) has no limits on
 input line length or restrictions on bytes allowed within lines.  In
-addition, if the final byte of an input file is not a newline, GNU
+addition, if the final byte of an input file is not a newline, @sc{gnu}
 @code{sort} silently supplies one.  A line's trailing newline is not
 part of the line for comparison purposes.@footnote{@sc{posix}.2-1992
 requires that the trailing newline be part of the comparison, and some
@@ -2264,9 +2284,27 @@ Other options are:
 @opindex -o
 @cindex overwriting of input, allowed
 Write output to @var{output-file} instead of standard output.
-If @var{output-file} is one of the input files, @code{sort} copies
-it to a temporary file before sorting and writing the output to
-@var{output-file}.
+If necessary, @command{sort} reads input before opening
+@var{output-file}, so you can safely sort a file in place by using
+commands like @code{sort F -o F} and @code{cat F | sort -o F}.
+
+@item -S @var{size}
+@opindex -S
+@cindex size for main memory sorting
+Use a main-memory sort buffer of the given @var{size}.  By default,
+@var{size} is in units of 1,024 bytes.  Appending @samp{%} causes
+@var{size} to be interpreted as a percentage of physical memory.
+Appending @samp{k} multiplies @var{size} by 1,024 (the default),
+@samp{M} by 1,048,576, @samp{G} by 1,073,741,824, and so on for
+@samp{T}, @samp{P}, @samp{E}, @samp{Z}, and @samp{Y}.  Appending
+@samp{b} causes @var{size} to be interpreted as a byte count, with no
+multiplication.
+
+This option can improve the performance of @command{sort} by causing it
+to start with a larger or smaller sort buffer than the default.
+However, this option affects only the initial buffer size.  The buffer
+grows beyond @var{size} if @command{sort} encounters input lines larger
+than @var{size}.
 
 @item -t @var{separator}
 @opindex -t
@@ -2277,7 +2315,9 @@ string between a non-whitespace character and a whitespace character.
 That is, given the input line @w{@samp{ foo bar}}, @code{sort} breaks it
 into fields @w{@samp{ foo}} and @w{@samp{ bar}}.  The field separator is
 not considered to be part of either the field preceding or the field
-following.
+following.  But note that sort fields that extend to the end of the line,
+as @samp{-k 2}, or sort fields consisting of a range, as @samp{-k 2,3},
+retain the field separators present between the endpoints of the range.
 
 @item -T @var{tempdir}
 @opindex -T
@@ -2318,20 +2358,24 @@ reliably handle arbitrary pathnames (even those which contain Line Feed
 characters.)
 
 @item +@var{pos1}[-@var{pos2}]
-The obsolete, traditional option for specifying a sort field.  The field
+The obsolescent, traditional option for specifying a sort field.  The field
 consists of the line between @var{pos1} and up to but @emph{not including}
 @var{pos2} (or the end of the line if @var{pos2} is omitted).  Fields
 and character positions are numbered starting with 0.  See below.
 
+Warning: the @samp{+@var{pos}} usage is obsolescent.  Future versions of
+@sc{posix} will require that support for it be withdrawn.  Use
+@option{-k} instead.
+
 @end table
 
-In addition, when GNU @code{sort} is invoked with exactly one argument,
+In addition, when @sc{gnu} @code{sort} is invoked with exactly one argument,
 options @samp{--help} and @samp{--version} are recognized.  @xref{Common
 options}.
 
 Historical (BSD and System V) implementations of @code{sort} have
 differed in their interpretation of some options, particularly
-@samp{-b}, @samp{-f}, and @samp{-n}.  GNU sort follows the @sc{posix}
+@samp{-b}, @samp{-f}, and @samp{-n}.  @sc{gnu} sort follows the @sc{posix}
 behavior, which is usually (but not always!) like the System V behavior.
 According to @sc{posix}, @samp{-n} no longer implies @samp{-b}.  For
 consistency, @samp{-M} has been changed in the same way.  This may
@@ -2359,7 +2403,7 @@ Keys may span multiple fields.
 
 Here are some examples to illustrate various combinations of options.
 In them, the @sc{posix} @samp{-k} option is used to specify sort keys rather
-than the obsolete @samp{+@var{pos1}-@var{pos2}} syntax.
+than the obsolescent @samp{+@var{pos1}-@var{pos2}} syntax.
 
 @itemize @bullet
 
@@ -2389,7 +2433,7 @@ sort -t : -k 2,2n -k 5.3,5.4
 @end example
 
 Note that if you had written @samp{-k 2} instead of @samp{-k 2,2}
-@samp{sort} would have used all characters beginning in the second field
+@command{sort} would have used all characters beginning in the second field
 and extending to the end of the line as the primary @emph{numeric}
 key.  For the large majority of applications, treating keys spanning
 more than one field as numeric will not do what you expect.
@@ -2503,6 +2547,10 @@ each other by at least one space or tab.
 Skip @var{n} characters before checking for uniqueness.  If you use both
 the field and character skipping options, fields are skipped over first.
 
+Warning: the @samp{+@var{n}} usage is obsolescent.  Future versions of
+@sc{posix} will require that support for it be withdrawn.  Use @samp{-s
+@var{n}} instead.
+
 @item -c
 @itemx --count
 @opindex -c
@@ -2530,7 +2578,7 @@ Print only duplicate lines.
 Print all duplicate lines and only duplicate lines.
 This option is useful mainly in conjunction with other options e.g.,
 to ignore case or to compare only selected fields.
-This is a GNU extension.
+This is a @sc{gnu} extension.
 @c FIXME: give an example showing *how* it's useful
 
 @item -u
@@ -2659,15 +2707,15 @@ ptx -G [@var{option} @dots{}] [@var{input} [@var{output}]]
 @end example
 
 The @samp{-G} (or its equivalent: @samp{--traditional}) option disables
-all GNU extensions and reverts to traditional mode, thus introducing some
+all @sc{gnu} extensions and reverts to traditional mode, thus introducing some
 limitations and changing several of the program's default option values.
-When @samp{-G} is not specified, GNU extensions are always enabled.  GNU
-extensions to @code{ptx} are documented wherever appropriate in this
+When @samp{-G} is not specified, @sc{gnu} extensions are always enabled.
+@sc{gnu} extensions to @code{ptx} are documented wherever appropriate in this
 document.  For the full list, see @xref{Compatibility in ptx}.
 
 Individual options are explained in the following sections.
 
-When GNU extensions are enabled, there may be zero, one or several
+When @sc{gnu} extensions are enabled, there may be zero, one or several
 @var{file}s after the options.  If there is no @var{file}, the program
 reads the standard input.  If there is one or several @var{file}s, they
 give the name of input files which are all read in turn, as if all the
@@ -2677,7 +2725,7 @@ file names and line numbers refer to individual text input files.  In
 all cases, the program outputs the permuted index to the standard
 output.
 
-When GNU extensions are @emph{not} enabled, that is, when the program
+When @sc{gnu} extensions are @emph{not} enabled, that is, when the program
 operates in traditional mode, there may be zero, one or two parameters
 besides the options.  If there are no parameters, the program reads the
 standard input and outputs the permuted index to the standard output.
@@ -2687,7 +2735,7 @@ respectively the name of the @var{input} file to read and the name of
 the @var{output} file to produce.  @emph{Be very careful} to note that,
 in this case, the contents of file given by the second parameter is
 destroyed.  This behavior is dictated by System V @code{ptx}
-compatibility; GNU Standards normally discourage output parameters not
+compatibility; @sc{gnu} Standards normally discourage output parameters not
 introduced by an option.
 
 Note that for @emph{any} file named as the value of an option or as an
@@ -2716,7 +2764,7 @@ exit without further processing.
 
 @item -G
 @itemx --traditional
-As already explained, this option disables all GNU extensions to
+As already explained, this option disables all @sc{gnu} extensions to
 @code{ptx} and switches to traditional mode.
 
 @item --help
@@ -2737,7 +2785,7 @@ processing.
 As it is set up now, the program assumes that the input file is coded
 using 8-bit ISO 8859-1 code, also known as Latin-1 character set,
 @emph{unless} it is compiled for MS-DOS, in which case it uses the
-character set of the IBM-PC.  (GNU @code{ptx} is not known to work on
+character set of the IBM-PC.  (@sc{gnu} @code{ptx} is not known to work on
 smaller MS-DOS machines anymore.)  Compared to 7-bit @sc{ascii}, the set
 of characters which are letters is different; this alters the behavior
 of regular expression matching.  Thus, the default regular expression
@@ -2770,9 +2818,9 @@ is not part of the Break file is a word constituent.  If both options
 @samp{-b} and @samp{-W} are specified, then @samp{-W} has precedence and
 @samp{-b} is ignored.
 
-When GNU extensions are enabled, the only way to avoid newline as a
+When @sc{gnu} extensions are enabled, the only way to avoid newline as a
 break character is to write all the break characters in the file with no
-newline at all, not even at the end of the file.  When GNU extensions
+newline at all, not even at the end of the file.  When @sc{gnu} extensions
 are disabled, spaces, tabs and newlines are always considered as break
 characters even if not included in the Break file.
 
@@ -2799,9 +2847,9 @@ is ignored.  The file is called the @dfn{Only file}.  The file contains
 exactly one word in each line; the end of line separation of words is
 not subject to the value of the @samp{-S} option.
 
-There is no default for the Only file.  In the case there are both an
-Only file and an Ignore file, a word can be a keyword only if it is
-given in the Only file and not given in the Ignore file.
+There is no default for the Only file.  When both an Only file and an
+Ignore file are specified, a word is considered a keyword only
+if it is listed in the Only file and not in the Ignore file.
 
 @item -r
 @itemx --references
@@ -2815,7 +2863,7 @@ Using this option changes the default value for option @samp{-S}.
 Using this option, the program does not try very hard to remove
 references from contexts in output, but it succeeds in doing so
 @emph{when} the context ends exactly at the newline.  If option
-@samp{-r} is used with @samp{-S} default value, or when GNU extensions
+@samp{-r} is used with @samp{-S} default value, or when @sc{gnu} extensions
 are disabled, this condition is always met and references are completely
 excluded from the output contexts.
 
@@ -2826,15 +2874,15 @@ This option selects which regular expression will describe the end of a
 line or the end of a sentence.  In fact, this regular expression is not
 the only distinction between end of lines or end of sentences, and input
 line boundaries have no special significance outside this option.  By
-default, when GNU extensions are enabled and if @samp{-r} option is not
+default, when @sc{gnu} extensions are enabled and if @samp{-r} option is not
 used, end of sentences are used.  In this case, this @var{regex} is
-imported from GNU Emacs:
+imported from @sc{gnu} Emacs:
 
 @example
 [.?!][]\"')@}]*\\($\\|\t\\|  \\)[ \t\n]*
 @end example
 
-Whenever GNU extensions are disabled or if @samp{-r} option is used, end
+Whenever @sc{gnu} extensions are disabled or if @samp{-r} option is used, end
 of lines are used; in this case, the default @var{regexp} is just:
 
 @example
@@ -2866,8 +2914,8 @@ corresponding characters by @code{ptx} itself.
 @itemx --word-regexp=@var{regexp}
 
 This option selects which regular expression will describe each keyword.
-By default, if GNU extensions are enabled, a word is a sequence of
-letters; the @var{regexp} used is @samp{\w+}.  When GNU extensions are
+By default, if @sc{gnu} extensions are enabled, a word is a sequence of
+letters; the @var{regexp} used is @samp{\w+}.  When @sc{gnu} extensions are
 disabled, a word is by default anything which ends with a space, a tab
 or a newline; the @var{regexp} used is @samp{[^ \t\n]+}.
 
@@ -2887,14 +2935,14 @@ the corresponding characters by @code{ptx} itself.
 
 Output format is mainly controlled by the @samp{-O} and @samp{-T} options
 described in the table below.  When neither @samp{-O} nor @samp{-T} are
-selected, and if GNU extensions are enabled, the program chooses an
+selected, and if @sc{gnu} extensions are enabled, the program chooses an
 output format suitable for a dumb terminal.  Each keyword occurrence is
 output to the center of one line, surrounded by its left and right
 contexts.  Each field is properly justified, so the concordance output
 can be readily observed.  As a special feature, if automatic
 references are selected by option @samp{-A} and are output before the
 left context, that is, if option @samp{-R} is @emph{not} selected, then
-a colon is added after the reference; this nicely interfaces with GNU
+a colon is added after the reference; this nicely interfaces with @sc{gnu}
 Emacs @code{next-error} processing.  In this default output format, each
 white space character, like newline and tab, is merely changed to
 exactly one space, with no special attempt to compress consecutive
@@ -2915,13 +2963,13 @@ output line.
 @item -w @var{number}
 @itemx --width=@var{number}
 
-Select the output maximum width of each final line.  If references are
-used, they are included or excluded from the output maximum width
+Select the maximum output width of each final line.  If references are
+used, they are included or excluded from the maximum output width
 depending on the value of option @samp{-R}.  If this option is not
 selected, that is, when references are output before the left context,
-the output maximum width takes into account the maximum length of all
+the maximum output width takes into account the maximum length of all
 references.  If this option is selected, that is, when references are
-output after the right context, the output maximum width does not take
+output after the right context, the maximum output width does not take
 into account the space taken by references, nor the gap that precedes
 them.
 
@@ -2938,17 +2986,16 @@ reference is used at output time, overriding the input reference.
 @item -R
 @itemx --right-side-refs
 
-In default output format, when option @samp{-R} is not used, any
-reference produced by the effect of options @samp{-r} or @samp{-A} are
-given to the far right of output lines, after the right context.  In
-default output format, when option @samp{-R} is specified, references
-are rather given to the beginning of each output line, before the left
-context.  For any other output format, option @samp{-R} is almost
-ignored, except for the fact that the width of references is @emph{not}
-taken into account in total output width given by @samp{-w} whenever
-@samp{-R} is selected.
+In the default output format, when option @samp{-R} is not used, any
+references produced by the effect of options @samp{-r} or @samp{-A} are
+placed to the far right of output lines, after the right context.  With
+default output format, when the @samp{-R} option is specified, references
+are rather placed at the beginning of each output line, before the left
+context.  For any other output format, option @samp{-R} is
+ignored, with one exception:  with @samp{-R} the width of references
+is @emph{not} taken into account in total output width given by @samp{-w}.
 
-This option is automatically selected whenever GNU extensions are
+This option is automatically selected whenever @sc{gnu} extensions are
 disabled.
 
 @item -F @var{string}
@@ -2990,8 +3037,8 @@ processing.  Each output line will look like:
 @end smallexample
 
 so it will be possible to write a @samp{.xx} roff macro to take care of
-the output typesetting.  This is the default output format when GNU
-extensions are disabled.  Option @samp{-M} might be used to change
+the output typesetting.  This is the default output format when @sc{gnu}
+extensions are disabled.  Option @samp{-M} can be used to change
 @samp{xx} to another macro name.
 
 In this output format, each non-graphical character, like newline and
@@ -3014,48 +3061,48 @@ so it will be possible to write a @code{\xx} definition to take care of
 the output typesetting.  Note that when references are not being
 produced, that is, neither option @samp{-A} nor option @samp{-r} is
 selected, the last parameter of each @code{\xx} call is inhibited.
-Option @samp{-M} might be used to change @samp{xx} to another macro
+Option @samp{-M} can be used to change @samp{xx} to another macro
 name.
 
 In this output format, some special characters, like @kbd{$}, @kbd{%},
 @kbd{&}, @kbd{#} and @kbd{_} are automatically protected with a
-backslash.  Curly brackets @kbd{@{}, @kbd{@}} are also protected with a
-backslash, but also enclosed in a pair of dollar signs to force
-mathematical mode.  The backslash itself produces the sequence
-@code{\backslash@{@}}.  Circumflex and tilde diacritics produce the
-sequence @code{^\@{ @}} and @code{~\@{ @}} respectively.  Other
-diacriticized characters of the underlying character set produce an
-appropriate @TeX{} sequence as far as possible.  The other non-graphical
-characters, like newline and tab, and all others characters which are
-not part of @sc{ascii}, are merely changed to exactly one space, with no
-special attempt to compress consecutive spaces.  Let me know how to
-improve this special character processing for @TeX{}.
+backslash.  Curly brackets @kbd{@{}, @kbd{@}} are protected with a
+backslash and a pair of dollar signs (to force mathematical mode).  The
+backslash itself produces the sequence @code{\backslash@{@}}.
+Circumflex and tilde diacritics produce the sequence @code{^\@{ @}} and
+@code{~\@{ @}} respectively.  Other diacriticized characters of the
+underlying character set produce an appropriate @TeX{} sequence as far
+as possible.  The other non-graphical characters, like newline and tab,
+and all other characters which are not part of @sc{ascii}, are merely
+changed to exactly one space, with no special attempt to compress
+consecutive spaces.  Let me know how to improve this special character
+processing for @TeX{}.
 
 @end table
 
 
 @node Compatibility in ptx
-@subsection The GNU extensions to @code{ptx}
+@subsection The @sc{gnu} extensions to @code{ptx}
 
 This version of @code{ptx} contains a few features which do not exist in
 System V @code{ptx}.  These extra features are suppressed by using the
 @samp{-G} command line option, unless overridden by other command line
-options.  Some GNU extensions cannot be recovered by overriding, so the
-simple rule is to avoid @samp{-G} if you care about GNU extensions.
+options.  Some @sc{gnu} extensions cannot be recovered by overriding, so the
+simple rule is to avoid @samp{-G} if you care about @sc{gnu} extensions.
 Here are the differences between this program and System V @code{ptx}.
 
 @itemize @bullet
 
 @item
 This program can read many input files at once, it always writes the
-resulting concordance on standard output.  On the other end, System V
-@code{ptx} reads only one file and produce the result on standard output
+resulting concordance on standard output.  On the other hand, System V
+@code{ptx} reads only one file and sends the result to standard output
 or, if a second @var{file} parameter is given on the command, to that
 @var{file}.
 
-Having output parameters not introduced by options is a quite dangerous
-practice which GNU avoids as far as possible.  So, for using @code{ptx}
-portably between GNU and System V, you should always use it with a
+Having output parameters not introduced by options is a dangerous
+practice which @sc{gnu} avoids as far as possible.  So, for using @code{ptx}
+portably between @sc{gnu} and System V, you should always use it with a
 single input file, and always expect the result on standard output.  You
 might also want to automatically configure in a @samp{-G} option to
 @code{ptx} calls in products using @code{ptx}, if the configurator finds
@@ -3064,9 +3111,9 @@ that the installed @code{ptx} accepts @samp{-G}.
 @item
 The only options available in System V @code{ptx} are options @samp{-b},
 @samp{-f}, @samp{-g}, @samp{-i}, @samp{-o}, @samp{-r}, @samp{-t} and
-@samp{-w}.  All other options are GNU extensions and are not repeated in
+@samp{-w}.  All other options are @sc{gnu} extensions and are not repeated in
 this enumeration.  Moreover, some options have a slightly different
-meaning when GNU extensions are enabled, as explained below.
+meaning when @sc{gnu} extensions are enabled, as explained below.
 
 @item
 By default, concordance output is not formatted for @code{troff} or
@@ -3075,29 +3122,29 @@ or @code{nroff} output may still be selected through option @samp{-O}.
 
 @item
 Unless @samp{-R} option is used, the maximum reference width is
-subtracted from the total output line width.  With GNU extensions
+subtracted from the total output line width.  With @sc{gnu} extensions
 disabled, width of references is not taken into account in the output
 line width computations.
 
 @item
 All 256 characters, even @kbd{NUL}s, are always read and processed from
-input file with no adverse effect, even if GNU extensions are disabled.
+input file with no adverse effect, even if @sc{gnu} extensions are disabled.
 However, System V @code{ptx} does not accept 8-bit characters, a few
 control characters are rejected, and the tilde @kbd{~} is also rejected.
 
 @item
-Input line length is only limited by available memory, even if GNU
+Input line length is only limited by available memory, even if @sc{gnu}
 extensions are disabled.  However, System V @code{ptx} processes only
 the first 200 characters in each line.
 
 @item
 The break (non-word) characters default to be every character except all
-letters of the underlying character set, diacriticized or not.  When GNU
+letters of the underlying character set, diacriticized or not.  When @sc{gnu}
 extensions are disabled, the break characters default to space, tab and
 newline only.
 
 @item
-The program makes better use of output line width.  If GNU extensions
+The program makes better use of output line width.  If @sc{gnu} extensions
 are disabled, the program rather tries to imitate System V @code{ptx},
 but still, there are some slight disposition glitches this program does
 not completely reproduce.
@@ -3134,7 +3181,7 @@ cut [@var{option}]@dots{} [@var{file}]@dots{}
 In the table which follows, the @var{byte-list}, @var{character-list},
 and @var{field-list} are one or more numbers or ranges (two numbers
 separated by a dash) separated by commas.  Bytes, characters, and
-fields are numbered from starting at 1.  Incomplete ranges may be
+fields are numbered starting at 1.  Incomplete ranges may be
 given: @samp{-@var{m}} means @samp{1-@var{m}}; @samp{@var{n}-} means
 @samp{@var{n}} through end of line or last field.
 
@@ -3165,6 +3212,8 @@ take up 1 character.
 @opindex --fields
 Print only the fields listed in @var{field-list}.  Fields are
 separated by a TAB character by default.
+Also print any line that contains no delimiter character, unless
+the @samp{--only-delimited} (@samp{-s}) option is specified
 
 @item -d @var{input_delim_byte}
 @itemx --delimiter=@var{input_delim_byte}
@@ -3330,7 +3379,7 @@ Print a line for each unpairable line in file @var{file-number}
 
 @end table
 
-In addition, when GNU @code{join} is invoked with exactly one argument,
+In addition, when @sc{gnu} @code{join} is invoked with exactly one argument,
 options @samp{--help} and @samp{--version} are recognized.  @xref{Common
 options}.
 
@@ -3438,7 +3487,7 @@ from @var{m} through @var{n}, in ascending order.  @var{m} should
 collate before @var{n}; if it doesn't, an error results.  As an example,
 @samp{0-9} is the same as @samp{0123456789}.
 
-GNU @code{tr} does not support the System V syntax that uses square
+@sc{gnu} @code{tr} does not support the System V syntax that uses square
 brackets to enclose ranges.  Translations specified in that format
 sometimes work as expected, since the brackets are often transliterated
 to themselves.  However, they should be avoided because they sometimes
@@ -3526,7 +3575,7 @@ The syntax @samp{[=@var{c}=]} expands to all of the characters that are
 equivalent to @var{c}, in no particular order.  Equivalence classes are
 a relatively recent invention intended to support non-English alphabets.
 But there seems to be no standard way to define them or determine their
-contents.  Therefore, they are not fully implemented in GNU @code{tr};
+contents.  Therefore, they are not fully implemented in @sc{gnu} @code{tr};
 each character's equivalence class consists only of that character,
 which is of no particular use.
 
@@ -3574,8 +3623,8 @@ BSD @code{tr} pads @var{set2} to the length of @var{set1} by repeating
 the last character of @var{set2} as many times as necessary.  System V
 @code{tr} truncates @var{set1} to the length of @var{set2}.
 
-By default, GNU @code{tr} handles this case like BSD @code{tr}.  When
-the @samp{--truncate-set1} (@samp{-t}) option is given, GNU @code{tr}
+By default, @sc{gnu} @code{tr} handles this case like BSD @code{tr}.  When
+the @samp{--truncate-set1} (@samp{-t}) option is given, @sc{gnu} @code{tr}
 handles this case like the System V @code{tr} instead.  This option is
 ignored for operations other than translation.
 
@@ -3714,7 +3763,7 @@ following warning and error messages, for strict compliance with
 
 @item
 When the @samp{--delete} option is given but @samp{--squeeze-repeats}
-is not, and @var{set2} is given, GNU @code{tr} by default prints
+is not, and @var{set2} is given, @sc{gnu} @code{tr} by default prints
 a usage message and exits, because @var{set2} would not be used.
 The @sc{posix} specification says that @var{set2} must be ignored in
 this case. Silently ignoring arguments is a bad idea.
@@ -3726,9 +3775,9 @@ value 400 octal does not fit into a single byte.
 
 @end enumerate
 
-GNU @code{tr} does not provide complete BSD or System V compatibility.
+@sc{gnu} @code{tr} does not provide complete BSD or System V compatibility.
 For example, it is impossible to disable interpretation of the @sc{posix}
-constructs @samp{[:alpha:]}, @samp{[=c=]}, and @samp{[c*10]}.  Also, GNU
+constructs @samp{[:alpha:]}, @samp{[=c=]}, and @samp{[c*10]}.  Also, @sc{gnu}
 @code{tr} does not delete zero bytes automatically, unlike traditional
 Unix versions, which provide no way to preserve zero bytes.
 
@@ -3853,13 +3902,13 @@ Robbins.
 @node Toolbox introduction
 @unnumberedsec Toolbox introduction
 
-This month's column is only peripherally related to the GNU Project, in
-that it describes a number of the GNU tools on your Linux system and how they
-might be used.  What it's really about is the ``Software Tools'' philosophy
+This month's column is only peripherally related to the @sc{gnu} Project, in
+that it describes a number of the @sc{gnu} tools on your Linux system and how
+they might be used.  What it's really about is the ``Software Tools'' philosophy
 of program development and usage.
 
 The software tools philosophy was an important and integral concept
-in the initial design and development of Unix (of which Linux and GNU are
+in the initial design and development of Unix (of which Linux and @sc{gnu} are
 essentially clones).  Unfortunately, in the modern day press of
 Internetworking and flashy GUIs, it seems to have fallen by the
 wayside.  This is a shame, since it provides a powerful mental model
@@ -4352,8 +4401,8 @@ appropriate tool, build one.
 As of this writing, all the programs we've discussed are available via
 anonymous @code{ftp} from @code{prep.ai.mit.edu} as
 @file{/pub/gnu/textutils-1.9.tar.gz}.@footnote{Version 1.9 was current
-when this column was written. Check the nearest GNU archive for the
-current version.  The main GNU FTP site is now @code{ftp.gnu.org}.}
+when this column was written. Check the nearest @sc{gnu} archive for the
+current version.  The main @sc{gnu} FTP site is now @code{ftp.gnu.org}.}
 
 None of what I have presented in this column is new. The Software Tools
 philosophy was first introduced in the book @cite{Software Tools},
@@ -4379,8 +4428,8 @@ whose members had ported the original @code{ratfor} programs to essentially
 every computer system with a FORTRAN compiler.  The popularity of the
 group waned in the middle '80s as Unix began to spread beyond universities.
 
-With the current proliferation of GNU code and other clones of Unix programs,
-these programs now receive little attention; modern C versions are
+With the current proliferation of @sc{gnu} code and other clones of Unix
+programs, these programs now receive little attention; modern C versions are
 much more efficient and do more than these programs do.  Nevertheless, as
 exposition of good programming style, and evangelism for a still-valuable
 philosophy, these books are unparalleled, and I recommend them highly.

lib/.gdb-history

@@ -217,3 +217,13 @@ p delta
 n
 p Start
 q
+b dir_name
+r
+n
+p slash
+n
+n
+n
+p slash
+p slash - path + 1
+q

lib/ChangeLog

@@ -1,3 +1,474 @@
+2001-03-19  Paul Eggert  <eggert@twinsun.com>
+
+	* lib/version-etc.c (version_etc_copyright): Update to 2001.
+
+2001-03-16  Paul Eggert  <eggert@twinsun.com>
+
+	* tempname.c (uint64_t): Define to uintmax_t if
+	not defined, and if UINT64_MAX is not defined.
+	Required at least for Vax Ultrix4.3, which doesn't define uint64_t.
+	Reported by John David Anglin.
+
+2001-03-10  Bruno Haible  <haible@clisp.cons.org>
+
+	* localcharset.c (locale_charset): Allow wildcard syntax. Also resolve
+	alias if codeset is empty.
+	* config.charset (BeOS): Use wildcard syntax.
+
+2001-03-13  Jim Meyering  <meyering@lucent.com>
+
+	* path-concat.c (path_concat) [FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX]:
+	Don't insert a backslash when concatenating e.g., `C:' and `foo'.
+	From Bruno Haible.
+
+2001-03-06  Bruno Haible  <haible@clisp.cons.org>
+
+	* localcharset.c (locale_charset): Don't use setlocale(LC_CTYPE,NULL).
+	Don't return NULL.
+	* unicodeio.c (print_unicode_char): Simplify accordingly.
+
+2001-03-06  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Update for FreeBSD 4.2 and OSF/1 5.1. Add
+	support for DOS/DJGPP.
+
+2001-02-28  Paul Eggert  <eggert@twinsun.com>
+
+	* Makefile.am (libfetish_a_SOURCES):
+	Add dup-safer.c, fopen-safer.c.
+	(noinst_HEADERS): Add stdio-safer.h, unistd-safer.h.
+
+	* dup-safer.c, fopen-safer.c, stdio-safer.h,
+	lib/unistd-safer.h: New files.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	The mkstemp replacement is taken from glibc 2.2.2, with some
+	portability fixes for use outside glibc, as follows:
+
+	* tempname.c (struct_stat64): New macro.
+	(direxists, __gen_tempname): Use it.
+	This avoids a portability problem with Solaris 8.
+
+	* tempname.c (<config.h>): Include if HAVE_CONFIG_H.
+	(<stddef.h>, <stdint.h>, <string.h>):
+	Include only if STDC_HEADERS || _LIBC.
+	(<fcntl.h>): Include only if HAVE_FCNTL_H || _LIBC.
+	(<unistd.h>): Include only if HAVE_UNISTD_H || _LIBC.
+	(<sys/time.h>): Include only if HAVE_SYS_TIME_H || _LIBC.
+	(__set_errno): Define this macro if <errno.h> doesn't.
+	(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
+	Define these macros if <stdio.h> doesn't.
+	(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
+	Define these macros if <sys/stat.h>
+	doesn't.  Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
+	(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64, lxstat64,
+	__xstat64): Define if not _LIBC.
+	(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
+	(__gen_tempname): Invoke gettimeofday only if
+	HAVE_GETTIMEOFDAY || _LIBC;
+	otherwise, fall back on plain "time".
+	Use macros like S_IRUSR | S_IWUSR rather than octal values like 0600.
+
+	* mkstemp.c (__GT_FILE): Define to zero if not defined.
+
+	* mkstemp.c, tempname.c: New files, taken from glibc 2.2.2.
+
+2001-02-17  Jim Meyering  <meyering@lucent.com>
+
+	* strtoul.c: Sync from GNU libc.  Use double quotes, not <...>
+	around included file name.
+
+	* strnlen.c (__strnlen): Merge in a change from GNU libc.
+
+	* strftime.c: Update from GNU libc (the only changes were to comments).
+
+2001-02-13  Bruno Haible  <haible@clisp.cons.org>
+
+	* mbswidth.h (mbswidth): Also define as macro, to avoid prototype clash.
+
+2001-02-17  Paul Eggert  <eggert@twinsun.com>
+
+	* mbswidth.c, quotearg.c (mbrtowc, mbsinit):
+	Remove workaround macros for hosts that have mbrtowc but not
+	mbstate_t, as we now insist on proper declarations for both
+	before using mbrtowc.
+
+2001-02-17  Jim Meyering  <meyering@lucent.com>
+
+	* regex.c: Update from libc.
+
+2001-02-16  Paul Eggert  <eggert@twinsun.com>
+
+	* alloca.c (malloc): Undef before defining, since stdlib.h
+	may have defined it.  Needed for Encore Umax-3.0.9.16b systems.
+	Reported by Mark Hounschell via Paul Eggert.
+
+2001-01-30  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Update for FreeBSD 4.2.
+
+2001-01-26  Jim Meyering  <meyering@lucent.com>
+
+	* quotearg.c: Include stddef.h.
+	* quote.c: Include stddef.h.
+	Reported by Axel Kittenberger.
+
+	* xmalloc.c [HAVE_DONE_WORKING_MALLOC_CHECK]: Enclose error-evoking
+	line in double quotes so that it evokes a better diagnostic.
+	[HAVE_DONE_WORKING_REALLOC_CHECK]: Likewise.
+	Reported by Axel Kittenberger.
+
+2001-01-15  Bruno Haible  <haible@clisp.cons.org>
+
+	* unicodeio.c (print_unicode_char): Cast the second iconv() arg,
+	to avoid a warning.  Add back 'const' to inptr.
+
+2001-01-16  Jim Meyering  <meyering@lucent.com>
+
+	* basename.c: Include <stdio.h>, needed by assert on SunOS4.
+	From Bruno Haible.
+
+2001-01-14  Jim Meyering  <meyering@lucent.com>
+
+	* rename.c: New file.  From Volker Borchert.
+	Include stdlib.h, string.h or strings.h, and xalloc.h.
+	Use strip_trailing_slashes rather than open-coding it.
+
+2001-01-03  Paul Eggert  <eggert@twinsun.com>
+
+	* strftime.c: Sync with glibc time/strftime.c 1.81.
+
+2001-01-03  Jim Meyering  <meyering@lucent.com>
+
+	* unicodeio.c (print_unicode_char): Remove `const' from declaration of
+	local `inptr' to avoid warning with some system declarations of iconv.
+
+2000-12-29  Paul Eggert  <eggert@twinsun.com>
+
+	* modechange.c: Do not assume that mode_t uses the
+	traditional octal encoding.  E.g. "chmod 1 FOO" should set
+	the other-execute bit of FOO even if S_IXOTH != 1.
+
+	(SUID, SGID, SVTX, RUSR, WUSR, XUSR, RGRP, WGRP, XGRP, ROTH,
+	WOTH, XOTH, ALLM): New macros.
+	(S_ISUID, S_ISGID, S_ISVTX, S_IRUSR, S_IWUSR, S_IXUSR,
+	 S_IRGRP, S_IWGRP, S_IXGRP, S_IROTH, S_IWOTH, S_IXOTH):
+	Use them.
+	(S_ISGID): Fix typo; it was defaulting to the same value as S_ISUID.
+	(S_IRWXU, S_IRWXG, S_IRWXO): Specify defaults in terms of the above.
+	(mode_compile):
+	No need to use uintmax_t; unsigned long is long enough.
+	Don't bother to get suffix since we don't use it.
+
+2000-12-24  Jim Meyering  <meyering@lucent.com>
+
+	* hash.c (is_prime): Return explicit boolean values.
+	(hash_get_first): Return NULL to appease Irix5.6's 89.
+	Reported by Nelson Beebe.
+
+2000-10-31  Bruno Haible  <haible@clisp.cons.org>
+
+	* localcharset.c (locale_charset): Add support for Win32.
+
+2000-12-18  Paul Eggert  <eggert@twinsun.com>
+
+	* physmem.h, physmem.c: New files.
+
+	* Makefile.am (libfetish_a_SOURCES): Add physmem.c.
+	(noinst_HEADERS): Add physmem.h.
+
+	* xstrtol.c (__xstrtol): Add undocumented suffixes 'g' and
+	't' for compatibility with Solaris 8 sort.
+
+2000-12-18  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Add support for BeOS.
+
+2000-12-16  Jim Meyering  <meyering@lucent.com>
+
+	* getusershell.c [!SHELLS_FILE && __DJGPP__]: Define
+	SHELLS_FILE to a file name that's useful on djgpp systems.
+	Include stdlib.h.
+	(ADDITIONAL_DEFAULT_SHELLS): Define.
+	(default_shells): Prepend ADDITIONAL_DEFAULT_SHELLS.
+	Based mostly on a patch from Prashant TR.
+
+2000-12-16  Jim Meyering  <meyering@lucent.com>
+
+	This bug had a serious impact on chown: `chown N:M FILE' (for integer
+	N and M) would have treated it like `chown N:N FILE'.
+
+	* userspec.c (parse_user_spec): Fix typo: s/u/g/.
+
+2000-10-31  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Add ISO-8859-3, BIG5HKSCS, GB18030, JOHAB, VISCII,
+	CP874, CP949, CP950, CP1250, CP1253, CP1254, CP1255, CP1256, CP1257
+	to the list of canonical encodings. Rename EUC-CN to GB2312.
+
+2000-12-08  Andreas Schwab  <schwab@suse.de>
+
+	* mbswidth.c (mbsnwidth): Don't loop endlessly when called with an
+	invalid mulitbyte sequence and with the MBSW_ACCEPT_INVALID flag set.
+
+2000-12-07  Jim Meyering  <meyering@lucent.com>
+
+	* stripslash.c (ISSLASH): Define.
+	(strip_trailing_slashes): Use ISSLASH rather than comparing against `/'.
+	From Prashant TR.
+
+	* dirname.c (FILESYSTEM_PREFIX_LEN): Define.
+	(dir_name_r): Declare this function as static.
+	[BACKSLASH_IS_PATH_SEPARATOR]: Fix a bug that'd
+	manifest itself on a name containing a mix of slashes and
+	backslashes.
+	Make this function work with names starting with a DOS-style
+	drive letter and colon prefix.
+	(dir_name): Append `.' if necessary.
+	Based mostly on patches from Prashant TR and Eli Zaretskii.
+
+	* dirname.h (dir_name_r): Remove prototype.
+
+2000-12-05  Jim Meyering  <meyering@lucent.com>
+
+	* dirname.c (dir_name_r): Add `const' in a few local declarations.
+
+2000-12-04  Jim Meyering  <meyering@lucent.com>
+
+	* path-concat.c: [!HAVE_DECL_MALLOC]: Declare malloc.
+	Also include memory.h, stdlib.h, unistd.h if appropriate.
+	Reported by Andreas Jaeger (conflicting declaration of malloc).
+
+2000-12-02  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.h: Make idempotent, to avoid some obscure warnings.
+
+2000-12-01  Paul Eggert  <eggert@twinsun.com>
+
+	* memrchr.c: Include <config.h> before any system include file.
+
+2000-11-29  Paul Eggert  <eggert@twinsun.com>
+
+	* dirname.c (dir_name_r): Fix typo: int -> size_t.
+
+2000-11-26  Jim Meyering  <meyering@lucent.com>
+
+	* memcoll.c: Include sys/types.h.  From Werner Almesberger.
+
+2000-11-22  Paul Eggert  <eggert@twinsun.com>
+
+	* strftime.c (my_strftime): Do not invoke mbrlen with a
+	size of (size_t) -1; it's not portable.
+
+2000-11-17  Akim Demaille  <akim@epita.fr>
+
+	* obstack.h: Formatting changes.
+	(obstack_grow, obstack_grow0): Don't cast WHERE at all: that would
+	prevent type checking.
+	(obstack_ptr_grow, obstack_ptr_grow_fast): When assigning, don't
+	cast the value to (void *): assigning a `foo *' to a `void *'
+	variable is valid.
+	(obstack_int_grow, obstack_int_grow_fast): Don't cast AINT to int.
+
+2000-11-17  Jim Meyering  <meyering@lucent.com>
+
+	* strstr.c: Update from GNU libc.
+
+2000-11-16  Jim Meyering  <meyering@lucent.com>
+
+	* strverscmp.c: Incorporate weak-alias-related changes from glibc.
+
+2000-11-11  Jim Meyering  <meyering@lucent.com>
+
+	* error.c: Add a couple #includes, merging from GNU libc version.
+
+2000-11-10  Jim Meyering  <meyering@lucent.com>
+
+	* obstack.h: Update from GNU libc.
+	* obstack.c: Likewise.
+
+2000-11-06  Paul Eggert  <eggert@twinsun.com>
+
+	* getusershell.c (setusershell): Use rewind rather than
+	fseek/fseeko, to avoid configuration hassles with fseeko.
+	Don't bother opening SHELLS_FILE if shellstream is NULL;
+	it's not necessary.
+
+2000-11-05  Jim Meyering  <meyering@lucent.com>
+
+	* makepath.h (make_dir): Declare.
+	* makepath.c (make_dir): Remove `static' attribute.
+	Tweak a comment.
+
+2000-11-04  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* hash.c (hash_get_next): Fix a thinko:  when ENTRY is the
+	last one in a bucket, advance to the next bucket.
+
+2000-11-02  Vesselin Atanasov  <vesselin@bgnet.bg>
+
+	* fnmatch.c: Do not comment out all the code if we are using
+	the GNU C library, because in some cases we are replacing buggy
+	code in the GNU C library itself.
+
+2000-10-30  Paul Eggert  <eggert@twinsun.com>
+
+	* error.h, getline.h, modechange.h:
+	Remove "2000" from Copyright line, as the file hasn't been
+	changed this year other than in the copyright notice.
+
+	* xalloc.h: Add "2000" to Copyright line, as this file
+	was changed this year.
+
+2000-10-30  Paul Eggert  <eggert@twinsun.com>
+
+	* fnmatch.c (FOLD): Do not assume that characters are unsigned.
+	(fnmatch): Fix some FNM_FILE_NAME and FNM_LEADING_DIR bugs,
+	e.g. fnmatch("d*/*1", "d/s/1", FNM_FILE_NAME) incorrectly yielded zero.
+
+2000-10-29  Greg Louis  <glouis@dynamicro.on.ca>
+
+	* regex.h (__restrict_arr): Move definition out of #ifndef block.
+	Required because egcs-2.91.66 (aka 1.1.2) defines __restrict, but
+	doesn't define __restrict_arr.
+
+2000-10-29  Jim Meyering  <meyering@lucent.com>
+
+	* xstat.in: Fix grammar in comment.
+
+2000-10-28  Jim Meyering  <meyering@lucent.com>
+
+	* memchr.c: Update from libc.
+	Adjust for portability:
+	[HAVE_STDLIB_H]: Include stdlib.h.
+	[HAVE_BP_SYM_H || _LIBC]: Guard inclusion of bp-sym.h.
+	Undef __memchr, too.
+	[!weak_alias]: Define __memchr to memchr.
+
+	* regex.c: Update from libc.
+	* regex.h: Likewise.
+	* getopt1.c: Likewise.
+	* memcmp.c: Likewise.
+
+	* getusershell.c (setusershell) [HAVE_FSEEKO]: Use fseeko.
+	Avoid using fseek, when possible -- it's broken by design.
+	Patch by Ulrich Drepper.
+
+2000-10-26  Jim Meyering  <meyering@lucent.com>
+
+	* strftime.c: Update from libc.
+
+2000-10-25  Jim Meyering  <meyering@lucent.com>
+
+	* obstack.c: Update from libc.
+
+2000-10-23  Jim Meyering  <meyering@lucent.com>
+
+	* hard-locale.c (hard_locale): Revert last change -- it was simply
+	wrong.  That set_locale call must not have any side effects.
+	From Paul Eggert.
+
+2000-10-22  Jim Meyering  <meyering@lucent.com>
+
+	* md5.c (md5_process_block) [OP]: Use `rol', not CYCLIC.
+	[CYCLIC]: Remove now-unused definition.
+
+	* save-cwd.c (O_DIRECTORY): Define, if needed.
+	(save_cwd) [HAVE_FCHDIR]: Use O_DIRECTORY when opening ".".
+	Suggestion from Ulrich Drepper.
+
+2000-10-21  Jim Meyering  <meyering@lucent.com>
+
+	* dirname.c (dir_name_r): New function, factored out of dir_name.
+	(dir_name): Use dir_name_r.
+	* dirname.h (dir_name_r): Declare it.
+
+2000-10-21  Jim Meyering  <meyering@lucent.com>
+
+	* dirname.c (memrchr): Declare if necessary.
+	(dir_name): Remove the restriction that there be no
+	trailing slashes.  Now, this code skips past them, effectively
+	ignoring them.
+	[TEST_DIRNAME] (main): New unit tests.
+
+	* memrchr.c: New file from GNU libc.
+	Undef __memrchr, too.
+	[!weak_alias]: Define __memrchr to memrchr.
+	Guard weak_alias use with `#ifdef weak_alias'.
+
+2000-10-17  Jim Meyering  <meyering@lucent.com>
+
+	* quote.h (PARAMS): Define and use.
+	Reported by Akim Demaille.
+
+	* getopt.c: Update from libc.
+
+2000-10-16  Jim Meyering  <meyering@lucent.com>
+
+	* hard-locale.c (hard_locale): Use "", not 0 as 2nd arg to setlocale.
+	From Jan Fedak.
+
+2000-09-25  Jim Meyering  <meyering@lucent.com>
+
+	* md5.h (rol): Define (from GnuPG).
+
+	* sha.c: Give credit (GnuPG) where due.
+	(M): Use rol rather than open-coding it.
+	Add a FIXME comment.
+
+2000-09-21  Jim Meyering  <meyering@lucent.com>
+
+	* userspec.c (parse_user_spec): Remove debugging printf I'd added.
+	Reported by Michael Stone.
+
+2000-09-20  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (libfetish_a_SOURCES): Add sha.c.
+	(noinst_HEADERS): Add sha.h.
+	Based on code from Scott G. Miller and from GnuPG.
+
+2000-09-15  Jim Meyering  <meyering@lucent.com>
+
+	* regex.c: Update from libc.
+
+2000-09-10  Jim Meyering  <meyering@lucent.com>
+
+	* getopt.c (_getopt_internal): Update from glibc.
+
+2000-09-09  Jim Meyering  <meyering@lucent.com>
+
+	* quotearg.c: Rename ISASCII to IN_CTYPE_DOMAIN, so people don't
+	think it should be used as a general replacement for isascii.
+	* fnmatch.c: Likewise.
+	* mbswidth.c: Likewise
+	* regex.c: Likewise.
+
+	Don't use atoi.
+	* userspec.c: Include sys/param.h and limits.h.
+	Include xstrtol.h.
+	(CHAR_BIT, TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Define.
+	(UID_T_MAX, GID_T_MAX, MAXUID, MAXGID): Define.
+	(parse_user_spec): Use xstrtoul, not atoi when converting numeric
+	UID, GID.  Check range.
+
+2000-09-06  Jim Meyering  <meyering@lucent.com>
+
+	* getopt.c (_getopt_internal): Update from glibc.
+
+2000-08-30  Jim Meyering  <meyering@lucent.com>
+
+	* strftime.c: Merge in changes from GNU libc.
+
+2000-08-26  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c: Include "__fpending.h".
+	(close_stdout_status): Return right away if there's nothing to flush.
+
+	* Makefile.am (noinst_HEADERS): Add __fpending.h.
+	* __fpending.c: New file.
+	* __fpending.h: New file.
+
 2000-08-07  Paul Eggert  <eggert@twinsun.com>
 
 	Standardize on "memory exhausted" instead of "Memory exhausted"
@@ -172,7 +643,7 @@
 
 	* quotearg.h (enum quoting style): New enum clocale_quoting_style.
 
-	* quotearg.c: (quoting_style_args, quoting_style_vals,
+	* quotearg.c (quoting_style_args, quoting_style_vals,
 	quotearg_buffer_restyled): Add support for
 	clocale_quoting_style.  Undo previous change to
 	locale_quoting_style behavior, and undo the "{LEFT QUOTATION MARK}"

lib/Makefile.am

@@ -9,13 +9,14 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 
 libfetish_a_SOURCES = \
   getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
-  canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
+  canon-host.c closeout.c diacrit.c dirname.c dup-safer.c \
+  exclude.c filemode.c fopen-safer.c \
   full-write.c getopt.c getopt1.c getstr.c getugroups.c hard-locale.c hash.c \
   human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
   makepath.c mbswidth.c md5.c memcasecmp.c memcoll.c modechange.c \
-  path-concat.c \
+  path-concat.c physmem.c \
   quote.c quotearg.c readtokens.c safe-read.c same.c save-cwd.c \
-  savedir.c stripslash.c unicodeio.c userspec.c version-etc.c xgetcwd.c \
+  savedir.c sha.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
 
@@ -24,13 +25,16 @@ libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 
 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 \
+  exclude.h filemode.h fnmatch.h __fpending.h fsusage.h \
+  getdate.h getline.h getopt.h \
   getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
   linebuffer.h long-options.h mbswidth.h md5.h memcasecmp.h memcoll.h \
   makepath.h mbswidth.h modechange.h mountlist.h nanosleep.h obstack.h \
-  path-concat.h pathmax.h posixtm.h quote.h quotearg.h readtokens.h \
-  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h \
-  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h
+  path-concat.h pathmax.h physmem.h posixtm.h \
+  quote.h quotearg.h readtokens.h \
+  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h sha.h \
+  stdio-safer.h strverscmp.h unicodeio.h unistd-safer.h version-etc.h \
+  xalloc.h xstrtod.h xstrtol.h
 
 BUILT_SOURCES = getdate.c lstat.c stat.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)

lib/Makefile.in

@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
 
-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -46,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -56,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 
-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -66,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -81,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -106,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@
 
@@ -124,13 +128,14 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 
 libfetish_a_SOURCES = \
   getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
-  canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
+  canon-host.c closeout.c diacrit.c dirname.c dup-safer.c \
+  exclude.c filemode.c fopen-safer.c \
   full-write.c getopt.c getopt1.c getstr.c getugroups.c hard-locale.c hash.c \
   human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
   makepath.c mbswidth.c md5.c memcasecmp.c memcoll.c modechange.c \
-  path-concat.c \
+  path-concat.c physmem.c \
   quote.c quotearg.c readtokens.c safe-read.c same.c save-cwd.c \
-  savedir.c stripslash.c unicodeio.c userspec.c version-etc.c xgetcwd.c \
+  savedir.c sha.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
 
@@ -140,13 +145,16 @@ libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 
 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 \
+  exclude.h filemode.h fnmatch.h __fpending.h fsusage.h \
+  getdate.h getline.h getopt.h \
   getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
   linebuffer.h long-options.h mbswidth.h md5.h memcasecmp.h memcoll.h \
   makepath.h mbswidth.h modechange.h mountlist.h nanosleep.h obstack.h \
-  path-concat.h pathmax.h posixtm.h quote.h quotearg.h readtokens.h \
-  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h \
-  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h
+  path-concat.h pathmax.h physmem.h posixtm.h \
+  quote.h quotearg.h readtokens.h \
+  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h sha.h \
+  stdio-safer.h strverscmp.h unicodeio.h unistd-safer.h version-etc.h \
+  xalloc.h xstrtod.h xstrtol.h
 
 
 BUILT_SOURCES = getdate.c lstat.c stat.c
@@ -161,143 +169,153 @@ charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 SUFFIXES = .sed .sin
 
 CLEANFILES = charset.alias ref-add.sed ref-del.sed
+EXEEXT =
+OBJEXT = o
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ANSI2KNR = ../src/ansi2knr
 libfetish_a_AR = $(AR) cru
-am_libfetish_a_OBJECTS =  getdate$U.o posixtm$U.o addext$U.o \
-argmatch$U.o backupfile$U.o basename$U.o canon-host$U.o closeout$U.o \
-diacrit$U.o dirname$U.o exclude$U.o filemode$U.o full-write$U.o \
-getopt$U.o getopt1$U.o getstr$U.o getugroups$U.o hard-locale$U.o \
-hash$U.o human$U.o idcache$U.o isdir$U.o linebuffer$U.o \
-localcharset$U.o long-options$U.o makepath$U.o mbswidth$U.o md5$U.o \
-memcasecmp$U.o memcoll$U.o modechange$U.o path-concat$U.o quote$U.o \
-quotearg$U.o readtokens$U.o safe-read$U.o same$U.o save-cwd$U.o \
-savedir$U.o stripslash$U.o unicodeio$U.o userspec$U.o version-etc$U.o \
-xgetcwd$U.o xgethostname$U.o xmalloc$U.o xstrdup$U.o xstrtod$U.o \
-xstrtol$U.o xstrtoul$U.o xstrtoumax$U.o yesno$U.o
-libfetish_a_OBJECTS =  $(am_libfetish_a_OBJECTS)
+am_libfetish_a_OBJECTS = getdate$U.$(OBJEXT) posixtm$U.$(OBJEXT) \
+addext$U.$(OBJEXT) argmatch$U.$(OBJEXT) backupfile$U.$(OBJEXT) \
+basename$U.$(OBJEXT) canon-host$U.$(OBJEXT) closeout$U.$(OBJEXT) \
+diacrit$U.$(OBJEXT) dirname$U.$(OBJEXT) dup-safer$U.$(OBJEXT) \
+exclude$U.$(OBJEXT) filemode$U.$(OBJEXT) fopen-safer$U.$(OBJEXT) \
+full-write$U.$(OBJEXT) getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) \
+getstr$U.$(OBJEXT) getugroups$U.$(OBJEXT) hard-locale$U.$(OBJEXT) \
+hash$U.$(OBJEXT) human$U.$(OBJEXT) idcache$U.$(OBJEXT) \
+isdir$U.$(OBJEXT) linebuffer$U.$(OBJEXT) localcharset$U.$(OBJEXT) \
+long-options$U.$(OBJEXT) makepath$U.$(OBJEXT) mbswidth$U.$(OBJEXT) \
+md5$U.$(OBJEXT) memcasecmp$U.$(OBJEXT) memcoll$U.$(OBJEXT) \
+modechange$U.$(OBJEXT) path-concat$U.$(OBJEXT) physmem$U.$(OBJEXT) \
+quote$U.$(OBJEXT) quotearg$U.$(OBJEXT) readtokens$U.$(OBJEXT) \
+safe-read$U.$(OBJEXT) same$U.$(OBJEXT) save-cwd$U.$(OBJEXT) \
+savedir$U.$(OBJEXT) sha$U.$(OBJEXT) stripslash$U.$(OBJEXT) \
+unicodeio$U.$(OBJEXT) userspec$U.$(OBJEXT) version-etc$U.$(OBJEXT) \
+xgetcwd$U.$(OBJEXT) xgethostname$U.$(OBJEXT) xmalloc$U.$(OBJEXT) \
+xstrdup$U.$(OBJEXT) xstrtod$U.$(OBJEXT) xstrtol$U.$(OBJEXT) \
+xstrtoul$U.$(OBJEXT) xstrtoumax$U.$(OBJEXT) yesno$U.$(OBJEXT)
+libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
 AR = ar
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CFLAGS = @CFLAGS@
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES =  $(libfetish_a_SOURCES)
-HEADERS =  $(noinst_HEADERS)
+DIST_SOURCES = $(libfetish_a_SOURCES)
+HEADERS = $(noinst_HEADERS)
 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-DEP_FILES =  @AMDEP@ $(DEPDIR)/addext$U.Po $(DEPDIR)/alloca.Po \
-$(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po $(DEPDIR)/backupfile$U.Po \
-$(DEPDIR)/basename$U.Po $(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po \
-$(DEPDIR)/closeout$U.Po $(DEPDIR)/diacrit$U.Po $(DEPDIR)/dirname$U.Po \
-$(DEPDIR)/dup2.Po $(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \
-$(DEPDIR)/exclude$U.Po $(DEPDIR)/fileblocks.Po $(DEPDIR)/filemode$U.Po \
-$(DEPDIR)/fnmatch.Po $(DEPDIR)/fsusage.Po $(DEPDIR)/ftruncate.Po \
-$(DEPDIR)/full-write$U.Po $(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po \
-$(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po \
-$(DEPDIR)/getopt$U.Po $(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po \
-$(DEPDIR)/getstr$U.Po $(DEPDIR)/getugroups$U.Po \
-$(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \
-$(DEPDIR)/hard-locale$U.Po $(DEPDIR)/hash$U.Po $(DEPDIR)/human$U.Po \
-$(DEPDIR)/idcache$U.Po $(DEPDIR)/isdir$U.Po $(DEPDIR)/lchown.Po \
-$(DEPDIR)/linebuffer$U.Po $(DEPDIR)/localcharset$U.Po \
-$(DEPDIR)/long-options$U.Po $(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po \
-$(DEPDIR)/malloc.Po $(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po \
-$(DEPDIR)/memcasecmp$U.Po $(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po \
-$(DEPDIR)/memcoll$U.Po $(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po \
-$(DEPDIR)/memset.Po $(DEPDIR)/mktime.Po $(DEPDIR)/modechange$U.Po \
-$(DEPDIR)/mountlist.Po $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
-$(DEPDIR)/path-concat$U.Po $(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po \
-$(DEPDIR)/quote$U.Po $(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po \
-$(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
-$(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po $(DEPDIR)/safe-read$U.Po \
-$(DEPDIR)/same$U.Po $(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po \
-$(DEPDIR)/stat.Po $(DEPDIR)/stime.Po $(DEPDIR)/stpcpy.Po \
-$(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po $(DEPDIR)/strdup.Po \
-$(DEPDIR)/strftime.Po $(DEPDIR)/stripslash$U.Po \
-$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
-$(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \
-$(DEPDIR)/strtol.Po $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
-$(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po $(DEPDIR)/unicodeio$U.Po \
-$(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po $(DEPDIR)/version-etc$U.Po \
-$(DEPDIR)/xgetcwd$U.Po $(DEPDIR)/xgethostname$U.Po \
-$(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
-$(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
-$(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
-DIST_COMMON =  README $(noinst_HEADERS) ChangeLog Makefile.am \
-Makefile.in TODO alloca.c atexit.c chown.c dup2.c error.c error.h \
+@AMDEP@DEP_FILES = $(DEPDIR)/__fpending.Po $(DEPDIR)/addext$U.Po \
+@AMDEP@ $(DEPDIR)/alloca.Po $(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po \
+@AMDEP@ $(DEPDIR)/backupfile$U.Po $(DEPDIR)/basename$U.Po \
+@AMDEP@ $(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po \
+@AMDEP@ $(DEPDIR)/closeout$U.Po $(DEPDIR)/diacrit$U.Po \
+@AMDEP@ $(DEPDIR)/dirname$U.Po $(DEPDIR)/dup-safer$U.Po \
+@AMDEP@ $(DEPDIR)/dup2.Po $(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \
+@AMDEP@ $(DEPDIR)/exclude$U.Po $(DEPDIR)/fileblocks.Po \
+@AMDEP@ $(DEPDIR)/filemode$U.Po $(DEPDIR)/fnmatch.Po \
+@AMDEP@ $(DEPDIR)/fopen-safer$U.Po $(DEPDIR)/fsusage.Po \
+@AMDEP@ $(DEPDIR)/ftruncate.Po $(DEPDIR)/full-write$U.Po \
+@AMDEP@ $(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po \
+@AMDEP@ $(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po \
+@AMDEP@ $(DEPDIR)/getloadavg.Po $(DEPDIR)/getopt$U.Po \
+@AMDEP@ $(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po \
+@AMDEP@ $(DEPDIR)/getstr$U.Po $(DEPDIR)/getugroups$U.Po \
+@AMDEP@ $(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \
+@AMDEP@ $(DEPDIR)/hard-locale$U.Po $(DEPDIR)/hash$U.Po \
+@AMDEP@ $(DEPDIR)/human$U.Po $(DEPDIR)/idcache$U.Po $(DEPDIR)/isdir$U.Po \
+@AMDEP@ $(DEPDIR)/lchown.Po $(DEPDIR)/linebuffer$U.Po \
+@AMDEP@ $(DEPDIR)/localcharset$U.Po $(DEPDIR)/long-options$U.Po \
+@AMDEP@ $(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po $(DEPDIR)/malloc.Po \
+@AMDEP@ $(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po \
+@AMDEP@ $(DEPDIR)/memcasecmp$U.Po $(DEPDIR)/memchr.Po \
+@AMDEP@ $(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po $(DEPDIR)/memcpy.Po \
+@AMDEP@ $(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \
+@AMDEP@ $(DEPDIR)/mkstemp.Po $(DEPDIR)/mktime.Po \
+@AMDEP@ $(DEPDIR)/modechange$U.Po $(DEPDIR)/mountlist.Po \
+@AMDEP@ $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
+@AMDEP@ $(DEPDIR)/path-concat$U.Po $(DEPDIR)/physmem$U.Po \
+@AMDEP@ $(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po $(DEPDIR)/quote$U.Po \
+@AMDEP@ $(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po \
+@AMDEP@ $(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
+@AMDEP@ $(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po \
+@AMDEP@ $(DEPDIR)/safe-read$U.Po $(DEPDIR)/same$U.Po \
+@AMDEP@ $(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po \
+@AMDEP@ $(DEPDIR)/sha$U.Po $(DEPDIR)/stat.Po $(DEPDIR)/stime.Po \
+@AMDEP@ $(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
+@AMDEP@ $(DEPDIR)/strdup.Po $(DEPDIR)/strftime.Po \
+@AMDEP@ $(DEPDIR)/stripslash$U.Po $(DEPDIR)/strncasecmp.Po \
+@AMDEP@ $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po \
+@AMDEP@ $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po $(DEPDIR)/strtol.Po \
+@AMDEP@ $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
+@AMDEP@ $(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \
+@AMDEP@ $(DEPDIR)/tempname.Po $(DEPDIR)/unicodeio$U.Po \
+@AMDEP@ $(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po \
+@AMDEP@ $(DEPDIR)/version-etc$U.Po $(DEPDIR)/xgetcwd$U.Po \
+@AMDEP@ $(DEPDIR)/xgethostname$U.Po $(DEPDIR)/xmalloc$U.Po \
+@AMDEP@ $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
+@AMDEP@ $(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
+@AMDEP@ $(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
+DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \
+TODO __fpending.c alloca.c atexit.c chown.c dup2.c error.c error.h \
 euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c \
 getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
 getusershell.c group-member.c lchown.c malloc.c memchr.c memcmp.c \
-memcpy.c memmove.c memset.c mktime.c mountlist.c nanosleep.c obstack.c \
-obstack.h putenv.c readutmp.c realloc.c regex.c rmdir.c rpmatch.c \
-stime.c stpcpy.c strcasecmp.c strcspn.c strdup.c strftime.c \
-strncasecmp.c strndup.c strnlen.c strpbrk.c strstr.c strtod.c strtol.c \
-strtoul.c strtoull.c strtoumax.c strverscmp.c utime.c
+memcpy.c memmove.c memrchr.c memset.c mkstemp.c mktime.c mountlist.c \
+nanosleep.c obstack.c obstack.h putenv.c readutmp.c realloc.c regex.c \
+rename.c rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c strcspn.c \
+strdup.c strftime.c strncasecmp.c strndup.c strnlen.c strpbrk.c \
+strstr.c strtod.c strtol.c strtoul.c strtoull.c strtoumax.c \
+strverscmp.c tempname.c utime.c
 
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
 SOURCES = $(libfetish_a_SOURCES)
 OBJECTS = $(am_libfetish_a_OBJECTS)
 
-all: all-redirect
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
 .SUFFIXES:
-.SUFFIXES: .c .o .sed .sin .y
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile
+.SUFFIXES: .sed .sin .c .o .obj .y
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  lib/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
 mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-
-maintainer-clean-compile:
-../src/ansi2knr: ../src/ansi2knr.o
+../src/ansi2knr: ../src/ansi2knr.$(OBJEXT)
 	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
-../src/ansi2knr.o:
-	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o
+../src/ansi2knr.$(OBJEXT):
+	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-clean-kr:
-
-distclean-kr:
-
-maintainer-clean-kr:
-
 libfetish.a: $(libfetish_a_OBJECTS) $(libfetish_a_DEPENDENCIES)
 	-rm -f libfetish.a
 	$(libfetish_a_AR) libfetish.a $(libfetish_a_OBJECTS) $(libfetish_a_LIBADD)
 	$(RANLIB) libfetish.a
+__fpending_.c: __fpending.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/__fpending.c; then echo $(srcdir)/__fpending.c; else echo __fpending.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > __fpending_.c
 addext_.c: addext.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/addext.c; then echo $(srcdir)/addext.c; else echo addext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > addext_.c
 alloca_.c: alloca.c $(ANSI2KNR)
@@ -320,6 +338,8 @@ diacrit_.c: diacrit.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/diacrit.c; then echo $(srcdir)/diacrit.c; else echo diacrit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > diacrit_.c
 dirname_.c: dirname.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dirname.c; then echo $(srcdir)/dirname.c; else echo dirname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dirname_.c
+dup-safer_.c: dup-safer.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dup-safer.c; then echo $(srcdir)/dup-safer.c; else echo dup-safer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dup-safer_.c
 dup2_.c: dup2.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dup2.c; then echo $(srcdir)/dup2.c; else echo dup2.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dup2_.c
 error_.c: error.c $(ANSI2KNR)
@@ -334,6 +354,8 @@ filemode_.c: filemode.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/filemode.c; then echo $(srcdir)/filemode.c; else echo filemode.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > filemode_.c
 fnmatch_.c: fnmatch.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fnmatch.c; then echo $(srcdir)/fnmatch.c; else echo fnmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fnmatch_.c
+fopen-safer_.c: fopen-safer.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fopen-safer.c; then echo $(srcdir)/fopen-safer.c; else echo fopen-safer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fopen-safer_.c
 fsusage_.c: fsusage.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fsusage.c; then echo $(srcdir)/fsusage.c; else echo fsusage.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fsusage_.c
 ftruncate_.c: ftruncate.c $(ANSI2KNR)
@@ -404,8 +426,12 @@ memcpy_.c: memcpy.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcpy.c; then echo $(srcdir)/memcpy.c; else echo memcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcpy_.c
 memmove_.c: memmove.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memmove_.c
+memrchr_.c: memrchr.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memrchr.c; then echo $(srcdir)/memrchr.c; else echo memrchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memrchr_.c
 memset_.c: memset.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memset.c; then echo $(srcdir)/memset.c; else echo memset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memset_.c
+mkstemp_.c: mkstemp.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkstemp.c; then echo $(srcdir)/mkstemp.c; else echo mkstemp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkstemp_.c
 mktime_.c: mktime.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c
 modechange_.c: modechange.c $(ANSI2KNR)
@@ -418,6 +444,8 @@ obstack_.c: obstack.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/obstack.c; then echo $(srcdir)/obstack.c; else echo obstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > obstack_.c
 path-concat_.c: path-concat.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/path-concat.c; then echo $(srcdir)/path-concat.c; else echo path-concat.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > path-concat_.c
+physmem_.c: physmem.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/physmem.c; then echo $(srcdir)/physmem.c; else echo physmem.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > physmem_.c
 posixtm_.c: posixtm.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/posixtm.c; then echo $(srcdir)/posixtm.c; else echo posixtm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > posixtm_.c
 putenv_.c: putenv.c $(ANSI2KNR)
@@ -434,6 +462,8 @@ realloc_.c: realloc.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/realloc.c; then echo $(srcdir)/realloc.c; else echo realloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > realloc_.c
 regex_.c: regex.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/regex.c; then echo $(srcdir)/regex.c; else echo regex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > regex_.c
+rename_.c: rename.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rename.c; then echo $(srcdir)/rename.c; else echo rename.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rename_.c
 rmdir_.c: rmdir.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rmdir.c; then echo $(srcdir)/rmdir.c; else echo rmdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rmdir_.c
 rpmatch_.c: rpmatch.c $(ANSI2KNR)
@@ -446,6 +476,8 @@ save-cwd_.c: save-cwd.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/save-cwd.c; then echo $(srcdir)/save-cwd.c; else echo save-cwd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > save-cwd_.c
 savedir_.c: savedir.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/savedir.c; then echo $(srcdir)/savedir.c; else echo savedir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > savedir_.c
+sha_.c: sha.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/sha.c; then echo $(srcdir)/sha.c; else echo sha.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > sha_.c
 stat_.c: stat.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stat.c; then echo $(srcdir)/stat.c; else echo stat.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stat_.c
 stime_.c: stime.c $(ANSI2KNR)
@@ -484,6 +516,8 @@ strtoumax_.c: strtoumax.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoumax.c; then echo $(srcdir)/strtoumax.c; else echo strtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoumax_.c
 strverscmp_.c: strverscmp.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strverscmp.c; then echo $(srcdir)/strverscmp.c; else echo strverscmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strverscmp_.c
+tempname_.c: tempname.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tempname.c; then echo $(srcdir)/tempname.c; else echo tempname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tempname_.c
 unicodeio_.c: unicodeio.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/unicodeio.c; then echo $(srcdir)/unicodeio.c; else echo unicodeio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > unicodeio_.c
 userspec_.c: userspec.c $(ANSI2KNR)
@@ -510,25 +544,44 @@ xstrtoumax_.c: xstrtoumax.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoumax.c; then echo $(srcdir)/xstrtoumax.c; else echo xstrtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoumax_.c
 yesno_.c: yesno.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/yesno.c; then echo $(srcdir)/yesno.c; else echo yesno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > yesno_.c
-addext_.o alloca_.o argmatch_.o atexit_.o backupfile_.o basename_.o \
-canon-host_.o chown_.o closeout_.o diacrit_.o dirname_.o dup2_.o \
-error_.o euidaccess_.o exclude_.o fileblocks_.o filemode_.o fnmatch_.o \
-fsusage_.o ftruncate_.o full-write_.o getdate_.o getgroups_.o \
-gethostname_.o getline_.o getloadavg_.o getopt_.o getopt1_.o getpass_.o \
-getstr_.o getugroups_.o getusershell_.o group-member_.o hard-locale_.o \
-hash_.o human_.o idcache_.o isdir_.o lchown_.o linebuffer_.o \
-localcharset_.o long-options_.o lstat_.o makepath_.o malloc_.o \
-mbswidth_.o md5_.o memcasecmp_.o memchr_.o memcmp_.o memcoll_.o \
-memcpy_.o memmove_.o memset_.o mktime_.o modechange_.o mountlist_.o \
-nanosleep_.o obstack_.o path-concat_.o posixtm_.o putenv_.o quote_.o \
-quotearg_.o readtokens_.o readutmp_.o realloc_.o regex_.o rmdir_.o \
-rpmatch_.o safe-read_.o same_.o save-cwd_.o savedir_.o stat_.o stime_.o \
-stpcpy_.o strcasecmp_.o strcspn_.o strdup_.o strftime_.o stripslash_.o \
-strncasecmp_.o strndup_.o strnlen_.o strpbrk_.o strstr_.o strtod_.o \
-strtol_.o strtoul_.o strtoull_.o strtoumax_.o strverscmp_.o \
-unicodeio_.o userspec_.o utime_.o version-etc_.o xgetcwd_.o \
-xgethostname_.o xmalloc_.o xstrdup_.o xstrtod_.o xstrtol_.o xstrtoul_.o \
-xstrtoumax_.o yesno_.o : $(ANSI2KNR)
+__fpending_.$(OBJEXT) addext_.$(OBJEXT) alloca_.$(OBJEXT) \
+argmatch_.$(OBJEXT) atexit_.$(OBJEXT) backupfile_.$(OBJEXT) \
+basename_.$(OBJEXT) canon-host_.$(OBJEXT) chown_.$(OBJEXT) \
+closeout_.$(OBJEXT) diacrit_.$(OBJEXT) dirname_.$(OBJEXT) \
+dup-safer_.$(OBJEXT) dup2_.$(OBJEXT) error_.$(OBJEXT) \
+euidaccess_.$(OBJEXT) exclude_.$(OBJEXT) fileblocks_.$(OBJEXT) \
+filemode_.$(OBJEXT) fnmatch_.$(OBJEXT) fopen-safer_.$(OBJEXT) \
+fsusage_.$(OBJEXT) ftruncate_.$(OBJEXT) full-write_.$(OBJEXT) \
+getdate_.$(OBJEXT) getgroups_.$(OBJEXT) gethostname_.$(OBJEXT) \
+getline_.$(OBJEXT) getloadavg_.$(OBJEXT) getopt_.$(OBJEXT) \
+getopt1_.$(OBJEXT) getpass_.$(OBJEXT) getstr_.$(OBJEXT) \
+getugroups_.$(OBJEXT) getusershell_.$(OBJEXT) group-member_.$(OBJEXT) \
+hard-locale_.$(OBJEXT) hash_.$(OBJEXT) human_.$(OBJEXT) \
+idcache_.$(OBJEXT) isdir_.$(OBJEXT) lchown_.$(OBJEXT) \
+linebuffer_.$(OBJEXT) localcharset_.$(OBJEXT) long-options_.$(OBJEXT) \
+lstat_.$(OBJEXT) makepath_.$(OBJEXT) malloc_.$(OBJEXT) \
+mbswidth_.$(OBJEXT) md5_.$(OBJEXT) memcasecmp_.$(OBJEXT) \
+memchr_.$(OBJEXT) memcmp_.$(OBJEXT) memcoll_.$(OBJEXT) \
+memcpy_.$(OBJEXT) memmove_.$(OBJEXT) memrchr_.$(OBJEXT) \
+memset_.$(OBJEXT) mkstemp_.$(OBJEXT) mktime_.$(OBJEXT) \
+modechange_.$(OBJEXT) mountlist_.$(OBJEXT) nanosleep_.$(OBJEXT) \
+obstack_.$(OBJEXT) path-concat_.$(OBJEXT) physmem_.$(OBJEXT) \
+posixtm_.$(OBJEXT) putenv_.$(OBJEXT) quote_.$(OBJEXT) \
+quotearg_.$(OBJEXT) readtokens_.$(OBJEXT) readutmp_.$(OBJEXT) \
+realloc_.$(OBJEXT) regex_.$(OBJEXT) rename_.$(OBJEXT) rmdir_.$(OBJEXT) \
+rpmatch_.$(OBJEXT) safe-read_.$(OBJEXT) same_.$(OBJEXT) \
+save-cwd_.$(OBJEXT) savedir_.$(OBJEXT) sha_.$(OBJEXT) stat_.$(OBJEXT) \
+stime_.$(OBJEXT) stpcpy_.$(OBJEXT) strcasecmp_.$(OBJEXT) \
+strcspn_.$(OBJEXT) strdup_.$(OBJEXT) strftime_.$(OBJEXT) \
+stripslash_.$(OBJEXT) strncasecmp_.$(OBJEXT) strndup_.$(OBJEXT) \
+strnlen_.$(OBJEXT) strpbrk_.$(OBJEXT) strstr_.$(OBJEXT) \
+strtod_.$(OBJEXT) strtol_.$(OBJEXT) strtoul_.$(OBJEXT) \
+strtoull_.$(OBJEXT) strtoumax_.$(OBJEXT) strverscmp_.$(OBJEXT) \
+tempname_.$(OBJEXT) unicodeio_.$(OBJEXT) userspec_.$(OBJEXT) \
+utime_.$(OBJEXT) version-etc_.$(OBJEXT) xgetcwd_.$(OBJEXT) \
+xgethostname_.$(OBJEXT) xmalloc_.$(OBJEXT) xstrdup_.$(OBJEXT) \
+xstrtod_.$(OBJEXT) xstrtol_.$(OBJEXT) xstrtoul_.$(OBJEXT) \
+xstrtoumax_.$(OBJEXT) yesno_.$(OBJEXT) : $(ANSI2KNR)
 .y.c:
 	$(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c
 	if test -f y.tab.h; then \
@@ -547,7 +600,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -560,131 +613,133 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 
-mostlyclean-tags:
-
-clean-tags:
+GTAGS:
+	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $$here
 
 distclean-tags:
 	-rm -f TAGS ID
 
-maintainer-clean-tags:
-
-@AMDEP@include $(DEPDIR)/addext$U.Po
-@AMDEP@include $(DEPDIR)/alloca.Po
-@AMDEP@include $(DEPDIR)/argmatch$U.Po
-@AMDEP@include $(DEPDIR)/atexit.Po
-@AMDEP@include $(DEPDIR)/backupfile$U.Po
-@AMDEP@include $(DEPDIR)/basename$U.Po
-@AMDEP@include $(DEPDIR)/canon-host$U.Po
-@AMDEP@include $(DEPDIR)/chown.Po
-@AMDEP@include $(DEPDIR)/closeout$U.Po
-@AMDEP@include $(DEPDIR)/diacrit$U.Po
-@AMDEP@include $(DEPDIR)/dirname$U.Po
-@AMDEP@include $(DEPDIR)/dup2.Po
-@AMDEP@include $(DEPDIR)/error.Po
-@AMDEP@include $(DEPDIR)/euidaccess.Po
-@AMDEP@include $(DEPDIR)/exclude$U.Po
-@AMDEP@include $(DEPDIR)/fileblocks.Po
-@AMDEP@include $(DEPDIR)/filemode$U.Po
-@AMDEP@include $(DEPDIR)/fnmatch.Po
-@AMDEP@include $(DEPDIR)/fsusage.Po
-@AMDEP@include $(DEPDIR)/ftruncate.Po
-@AMDEP@include $(DEPDIR)/full-write$U.Po
-@AMDEP@include $(DEPDIR)/getdate$U.Po
-@AMDEP@include $(DEPDIR)/getgroups.Po
-@AMDEP@include $(DEPDIR)/gethostname.Po
-@AMDEP@include $(DEPDIR)/getline.Po
-@AMDEP@include $(DEPDIR)/getloadavg.Po
-@AMDEP@include $(DEPDIR)/getopt$U.Po
-@AMDEP@include $(DEPDIR)/getopt1$U.Po
-@AMDEP@include $(DEPDIR)/getpass.Po
-@AMDEP@include $(DEPDIR)/getstr$U.Po
-@AMDEP@include $(DEPDIR)/getugroups$U.Po
-@AMDEP@include $(DEPDIR)/getusershell.Po
-@AMDEP@include $(DEPDIR)/group-member.Po
-@AMDEP@include $(DEPDIR)/hard-locale$U.Po
-@AMDEP@include $(DEPDIR)/hash$U.Po
-@AMDEP@include $(DEPDIR)/human$U.Po
-@AMDEP@include $(DEPDIR)/idcache$U.Po
-@AMDEP@include $(DEPDIR)/isdir$U.Po
-@AMDEP@include $(DEPDIR)/lchown.Po
-@AMDEP@include $(DEPDIR)/linebuffer$U.Po
-@AMDEP@include $(DEPDIR)/localcharset$U.Po
-@AMDEP@include $(DEPDIR)/long-options$U.Po
-@AMDEP@include $(DEPDIR)/lstat.Po
-@AMDEP@include $(DEPDIR)/makepath$U.Po
-@AMDEP@include $(DEPDIR)/malloc.Po
-@AMDEP@include $(DEPDIR)/mbswidth$U.Po
-@AMDEP@include $(DEPDIR)/md5$U.Po
-@AMDEP@include $(DEPDIR)/memcasecmp$U.Po
-@AMDEP@include $(DEPDIR)/memchr.Po
-@AMDEP@include $(DEPDIR)/memcmp.Po
-@AMDEP@include $(DEPDIR)/memcoll$U.Po
-@AMDEP@include $(DEPDIR)/memcpy.Po
-@AMDEP@include $(DEPDIR)/memmove.Po
-@AMDEP@include $(DEPDIR)/memset.Po
-@AMDEP@include $(DEPDIR)/mktime.Po
-@AMDEP@include $(DEPDIR)/modechange$U.Po
-@AMDEP@include $(DEPDIR)/mountlist.Po
-@AMDEP@include $(DEPDIR)/nanosleep.Po
-@AMDEP@include $(DEPDIR)/obstack.Po
-@AMDEP@include $(DEPDIR)/path-concat$U.Po
-@AMDEP@include $(DEPDIR)/posixtm$U.Po
-@AMDEP@include $(DEPDIR)/putenv.Po
-@AMDEP@include $(DEPDIR)/quote$U.Po
-@AMDEP@include $(DEPDIR)/quotearg$U.Po
-@AMDEP@include $(DEPDIR)/readtokens$U.Po
-@AMDEP@include $(DEPDIR)/readutmp.Po
-@AMDEP@include $(DEPDIR)/realloc.Po
-@AMDEP@include $(DEPDIR)/regex.Po
-@AMDEP@include $(DEPDIR)/rmdir.Po
-@AMDEP@include $(DEPDIR)/rpmatch.Po
-@AMDEP@include $(DEPDIR)/safe-read$U.Po
-@AMDEP@include $(DEPDIR)/same$U.Po
-@AMDEP@include $(DEPDIR)/save-cwd$U.Po
-@AMDEP@include $(DEPDIR)/savedir$U.Po
-@AMDEP@include $(DEPDIR)/stat.Po
-@AMDEP@include $(DEPDIR)/stime.Po
-@AMDEP@include $(DEPDIR)/stpcpy.Po
-@AMDEP@include $(DEPDIR)/strcasecmp.Po
-@AMDEP@include $(DEPDIR)/strcspn.Po
-@AMDEP@include $(DEPDIR)/strdup.Po
-@AMDEP@include $(DEPDIR)/strftime.Po
-@AMDEP@include $(DEPDIR)/stripslash$U.Po
-@AMDEP@include $(DEPDIR)/strncasecmp.Po
-@AMDEP@include $(DEPDIR)/strndup.Po
-@AMDEP@include $(DEPDIR)/strnlen.Po
-@AMDEP@include $(DEPDIR)/strpbrk.Po
-@AMDEP@include $(DEPDIR)/strstr.Po
-@AMDEP@include $(DEPDIR)/strtod.Po
-@AMDEP@include $(DEPDIR)/strtol.Po
-@AMDEP@include $(DEPDIR)/strtoul.Po
-@AMDEP@include $(DEPDIR)/strtoull.Po
-@AMDEP@include $(DEPDIR)/strtoumax.Po
-@AMDEP@include $(DEPDIR)/strverscmp.Po
-@AMDEP@include $(DEPDIR)/unicodeio$U.Po
-@AMDEP@include $(DEPDIR)/userspec$U.Po
-@AMDEP@include $(DEPDIR)/utime.Po
-@AMDEP@include $(DEPDIR)/version-etc$U.Po
-@AMDEP@include $(DEPDIR)/xgetcwd$U.Po
-@AMDEP@include $(DEPDIR)/xgethostname$U.Po
-@AMDEP@include $(DEPDIR)/xmalloc$U.Po
-@AMDEP@include $(DEPDIR)/xstrdup$U.Po
-@AMDEP@include $(DEPDIR)/xstrtod$U.Po
-@AMDEP@include $(DEPDIR)/xstrtol$U.Po
-@AMDEP@include $(DEPDIR)/xstrtoul$U.Po
-@AMDEP@include $(DEPDIR)/xstrtoumax$U.Po
-@AMDEP@include $(DEPDIR)/yesno$U.Po
-
-mostlyclean-depend:
-
-clean-depend:
+@AMDEP@@_am_include@ $(DEPDIR)/__fpending.Po
+@AMDEP@@_am_include@ $(DEPDIR)/addext$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/alloca.Po
+@AMDEP@@_am_include@ $(DEPDIR)/argmatch$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/atexit.Po
+@AMDEP@@_am_include@ $(DEPDIR)/backupfile$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/basename$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/canon-host$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/chown.Po
+@AMDEP@@_am_include@ $(DEPDIR)/closeout$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/diacrit$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dirname$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dup-safer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dup2.Po
+@AMDEP@@_am_include@ $(DEPDIR)/error.Po
+@AMDEP@@_am_include@ $(DEPDIR)/euidaccess.Po
+@AMDEP@@_am_include@ $(DEPDIR)/exclude$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fileblocks.Po
+@AMDEP@@_am_include@ $(DEPDIR)/filemode$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fnmatch.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fopen-safer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fsusage.Po
+@AMDEP@@_am_include@ $(DEPDIR)/ftruncate.Po
+@AMDEP@@_am_include@ $(DEPDIR)/full-write$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getdate$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getgroups.Po
+@AMDEP@@_am_include@ $(DEPDIR)/gethostname.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getline.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getloadavg.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getopt$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getopt1$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getpass.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getstr$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getugroups$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getusershell.Po
+@AMDEP@@_am_include@ $(DEPDIR)/group-member.Po
+@AMDEP@@_am_include@ $(DEPDIR)/hard-locale$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/hash$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/human$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/idcache$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/isdir$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/lchown.Po
+@AMDEP@@_am_include@ $(DEPDIR)/linebuffer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/localcharset$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/long-options$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/lstat.Po
+@AMDEP@@_am_include@ $(DEPDIR)/makepath$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/malloc.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mbswidth$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/md5$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcasecmp$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memchr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcoll$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcpy.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memmove.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memrchr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memset.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mkstemp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mktime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/modechange$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mountlist.Po
+@AMDEP@@_am_include@ $(DEPDIR)/nanosleep.Po
+@AMDEP@@_am_include@ $(DEPDIR)/obstack.Po
+@AMDEP@@_am_include@ $(DEPDIR)/path-concat$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/physmem$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/posixtm$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/putenv.Po
+@AMDEP@@_am_include@ $(DEPDIR)/quote$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/quotearg$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/readtokens$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/readutmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/realloc.Po
+@AMDEP@@_am_include@ $(DEPDIR)/regex.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rename.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rmdir.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rpmatch.Po
+@AMDEP@@_am_include@ $(DEPDIR)/safe-read$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/same$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/save-cwd$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/savedir$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/sha$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stat.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stpcpy.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strcasecmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strcspn.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strdup.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strftime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stripslash$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strncasecmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strndup.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strnlen.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strpbrk.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strstr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtod.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtol.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoul.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoull.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoumax.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strverscmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/tempname.Po
+@AMDEP@@_am_include@ $(DEPDIR)/unicodeio$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/userspec$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/utime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/version-etc$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xgetcwd$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xgethostname$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xmalloc$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrdup$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtod$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtol$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtoul$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtoumax$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/yesno$U.Po
 
 distclean-depend:
 	-rm -rf $(DEPDIR)
 
-maintainer-clean-depend:
-
 @AMDEP@CCDEPMODE = @CCDEPMODE@
 
 .c.o:
@@ -693,8 +748,17 @@ maintainer-clean-depend:
 @AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
 
+.c.obj:
+@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c -o $@ `cygpath -w $<`
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -708,31 +772,25 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am: install-exec-local
-install-exec: install-exec-am
+all-am: Makefile $(LIBRARIES) $(HEADERS) all-local
 
-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(HEADERS) all-local
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:
 
+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 
 mostlyclean-generic:
 
@@ -745,47 +803,57 @@ distclean-generic:
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
 	-test -z "getdate.c$(BUILT_SOURCES)$(MAINTAINERCLEANFILES)" || rm -f getdate.c $(BUILT_SOURCES) $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-kr mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-kr clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
 clean: clean-am
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile distclean-kr \
-		distclean-tags distclean-depend distclean-generic \
-		clean-am
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-kr \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-exec-local
+
+install-info:
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
-maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-local install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-local all-redirect all-am \
-all install-strip installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+
+uninstall-am: uninstall-local
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-noinstLIBRARIES distclean distclean-compile \
+	distclean-depend distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-exec-local \
+	install-info install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-local
 
 lstat.c: xstat.in
 	sed \

lib/__fpending.c

@@ -0,0 +1,30 @@
+/* __fpending.c -- return the number of pending output bytes on a stream
+   Copyright (C) 2000 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "__fpending.h"
+
+size_t
+__fpending (FILE *fp)
+{
+  return PENDING_OUTPUT_N_BYTES;
+}

lib/__fpending.h

@@ -0,0 +1,18 @@
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+
+#if HAVE_STDIO_EXT_H
+# include <stdio_ext.h>
+#endif
+
+#include <sys/types.h>
+
+#ifndef HAVE_DECL___FPENDING
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL___FPENDING
+size_t __fpending (FILE *);
+#endif

lib/alloca.c

@@ -88,6 +88,7 @@ typedef char *pointer;
    Callers below should use malloc.  */
 
 #  ifndef emacs
+#   undef malloc
 #   define malloc xmalloc
 #  endif
 extern pointer malloc ();

lib/basename.c

@@ -1,5 +1,5 @@
 /* basename.c -- return the last element in a path
-   Copyright (C) 1990, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 # include <config.h>
 #endif
 
+#include <stdio.h>
 #include <assert.h>
 
 #ifndef FILESYSTEM_PREFIX_LEN

lib/closeout.c

@@ -43,6 +43,7 @@ extern int errno;
 #include "closeout.h"
 #include "error.h"
 #include "quotearg.h"
+#include "__fpending.h"
 
 static int default_exit_status = EXIT_FAILURE;
 static const char *file_name;
@@ -86,11 +87,15 @@ close_stdout_set_file_name (const char *file)
    It's important to detect such failures and exit nonzero because many
    tools (most notably `make' and other build-management systems) depend
    on being able to detect failure in other tools via their exit status.  */
+
 void
 close_stdout_status (int status)
 {
   int e = ferror (stdout) ? 0 : -1;
 
+  if (__fpending (stdout) == 0)
+    return;
+
   if (fclose (stdout) != 0)
     e = errno;
 

lib/closeout.h

@@ -1,12 +1,17 @@
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
+#ifndef CLOSEOUT_H
+# define CLOSEOUT_H 1
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
 # 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));
+
+#endif

lib/config.charset

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2001 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU Library General Public License as published
@@ -33,43 +33,69 @@
 #       name                         used by which systems         a MIME name?
 #   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
 #   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-2                glibc aix hpux irix solaris freebsd       yes
-#   ISO-8859-4                solaris                                   yes
-#   ISO-8859-5                glibc aix hpux irix solaris               yes
+#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
+#   ISO-8859-3                glibc                                     yes
+#   ISO-8859-4                osf solaris freebsd                       yes
+#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
 #   ISO-8859-6                glibc aix hpux solaris                    yes
 #   ISO-8859-7                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-8                glibc aix hpux solaris                    yes
+#   ISO-8859-8                glibc aix hpux osf solaris                yes
 #   ISO-8859-9                glibc aix hpux irix osf solaris           yes
 #   ISO-8859-13               glibc
-#   ISO-8859-15               aix solaris freebsd
+#   ISO-8859-15               glibc aix osf solaris freebsd
 #   KOI8-R                    glibc solaris freebsd                     yes
-#   KOI8-U                    glibc                                     yes
-#   CP850                     aix osf
+#   KOI8-U                    glibc freebsd                             yes
+#   CP437                     dos
+#   CP775                     dos
+#   CP850                     aix osf dos
+#   CP852                     dos
+#   CP855                     dos
 #   CP856                     aix
-#   CP866                     freebsd
+#   CP857                     dos
+#   CP861                     dos
+#   CP862                     dos
+#   CP864                     dos
+#   CP865                     dos
+#   CP866                     freebsd dos
+#   CP869                     dos
+#   CP874                     win32 dos
 #   CP922                     aix
-#   CP932                     aix
+#   CP932                     aix win32 dos
 #   CP943                     aix
+#   CP949                     osf win32 dos
+#   CP950                     win32 dos
 #   CP1046                    aix
 #   CP1124                    aix
 #   CP1129                    aix
-#   CP1251                    glibc
-#   CP1252                    aix
-#   EUC-CN                    aix hpux irix solaris
-#   EUC-JP                    aix hpux irix solaris                     yes
-#   EUC-KR                    aix hpux irix solaris                     yes
-#   EUC-TW                    aix hpux irix solaris
-#   BIG5                      aix hpux solaris                          yes
-#   GBK                       aix
-#   SJIS                      hpux solaris
-#   TIS-620                   aix hpux solaris
+#   CP1250                    win32
+#   CP1251                    glibc win32
+#   CP1252                    aix win32
+#   CP1253                    win32
+#   CP1254                    win32
+#   CP1255                    win32
+#   CP1256                    win32
+#   CP1257                    win32
+#   GB2312                    glibc aix hpux irix solaris freebsd       yes
+#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
+#   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
+#   EUC-TW                    glibc aix hpux irix osf solaris
+#   BIG5                      glibc aix hpux osf solaris freebsd        yes
+#   BIG5HKSCS                 glibc
+#   GBK                       aix osf win32 dos
+#   GB18030                   glibc
+#   SJIS                      hpux osf solaris freebsd
+#   JOHAB                     glibc win32
+#   TIS-620                   glibc aix hpux osf solaris
+#   VISCII                    glibc                                     yes
 #   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
+#   DEC-KANJI                 osf
+#   DEC-HANYU                 osf
+#   UTF-8                     glibc aix hpux osf solaris                yes
 #
 # Note: Names which are not marked as being a MIME name should not be used in
 # Internet protocols for information interchange (mail, news, etc.).
@@ -117,7 +143,7 @@ case "$os" in
 	echo "IBM-1124 CP1124"
 	echo "IBM-1129 CP1129"
 	echo "IBM-1252 CP1252"
-	echo "IBM-eucCN EUC-CN"
+	echo "IBM-eucCN GB2312"
 	echo "IBM-eucJP EUC-JP"
 	echo "IBM-eucKR EUC-KR"
 	echo "IBM-eucTW EUC-TW"
@@ -146,7 +172,7 @@ case "$os" in
 	echo "eucJP EUC-JP"
 	echo "eucKR EUC-KR"
 	echo "eucTW EUC-TW"
-	echo "hp15CN EUC-CN"
+	echo "hp15CN GB2312"
 	#echo "ccdc ?" # what is this?
 	echo "SJIS SJIS"
 	echo "utf8 UTF-8"
@@ -157,16 +183,35 @@ case "$os" in
 	echo "ISO8859-5 ISO-8859-5"
 	echo "ISO8859-7 ISO-8859-7"
 	echo "ISO8859-9 ISO-8859-9"
-	echo "eucCN EUC-CN"
+	echo "eucCN GB2312"
 	echo "eucJP EUC-JP"
 	echo "eucKR EUC-KR"
 	echo "eucTW EUC-TW"
 	;;
     osf*)
 	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
 	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
 	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
 	echo "cp850 CP850"
+	echo "big5 BIG5"
+	echo "dechanyu DEC-HANYU"
+	echo "dechanzi GB2312"
+	echo "deckanji DEC-KANJI"
+	echo "deckorean EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "GBK GBK"
+	echo "KSC5601 CP949"
+	echo "sdeckanji EUC-JP"
+	echo "SJIS SJIS"
+	echo "TACTIS TIS-620"
+	echo "UTF-8 UTF-8"
 	;;
     solaris*)
 	echo "646 ASCII"
@@ -181,7 +226,7 @@ case "$os" in
 	echo "ISO8859-15 ISO-8859-15"
 	echo "koi8-r KOI8-R"
 	echo "BIG5 BIG5"
-	echo "gb2312 EUC-CN"
+	echo "gb2312 GB2312"
 	echo "cns11643 EUC-TW"
 	echo "5601 EUC-KR"
 	echo "eucJP EUC-JP"
@@ -191,26 +236,203 @@ case "$os" in
 	echo "UTF-8 UTF-8"
 	;;
     freebsd*)
-	# FreeBSD 3.3 doesn't have nl_langinfo(CODESET); therefore
+	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
 	# localcharset.c falls back to using the full locale name
 	# from the environment variables.
 	echo "C ASCII"
 	echo "US-ASCII ASCII"
-	for l in lt_LN; do
+	for l in la_LN lt_LN; do
 	  echo "$l.ASCII ASCII"
 	done
 	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-                 fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT lt_LN \
-                 nl_BE nl_NL no_NO pt_PT sv_SE; do
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
 	  echo "$l.ISO_8859-1 ISO-8859-1"
 	  echo "$l.DIS_8859-15 ISO-8859-15"
 	done
-	for l in hr_HR hu_HU lt_LN pl_PL sl_SI; do
+	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
 	  echo "$l.ISO_8859-2 ISO-8859-2"
 	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO_8859-4 ISO-8859-4"
+	done
 	for l in ru_RU ru_SU; do
 	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO_8859-5 ISO-8859-5"
 	  echo "$l.CP866 CP866"
 	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SJIS"
+	echo "ja_JP.Shift_JIS SJIS"
+	echo "ko_KR.EUC EUC-KR"
+	;;
+    beos*)
+	# BeOS has a single locale, and it has UTF-8 encoding.
+	echo "* UTF-8"
+	;;
+    msdosdjgpp*)
+	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "#"
+	echo "# The encodings given here may not all be correct."
+	echo "# If you find that the encoding given for your language and"
+	echo "# country is not the one your DOS machine actually uses, just"
+	echo "# correct it in this file, and send a mail to"
+	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
+	echo "# and Bruno Haible <haible@clisp.cons.org>."
+	echo "#"
+	echo "C ASCII"
+	# ISO-8859-1 languages
+	echo "ca CP850"
+	echo "ca_ES CP850"
+	echo "da CP865"    # not CP850 ??
+	echo "da_DK CP865" # not CP850 ??
+	echo "de CP850"
+	echo "de_AT CP850"
+	echo "de_CH CP850"
+	echo "de_DE CP850"
+	echo "en CP850"
+	echo "en_AU CP850" # not CP437 ??
+	echo "en_CA CP850"
+	echo "en_GB CP850"
+	echo "en_NZ CP437"
+	echo "en_US CP437"
+	echo "en_ZA CP850" # not CP437 ??
+	echo "es CP850"
+	echo "es_AR CP850"
+	echo "es_BO CP850"
+	echo "es_CL CP850"
+	echo "es_CO CP850"
+	echo "es_CR CP850"
+	echo "es_CU CP850"
+	echo "es_DO CP850"
+	echo "es_EC CP850"
+	echo "es_ES CP850"
+	echo "es_GT CP850"
+	echo "es_HN CP850"
+	echo "es_MX CP850"
+	echo "es_NI CP850"
+	echo "es_PA CP850"
+	echo "es_PY CP850"
+	echo "es_PE CP850"
+	echo "es_SV CP850"
+	echo "es_UY CP850"
+	echo "es_VE CP850"
+	echo "et CP850"
+	echo "et_EE CP850"
+	echo "eu CP850"
+	echo "eu_ES CP850"
+	echo "fi CP850"
+	echo "fi_FI CP850"
+	echo "fr CP850"
+	echo "fr_BE CP850"
+	echo "fr_CA CP850"
+	echo "fr_CH CP850"
+	echo "fr_FR CP850"
+	echo "ga CP850"
+	echo "ga_IE CP850"
+	echo "gd CP850"
+	echo "gd_GB CP850"
+	echo "gl CP850"
+	echo "gl_ES CP850"
+	echo "id CP850"    # not CP437 ??
+	echo "id_ID CP850" # not CP437 ??
+	echo "is CP861"    # not CP850 ??
+	echo "is_IS CP861" # not CP850 ??
+	echo "it CP850"
+	echo "it_CH CP850"
+	echo "it_IT CP850"
+	echo "lt CP775"
+	echo "lt_LT CP775"
+	echo "lv CP775"
+	echo "lv_LV CP775"
+	echo "nb CP865"    # not CP850 ??
+	echo "nb_NO CP865" # not CP850 ??
+	echo "nl CP850"
+	echo "nl_BE CP850"
+	echo "nl_NL CP850"
+	echo "nn CP865"    # not CP850 ??
+	echo "nn_NO CP865" # not CP850 ??
+	echo "no CP865"    # not CP850 ??
+	echo "no_NO CP865" # not CP850 ??
+	echo "pt CP850"
+	echo "pt_BR CP850"
+	echo "pt_PT CP850"
+	echo "sv CP850"
+	echo "sv_SE CP850"
+	# ISO-8859-2 languages
+	echo "cs CP852"
+	echo "cs_CZ CP852"
+	echo "hr CP852"
+	echo "hr_HR CP852"
+	echo "hu CP852"
+	echo "hu_HU CP852"
+	echo "pl CP852"
+	echo "pl_PL CP852"
+	echo "ro CP852"
+	echo "ro_RO CP852"
+	echo "sk CP852"
+	echo "sk_SK CP852"
+	echo "sl CP852"
+	echo "sl_SI CP852"
+	echo "sq CP852"
+	echo "sq_AL CP852"
+	echo "sr CP852"    # CP852 or CP866 or CP855 ??
+	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+	# ISO-8859-3 languages
+	echo "mt CP850"
+	echo "mt_MT CP850"
+	# ISO-8859-5 languages
+	echo "be CP866"
+	echo "be_BE CP866"
+	echo "bg CP866"    # not CP855 ??
+	echo "bg_BG CP866" # not CP855 ??
+	echo "mk CP866"    # not CP855 ??
+	echo "mk_MK CP866" # not CP855 ??
+	echo "ru KOI8-R"    # not CP866 ??
+	echo "ru_RU KOI8-R" # not CP866 ??
+	# ISO-8859-6 languages
+	echo "ar CP864"
+	echo "ar_AE CP864"
+	echo "ar_DZ CP864"
+	echo "ar_EG CP864"
+	echo "ar_IQ CP864"
+	echo "ar_IR CP864"
+	echo "ar_JO CP864"
+	echo "ar_KW CP864"
+	echo "ar_MA CP864"
+	echo "ar_OM CP864"
+	echo "ar_QA CP864"
+	echo "ar_SA CP864"
+	echo "ar_SY CP864"
+	# ISO-8859-7 languages
+	echo "el CP869"
+	echo "el_GR CP869"
+	# ISO-8859-8 languages
+	echo "he CP862"
+	echo "he_IL CP862"
+	# ISO-8859-9 languages
+	echo "tr CP857"
+	echo "tr_TR CP857"
+	# Japanese
+	echo "ja CP932"
+	echo "ja_JP CP932"
+	# Chinese
+	echo "zh_CN GBK"
+	echo "zh_TW CP950" # not CP938 ??
+	# Korean
+	echo "kr CP949"    # not CP934 ??
+	echo "kr_KR CP949" # not CP934 ??
+	# Thai
+	echo "th CP874"
+	echo "th_TH CP874"
+	# Other
+	echo "eo CP850"
+	echo "eo_EO CP850"
 	;;
 esac

lib/dirname.c

@@ -34,72 +34,156 @@ char *malloc ();
 #endif
 #include <assert.h>
 
+#ifndef HAVE_DECL_MEMRCHR
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_MEMRCHR
+void *memrchr ();
+#endif
+
 #include "dirname.h"
 
+#ifndef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
+#endif
+
 #ifndef ISSLASH
 # define ISSLASH(C) ((C) == '/')
 #endif
 
 #define BACKSLASH_IS_PATH_SEPARATOR ISSLASH ('\\')
 
-/* Return the leading directories part of PATH,
-   allocated with malloc.  If out of memory, return 0.
-   Assumes that trailing slashes have already been
-   removed.  */
-
-char *
-dir_name (const char *path)
+/* Return the length of `dirname (PATH)' and set *RESULT to point
+   to PATH or to `"."', as appropriate.  Works properly even if
+   there are trailing slashes (by effectively ignoring them).
+   WARNING: This function doesn't work for cwd-relative names like
+   `a:foo' that are specified with a drive-letter prefix.  That case
+   is handled in the caller.  */
+static size_t
+dir_name_r (char const *path, char const **result)
 {
-  char *newpath;
-  char *slash;
-  int length;			/* Length of result, not including NUL.  */
+  char const *slash;
+  size_t length;		/* Length of result, not including NUL.  */
 
   slash = strrchr (path, '/');
   if (BACKSLASH_IS_PATH_SEPARATOR)
     {
-      char *b = strrchr (path, '\\');
+      char const *b = strrchr (path, '\\');
       if (b && slash < b)
 	slash = b;
     }
 
-  /* Make sure there are no trailing slashes.  */
-  assert (slash == NULL	   /* There are no slashes in PATH.  */
-	  || slash[1] != 0 /* There is a non-NUL byte after the last slash.  */
-	  || path == slash /* PATH is just `/'.  */
-	  );
+  /* If the last byte of PATH is a slash, decrement SLASH until it's
+     pointing at the leftmost in a sequence of trailing slashes.  */
+  if (slash && slash[1] == 0)
+    {
+      while (path < slash && ISSLASH (slash[-1]))
+	{
+	  --slash;
+	}
+
+      if (path < slash)
+	{
+	  size_t len = slash - path;
+	  slash = memrchr (path, '/', len);
+	  if (BACKSLASH_IS_PATH_SEPARATOR)
+	    {
+	      char const *b = memrchr (path, '\\', len);
+	      if (b && slash < b)
+		slash = b;
+	    }
+	}
+    }
 
   if (slash == 0)
     {
       /* File is in the current directory.  */
-      path = ".";
-      length = 1;
+
+      length = FILESYSTEM_PREFIX_LEN (path);
+
+      if (length == 0)
+	{
+	  path = ".";
+	  length = 1;
+	}
     }
   else
     {
-      /* Remove any trailing slashes from the result.  */
-      if (BACKSLASH_IS_PATH_SEPARATOR)
-	{
-	  const char *lim = ((path[0] >= 'A' && path[0] <= 'z'
-			      && path[1] == ':')
-			     ? path + 2 : path);
+      /* Remove any trailing slashes from the result.  If we have a
+	 canonicalized "d:/path", leave alone the root case "d:/".  */
+      char const *lim = path + FILESYSTEM_PREFIX_LEN (path);
 
-	  /* If canonicalized "d:/path", leave alone the root case "d:/".  */
-	  while (slash > lim && ISSLASH (*slash))
-	    --slash;
-	}
-      else
-	{
-	  while (slash > path && ISSLASH (*slash))
-	    --slash;
-	}
+      while (lim < slash && ISSLASH (*slash))
+	--slash;
 
       length = slash - path + 1;
     }
 
-  newpath = (char *) malloc (length + 1);
+  *result = path;
+  return length;
+}
+
+/* Return the leading directories part of PATH,
+   allocated with malloc.  If out of memory, return 0.
+   Works properly even if there are trailing slashes
+   (by effectively ignoring them).  */
+
+char *
+dir_name (char const *path)
+{
+  char const *result;
+  size_t length = dir_name_r (path, &result);
+  int append_dot = (length && length == FILESYSTEM_PREFIX_LEN (newpath));
+  char *newpath = (char *) malloc (length + append_dot + 1);
   if (newpath == 0)
     return 0;
-  strncpy (newpath, path, length);
+  strncpy (newpath, result, length);
+  /* If PATH is "d:foo", return "d:.", the CWD on drive d:  */
+  if (append_dot)
+    newpath[length++] = '.';
   newpath[length] = 0;
   return newpath;
 }
+
+#ifdef TEST_DIRNAME
+/*
+
+Run the test like this (expect no output):
+  gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall memrchr.c dirname.c
+  sed -n '/^BEGIN-DATA$/,/^END-DATA$/p' dirname.c|grep -v DATA|./a.out
+
+BEGIN-DATA
+foo//// .
+bar/foo//// bar
+foo/ .
+/ /
+. .
+a .
+END-DATA
+
+*/
+
+# define MAX_BUFF_LEN 1024
+# include <stdio.h>
+# include <stdlib.h>
+
+int
+main ()
+{
+  char buff[MAX_BUFF_LEN + 1];
+
+  buff[MAX_BUFF_LEN] = 0;
+  while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
+    {
+      char path[MAX_BUFF_LEN];
+      char expected_result[MAX_BUFF_LEN];
+      char const *result;
+      sscanf (buff, "%s %s", path, expected_result);
+      result = dir_name (path);
+      if (strcmp (result, expected_result))
+	printf ("%s: got %s, expected %s\n", path, result, expected_result);
+    }
+  exit (0);
+
+}
+#endif

lib/dup-safer.c

@@ -0,0 +1,62 @@
+/* Invoke dup, but avoid some glitches.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#if HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifndef STDERR_FILENO
+# define STDERR_FILENO 2
+#endif
+
+#include <unistd-safer.h>
+
+/* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
+   STDERR_FILENO.  */
+
+int
+dup_safer (int fd)
+{
+#ifdef F_DUPFD
+  return fcntl (fd, F_DUPFD, STDERR_FILENO + 1);
+#else
+  int f = dup (fd);
+  if (0 <= f && f <= STDERR_FILENO)
+    {
+      int f1 = dup_safer (f);
+      int e = errno;
+      close (f);
+      errno = e;
+      f = f1;
+    }
+  return f;
+#endif
+}

lib/error.c

@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-2000 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 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.
@@ -26,6 +26,9 @@
 #endif
 
 #include <stdio.h>
+#if HAVE_LIBINTL_H
+# include <libintl.h>
+#endif
 
 #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
 # if __STDC__
@@ -83,6 +86,11 @@ unsigned int error_message_count;
 # define error __error
 # define error_at_line __error_at_line
 
+# ifdef USE_IN_LIBIO
+#  include <libio/iolibio.h>
+#  define fflush(s) _IO_fflush (s)
+# endif
+
 #else /* not _LIBC */
 
 /* The calling program should define program_name and set it to the

lib/error.h

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

lib/fnmatch.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright 1991, 1992, 1993, 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
@@ -27,30 +27,18 @@
 #include <fnmatch.h>
 #include <ctype.h>
 
+#if defined STDC_HEADERS || !defined isascii
+# define IN_CTYPE_DOMAIN(c) 1
+#else
+# define IN_CTYPE_DOMAIN(c) isascii (c)
+#endif
 
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#if defined _LIBC || !defined __GNU_LIBRARY__
+#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))
 
 
-# if defined STDC_HEADERS || !defined isascii
-#  define ISASCII(c) 1
-# else
-#  define ISASCII(c) isascii(c)
-# endif
-
-# define ISUPPER(c) (ISASCII (c) && isupper (c))
-
-
-# ifndef errno
+#ifndef errno
 extern int errno;
-# endif
+#endif
 
 /* Match STRING against the filename pattern PATTERN, returning zero if
    it matches, nonzero if not.  */
@@ -61,7 +49,9 @@ fnmatch (const char *pattern, const char *string, int flags)
   register char c;
 
 /* Note that this evaluates C many times.  */
-# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c))
+#define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER ((unsigned char) (c)) \
+                 ? tolower ((unsigned char) (c)) \
+                 : (c))
 
   while ((c = *p++) != '\0')
     {
@@ -99,13 +89,10 @@ fnmatch (const char *pattern, const char *string, int flags)
 
 	  for (c = *p++; c == '?' || c == '*'; c = *p++)
 	    {
-	      if ((flags & FNM_FILE_NAME) && *n == '/')
-		/* A slash does not match a wildcard under FNM_FILE_NAME.  */
-		return FNM_NOMATCH;
-	      else if (c == '?')
+	      if (c == '?')
 		{
 		  /* A ? needs to match one character.  */
-		  if (*n == '\0')
+		  if (*n == '\0' || (*n == '/' && (flags & FNM_FILE_NAME)))
 		    /* There isn't another character; no match.  */
 		    return FNM_NOMATCH;
 		  else
@@ -117,7 +104,13 @@ fnmatch (const char *pattern, const char *string, int flags)
 	    }
 
 	  if (c == '\0')
-	    return 0;
+	    {
+	      if ((flags & (FNM_FILE_NAME | FNM_LEADING_DIR)) == FNM_FILE_NAME)
+		for (; *n != '\0'; n++)
+		  if (*n == '/')
+		    return FNM_NOMATCH;
+	      return 0;
+	    }
 
 	  {
 	    char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c;
@@ -126,6 +119,8 @@ fnmatch (const char *pattern, const char *string, int flags)
 	      if ((c == '[' || FOLD (*n) == c1) &&
 		  fnmatch (p, n, flags & ~FNM_PERIOD) == 0)
 		return 0;
+	      else if (*n == '/' && (flags & FNM_FILE_NAME))
+		break;
 	    return FNM_NOMATCH;
 	  }
 
@@ -231,7 +226,5 @@ fnmatch (const char *pattern, const char *string, int flags)
 
   return FNM_NOMATCH;
 
-# undef FOLD
+#undef FOLD
 }
-
-#endif	/* _LIBC or not __GNU_LIBRARY__.  */

lib/fopen-safer.c

@@ -0,0 +1,76 @@
+/* Invoke fopen, but avoid some glitches.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <unistd-safer.h>
+
+#ifndef STDERR_FILENO
+# define STDERR_FILENO 2
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#include <stdio.h>
+#include <stdio-safer.h>
+
+/* Like fopen, but do not return stdin, stdout, or stderr.  */
+
+FILE *
+fopen_safer (char const *file, char const *mode)
+{
+  FILE *fp = fopen (file, mode);
+
+  if (fp)
+    {
+      int fd = fileno (fp);
+
+      if (0 <= fd && fd <= STDERR_FILENO)
+	{
+	  int f = dup_safer (fd);
+
+	  if (f < 0)
+	    {
+	      int e = errno;
+	      fclose (fp);
+	      errno = e;
+	      return NULL;
+	    }
+
+	  if (fclose (fp) != 0
+	      || ! (fp = fdopen (f, mode)))
+	    {
+	      int e = errno;
+	      close (f);
+	      errno = e;
+	      return NULL;
+	    }
+	}
+    }
+
+  return fp;
+}

lib/getline.h

@@ -1,4 +1,4 @@
-/*  Copyright (C) 1995, 1997, 1999, 2000 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

lib/getopt.c

@@ -27,13 +27,13 @@
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
-#else
-# if !defined __STDC__ || !__STDC__
+#endif
+
+#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
 
@@ -75,11 +75,12 @@
 #endif
 
 #ifndef _
-/* This is for other GNU distributions with internationalized messages.
-   When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
+/* This is for other GNU distributions with internationalized messages.  */
+# if defined HAVE_LIBINTL_H || defined _LIBC
 #  include <libintl.h>
-#  define _(msgid)	gettext (msgid)
+#  ifndef _
+#   define _(msgid)	gettext (msgid)
+#  endif
 # else
 #  define _(msgid)	(msgid)
 # endif
@@ -671,7 +672,10 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		pfound = p;
 		indfound = option_index;
 	      }
-	    else
+	    else if (long_only
+		     || pfound->has_arg != p->has_arg
+		     || pfound->flag != p->flag
+		     || pfound->val != p->val)
 	      /* Second or later nonexact match found.  */
 	      ambig = 1;
 	  }

lib/getopt1.c

@@ -20,7 +20,10 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#else
+#endif
+
+#include "getopt.h"
+
 #if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
@@ -28,9 +31,6 @@
 #define const
 #endif
 #endif
-#endif
-
-#include "getopt.h"
 
 #include <stdio.h>
 

lib/getusershell.c

@@ -22,11 +22,19 @@
 #endif
 
 #ifndef SHELLS_FILE
+# ifndef __DJGPP__
 /* File containing a list of nonrestricted shells, one per line. */
-# define SHELLS_FILE "/etc/shells"
+#  define SHELLS_FILE "/etc/shells"
+# else
+/* This is a horrible kludge.  Isn't there a better way?  */
+#  define SHELLS_FILE "/dev/env/DJDIR/etc/shells"
+# endif
 #endif
 
 #include <stdio.h>
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 #include <ctype.h>
 #include "xalloc.h"
 
@@ -40,9 +48,17 @@
 
 static int readname ();
 
+#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
+# define ADDITIONAL_DEFAULT_SHELLS \
+  "c:/dos/command.com", "c:/windows/command.com", "c:/command.com",
+#else
+# define ADDITIONAL_DEFAULT_SHELLS /* empty */
+#endif
+
 /* List of shells to use if the shells file is missing. */
 static char const* const default_shells[] =
 {
+  ADDITIONAL_DEFAULT_SHELLS
   "/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
 };
 
@@ -100,10 +116,8 @@ void
 setusershell ()
 {
   default_index = 0;
-  if (shellstream == NULL)
-    shellstream = fopen (SHELLS_FILE, "r");
-  else
-    fseek (shellstream, 0L, 0);
+  if (shellstream)
+    rewind (shellstream);
 }
 
 /* Close the shells file. */

lib/hash.c

@@ -1,5 +1,5 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    Written by Jim Meyering, 1992.
 
    This program is free software; you can redistribute it and/or modify
@@ -263,11 +263,12 @@ hash_get_first (const Hash_table *table)
       return bucket->data;
 
   assert (0);
+  return NULL;
 }
 
 /* Return the user data for the entry following ENTRY, where ENTRY has been
    returned by a previous call to either `hash_get_first' or `hash_get_next'.
-   Return NULL if there is no more entries.  */
+   Return NULL if there are no more entries.  */
 
 void *
 hash_get_next (const Hash_table *table, const void *entry)
@@ -284,7 +285,7 @@ hash_get_next (const Hash_table *table, const void *entry)
       return cursor->next->data;
 
   /* Find first entry in any subsequent bucket.  */
-  for (; bucket < table->bucket_limit; bucket++)
+  while (++bucket < table->bucket_limit)
     if (bucket->data)
       return bucket->data;
 
@@ -422,7 +423,7 @@ is_prime (unsigned long candidate)
       divisor++;
     }
 
-  return candidate % divisor != 0;
+  return (candidate % divisor ? true : false);
 }
 
 /* Round a given CANDIDATE number up to the nearest prime, and return that

lib/localcharset.c

@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -37,12 +37,22 @@
 # include <stdlib.h>
 #endif
 
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#else
-# if HAVE_SETLOCALE
-#  include <locale.h>
+#if defined _WIN32 || defined __WIN32__
+# undef WIN32   /* avoid warning on mingw32 */
+# define WIN32
+#endif
+
+#ifndef WIN32
+# if HAVE_LANGINFO_CODESET
+#  include <langinfo.h>
+# else
+#  if HAVE_SETLOCALE
+#   include <locale.h>
+#  endif
 # endif
+#else /* WIN32 */
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
 #endif
 
 #ifndef DIRECTORY_SEPARATOR
@@ -73,6 +83,7 @@ get_charset_aliases ()
   cp = charset_aliases;
   if (cp == NULL)
     {
+#ifndef WIN32
       FILE *fp;
       const char *dir = LIBDIR;
       const char *base = "charset.alias";
@@ -157,9 +168,20 @@ get_charset_aliases ()
 	    }
 	}
 
-      charset_aliases = cp;
       if (file_name != NULL)
 	free (file_name);
+
+#else /* WIN32 */
+
+      /* To avoid the troubles of installing a separate file in the same
+	 directory as the DLL and of retrieving the DLL's directory at
+	 runtime, simply inline the aliases here.  */
+
+      cp = "CP936" "\0" "GBK" "\0"
+	   "CP1361" "\0" "JOHAB" "\0";
+#endif
+
+      charset_aliases = cp;
     }
 
   return cp;
@@ -169,7 +191,7 @@ get_charset_aliases ()
    into one of the canonical names listed in config.charset.
    The result must not be freed; it is statically allocated.
    If the canonical name cannot be determined, the result is a non-canonical
-   name or NULL.  */
+   name.  */
 
 #ifdef STATIC
 STATIC
@@ -180,19 +202,25 @@ locale_charset ()
   const char *codeset;
   const char *aliases;
 
-#if HAVE_LANGINFO_CODESET
+#ifndef WIN32
+
+# if HAVE_LANGINFO_CODESET
 
   /* Most systems support nl_langinfo (CODESET) nowadays.  */
   codeset = nl_langinfo (CODESET);
 
-#else
+# else
 
-  /* On old systems which lack it, use setlocale and getenv.  */
+  /* On old systems which lack it, use setlocale or getenv.  */
   const char *locale = NULL;
 
-# if HAVE_SETLOCALE
+  /* But most old systems don't have a complete set of locales.  Some
+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
+     use setlocale here; it would return "C" when it doesn't support the
+     locale name the user has set.  */
+#  if HAVE_SETLOCALE && 0
   locale = setlocale (LC_CTYPE, NULL);
-# endif
+#  endif
   if (locale == NULL || locale[0] == '\0')
     {
       locale = getenv ("LC_ALL");
@@ -209,20 +237,32 @@ locale_charset ()
      through the charset.alias file.  */
   codeset = locale;
 
+# endif
+
+#else /* WIN32 */
+
+  static char buf[2 + 10 + 1];
+
+  /* Win32 has a function returning the locale's codepage as a number.  */
+  sprintf (buf, "CP%u", GetACP ());
+  codeset = buf;
+
 #endif
 
-  if (codeset != NULL && codeset[0] != '\0')
-    {
-      /* Resolve alias. */
-      for (aliases = get_charset_aliases ();
-	   *aliases != '\0';
-	   aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-	if (!strcmp (codeset, aliases))
-	  {
-	    codeset = aliases + strlen (aliases) + 1;
-	    break;
-	  }
-    }
+  if (codeset == NULL)
+    /* The canonical name cannot be determined.  */
+    codeset = "";
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+	|| (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+	codeset = aliases + strlen (aliases) + 1;
+	break;
+      }
 
   return codeset;
 }

lib/makepath.c

@@ -148,10 +148,10 @@ void strip_trailing_slashes ();
    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.  */
+   Note that if DIR already exists, this function returns zero
+   (indicating success) and sets *CREATED_DIR_P to zero.  */
 
-static int
+int
 make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
 {
   int fail = 0;

lib/makepath.h

@@ -14,3 +14,9 @@ make_path PARAMS ((const char *_argpath,
 		   gid_t _group,
 		   int _preserve_existing,
 		   const char *_verbose_fmt_string));
+
+int
+make_dir PARAMS ((const char *dir,
+		  const char *dirpath,
+		  mode_t mode,
+		  int *created_dir_p));

lib/mbswidth.c

@@ -51,12 +51,6 @@
 # define iswprint(wc) 1
 #endif
 
-/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
-#if HAVE_MBRTOWC && defined mbstate_t
-# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
-# define mbsinit(ps) 1
-#endif
-
 #ifndef HAVE_DECL_WCWIDTH
 "this configure-time declaration test was not run"
 #endif
@@ -74,15 +68,13 @@ int wcwidth ();
 
 /* Get ISPRINT.  */
 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
-# undef ISASCII
-# define ISASCII(c) 1
+# define IN_CTYPE_DOMAIN(c) 1
 #else
-# define ISASCII(c) isascii (c)
+# define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif
 /* Undefine to protect against the definition in wctype.h of solaris2.6.   */
 #undef ISPRINT
-#define ISPRINT(c) (ISASCII (c) && isprint (c))
+#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c))
 
 #include "mbswidth.h"
 
@@ -155,7 +147,11 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
 		      /* An invalid multibyte sequence was encountered.  */
 		      {
 			if (flags & MBSW_ACCEPT_INVALID)
-			  break;
+			  {
+			    p++;
+			    width++;
+			    break;
+			  }
 			else
 			  return -1;
 		      }
@@ -164,7 +160,11 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
 		      /* An incomplete multibyte character at the end.  */
 		      {
 			if (flags & MBSW_ACCEPT_INVALID)
-			  break;
+			  {
+			    p = plimit;
+			    width++;
+			    break;
+			  }
 			else
 			  return -1;
 		      }

lib/mbswidth.h

@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@
 #define MBSW_ACCEPT_UNPRINTABLE	2
 
 /* Returns the number of screen columns needed for STRING.  */
+#define mbswidth gnu_mbswidth  /* avoid clash with UnixWare 7.1.1 function */
 extern int mbswidth PARAMS ((const char *string, int flags));
 
 /* Returns the number of screen columns needed for the NBYTES bytes

lib/md5.c

@@ -304,19 +304,16 @@ md5_process_block (buffer, len, ctx)
         {								\
 	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
 	  ++words;							\
-	  CYCLIC (a, s);						\
+	  a = rol (a, s);						\
 	  a += b;							\
         }								\
       while (0)
 
-      /* It is unfortunate that C does not provide an operator for
-	 cyclic rotation.  Hope the C compiler is smart enough.  */
-#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
-
       /* Before we start, one word to the strange constants.
 	 They are defined in RFC 1321 as
 
-	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64, or
+	 perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
        */
 
       /* Round 1.  */
@@ -345,7 +342,7 @@ md5_process_block (buffer, len, ctx)
       do 								\
 	{								\
 	  a += f (b, c, d) + correct_words[k] + T;			\
-	  CYCLIC (a, s);						\
+	  a = rol (a, s);						\
 	  a += b;							\
 	}								\
       while (0)

lib/md5.h

@@ -143,4 +143,19 @@ extern int md5_stream __P ((FILE *stream, void *resblock));
    digest.  */
 extern void *md5_buffer __P ((const char *buffer, size_t len, void *resblock));
 
+/* The following is from gnupg-1.0.2's cipher/bithelp.h.  */
+/* Rotate a 32 bit integer by n bytes */
+#if defined __GNUC__ && defined __i386__
+static inline md5_uint32
+rol(md5_uint32 x, int n)
+{
+  __asm__("roll %%cl,%0"
+	  :"=r" (x)
+	  :"0" (x),"c" (n));
+  return x;
+}
+#else
+# define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
+#endif
+
 #endif

lib/memchr.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,93,96,97,99,2000 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);
@@ -34,11 +34,18 @@ USA.  */
 # define __ptr_t char *
 #endif /* C++ or ANSI C.  */
 
-#if defined (_LIBC)
+#if defined _LIBC
 # include <string.h>
+# include <memcopy.h>
+#else
+# define reg_char char
 #endif
 
-#if defined (HAVE_LIMITS_H) || defined (_LIBC)
+#if HAVE_STDLIB_H || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if HAVE_LIMITS_H || defined _LIBC
 # include <limits.h>
 #endif
 
@@ -49,21 +56,28 @@ USA.  */
 #endif
 
 #include <sys/types.h>
+#if HAVE_BP_SYM_H || defined _LIBC
+# include <bp-sym.h>
+#else
+# define BP_SYM(sym) sym
+#endif
 
+#undef memchr
+#undef __memchr
 
 /* Search no more than N bytes of S for C.  */
-
 __ptr_t
-memchr (s, c, n)
+__memchr (s, c_in, n)
      const __ptr_t s;
-     int c;
+     int c_in;
      size_t n;
 {
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
   unsigned long int longword, magic_bits, charmask;
+  unsigned reg_char c;
 
-  c = (unsigned char) c;
+  c = (unsigned char) c_in;
 
   /* Handle the first few characters by reading one character at a time.
      Do this until CHAR_PTR is aligned on a longword boundary.  */
@@ -197,3 +211,6 @@ memchr (s, c, n)
 
   return 0;
 }
+#ifdef weak_alias
+weak_alias (__memchr, BP_SYM (memchr))
+#endif

lib/memcmp.c

@@ -49,6 +49,11 @@
 #ifdef _LIBC
 
 # include <memcopy.h>
+# include <endian.h>
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define WORDS_BIGENDIAN
+# endif
 
 #else	/* Not in the GNU C library.  */
 

lib/memcoll.c

@@ -21,6 +21,8 @@
 # include <config.h>
 #endif
 
+#include <sys/types.h>
+
 #if HAVE_STRING_H
 # include <string.h>
 #endif

lib/memrchr.c

@@ -0,0 +1,209 @@
+/* memrchr -- find the last occurrence of a byte in a memory block
+   Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc.
+   Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
+   with help from Dan Sahlin (dan@sics.se) and
+   commentary by Jim Blandy (jimb@ai.mit.edu);
+   adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
+   and implemented by Roland McGrath (roland@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.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+
+#undef __ptr_t
+#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
+# define __ptr_t void *
+#else /* Not C++ or ANSI C.  */
+# define __ptr_t char *
+#endif /* C++ or ANSI C.  */
+
+#if defined (_LIBC)
+# include <string.h>
+# include <memcopy.h>
+#else
+# define reg_char char
+#endif
+
+#if defined (HAVE_LIMITS_H) || defined (_LIBC)
+# include <limits.h>
+#endif
+
+#define LONG_MAX_32_BITS 2147483647
+
+#ifndef LONG_MAX
+# define LONG_MAX LONG_MAX_32_BITS
+#endif
+
+#include <sys/types.h>
+
+#undef __memrchr
+#undef memrchr
+
+#ifndef weak_alias
+# define __memrchr memrchr
+#endif
+
+/* Search no more than N bytes of S for C.  */
+__ptr_t
+__memrchr (s, c_in, n)
+     const __ptr_t s;
+     int c_in;
+     size_t n;
+{
+  const unsigned char *char_ptr;
+  const unsigned long int *longword_ptr;
+  unsigned long int longword, magic_bits, charmask;
+  unsigned reg_char c;
+
+  c = (unsigned char) c_in;
+
+  /* Handle the last few characters by reading one character at a time.
+     Do this until CHAR_PTR is aligned on a longword boundary.  */
+  for (char_ptr = (const unsigned char *) s + n;
+       n > 0 && ((unsigned long int) char_ptr
+		 & (sizeof (longword) - 1)) != 0;
+       --n)
+    if (*--char_ptr == c)
+      return (__ptr_t) char_ptr;
+
+  /* All these elucidatory comments refer to 4-byte longwords,
+     but the theory applies equally well to 8-byte longwords.  */
+
+  longword_ptr = (unsigned long int *) char_ptr;
+
+  /* Bits 31, 24, 16, and 8 of this number are zero.  Call these bits
+     the "holes."  Note that there is a hole just to the left of
+     each byte, with an extra at the end:
+
+     bits:  01111110 11111110 11111110 11111111
+     bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
+
+     The 1-bits make sure that carries propagate to the next 0-bit.
+     The 0-bits provide holes for carries to fall into.  */
+
+  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+    abort ();
+
+#if LONG_MAX <= LONG_MAX_32_BITS
+  magic_bits = 0x7efefeff;
+#else
+  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+#endif
+
+  /* Set up a longword, each of whose bytes is C.  */
+  charmask = c | (c << 8);
+  charmask |= charmask << 16;
+#if LONG_MAX > LONG_MAX_32_BITS
+  charmask |= charmask << 32;
+#endif
+
+  /* Instead of the traditional loop which tests each character,
+     we will test a longword at a time.  The tricky part is testing
+     if *any of the four* bytes in the longword in question are zero.  */
+  while (n >= sizeof (longword))
+    {
+      /* We tentatively exit the loop if adding MAGIC_BITS to
+	 LONGWORD fails to change any of the hole bits of LONGWORD.
+
+	 1) Is this safe?  Will it catch all the zero bytes?
+	 Suppose there is a byte with all zeros.  Any carry bits
+	 propagating from its left will fall into the hole at its
+	 least significant bit and stop.  Since there will be no
+	 carry from its most significant bit, the LSB of the
+	 byte to the left will be unchanged, and the zero will be
+	 detected.
+
+	 2) Is this worthwhile?  Will it ignore everything except
+	 zero bytes?  Suppose every byte of LONGWORD has a bit set
+	 somewhere.  There will be a carry into bit 8.  If bit 8
+	 is set, this will carry into bit 16.  If bit 8 is clear,
+	 one of bits 9-15 must be set, so there will be a carry
+	 into bit 16.  Similarly, there will be a carry into bit
+	 24.  If one of bits 24-30 is set, there will be a carry
+	 into bit 31, so all of the hole bits will be changed.
+
+	 The one misfire occurs when bits 24-30 are clear and bit
+	 31 is set; in this case, the hole at bit 31 is not
+	 changed.  If we had access to the processor carry flag,
+	 we could close this loophole by putting the fourth hole
+	 at bit 32!
+
+	 So it ignores everything except 128's, when they're aligned
+	 properly.
+
+	 3) But wait!  Aren't we looking for C, not zero?
+	 Good point.  So what we do is XOR LONGWORD with a longword,
+	 each of whose bytes is C.  This turns each byte that is C
+	 into a zero.  */
+
+      longword = *--longword_ptr ^ charmask;
+
+      /* Add MAGIC_BITS to LONGWORD.  */
+      if ((((longword + magic_bits)
+
+	    /* Set those bits that were unchanged by the addition.  */
+	    ^ ~longword)
+
+	   /* Look at only the hole bits.  If any of the hole bits
+	      are unchanged, most likely one of the bytes was a
+	      zero.  */
+	   & ~magic_bits) != 0)
+	{
+	  /* Which of the bytes was C?  If none of them were, it was
+	     a misfire; continue the search.  */
+
+	  const unsigned char *cp = (const unsigned char *) longword_ptr;
+
+#if LONG_MAX > 2147483647
+	  if (cp[7] == c)
+	    return (__ptr_t) &cp[7];
+	  if (cp[6] == c)
+	    return (__ptr_t) &cp[6];
+	  if (cp[5] == c)
+	    return (__ptr_t) &cp[5];
+	  if (cp[4] == c)
+	    return (__ptr_t) &cp[4];
+#endif
+	  if (cp[3] == c)
+	    return (__ptr_t) &cp[3];
+	  if (cp[2] == c)
+	    return (__ptr_t) &cp[2];
+	  if (cp[1] == c)
+	    return (__ptr_t) &cp[1];
+	  if (cp[0] == c)
+	    return (__ptr_t) cp;
+	}
+
+      n -= sizeof (longword);
+    }
+
+  char_ptr = (const unsigned char *) longword_ptr;
+
+  while (n-- > 0)
+    {
+      if (*--char_ptr == c)
+	return (__ptr_t) char_ptr;
+    }
+
+  return 0;
+}
+#ifdef weak_alias
+weak_alias (__memrchr, memrchr)
+#endif

lib/mkstemp.c

@@ -0,0 +1,37 @@
+/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __GT_FILE
+# define __GT_FILE 0
+#endif
+
+int __gen_tempname ();
+
+/* Generate a unique temporary file name from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the filename unique.
+   Then open the file and return a fd. */
+int
+mkstemp (template)
+     char *template;
+{
+  return __gen_tempname (template, __GT_FILE);
+}

lib/modechange.c

@@ -1,5 +1,5 @@
 /* modechange.c -- file mode manipulation
-   Copyright (C) 1989, 1990, 1997-2000 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,50 +50,65 @@ char *malloc ();
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
+/* The traditional octal values corresponding to each mode bit.  */
+#define SUID 04000
+#define SGID 02000
+#define SVTX 01000
+#define RUSR 00400
+#define WUSR 00200
+#define XUSR 00100
+#define RGRP 00040
+#define WGRP 00020
+#define XGRP 00010
+#define ROTH 00004
+#define WOTH 00002
+#define XOTH 00001
+#define ALLM 07777 /* all octal mode bits */
+
 #ifndef S_ISUID
-# define S_ISUID 04000
+# define S_ISUID SUID
 #endif
 #ifndef S_ISGID
-# define S_ISGID 04000
+# define S_ISGID SGID
 #endif
 #ifndef S_ISVTX
-# define S_ISVTX 01000
+# define S_ISVTX SVTX
 #endif
 #ifndef S_IRUSR
-# define S_IRUSR 0400
+# define S_IRUSR RUSR
 #endif
 #ifndef S_IWUSR
-# define S_IWUSR 0200
+# define S_IWUSR WUSR
 #endif
 #ifndef S_IXUSR
-# define S_IXUSR 0100
+# define S_IXUSR XUSR
 #endif
 #ifndef S_IRGRP
-# define S_IRGRP 0040
+# define S_IRGRP RGRP
 #endif
 #ifndef S_IWGRP
-# define S_IWGRP 0020
+# define S_IWGRP WGRP
 #endif
 #ifndef S_IXGRP
-# define S_IXGRP 0010
+# define S_IXGRP XGRP
 #endif
 #ifndef S_IROTH
-# define S_IROTH 0004
+# define S_IROTH ROTH
 #endif
 #ifndef S_IWOTH
-# define S_IWOTH 0002
+# define S_IWOTH WOTH
 #endif
 #ifndef S_IXOTH
-# define S_IXOTH 0001
+# define S_IXOTH XOTH
 #endif
 #ifndef S_IRWXU
-# define S_IRWXU 0700
+# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
 #endif
 #ifndef S_IRWXG
-# define S_IRWXG 0070
+# define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP)
 #endif
 #ifndef S_IRWXO
-# define S_IRWXO 0007
+# define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
 #endif
 
 /* All the mode bits that can be affected by chmod.  */
@@ -157,8 +172,7 @@ mode_compile (const char *mode_string, unsigned int masked_ops)
 {
   struct mode_change *head;	/* First element of the linked list. */
   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.  */
+  unsigned long octal_value;	/* The mode value, if octal.  */
   mode_t umask_value;		/* The umask value (surprise). */
 
   head = NULL;
@@ -166,12 +180,34 @@ mode_compile (const char *mode_string, unsigned int masked_ops)
   tail = NULL;
 #endif
 
-  if (xstrtoumax (mode_string, &string_end, 8, &mode_value, "") == LONGINT_OK)
+  if (xstrtoul (mode_string, NULL, 8, &octal_value, "") == LONGINT_OK)
     {
       struct mode_change *p;
-      if (mode_value != (mode_value & CHMOD_MODE_BITS))
+      mode_t mode;
+      if (octal_value != (octal_value & ALLM))
 	return MODE_INVALID;
-      p = make_node_op_equals ((mode_t) mode_value);
+
+      /* Help the compiler optimize the usual case where mode_t uses
+	 the traditional octal representation.  */
+      mode = ((S_ISUID == SUID && S_ISGID == SGID && S_ISVTX == SVTX
+	       && S_IRUSR == RUSR && S_IWUSR == WUSR && S_IXUSR == XUSR
+	       && S_IRGRP == RGRP && S_IWGRP == WGRP && S_IXGRP == XGRP
+	       && S_IROTH == ROTH && S_IWOTH == WOTH && S_IXOTH == XOTH)
+	      ? octal_value
+	      : ((octal_value & SUID ? S_ISUID : 0)
+		 | (octal_value & SGID ? S_ISGID : 0)
+		 | (octal_value & SVTX ? S_ISVTX : 0)
+		 | (octal_value & RUSR ? S_IRUSR : 0)
+		 | (octal_value & WUSR ? S_IWUSR : 0)
+		 | (octal_value & XUSR ? S_IXUSR : 0)
+		 | (octal_value & RGRP ? S_IRGRP : 0)
+		 | (octal_value & WGRP ? S_IWGRP : 0)
+		 | (octal_value & XGRP ? S_IXGRP : 0)
+		 | (octal_value & ROTH ? S_IROTH : 0)
+		 | (octal_value & WOTH ? S_IWOTH : 0)
+		 | (octal_value & XOTH ? S_IXOTH : 0)));
+
+      p = make_node_op_equals (mode);
       if (p == NULL)
 	return MODE_MEMORY_EXHAUSTED;
       mode_append_entry (&head, &tail, p);
@@ -393,7 +429,7 @@ mode_adjust (mode_t oldmode, const struct mode_change *changes)
 
 	  /* In order to change only `u', `g', or `o' permissions,
 	     or some combination thereof, clear unselected bits.
-	     This can not be done in mode_compile because the value
+	     This cannot be done in mode_compile because the value
 	     to which the `changes->affected' mask is applied depends
 	     on the old mode of each file. */
 	  value &= changes->affected;

lib/obstack.c

@@ -1,5 +1,5 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-1994,96,97,98,1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1988-1994,96,97,98,99,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.
@@ -282,9 +282,10 @@ _obstack_newchunk (h, length)
   register long obj_size = h->next_free - h->object_base;
   register long i;
   long already;
+  char *object_base;
 
   /* Compute size for new chunk.  */
-  new_size = (obj_size + length) + (obj_size >> 3) + 100;
+  new_size = (obj_size + length) + (obj_size >> 3) + h->alignment_mask + 100;
   if (new_size < h->chunk_size)
     new_size = h->chunk_size;
 
@@ -296,6 +297,11 @@ _obstack_newchunk (h, length)
   new_chunk->prev = old_chunk;
   new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
 
+  /* Compute an aligned object_base in the new chunk */
+  object_base =
+    __INT_TO_PTR ((__PTR_TO_INT (new_chunk->contents) + h->alignment_mask)
+		  & ~ (h->alignment_mask));
+
   /* Move the existing object to the new chunk.
      Word at a time is fast and is safe if the object
      is sufficiently aligned.  */
@@ -303,7 +309,7 @@ _obstack_newchunk (h, length)
     {
       for (i = obj_size / sizeof (COPYING_UNIT) - 1;
 	   i >= 0; i--)
-	((COPYING_UNIT *)new_chunk->contents)[i]
+	((COPYING_UNIT *)object_base)[i]
 	  = ((COPYING_UNIT *)h->object_base)[i];
       /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
 	 but that can cross a page boundary on a machine
@@ -314,7 +320,7 @@ _obstack_newchunk (h, length)
     already = 0;
   /* Copy remaining bytes one by one.  */
   for (i = already; i < obj_size; i++)
-    new_chunk->contents[i] = h->object_base[i];
+    object_base[i] = h->object_base[i];
 
   /* If the object just copied was the only data in OLD_CHUNK,
      free that chunk and remove it from the chain.
@@ -325,7 +331,7 @@ _obstack_newchunk (h, length)
       CALL_FREEFUN (h, old_chunk);
     }
 
-  h->object_base = new_chunk->contents;
+  h->object_base = object_base;
   h->next_free = h->object_base + obj_size;
   /* The new chunk certainly contains no empty object yet.  */
   h->maybe_empty_object = 0;
@@ -451,7 +457,7 @@ _obstack_memory_used (h)
 
 /* Define the error handler.  */
 # ifndef _
-#  ifdef HAVE_LIBINTL_H
+#  if defined HAVE_LIBINTL_H || defined _LIBC
 #   include <libintl.h>
 #   ifndef _
 #    define _(Str) gettext (Str)
@@ -518,20 +524,20 @@ int (obstack_make_room) (obstack, length)
   return obstack_make_room (obstack, length);
 }
 
-void (obstack_grow) (obstack, pointer, length)
+void (obstack_grow) (obstack, data, length)
      struct obstack *obstack;
-     POINTER pointer;
+     const POINTER data;
      int length;
 {
-  obstack_grow (obstack, pointer, length);
+  obstack_grow (obstack, data, length);
 }
 
-void (obstack_grow0) (obstack, pointer, length)
+void (obstack_grow0) (obstack, data, length)
      struct obstack *obstack;
-     POINTER pointer;
+     const POINTER data;
      int length;
 {
-  obstack_grow0 (obstack, pointer, length);
+  obstack_grow0 (obstack, data, length);
 }
 
 void (obstack_1grow) (obstack, character)
@@ -575,20 +581,20 @@ POINTER (obstack_alloc) (obstack, length)
   return obstack_alloc (obstack, length);
 }
 
-POINTER (obstack_copy) (obstack, pointer, length)
+POINTER (obstack_copy) (obstack, address, length)
      struct obstack *obstack;
-     POINTER pointer;
+     const POINTER address;
      int length;
 {
-  return obstack_copy (obstack, pointer, length);
+  return obstack_copy (obstack, address, length);
 }
 
-POINTER (obstack_copy0) (obstack, pointer, length)
+POINTER (obstack_copy0) (obstack, address, length)
      struct obstack *obstack;
-     POINTER pointer;
+     const POINTER address;
      int length;
 {
-  return obstack_copy0 (obstack, pointer, length);
+  return obstack_copy0 (obstack, address, length);
 }
 
 #  endif /* __STDC__ */

lib/obstack.h

@@ -1,10 +1,11 @@
 /* obstack.h - object stack macros
    Copyright (C) 1988,89,90,91,92,93,94,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.
 
    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.
+   Bugs can be reported to bug-glibc@gnu.org.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -13,11 +14,11 @@
 
    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.
+   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
+   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.  */
 
@@ -219,18 +220,18 @@ void obstack_init (struct obstack *obstack);
 
 void * obstack_alloc (struct obstack *obstack, int size);
 
-void * obstack_copy (struct obstack *obstack, void *address, int size);
-void * obstack_copy0 (struct obstack *obstack, void *address, int size);
+void * obstack_copy (struct obstack *obstack, const void *address, int size);
+void * obstack_copy0 (struct obstack *obstack, const void *address, int size);
 
 void obstack_free (struct obstack *obstack, void *block);
 
 void obstack_blank (struct obstack *obstack, int size);
 
-void obstack_grow (struct obstack *obstack, void *data, int size);
-void obstack_grow0 (struct obstack *obstack, void *data, int size);
+void obstack_grow (struct obstack *obstack, const void *data, int size);
+void obstack_grow0 (struct obstack *obstack, const void *data, int size);
 
 void obstack_1grow (struct obstack *obstack, int data_char);
-void obstack_ptr_grow (struct obstack *obstack, void *data);
+void obstack_ptr_grow (struct obstack *obstack, const void *data);
 void obstack_int_grow (struct obstack *obstack, int data);
 
 void * obstack_finish (struct obstack *obstack);
@@ -240,7 +241,7 @@ int obstack_object_size (struct obstack *obstack);
 int obstack_room (struct obstack *obstack);
 void obstack_make_room (struct obstack *obstack, int size);
 void obstack_1grow_fast (struct obstack *obstack, int data_char);
-void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
+void obstack_ptr_grow_fast (struct obstack *obstack, const void *data);
 void obstack_int_grow_fast (struct obstack *obstack, int data);
 void obstack_blank_fast (struct obstack *obstack, int size);
 
@@ -290,21 +291,24 @@ extern int obstack_exit_failure;
    standard C version.  */
 #if defined __STDC__ && __STDC__
 
-# define obstack_init(h) \
-  _obstack_begin ((h), 0, 0, \
-		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
+# define obstack_init(h)					\
+  _obstack_begin ((h), 0, 0,					\
+		  (void *(*) (long)) obstack_chunk_alloc, 	\
+		  (void (*) (void *)) obstack_chunk_free)
 
-# define obstack_begin(h, size) \
-  _obstack_begin ((h), (size), 0, \
-		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
+# define obstack_begin(h, size)					\
+  _obstack_begin ((h), (size), 0,				\
+		  (void *(*) (long)) obstack_chunk_alloc, 	\
+		  (void (*) (void *)) obstack_chunk_free)
 
 # define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
-  _obstack_begin ((h), (size), (alignment), \
-		    (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun))
+  _obstack_begin ((h), (size), (alignment),				   \
+		  (void *(*) (long)) (chunkfun), 			   \
+		  (void (*) (void *)) (freefun))
 
 # define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
-  _obstack_begin_1 ((h), (size), (alignment), \
-		    (void *(*) (void *, long)) (chunkfun), \
+  _obstack_begin_1 ((h), (size), (alignment),				\
+		    (void *(*) (void *, long)) (chunkfun),		\
 		    (void (*) (void *, void *)) (freefun), (arg))
 
 # define obstack_chunkfun(h, newchunkfun) \
@@ -315,21 +319,25 @@ extern int obstack_exit_failure;
 
 #else
 
-# define obstack_init(h) \
-  _obstack_begin ((h), 0, 0, \
-		  (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free)
+# define obstack_init(h)						\
+  _obstack_begin ((h), 0, 0,						\
+		  (void *(*) ()) obstack_chunk_alloc, 			\
+		  (void (*) ()) obstack_chunk_free)
 
-# define obstack_begin(h, size) \
-  _obstack_begin ((h), (size), 0, \
-		  (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free)
+# 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) \
-  _obstack_begin ((h), (size), (alignment), \
-		    (void *(*) ()) (chunkfun), (void (*) ()) (freefun))
+  _obstack_begin ((h), (size), (alignment),				   \
+		  (void *(*) ()) (chunkfun), 				   \
+		  (void (*) ()) (freefun))
 
 # define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
-  _obstack_begin_1 ((h), (size), (alignment), \
-		    (void *(*) ()) (chunkfun), (void (*) ()) (freefun), (arg))
+  _obstack_begin_1 ((h), (size), (alignment),				\
+		    (void *(*) ()) (chunkfun), 				\
+		    (void (*) ()) (freefun), (arg))
 
 # define obstack_chunkfun(h, newchunkfun) \
   ((h) -> chunkfun = (struct _obstack_chunk *(*)()) (newchunkfun))
@@ -387,7 +395,7 @@ __extension__								\
    int __len = (length);						\
    if (__o->next_free + __len > __o->chunk_limit)			\
      _obstack_newchunk (__o, __len);					\
-   _obstack_memcpy (__o->next_free, (char *) (where), __len);		\
+   _obstack_memcpy (__o->next_free, (where), __len);			\
    __o->next_free += __len;						\
    (void) 0; })
 
@@ -397,7 +405,7 @@ __extension__								\
    int __len = (length);						\
    if (__o->next_free + __len + 1 > __o->chunk_limit)			\
      _obstack_newchunk (__o, __len + 1);				\
-   _obstack_memcpy (__o->next_free, (char *) (where), __len);		\
+   _obstack_memcpy (__o->next_free, (where), __len);			\
    __o->next_free += __len;						\
    *(__o->next_free)++ = 0;						\
    (void) 0; })
@@ -410,8 +418,8 @@ __extension__								\
    *(__o->next_free)++ = (datum);					\
    (void) 0; })
 
-/* These assume that the obstack alignment is good enough for pointers or ints,
-   and that the data added so far to the current object
+/* These assume that the obstack alignment is good enough for pointers
+   or ints, and that the data added so far to the current object
    shares that much alignment.  */
 
 # define obstack_ptr_grow(OBSTACK,datum)				\
@@ -419,7 +427,7 @@ __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
      _obstack_newchunk (__o, sizeof (void *));				\
-   *((void **)__o->next_free)++ = ((void *)datum);			\
+   *((void **)__o->next_free)++ = (datum);				\
    (void) 0; })
 
 # define obstack_int_grow(OBSTACK,datum)				\
@@ -427,11 +435,14 @@ __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + sizeof (int) > __o->chunk_limit)		\
      _obstack_newchunk (__o, sizeof (int));				\
-   *((int *)__o->next_free)++ = ((int)datum);				\
+   *((int *)__o->next_free)++ = (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)++ = (aptr))
+
+# define obstack_int_grow_fast(h,aint)					\
+  (*((int *) (h)->next_free)++ = (aint))
 
 # define obstack_blank(OBSTACK,length)					\
 __extension__								\
@@ -512,14 +523,14 @@ __extension__								\
 ( (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),	\
+  _obstack_memcpy ((h)->next_free, (where), (h)->temp),			\
   (h)->next_free += (h)->temp)
 
 # define obstack_grow0(h,where,length)					\
 ( (h)->temp = (length),							\
   (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit)			\
    ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0),			\
-  _obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp),	\
+  _obstack_memcpy ((h)->next_free, (where), (h)->temp),			\
   (h)->next_free += (h)->temp,						\
   *((h)->next_free)++ = 0)
 
@@ -531,15 +542,18 @@ __extension__								\
 # 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)))
+  (*((const char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = (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)))
+  (*((int *) (((h)->next_free+=sizeof(int))-sizeof(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)					\
+  (*((const char **) (h)->next_free)++ = (aptr))
+
+# define obstack_int_grow_fast(h,aint)					\
+  (*((int *) (h)->next_free)++ = (aint))
 
 # define obstack_blank(h,length)					\
 ( (h)->temp = (length),							\

lib/path-concat.c

@@ -1,5 +1,5 @@
 /* path-concat.c -- concatenate two arbitrary pathnames
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,12 +26,31 @@
 #endif
 
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-#include <sys/types.h>
 
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef HAVE_DECL_MALLOC
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_MALLOC
 char *malloc ();
+#endif
+
 #ifndef strdup
 char *strdup ();
 #endif
@@ -40,6 +59,10 @@ char *strdup ();
 # define DIRECTORY_SEPARATOR '/'
 #endif
 
+#ifndef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
+#endif
+
 #ifndef ISSLASH
 # define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
 #endif
@@ -86,11 +109,11 @@ path_concat (const char *dir, const char *base, char **base_in_result)
 
   p = mempcpy (p_concat, dir, dir_len);
 
-  if (dir_len > 0)
+  if (dir_len > FILESYSTEM_PREFIX_LEN (dir))
     {
-      if (ISSLASH (*(p - 1)) && ISSLASH(*base))
+      if (ISSLASH (*(p - 1)) && ISSLASH (*base))
 	--p;
-      else if (!ISSLASH (*(p - 1)) && !ISSLASH(*base))
+      else if (!ISSLASH (*(p - 1)) && !ISSLASH (*base))
 	*p++ = DIRECTORY_SEPARATOR;
     }
 

lib/physmem.c

@@ -0,0 +1,58 @@
+/* Calculate the size of physical memory.
+   Copyright 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 Paul Eggert.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "physmem.h"
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+/* Return the total amount of physical memory.  */
+double
+physmem_total (void)
+{
+#if defined _SC_PHYS_PAGES && defined _SC_PAGESIZE
+  double pages = sysconf (_SC_PHYS_PAGES);
+  double pagesize = sysconf (_SC_PAGESIZE);
+  if (0 <= pages && 0 <= pagesize)
+    return pages * pagesize;
+#endif
+
+  /* Guess 64 MB.  It's probably an older host, so guess small.  */
+  return 64 * 1024 * 1024;
+}
+
+/* Return the amount of physical memory available.  */
+double
+physmem_available (void)
+{
+#if defined _SC_AVPHYS_PAGES && defined _SC_PAGESIZE
+  double pages = sysconf (_SC_AVPHYS_PAGES);
+  double pagesize = sysconf (_SC_PAGESIZE);
+  if (0 <= pages && 0 <= pagesize)
+    return pages * pagesize;
+#endif
+
+  /* Guess 25% of physical memory.  */
+  return physmem_total () / 4;
+}

lib/physmem.h

@@ -0,0 +1,19 @@
+#ifndef PHYSMEM_H_
+# define PHYSMEM_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
+
+double physmem_total PARAMS ((void));
+double physmem_available PARAMS ((void));
+
+#endif /* PHYSMEM_H_ */

lib/quote.c

@@ -4,6 +4,9 @@
 # include <config.h>
 #endif
 
+#if HAVE_STDDEF_H
+# include <stddef.h>  /* For the definition of size_t on windows w/MSVC.  */
+#endif
 #include <sys/types.h>
 #include <quotearg.h>
 #include <quote.h>

lib/quote.h

@@ -1,4 +1,12 @@
 /* prototypes for quote.c */
 
-char const *quote_n (int n, char const *name);
-char const *quote (char const *name);
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+char const *quote_n PARAMS ((int n, char const *name));
+char const *quote PARAMS ((char const *name));

lib/quotearg.c

@@ -1,5 +1,5 @@
 /* quotearg.c - quote arguments for output
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,6 +21,9 @@
 # include <config.h>
 #endif
 
+#if HAVE_STDDEF_H
+# include <stddef.h>  /* For the definition of size_t on windows w/MSVC.  */
+#endif
 #include <sys/types.h>
 #include <quotearg.h>
 #include <xalloc.h>
@@ -63,13 +66,7 @@
 # include <wchar.h>
 #endif
 
-#if HAVE_MBRTOWC
-size_t mbrtowc ();
-# ifdef mbstate_t
-#  define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
-#  define mbsinit(ps) 1
-# endif
-#else
+#if !HAVE_MBRTOWC
 /* Disable multibyte processing entirely.  Since MB_CUR_MAX is 1, the
    other macros are defined only for documentation and to satisfy C
    syntax.  */
@@ -92,15 +89,14 @@ size_t mbrtowc ();
 #define INT_BITS (sizeof (int) * CHAR_BIT)
 
 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
-# undef ISASCII
-# define ISASCII(c) 1
+# define IN_CTYPE_DOMAIN(c) 1
 #else
-# define ISASCII(c) isascii (c)
+# define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif
+
 /* Undefine to protect against the definition in wctype.h of solaris2.6.   */
 #undef ISPRINT
-#define ISPRINT(c) (ISASCII (c) && isprint (c))
+#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c))
 
 struct quoting_options
 {

lib/regex.h

@@ -513,13 +513,31 @@ extern int re_exec _RE_ARGS ((const char *));
 # endif
 #endif
 
+/* GCC 2.95 and later have "__restrict"; C99 compilers have
+   "restrict", and "configure" may have defined "restrict".  */
+#ifndef __restrict
+# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
+#  if defined restrict || 199901L <= __STDC_VERSION__
+#   define __restrict restrict
+#  else
+#   define __restrict
+#  endif
+# endif
+#endif
+/* For now unconditionally define __restrict_arr to expand to nothing.
+   Ideally we would have a test for the compiler which allows defining
+   it to restrict.  */
+#define __restrict_arr
+
 /* POSIX compatibility.  */
-extern int regcomp _RE_ARGS ((regex_t *__preg, const char *__pattern,
+extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
+			      const char *__restrict __pattern,
 			      int __cflags));
 
-extern int regexec _RE_ARGS ((const regex_t *__preg,
-			      const char *__string, size_t __nmatch,
-			      regmatch_t __pmatch[], int __eflags));
+extern int regexec _RE_ARGS ((const regex_t *__restrict __preg,
+			      const char *__restrict __string, size_t __nmatch,
+			      regmatch_t __pmatch[__restrict_arr],
+			      int __eflags));
 
 extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg,
 				  char *__errbuf, size_t __errbuf_size));

lib/rename.c

@@ -0,0 +1,68 @@
+/* Work around the bug in some systems whereby rename fails when the source
+   path has a trailing slash.  The rename from SunOS 4.1.1_U1 has this bug.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* written by Volker Borchert */
+
+#include <config.h>
+#include <stdio.h>
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#include <xalloc.h>
+
+#ifndef HAVE_DECL_FREE
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_FREE
+void free ();
+#endif
+
+void strip_trailing_slashes ();
+
+/* Rename the file SRC_PATH to DST_PATH, removing any trailing
+   slashes from SRC_PATH.  Needed for SunOS 4.1.1_U1.  */
+
+int
+rpl_rename (const char *src_path, const char *dst_path)
+{
+  char *src_temp;
+  int ret_val;
+  size_t s_len = strlen (src_path);
+
+  if (s_len && src_path[s_len - 1] == '/')
+    {
+      src_temp = xstrdup (src_path);
+      strip_trailing_slashes (src_temp);
+    }
+  else
+    src_temp = (char *) src_path;
+
+  ret_val = rename (src_temp, dst_path);
+
+  if (src_temp != src_path)
+    free (src_temp);
+
+  return ret_val;
+}

lib/save-cwd.c

@@ -42,6 +42,10 @@
 extern int errno;
 #endif
 
+#ifndef O_DIRECTORY
+# define O_DIRECTORY 0
+#endif
+
 #include "save-cwd.h"
 #include "error.h"
 
@@ -67,7 +71,7 @@ save_cwd (struct saved_cwd *cwd)
   if (have_working_fchdir)
     {
 #if HAVE_FCHDIR
-      cwd->desc = open (".", O_RDONLY);
+      cwd->desc = open (".", O_RDONLY | O_DIRECTORY);
       if (cwd->desc < 0)
 	{
 	  error (0, errno, "cannot open current directory");

lib/sha.c

@@ -0,0 +1,376 @@
+/* sha.c - Functions to compute the SHA1 hash (message-digest) of files
+   or blocks of memory.  Complies to the NIST specification FIPS-180-1.
+
+   Copyright (C) 2000 Scott G. Miller
+
+   Credits:
+      Robert Klep <robert@ilse.nl>  -- Expansion function fix
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+
+#if STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+# include <string.h>
+#else
+# ifndef HAVE_MEMCPY
+#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+# endif
+#endif
+
+#include "md5.h"
+#include "sha.h"
+
+/*
+  Not-swap is a macro that does an endian swap on architectures that are
+  big-endian, as SHA needs some data in a little-endian format
+*/
+
+#ifdef WORDS_BIGENDIAN
+# define NOTSWAP(n) (n)
+# define SWAP(n)							\
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
+#else
+# define NOTSWAP(n)                                                         \
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
+# define SWAP(n) (n)
+#endif
+
+/* This array contains the bytes used to pad the buffer to the next
+   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
+
+
+/*
+  Takes a pointer to a 160 bit block of data (five 32 bit ints) and
+  intializes it to the start constants of the SHA1 algorithm.  This
+  must be called before using hash in the call to sha_hash
+*/
+void
+sha_init_ctx (struct sha_ctx *ctx)
+{
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
+  ctx->E = 0xc3d2e1f0;
+
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
+}
+
+/* Put result from CTX in first 20 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+void *
+sha_read_ctx (const struct sha_ctx *ctx, void *resbuf)
+{
+  ((md5_uint32 *) resbuf)[0] = NOTSWAP (ctx->A);
+  ((md5_uint32 *) resbuf)[1] = NOTSWAP (ctx->B);
+  ((md5_uint32 *) resbuf)[2] = NOTSWAP (ctx->C);
+  ((md5_uint32 *) resbuf)[3] = NOTSWAP (ctx->D);
+  ((md5_uint32 *) resbuf)[4] = NOTSWAP (ctx->E);
+
+  return resbuf;
+}
+
+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+void *
+sha_finish_ctx (struct sha_ctx *ctx, void *resbuf)
+{
+  /* Take yet unprocessed bytes into account.  */
+  md5_uint32 bytes = ctx->buflen;
+  size_t pad;
+
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
+
+  pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
+  memcpy (&ctx->buffer[bytes], fillbuf, pad);
+
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = NOTSWAP (ctx->total[0] << 3);
+  *(md5_uint32 *) &ctx->buffer[bytes + pad] = NOTSWAP ((ctx->total[1] << 3) |
+						    (ctx->total[0] >> 29));
+
+  /* Process last bytes.  */
+  sha_process_block (ctx->buffer, bytes + pad + 8, ctx);
+
+  return sha_read_ctx (ctx, resbuf);
+}
+
+/* Compute SHA1 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+int
+sha_stream (FILE *stream, void *resblock)
+{
+  /* Important: BLOCKSIZE must be a multiple of 64.  */
+#define BLOCKSIZE 4096
+  struct sha_ctx ctx;
+  char buffer[BLOCKSIZE + 72];
+  size_t sum;
+
+  /* Initialize the computation context.  */
+  sha_init_ctx (&ctx);
+
+  /* Iterate over full file contents.  */
+  while (1)
+    {
+      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
+	 computation function processes the whole buffer so that with the
+	 next round of the loop another block can be read.  */
+      size_t n;
+      sum = 0;
+
+      /* Read block.  Take care for partial reads.  */
+      do
+	{
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
+
+	  sum += n;
+	}
+      while (sum < BLOCKSIZE && n != 0);
+      if (n == 0 && ferror (stream))
+        return 1;
+
+      /* If end of file is reached, end the loop.  */
+      if (n == 0)
+	break;
+
+      /* Process buffer with BLOCKSIZE bytes.  Note that
+			BLOCKSIZE % 64 == 0
+       */
+      sha_process_block (buffer, BLOCKSIZE, &ctx);
+    }
+
+  /* Add the last bytes if necessary.  */
+  if (sum > 0)
+    sha_process_bytes (buffer, sum, &ctx);
+
+  /* Construct result in desired memory.  */
+  sha_finish_ctx (&ctx, resblock);
+  return 0;
+}
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+void *
+sha_buffer (const char *buffer, size_t len, void *resblock)
+{
+  struct sha_ctx ctx;
+
+  /* Initialize the computation context.  */
+  sha_init_ctx (&ctx);
+
+  /* Process whole buffer but last len % 64 bytes.  */
+  sha_process_bytes (buffer, len, &ctx);
+
+  /* Put result in desired memory area.  */
+  return sha_finish_ctx (&ctx, resblock);
+}
+
+void
+sha_process_bytes (const void *buffer, size_t len, struct sha_ctx *ctx)
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
+
+      memcpy (&ctx->buffer[left_over], buffer, add);
+      ctx->buflen += add;
+
+      if (left_over + add > 64)
+	{
+	  sha_process_block (ctx->buffer, (left_over + add) & ~63, ctx);
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
+		  (left_over + add) & 63);
+	  ctx->buflen = (left_over + add) & 63;
+	}
+
+      buffer = (const char *) buffer + add;
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len > 64)
+    {
+      sha_process_block (buffer, len & ~63, ctx);
+      buffer = (const char *) buffer + (len & ~63);
+      len &= 63;
+    }
+
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      memcpy (ctx->buffer, buffer, len);
+      ctx->buflen = len;
+    }
+}
+
+/* --- Code below is the primary difference between md5.c and sha.c --- */
+
+/* SHA1 round constants */
+#define K1 0x5a827999L
+#define K2 0x6ed9eba1L
+#define K3 0x8f1bbcdcL
+#define K4 0xca62c1d6L
+
+/* Round functions.  Note that F2 is the same as F4.  */
+#define F1(B,C,D) ( D ^ ( B & ( C ^ D ) ) )
+#define F2(B,C,D) (B ^ C ^ D)
+#define F3(B,C,D) ( ( B & C ) | ( D & ( B | C ) ) )
+#define F4(B,C,D) (B ^ C ^ D)
+
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+   It is assumed that LEN % 64 == 0.
+   Most of this code comes from GnuPG's cipher/sha1.c.  */
+
+void
+sha_process_block (const void *buffer, size_t len, struct sha_ctx *ctx)
+{
+  const md5_uint32 *words = buffer;
+  size_t nwords = len / sizeof (md5_uint32);
+  const md5_uint32 *endp = words + nwords;
+  md5_uint32 x[16];
+  md5_uint32 a = ctx->A;
+  md5_uint32 b = ctx->B;
+  md5_uint32 c = ctx->C;
+  md5_uint32 d = ctx->D;
+  md5_uint32 e = ctx->E;
+
+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
+#define M(I) ( tm =   x[I&0x0f] ^ x[(I-14)&0x0f] \
+		    ^ x[(I-8)&0x0f] ^ x[(I-3)&0x0f] \
+	       , (x[I&0x0f] = rol(tm, 1)) )
+
+#define R(A,B,C,D,E,F,K,M)  do { E += rol( A, 5 )     \
+				      + F( B, C, D )  \
+				      + K	      \
+				      + M;	      \
+				 B = rol( B, 30 );    \
+			       } while(0)
+
+  while (words < endp)
+    {
+      md5_uint32 tm;
+      int t;
+      /* FIXME: see sha1.c for a better implementation.  */
+      for (t = 0; t < 16; t++)
+	{
+	  x[t] = NOTSWAP (*words);
+	  words++;
+	}
+
+      R( a, b, c, d, e, F1, K1, x[ 0] );
+      R( e, a, b, c, d, F1, K1, x[ 1] );
+      R( d, e, a, b, c, F1, K1, x[ 2] );
+      R( c, d, e, a, b, F1, K1, x[ 3] );
+      R( b, c, d, e, a, F1, K1, x[ 4] );
+      R( a, b, c, d, e, F1, K1, x[ 5] );
+      R( e, a, b, c, d, F1, K1, x[ 6] );
+      R( d, e, a, b, c, F1, K1, x[ 7] );
+      R( c, d, e, a, b, F1, K1, x[ 8] );
+      R( b, c, d, e, a, F1, K1, x[ 9] );
+      R( a, b, c, d, e, F1, K1, x[10] );
+      R( e, a, b, c, d, F1, K1, x[11] );
+      R( d, e, a, b, c, F1, K1, x[12] );
+      R( c, d, e, a, b, F1, K1, x[13] );
+      R( b, c, d, e, a, F1, K1, x[14] );
+      R( a, b, c, d, e, F1, K1, x[15] );
+      R( e, a, b, c, d, F1, K1, M(16) );
+      R( d, e, a, b, c, F1, K1, M(17) );
+      R( c, d, e, a, b, F1, K1, M(18) );
+      R( b, c, d, e, a, F1, K1, M(19) );
+      R( a, b, c, d, e, F2, K2, M(20) );
+      R( e, a, b, c, d, F2, K2, M(21) );
+      R( d, e, a, b, c, F2, K2, M(22) );
+      R( c, d, e, a, b, F2, K2, M(23) );
+      R( b, c, d, e, a, F2, K2, M(24) );
+      R( a, b, c, d, e, F2, K2, M(25) );
+      R( e, a, b, c, d, F2, K2, M(26) );
+      R( d, e, a, b, c, F2, K2, M(27) );
+      R( c, d, e, a, b, F2, K2, M(28) );
+      R( b, c, d, e, a, F2, K2, M(29) );
+      R( a, b, c, d, e, F2, K2, M(30) );
+      R( e, a, b, c, d, F2, K2, M(31) );
+      R( d, e, a, b, c, F2, K2, M(32) );
+      R( c, d, e, a, b, F2, K2, M(33) );
+      R( b, c, d, e, a, F2, K2, M(34) );
+      R( a, b, c, d, e, F2, K2, M(35) );
+      R( e, a, b, c, d, F2, K2, M(36) );
+      R( d, e, a, b, c, F2, K2, M(37) );
+      R( c, d, e, a, b, F2, K2, M(38) );
+      R( b, c, d, e, a, F2, K2, M(39) );
+      R( a, b, c, d, e, F3, K3, M(40) );
+      R( e, a, b, c, d, F3, K3, M(41) );
+      R( d, e, a, b, c, F3, K3, M(42) );
+      R( c, d, e, a, b, F3, K3, M(43) );
+      R( b, c, d, e, a, F3, K3, M(44) );
+      R( a, b, c, d, e, F3, K3, M(45) );
+      R( e, a, b, c, d, F3, K3, M(46) );
+      R( d, e, a, b, c, F3, K3, M(47) );
+      R( c, d, e, a, b, F3, K3, M(48) );
+      R( b, c, d, e, a, F3, K3, M(49) );
+      R( a, b, c, d, e, F3, K3, M(50) );
+      R( e, a, b, c, d, F3, K3, M(51) );
+      R( d, e, a, b, c, F3, K3, M(52) );
+      R( c, d, e, a, b, F3, K3, M(53) );
+      R( b, c, d, e, a, F3, K3, M(54) );
+      R( a, b, c, d, e, F3, K3, M(55) );
+      R( e, a, b, c, d, F3, K3, M(56) );
+      R( d, e, a, b, c, F3, K3, M(57) );
+      R( c, d, e, a, b, F3, K3, M(58) );
+      R( b, c, d, e, a, F3, K3, M(59) );
+      R( a, b, c, d, e, F4, K4, M(60) );
+      R( e, a, b, c, d, F4, K4, M(61) );
+      R( d, e, a, b, c, F4, K4, M(62) );
+      R( c, d, e, a, b, F4, K4, M(63) );
+      R( b, c, d, e, a, F4, K4, M(64) );
+      R( a, b, c, d, e, F4, K4, M(65) );
+      R( e, a, b, c, d, F4, K4, M(66) );
+      R( d, e, a, b, c, F4, K4, M(67) );
+      R( c, d, e, a, b, F4, K4, M(68) );
+      R( b, c, d, e, a, F4, K4, M(69) );
+      R( a, b, c, d, e, F4, K4, M(70) );
+      R( e, a, b, c, d, F4, K4, M(71) );
+      R( d, e, a, b, c, F4, K4, M(72) );
+      R( c, d, e, a, b, F4, K4, M(73) );
+      R( b, c, d, e, a, F4, K4, M(74) );
+      R( a, b, c, d, e, F4, K4, M(75) );
+      R( e, a, b, c, d, F4, K4, M(76) );
+      R( d, e, a, b, c, F4, K4, M(77) );
+      R( c, d, e, a, b, F4, K4, M(78) );
+      R( b, c, d, e, a, F4, K4, M(79) );
+
+      a = ctx->A += a;
+      b = ctx->B += b;
+      c = ctx->C += c;
+      d = ctx->D += d;
+      e = ctx->E += e;
+    }
+}

lib/sha.h

@@ -0,0 +1,75 @@
+/* sha.h - Declaration of functions and datatypes for SHA1 sum computing
+   library functions.
+
+   Copyright (C) 1999, Scott G. Miller
+*/
+
+#ifndef _SHA_H
+# define _SHA_H 1
+
+# include <stdio.h>
+# include "md5.h"
+
+/* Structure to save state of computation between the single steps.  */
+struct sha_ctx
+{
+  md5_uint32 A;
+  md5_uint32 B;
+  md5_uint32 C;
+  md5_uint32 D;
+  md5_uint32 E;
+
+  md5_uint32 total[2];
+  md5_uint32 buflen;
+  char buffer[128];
+};
+
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void sha_process_block __P ((const void *buffer, size_t len,
+                            struct sha_ctx *ctx));
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void sha_process_bytes __P((const void *buffer, size_t len,
+				    struct sha_ctx *ctx));
+
+/* Initialize structure containing state of computation. */
+extern void sha_init_ctx __P ((struct sha_ctx *ctx));
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+extern void *sha_finish_ctx __P ((struct sha_ctx *ctx, void *resbuf));
+
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+extern void *sha_read_ctx __P ((const struct sha_ctx *ctx, void *resbuf));
+
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int sha_stream __P ((FILE *stream, void *resblock));
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *sha_buffer __P ((const char *buffer, size_t len, void *resblock));
+
+#endif

lib/stdio-safer.h

@@ -0,0 +1,9 @@
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+FILE *fopen_safer PARAMS ((char const *, char const *));

lib/strftime.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2000, 2001 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.
@@ -98,8 +98,8 @@ extern char *tzname[];
 # define L_(Str) L##Str
 # define NLW(Sym) _NL_W##Sym
 
-# define MEMCPY(d, s, n) wmemcpy (d, s, n)
-# define STRLEN(s) wcslen (s)
+# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
+# define STRLEN(s) __wcslen (s)
 
 #else
 # define CHAR_T char
@@ -289,7 +289,7 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
 	 else if (to_uppcase)						      \
 	   memcpy_uppcase (p, (s), _n);					      \
 	 else								      \
-	   MEMCPY ((PTR) p, (PTR) (s), _n))
+	   MEMCPY ((PTR) p, (const PTR) (s), _n))
 
 #ifdef COMPILE_WIDE
 # define widen(os, ws, l) \
@@ -457,8 +457,7 @@ static CHAR_T const month_name[][10] =
     return _strftime_copytm (s, maxsize, format, &tmcopy ut_argument);
   }
 # undef my_strftime
-# define my_strftime(S, Maxsize, Format, Tp) \
-  _strftime_copytm (S, Maxsize, Format, Tp)
+# define my_strftime _strftime_copytm
 #endif
 
 
@@ -516,6 +515,9 @@ my_strftime (s, maxsize, format, tp ut_argument)
   size_t i = 0;
   CHAR_T *p = s;
   const CHAR_T *f;
+#if DO_MULTIBYTE && !defined COMPILE_WIDE
+  const char *format_end = NULL;
+#endif
 
   zone = NULL;
 #if HAVE_TM_ZONE
@@ -608,10 +610,15 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	  {
 	    mbstate_t mbstate = mbstate_zero;
 	    size_t len = 0;
+	    size_t fsize;
+
+	    if (! format_end)
+	      format_end = f + strlen (f) + 1;
+	    fsize = format_end - f;
 
 	    do
 	      {
-		size_t bytes = mbrlen (f + len, (size_t) -1, &mbstate);
+		size_t bytes = mbrlen (f + len, fsize - len, &mbstate);
 
 		if (bytes == 0)
 		  break;
@@ -752,6 +759,11 @@ my_strftime (s, maxsize, format, tp ut_argument)
 
 	case L_('b'):
 	case L_('h'):		/* POSIX.2 extension.  */
+	  if (change_case)
+	    {
+	      to_uppcase = 1;
+	      to_lowcase = 0;
+	    }
 	  if (modifier != 0)
 	    goto bad_format;
 #if defined _NL_CURRENT || !HAVE_STRFTIME
@@ -781,10 +793,11 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	    goto bad_format;
 #ifdef _NL_CURRENT
 	  if (! (modifier == 'E'
-		 && (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-							NLW(ERA_D_T_FMT)))
+		 && (*(subfmt =
+		       (const CHAR_T *) _NL_CURRENT (LC_TIME,
+						     NLW(ERA_D_T_FMT)))
 		     != '\0')))
-	    subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT));
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT));
 #else
 # if HAVE_STRFTIME
 	  goto underlying_strftime;
@@ -796,8 +809,10 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	subformat:
 	  {
 	    CHAR_T *old_start = p;
-	    size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp);
-	    add (len, my_strftime (p, maxsize - i, subfmt, tp));
+	    size_t len = my_strftime (NULL, (size_t) -1, subfmt,
+				      tp ut_argument);
+	    add (len, my_strftime (p, maxsize - i, subfmt,
+				   tp ut_argument));
 
 	    if (to_uppcase)
 	      while (old_start < p)
@@ -848,7 +863,7 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	      if (era)
 		{
 # ifdef COMPILE_WIDE
-		  size_t len = wcslen (era->era_wname);
+		  size_t len = __wcslen (era->era_wname);
 		  cpy (len, era->era_wname);
 # else
 		  size_t len = strlen (era->era_name);
@@ -873,10 +888,10 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	    goto bad_format;
 #ifdef _NL_CURRENT
 	  if (! (modifier == L_('E')
-		 && (*(subfmt = (CHAR_T *)_NL_CURRENT (LC_TIME,
-						       NLW(ERA_D_FMT)))
+		 && (*(subfmt =
+		       (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT)))
 		     != L_('\0'))))
-	    subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT));
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT));
 	  goto subformat;
 #else
 # if HAVE_STRFTIME
@@ -1053,14 +1068,15 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	  goto underlying_strftime;
 #endif
 
-	case L_('R'):		/* GNU extension.  */
+	case L_('R'):		/* ISO C99 extension.  */
 	  subfmt = L_("%H:%M");
 	  goto subformat;
 
 	case L_('r'):		/* POSIX.2 extension.  */
 #ifdef _NL_CURRENT
-	  if (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-						 NLW(T_FMT_AMPM))) == L_('\0'))
+	  if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME,
+						       NLW(T_FMT_AMPM)))
+	      == L_('\0'))
 #endif
 	    subfmt = L_("%I:%M:%S %p");
 	  goto subformat;
@@ -1115,10 +1131,10 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	    goto bad_format;
 #ifdef _NL_CURRENT
 	  if (! (modifier == L_('E')
-		 && (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-							NLW(ERA_T_FMT)))
+		 && (*(subfmt =
+		       (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_T_FMT)))
 		     != L_('\0'))))
-	    subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT));
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT));
 	  goto subformat;
 #else
 # if HAVE_STRFTIME
@@ -1145,8 +1161,8 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	  DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7);
 
 	case L_('V'):
-	case L_('g'):		/* GNU extension.  */
-	case L_('G'):		/* GNU extension.  */
+	case L_('g'):		/* ISO C99 extension.  */
+	case L_('G'):		/* ISO C99 extension.  */
 	  if (modifier == L_('E'))
 	    goto bad_format;
 	  {
@@ -1270,7 +1286,7 @@ my_strftime (s, maxsize, format, tp ut_argument)
 #endif
 	  break;
 
-	case L_('z'):		/* GNU extension.  */
+	case L_('z'):		/* ISO C99 extension.  */
 	  if (tp->tm_isdst < 0)
 	    break;
 

lib/stripslash.c

@@ -19,12 +19,16 @@
 # include <config.h>
 #endif
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
+#if STDC_HEADERS || HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>
 #endif
 
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == '/')
+#endif
+
 /* Remove trailing slashes from PATH.
    This is useful when using filename completion from a shell that
    adds a "/" after directory names (such as tcsh and bash), because
@@ -37,6 +41,6 @@ strip_trailing_slashes (char *path)
   int last;
 
   last = strlen (path) - 1;
-  while (last > 0 && path[last] == '/')
+  while (0 < last && ISSLASH (path[last]))
     path[last--] = '\0';
 }

lib/strnlen.c

@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@ size_t
 __strnlen (const char *string, size_t maxlen)
 {
   const char *end = memchr (string, '\0', maxlen);
-  return end ? end - string : maxlen;
+  return end ? (size_t) (end - string) : maxlen;
 }
 #ifdef weak_alias
 weak_alias (__strnlen, strnlen)

lib/strstr.c

@@ -28,11 +28,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
-#include <string.h>
+#if defined _LIBC || defined HAVE_STRING_H
+# include <string.h>
+#endif
 #include <sys/types.h>
 
 typedef unsigned chartype;
 
+#undef strstr
+
 char *
 strstr (const char *phaystack, const char *pneedle)
 {
@@ -105,7 +109,7 @@ jin:	  a = *++haystack;
 	      }
 	    while (*rhaystack == a);
 
-	  needle = rneedle;		   /* took the register-poor aproach */
+	  needle = rneedle;		   /* took the register-poor approach */
 
 	  if (a == '\0')
 	    break;

lib/strtoul.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1999, 2001 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.
@@ -19,4 +19,4 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define UNSIGNED	1
 
-#include <strtol.c>
+#include "strtol.c"

lib/strverscmp.c

@@ -26,7 +26,7 @@
 #include <ctype.h>
 
 /* states: S_N: normal, S_I: comparing integral part, S_F: comparing
-           Fractional parts, S_Z: idem but with leading Zeroes only */
+           fractional parts, S_Z: idem but with leading Zeroes only */
 #define S_N    0x0
 #define S_I    0x4
 #define S_F    0x8
@@ -36,6 +36,7 @@
 #define CMP    2
 #define LEN    3
 
+
 /* ISDIGIT differs from isdigit, as follows:
    - Its arg may be any int or unsigned int; it need not be an unsigned char.
    - It's guaranteed to evaluate its argument exactly once.
@@ -46,13 +47,20 @@
    host does not conform to Posix.  */
 #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
 
+#undef __strverscmp
+#undef strverscmp
+
+#ifndef weak_alias
+# define __strverscmp strverscmp
+#endif
+
 /* Compare S1 and S2 as strings holding indices/version numbers,
    returning less than, equal to or greater than zero if S1 is less than,
    equal to or greater than S2 (for more info, see the texinfo doc).
 */
 
 int
-strverscmp (const char *s1, const char *s2)
+__strverscmp (const char *s1, const char *s2)
 {
   const unsigned char *p1 = (const unsigned char *) s1;
   const unsigned char *p2 = (const unsigned char *) s2;
@@ -120,3 +128,6 @@ strverscmp (const char *s1, const char *s2)
       return state;
     }
 }
+#ifdef weak_alias
+weak_alias (__strverscmp, strverscmp)
+#endif

lib/tempname.c

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

lib/unicodeio.c

@@ -1,6 +1,6 @@
 /* Unicode character output to streams with locale dependent encoding.
 
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -124,13 +124,11 @@ print_unicode_char (FILE *stream, unsigned int code)
       extern const char *locale_charset PARAMS ((void));
       const char *charset = locale_charset ();
 
-      is_utf8 = (charset != NULL && !strcmp (charset, UTF8_NAME));
+      is_utf8 = !strcmp (charset, UTF8_NAME);
 #if HAVE_ICONV
       if (!is_utf8)
 	{
-	  utf8_to_local = (charset != NULL
-			   ? iconv_open (charset, UTF8_NAME)
-			   : (iconv_t)(-1));
+	  utf8_to_local = iconv_open (charset, UTF8_NAME);
 	  if (utf8_to_local == (iconv_t)(-1))
 	    {
 	      /* For an unknown encoding, assume ASCII.  */
@@ -170,7 +168,9 @@ print_unicode_char (FILE *stream, unsigned int code)
       outbytesleft = sizeof (outbuf);
 
       /* Convert the character from UTF-8 to the locale's charset.  */
-      res = iconv (utf8_to_local, &inptr, &inbytesleft, &outptr, &outbytesleft);
+      res = iconv (utf8_to_local,
+		   (ICONV_CONST char **)&inptr, &inbytesleft,
+		   &outptr, &outbytesleft);
       if (inbytesleft > 0 || res == (size_t)(-1)
 	  /* Irix iconv() inserts a NUL byte if it cannot convert. */
 # if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi)

lib/unistd-safer.h

@@ -0,0 +1,9 @@
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+int dup_safer PARAMS ((int));

lib/userspec.c

@@ -40,6 +40,14 @@ char *alloca ();
 #include <pwd.h>
 #include <grp.h>
 
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
 #if HAVE_STRING_H
 # include <string.h>
 #else
@@ -58,6 +66,7 @@ char *alloca ();
 #endif
 
 #include "xalloc.h"
+#include "xstrtol.h"
 
 #if ENABLE_NLS
 # include <libintl.h>
@@ -81,6 +90,34 @@ struct group *getgrgid ();
 # define endpwent() ((void) 0)
 #endif
 
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
+
+/* The extra casts work around common compiler bugs.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
+   It is necessary at least when t == time_t.  */
+#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
+			      ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
+#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))
+
+#ifndef UID_T_MAX
+# define UID_T_MAX TYPE_MAXIMUM (uid_t)
+#endif
+
+#ifndef GID_T_MAX
+# define GID_T_MAX TYPE_MAXIMUM (gid_t)
+#endif
+
+/* MAXUID may come from limits.h or sys/params.h.  */
+#ifndef MAXUID
+# define MAXUID UID_T_MAX
+#endif
+#ifndef MAXGID
+# define MAXGID GID_T_MAX
+#endif
+
 /* Perform the equivalent of the statement `dest = strdup (src);',
    but obtaining storage via alloca instead of from the heap.  */
 
@@ -126,8 +163,8 @@ is_number (const char *str)
    use the given user's login group.
    If SPEC_ARG contains a `:', then use that as the separator, ignoring
    any `.'s.  If there is no `:', but there is a `.', then first look
-   up SPEC_ARG as a login name.  If that look-up fails, then try again
-   interpreting the `.'  as a separator.
+   up the entire SPEC_ARG as a login name.  If that look-up fails, then
+   try again interpreting the `.'  as a separator.
 
    USERNAME and GROUPNAME will be in newly malloc'd memory.
    Either one might be NULL instead, indicating that it was not
@@ -220,8 +257,11 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 		error_msg = E_bad_spec;
 	      else
 		{
-		  /* FIXME: don't use atoi!  */
-		  *uid = atoi (u);
+		  unsigned long int tmp_long;
+		  if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+		      || tmp_long > MAXUID)
+		    return _(E_invalid_user);
+		  *uid = tmp_long;
 		}
 	    }
 	}
@@ -263,8 +303,11 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 	    error_msg = E_invalid_group;
 	  else
 	    {
-	      /* FIXME: don't use atoi!  */
-	      *gid = atoi (g);
+	      unsigned long int tmp_long;
+	      if (xstrtoul (g, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+		  || tmp_long > MAXGID)
+		return _(E_invalid_group);
+	      *gid = tmp_long;
 	    }
 	}
       else

lib/version-etc.c

@@ -1,5 +1,5 @@
 /* Utility to help print --version output in a consistent format.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 /* Default copyright goes to the FSF. */
 
 char* version_etc_copyright =
-  N_("Copyright (C) 2000 Free Software Foundation, Inc.");
+  N_("Copyright (C) 2001 Free Software Foundation, Inc.");
 
 
 /* Display the --version information the standard way.

lib/xalloc.h

@@ -1,5 +1,5 @@
 /* xalloc.h -- malloc with out-of-memory checking
-   Copyright (C) 1990-1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/xmalloc.c

@@ -47,11 +47,11 @@ void free ();
 #endif
 
 #ifndef HAVE_DONE_WORKING_MALLOC_CHECK
-you must run the autoconf test for a properly working malloc -- see malloc.m4
+"you must run the autoconf test for a properly working malloc -- see malloc.m4"
 #endif
 
 #ifndef HAVE_DONE_WORKING_REALLOC_CHECK
-you must run the autoconf test for a properly working realloc -- see realloc.m4
+"you must run the autoconf test for a properly working realloc --see realloc.m4"
 #endif
 
 /* Exit value when the requested amount of memory is not available.

lib/xstat.in

@@ -52,7 +52,7 @@ void free ();
 
 char *xmalloc ();
 
-/* lstat works different on Linux and Solaris systems.  POSIX (see
+/* lstat works differently on Linux and Solaris systems.  POSIX (see
    `pathname resolution' in the glossary) requires that programs like `ls'
    take into consideration the fact that FILE has a trailing slash when
    FILE is a symbolic link.  On Linux systems, the lstat function already

lib/xstrtol.c

@@ -199,6 +199,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base,
 	  break;
 
 	case 'G': /* Giga */
+	case 'g': /* 'g' is undocumented; for compatibility only */
 	  overflow = bkm_scale_by_power (&tmp, base, 3);
 	  break;
 
@@ -207,7 +208,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base,
 	  break;
 
 	case 'M': /* Mega */
-	case 'm': /* 'm' is undocumented; for backward compatibility only */
+	case 'm': /* 'm' is undocumented; for compatibility only */
 	  overflow = bkm_scale_by_power (&tmp, base, 2);
 	  break;
 
@@ -216,6 +217,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base,
 	  break;
 
 	case 'T': /* Tera */
+	case 't': /* 't' is undocumented; for compatibility only */
 	  overflow = bkm_scale_by_power (&tmp, base, 4);
 	  break;
 

m4/ChangeLog

@@ -1,3 +1,216 @@
+2001-03-17  Jim Meyering  <meyering@lucent.com>
+
+	* memcmp.m4 (jm_AC_FUNC_MEMCMP): Remove my copy of AC_FUNC_MEMCMP,
+	now that the version in autoconf is equivalent.
+	(jm_FUNC_MEMCMP): Adjust to use AC_FUNC_MEMCMP.
+
+	* error.m4 (jm_PREREQ_ERROR): Invoke AC_FUNC_STRERROR_R.
+	Suggestion from Akim Demaille.
+
+	* prereq.m4 (jm_PREREQ): Add jm_PREREQ_TEMPNAME.
+	(jm_PREREQ_TEMPNAME): New function.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	* jm-macros.m4 (jm_MACROS): Use mkstemp replacement if the system
+	lacks mkstemp.  Compile our own tempname.c if we compile our own
+	mkstemp.c, as mkstemp relies on tempname.
+
+2001-03-01  Jim Meyering  <meyering@lucent.com>
+
+	* dos.m4 (jm_AC_DOS): Remove extra backslashes, now that
+	AH_VERBATIM really does output its argument verbatim.
+
+2001-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	* jm-macros.m4 (jm_CHECK_ALL_HEADERS): Check for sys/resource.h.
+
+2001-02-17  Jim Meyering  <meyering@lucent.com>
+
+	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Don't check for
+	getmntent via AC_CHECK_FUNCS, since that would get a `no' and disrupt
+	further attempts by AC_FUNC_GETMNTENT to check with e.g., -lgen on
+	UnixWare 7.1.1.
+
+	* mbrtowc.m4 (jm_FUNC_MBRTOWC): Adapt to use AC_CACHE_CHECK etc.,
+	rather than AC_CACHE_VAL.
+
+2001-02-17  Paul Eggert  <eggert@twinsun.com>
+
+	* mbrtowc.m4: New file, defining jm_FUNC_MBRTOWC.
+	* mbswidth.m4 (jm_PREREQ_MBSWIDTH):
+	Use jm_FUNC_MBRTOWC, not AC_CHECK_FUNCS(mbrtowc).
+	* prereq.m4 (jm_PREREQ_QUOTEARG): Likewise.
+
+2001-02-07  Jim Meyering  <meyering@lucent.com>
+
+	* regex.m4 (jm_INCLUDED_REGEX): Add a test for the latest bug.
+
+2001-02-05  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4: Require autoconf-2.14d (not yet released), because
+	it includes the patch required for `large file' support with at least
+	HP-UX's 10.20 /bin/cc.
+
+2001-02-03  Jim Meyering  <meyering@lucent.com>
+
+	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Restore prior use of
+	AS_IF, now that it works once again (mysteriously).
+	* fsusage.m4 (jm_FILE_SYSTEM_USAGE): Likewise.
+
+2001-01-30  Jim Meyering  <meyering@lucent.com>
+
+	Don't use filenames that are 8.3-equivalent to "conftest" on DOS.
+	* chown.m4: Rename conftestchown to conftest.chown.
+	* rename.m4: s/conftestdir/conftest.d1/ and s/conftestdir2/conftest.d2/.
+	* utimes.m4: s/conftestdata/conftest.data/
+	Inspired by Pavel Roskin's change in autoconf.
+
+2001-01-27  Jim Meyering  <meyering@lucent.com>
+
+	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Open-code what was
+	a use of AS_IF.
+	* fsusage.m4 (jm_FILE_SYSTEM_USAGE): Likewise.
+
+2001-01-26  Jim Meyering  <meyering@lucent.com>
+
+	* prereq.m4 (jm_PREREQ_QUOTEARG): Check for stddef.h, now that
+	quotearg.c includes it.
+
+2001-01-15  Bruno Haible  <haible@clisp.cons.org>
+
+	* iconv.m4 (jm_ICONV): Also check whether the iconv declaration
+	has const.
+
+2001-01-20  Jim Meyering  <meyering@lucent.com>
+
+	Be sure that headers are checked before used in code compiled
+	for the type checks.
+	* jm-macros.m4 (jm_MACROS): Remove all header checks.
+	In place of that, invoke jm_CHECK_ALL_TYPES.
+	(jm_CHECK_ALL_HEADERS): New functions with the above checks.
+	(jm_CHECK_ALL_TYPES): Require jm_CHECK_ALL_HEADERS.
+	Alan Iwi reported a build failure on an f300-fujitsu-uxpv4.1_ES;
+	The check for ssize_t was mistakenly run before the test for unistd.h.
+
+	The configure-time check for stdbool.h was missing.
+	* prereq.m4 (jm_PREREQ): Add jm_PREREQ_HASH.
+	(jm_PREREQ_HASH): New function.
+
+2001-01-17  Jim Meyering  <meyering@lucent.com>
+
+	* fsusage.m4 (jm_FILE_SYSTEM_USAGE): Use AS_IF, not AS_IFELSE,
+	for autoconf-2.49c.
+	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Likewise.
+
+2001-01-14  Jim Meyering  <meyering@lucent.com>
+
+	* rename.m4: Use temporary directories named conftestdir{,2}, not
+	foo and bar.  Create conftestdir/ in the script, not in the C code.
+	Remove directories in the script, not in the C code.
+	Remove conftestdir{,2} before trying to create the directory.
+	Make the entire configure script fail if the mkdir fails.
+
+2001-01-02  Volker Borchert  <bt@teknon.de>
+
+	* rename.m4: New file.
+	* jm-macros.m4 (jm_MACROS): Require vb_FUNC_RENAME.
+
+2001-01-01  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* libintl.m4 (AM_GNU_GETTEXT): Define MKINSTALLDIRS by
+	expanding the value of $ac_aux_dir, as in AM_MISSING_HAS_RUN,
+	so `make install' also works in VPATH builds.
+
+2001-01-01  Jim Meyering  <meyering@lucent.com>
+
+	* prereq.m4 (jm_PREREQ_READUTMP): Include utmp.h (if available), even
+	on systems with utmpx.h.  It's necessary for the declaration of utmp's
+	ut_user member.  Reported by Andreas Jaeger.
+
+	* check-decl.m4 (jm_CHECK_DECLS): Include grp.h and pwd.h if available.
+	They are required for the declarations of getgrgid and getpwuid resp.
+	(_jm_DECL_HEADERS): Check for grp.h and pwd.h.
+	Reported by Andreas Jaeger.
+
+2000-12-25  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* libintl.m4 (AM_WITH_NLS): When using AC_CONFIG_AUX_DIR,
+	prepend $(top_srcdir) to the value of MKINSTALLDIRS so that it
+	can be used in subdirectories.
+
+2000-12-26  Jim Meyering  <meyering@lucent.com>
+
+	* dos.m4 (jm_AC_DOS): Rewrite (though it's still a stub) to work better
+	with autoheader.
+
+2000-12-17  Jim Meyering  <meyering@lucent.com>
+
+	* dos.m4 (jm_AC_DOS): New file and macro.
+	* jm-macros.m4 (jm_MACROS): Require jm_AC_DOS.
+
+2000-12-06  Paul Eggert  <eggert@twinsun.com>
+
+	* off_t-format.m4: Remove this file.
+	* jm-macros.m4 (jm_MACROS): Remove jm_SYS_OFF_T_PRINTF_FORMAT.
+
+2000-12-06  Jim Meyering  <meyering@lucent.com>
+
+	* xstrtoumax.m4 (jm_AC_PREREQ_XSTRTOUMAX): If we need the replacement
+	strtoull, we may well need the replacement strtoul, too.
+	Check for declarations of strtoul and strtoull.
+	Check for strtol.  Mainly as a cue to cause automake to include
+	strtol.c -- that file is included by each of strtoul.c and strtoull.c.
+	Check for limits.h -- strtol.c needs it.
+
+2000-12-02  Jim Meyering  <meyering@lucent.com>
+
+	* off_t-format.m4 (OFF_T_PRINTF_FORMAT_STRING): New file/macro.
+	* jm-macros.m4 (jm_MACROS): require it.
+
+2000-11-30  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4 (jm_MACROS): Check for stdint.h.
+
+2000-11-30  Jim Meyering  <meyering@lucent.com>
+
+	* getloadavg.m4: s/ifval/m4_ifval/ to accommodate new autoconf.
+
+2000-11-03  Bruno Haible  <haible@clisp.cons.org>
+
+	* jm-macros.m4 (jm_MACROS): Add test for wcrtomb.
+
+2000-11-04  Jim Meyering  <meyering@lucent.com>
+
+	* regex.m4: Use the `m4_' prefix on `syscmd' and `m4_sysval'.
+
+2000-10-29  Jim Meyering  <meyering@lucent.com>
+
+	* fsusage.m4: s/AC_SHELL_IFELSE/AS_IFELSE/ to match autoconf renaming.
+	* ls-mntd-fs.m4: Likewise
+
+2000-10-28  Jim Meyering  <meyering@lucent.com>
+
+	* prereq.m4 (jm_PREREQ): Add jm_PREREQ_MEMCHR.
+	(jm_PREREQ_MEMCHR): New function.
+
+2000-10-21  Jim Meyering  <meyering@lucent.com>
+
+	* check-decl.m4 (jm_CHECK_DECLS): Also check for memrchr.
+	* prereq.m4 (jm_PREREQ_DIRNAME): New macro.
+	* jm-macros.m4 (AC_REPLACE_FUNCS): Add memrchr.
+
+2000-09-18  Jim Meyering  <meyering@lucent.com>
+
+	* getloadavg.m4 (AC_FUNC_GETLOADAVG): Restore the initial value of LIBS.
+	Otherwise, everyone ends up linking with -lelf for some configurations.
+	Reported by Mike Stone.
+
+2000-08-26  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4: Use jm_FUNC_FPENDING.
+	* fpending.m4: New file.
+
 2000-08-20  Jim Meyering  <meyering@lucent.com>
 
 	* check-decl.m4: Include utmp.h `#if HAVE_UTMP_H', rather than
@@ -13,7 +226,7 @@
 
 2000-08-06  Paul Eggert  <eggert@twinsun.com>
 
-	* m4/mbstate_t.m4 (AC_MBSTATE_T): Define mbstate_t to be int,
+	* mbstate_t.m4 (AC_MBSTATE_T): Define mbstate_t to be int,
 	not char, for compatibility with glibc 2.1.3 strftime.c.
 
 2000-07-23  Paul Eggert  <eggert@twinsun.com>
@@ -27,8 +240,8 @@
 
 2000-07-16  Bruno Haible  <haible@clisp.cons.org>
 
-        * mbswidth.m4: New file.
-        * prereq.m4 (jm_PREREQ): Call jm_PREREQ_MBSWIDTH.
+	* mbswidth.m4: New file.
+	* prereq.m4 (jm_PREREQ): Call jm_PREREQ_MBSWIDTH.
 
 2000-07-14  Jim Meyering  <meyering@lucent.com>
 
@@ -219,7 +432,7 @@
 2000-05-26  Bruno Haible  <haible@clisp.cons.org>
 
 	* glibc21.m4: New file.
-	* jm-macros.m4: (jm_MACROS): Call jm_GLIBC21.
+	* jm-macros.m4 (jm_MACROS): Call jm_GLIBC21.
 
 2000-05-28  Jim Meyering  <meyering@lucent.com>
 
@@ -270,7 +483,7 @@
 	* rmdir-errno.m4 (fetish_FUNC_RMDIR_NOTEMPTY): New macro and file.
 	* jm-macros.m4: Require fetish_FUNC_RMDIR_NOTEMPTY.
 
-	* nanosleep.m4: (jm_FUNC_NANOSLEEP): Save and restore LIBS around
+	* nanosleep.m4 (jm_FUNC_NANOSLEEP): Save and restore LIBS around
 	AC_SEARCH_LIBS call for nanosleep.
 	(LIB_NANOSLEEP): Set and AC_SUBST.
 
@@ -319,13 +532,13 @@
 2000-04-17  Jim Meyering  <meyering@lucent.com>
 
 	Get it right :-)
-	* jm-macros.m4: (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Emit the
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Emit the
 	actual #define via AH_VERBATIM.  Don't need separate AC_DEFINE.
 	Suggestion from Akim Demaille.
 
 2000-04-14  Jim Meyering  <meyering@lucent.com>
 
-	* jm-macros.m4: (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Use the one-arg form
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Use the one-arg form
 	of AC_DEFINE.  Otherwise, the #ifndef in AH_VERBATIM gets clobbered.
 
 2000-04-13  Jim Meyering  <meyering@lucent.com>
@@ -454,7 +667,7 @@
 
 2000-02-05  Jim Meyering  <meyering@lucent.com>
 
-	* jm-macros.m4: (jm_CHECK_ALL_TYPES): Require most macros.
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES): Require most macros.
 	Remove explicit use of AC_HEADER_TIME.  It is required by
 	jm_CHECK_TYPE_STRUCT_TIMESPEC.  Using AC_HEADER_TIME and
 	`AC_REQUIRE'ing jm_CHECK_TYPE_STRUCT_TIMESPEC provoked a but
@@ -515,10 +728,10 @@
 	(jm_FILE_SYSTEM_USAGE): Take two parameters.
 
 	* ftruncate.m4: New file (derived from part of fileutils/configure.in).
-	* jm-macros.m4: (jm_FUNC_FTRUNCATE): AC_REQUIRE it.
+	* jm-macros.m4 (jm_FUNC_FTRUNCATE): AC_REQUIRE it.
 	(jm_CHECK_ALL_TYPES): Require AC_HEADER_MAJOR and AC_HEADER_DIRENT.
 
-	* jm-macros.m4: (OPTIONAL_BIN_PROGS, OPTIONAL_BIN_ZCRIPTS, MAN):
+	* jm-macros.m4 (OPTIONAL_BIN_PROGS, OPTIONAL_BIN_ZCRIPTS, MAN):
 	AC_SUBST these here, rather than just in sh-util/configure.in, so
 	that the now-shared-by-fileutils-and-textutils lib/Makefile.am are
 	all the same.
@@ -608,7 +821,7 @@
 
 	* d-type.m4 (jm_CHECK_TYPE_STRUCT_DIRENT_D_TYPE): Rename from
 	jm_STRUCT_DIRENT_D_TYPE.
-	* d-ino.m4: (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Rename from
+	* d-ino.m4 (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Rename from
 	jm_STRUCT_DIRENT_D_INO.
 	* utimbuf.m4 (jm_CHECK_TYPE_STRUCT_UTIMBUF): Rename from
 	jm_STRUCT_UTIMBUF.
@@ -797,7 +1010,7 @@
 
 1999-07-15  Jim Meyering  <meyering@ascend.com>
 
-	* jm-macros.m4: (AC_CHECK_FUNCS): Check for getpagesize.
+	* jm-macros.m4 (AC_CHECK_FUNCS): Check for getpagesize.
 
 1999-05-22  Jim Meyering  <meyering@ascend.com>
 

m4/Makefile.am

@@ -11,8 +11,10 @@ chown.m4 \
 codeset.m4 \
 d-ino.m4 \
 d-type.m4 \
+dos.m4 \
 error.m4 \
 fnmatch.m4 \
+fpending.m4 \
 fstypename.m4 \
 fsusage.m4 \
 ftruncate.m4 \
@@ -39,6 +41,7 @@ link-follow.m4 \
 ls-mntd-fs.m4 \
 lstat.m4 \
 malloc.m4 \
+mbrtowc.m4 \
 mbstate_t.m4 \
 mbswidth.m4 \
 memcmp.m4 \
@@ -50,6 +53,7 @@ putenv.m4 \
 readdir.m4 \
 realloc.m4 \
 regex.m4 \
+rename.m4 \
 rmdir-errno.m4 \
 search-libs.m4 \
 st_dm_mode.m4 \

m4/Makefile.in

@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
 
-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -46,7 +47,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -56,9 +57,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 
-@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
+
+@SET_MAKE@
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
@@ -66,8 +68,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -81,6 +81,8 @@ GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -106,11 +108,13 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
+STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
+_am_include = @_am_include@
 install_sh = @install_sh@
 l = @l@
 
@@ -125,8 +129,10 @@ chown.m4 \
 codeset.m4 \
 d-ino.m4 \
 d-type.m4 \
+dos.m4 \
 error.m4 \
 fnmatch.m4 \
+fpending.m4 \
 fstypename.m4 \
 fsusage.m4 \
 ftruncate.m4 \
@@ -153,6 +159,7 @@ link-follow.m4 \
 ls-mntd-fs.m4 \
 lstat.m4 \
 malloc.m4 \
+mbrtowc.m4 \
 mbstate_t.m4 \
 mbswidth.m4 \
 memcmp.m4 \
@@ -164,6 +171,7 @@ putenv.m4 \
 readdir.m4 \
 realloc.m4 \
 regex.m4 \
+rename.m4 \
 rmdir-errno.m4 \
 search-libs.m4 \
 st_dm_mode.m4 \
@@ -181,31 +189,35 @@ utime.m4 \
 utimes.m4 \
 xstrtoumax.m4
 
+EXEEXT =
+OBJEXT = o
 subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  README ChangeLog Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = README ChangeLog Makefile.am Makefile.in
 
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile
+
+$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits  m4/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 tags: TAGS
 TAGS:
 
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
@@ -219,31 +231,25 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile
 
-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:
 
+installcheck: installcheck-am
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 
 mostlyclean-generic:
 
@@ -254,31 +260,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am
 
-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am
 
 
 Makefile.am: Makefile.am.in

m4/README

@@ -3,7 +3,7 @@ and textutils packages.
 
 These files are used by a program called aclocal (part of the GNU automake
 package).  aclocal uses these files to create aclocal.m4 which is in turn
-used by autoconf to create the configure script at the the top level in
+used by autoconf to create the configure script at the top level in
 this distribution.
 
 The Makefile.am file in this directory is automatically generated

m4/check-decl.m4

@@ -1,4 +1,4 @@
-#serial 15
+#serial 17
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
@@ -41,6 +41,14 @@ AC_DEFUN(jm_CHECK_DECLS,
 #if HAVE_UTMP_H
 # include <utmp.h>
 #endif
+
+#if HAVE_GRP_H
+# include <grp.h>
+#endif
+
+#if HAVE_PWD_H
+# include <pwd.h>
+#endif
 '
 
   AC_CHECK_DECLS([
@@ -55,6 +63,7 @@ AC_DEFUN(jm_CHECK_DECLS,
     lseek,
     malloc,
     memchr,
+    memrchr,
     nanosleep,
     realloc,
     stpcpy,
@@ -71,6 +80,6 @@ dnl This is a little helper so we can require these header checks.
 AC_DEFUN(_jm_DECL_HEADERS,
 [
   AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS(memory.h string.h strings.h stdlib.h unistd.h sys/time.h \
-                   utmp.h utmpx.h)
+  AC_CHECK_HEADERS(grp.h memory.h pwd.h string.h strings.h stdlib.h \
+                   unistd.h sys/time.h utmp.h utmpx.h)
 ])

m4/chown.m4

@@ -1,4 +1,4 @@
-#serial 5
+#serial 6
 
 dnl From Jim Meyering.
 dnl Determine whether chown accepts arguments of -1 for uid and gid.
@@ -21,7 +21,7 @@ AC_DEFUN(jm_FUNC_CHOWN,
     int
     main ()
     {
-      char *f = "conftestchown";
+      char *f = "conftest.chown";
       struct stat before, after;
 
       if (creat (f, 0600) < 0)

m4/dos.m4

@@ -0,0 +1,41 @@
+# serial 3
+
+# Define some macros required for proper operation of code in lib/*.c
+# on MSDOS/Windows systems.
+
+# From Jim Meyering.
+
+AC_DEFUN(jm_AC_DOS,
+  [
+    # FIXME: this is incomplete.  Add a compile-test that does something
+    # like this:
+    #if defined _WIN32 || defined __WIN32__ || defined __MSDOS__
+
+    AH_VERBATIM(FILESYSTEM_PREFIX_LEN,
+    [#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+# define FILESYSTEM_PREFIX_LEN(Filename) \
+  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
+else
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
+#endif])
+
+    ac_fs_accepts_drive_letter_prefix=0
+    AC_DEFINE_UNQUOTED([FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
+      $ac_fs_accepts_drive_letter_prefix,
+      [Define on systems for which file names may have a so-called
+       `drive letter' prefix, define this to compute the length of that
+       prefix, including the colon.])
+
+    AH_VERBATIM(ISSLASH,
+    [#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#else
+# define ISSLASH(C) ((C) == '/')
+#endif])
+
+    ac_fs_backslash_is_file_name_separator=0
+    AC_DEFINE_UNQUOTED([FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
+      $ac_fs_backslash_is_file_name_separator,
+      [Define if the backslash character may also serve as a file name
+       component separator.])
+  ])

m4/error.m4

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

m4/fpending.m4

@@ -0,0 +1,75 @@
+#serial 1
+
+dnl From Jim Meyering
+dnl Using code from emacs, based on suggestions from Paul Eggert
+dnl and Ulrich Drepper.
+
+dnl Find out how to determine the number of pending output bytes on a stream.
+dnl glibc (2.1.93 and newer) and Solaris provide __fpending.  On other systems,
+dnl we have to grub around in the FILE struct.
+
+AC_DEFUN(jm_FUNC_FPENDING,
+[
+  AC_CHECK_HEADERS(stdio_ext.h)
+  AC_REPLACE_FUNCS([__fpending])
+  fp_headers='
+#     if HAVE_STDIO_EXT_H
+#      include <stdio_ext.h>
+#     endif
+'
+  AC_CHECK_DECLS([__fpending], , , $fp_headers)
+  if test $ac_cv_func___fpending = no; then
+    AC_CACHE_CHECK(
+	      [how to determine the number of pending output bytes on a stream],
+		   ac_cv_sys_pending_output_n_bytes,
+      [
+        fp_save_DEFS=$DEFS
+	for ac_expr in						\
+								\
+	    '# glibc2'						\
+	    'fp->_IO_write_ptr - fp->_IO_write_base'		\
+								\
+	    '# traditional Unix'				\
+	    'fp->_ptr - fp->_base'				\
+								\
+	    '# BSD'						\
+	    'fp->_p - fp->_bf._base'				\
+								\
+	    '# SCO, Unixware'					\
+	    'fp->__ptr - fp->__base'				\
+								\
+	    '# old glibc?'					\
+	    'fp->__bufp - fp->__buffer'				\
+								\
+	    '# old glibc iostream?'				\
+	    'fp->_pptr - fp->_pbase'				\
+								\
+	    '# VMS'						\
+	    '(*fp)->_ptr - (*fp)->_base'			\
+								\
+	    '# e.g., DGUX R4.11; the info is not available'	\
+	    1							\
+	    ; do
+
+	  # Skip each embedded comment.
+	  case "$ac_expr" in '#'*) continue;; esac
+
+	  DEFS="$DEFS -DPENDING_OUTPUT_N_BYTES=$ac_expr"
+	  AC_TRY_COMPILE(
+	    [#include <stdio.h>
+	    ],
+	    [FILE *fp = stdin; (void) ($ac_expr);],
+	    fp_done=yes
+	  )
+	  DEFS=$fp_save_DEFS
+	  test "$fp_done" = yes && break
+	done
+
+	ac_cv_sys_pending_output_n_bytes=$ac_expr
+      ]
+    )
+    AC_DEFINE_UNQUOTED(PENDING_OUTPUT_N_BYTES,
+      $ac_cv_sys_pending_output_n_bytes,
+      [the number of pending output bytes on stream `fp'])
+  fi
+])

m4/fsusage.m4

@@ -1,4 +1,4 @@
-#serial 3
+#serial 7
 
 # From fileutils/configure.in
 
@@ -179,14 +179,15 @@ if test $ac_fsusage_space = no; then
 fi
 
 if test $ac_fsusage_space = no; then
-# SVR2
-AC_TRY_CPP([#include <sys/filsys.h>],
-  AC_DEFINE(STAT_READ_FILSYS, 1,
-[  Define if there is no specific function for reading filesystems usage
-   information and you have the <sys/filsys.h> header file.  (SVR2)])
-  ac_fsusage_space=yes)
+  # SVR2
+  AC_TRY_CPP([#include <sys/filsys.h>
+    ],
+    AC_DEFINE(STAT_READ_FILSYS, 1,
+      [Define if there is no specific function for reading filesystems usage
+       information and you have the <sys/filsys.h> header file.  (SVR2)])
+    ac_fsusage_space=yes)
 fi
 
-AC_SHELL_IFELSE([test $ac_fsusage_space = yes], [$1], [$2])dnl
+AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
 
 ])

m4/getloadavg.m4

@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 
 # A replacement for autoconf's macro by the same name.  This version
 # accepts an optional argument specifying the name of the $srcdir-relative
@@ -15,7 +15,7 @@ AC_DEFUN([AC_FUNC_GETLOADAVG],
 # By default, expect to find getloadavg.c in $srcdir/.
 ac_lib_dir_getloadavg=$srcdir
 # But if there's an argument, DIR, expect to find getloadavg.c in $srcdir/DIR.
-ifval([$1], [ac_lib_dir_getloadavg=$srcdir/$1])
+m4_ifval([$1], [ac_lib_dir_getloadavg=$srcdir/$1])
 # Make sure getloadavg.c is where it belongs, at ./configure-time.
 test -f $ac_lib_dir_getloadavg/getloadavg.c \
   || AC_MSG_ERROR([getloadavg.c is not in $ac_lib_dir_getloadavg])
@@ -99,5 +99,7 @@ if test "x$ac_save_LIBS" = x; then
 else
   GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$ac_save_LIBS!!"`
 fi
+LIBS=$ac_save_LIBS
+
 AC_SUBST(GETLOADAVG_LIBS)dnl
 ])# AC_FUNC_GETLOADAVG

m4/iconv.m4

@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 dnl From Bruno Haible.
 
@@ -30,6 +30,27 @@ AC_DEFUN(jm_ICONV,
   ])
   if test "$jm_cv_func_iconv" = yes; then
     AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(jm_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t* outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], jm_cv_proto_iconv_arg1="", jm_cv_proto_iconv_arg1="const")
+      jm_cv_proto_iconv="extern size_t iconv (iconv_t cd, $jm_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t* outbytesleft);"])
+    jm_cv_proto_iconv=`echo "[$]jm_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]jm_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $jm_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
   fi
   LIBICONV=
   if test "$jm_cv_lib_iconv" = yes; then

m4/jm-macros.m4

@@ -1,10 +1,10 @@
-#serial 25
+#serial 34   -*- autoconf -*-
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
 AC_DEFUN(jm_MACROS,
 [
-  AC_PREREQ(2.14a)
+  AC_PREREQ(2.14d)
 
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
@@ -19,44 +19,7 @@ AC_DEFUN(jm_MACROS,
   dnl This macro actually runs replacement code.  See isc-posix.m4.
   AC_REQUIRE([AC_ISC_POSIX])dnl
 
-  AC_CHECK_HEADERS( \
-    errno.h  \
-    fcntl.h \
-    fenv.h \
-    float.h \
-    limits.h \
-    memory.h \
-    mntent.h \
-    mnttab.h \
-    netdb.h \
-    paths.h \
-    stdlib.h \
-    stddef.h \
-    string.h \
-    sys/acl.h \
-    sys/filsys.h \
-    sys/fs/s5param.h \
-    sys/fs_types.h \
-    sys/fstyp.h \
-    sys/ioctl.h \
-    sys/mntent.h \
-    sys/mount.h \
-    sys/param.h \
-    sys/socket.h \
-    sys/statfs.h \
-    sys/statvfs.h \
-    sys/systeminfo.h \
-    sys/time.h \
-    sys/timeb.h \
-    sys/vfs.h \
-    sys/wait.h \
-    syslog.h \
-    termios.h \
-    unistd.h \
-    utime.h \
-    values.h \
-  )
-
+  jm_CHECK_ALL_TYPES
   jm_INCLUDED_REGEX([lib/regex.c])
 
   AC_REQUIRE([jm_BISON])
@@ -92,6 +55,7 @@ AC_DEFUN(jm_MACROS,
   AC_REQUIRE([AM_FUNC_ERROR_AT_LINE])
   AC_REQUIRE([jm_FUNC_GNU_STRFTIME])
   AC_REQUIRE([jm_FUNC_MKTIME])
+  AC_REQUIRE([jm_FUNC_FPENDING])
 
   AC_REQUIRE([jm_FUNC_GETGROUPS])
   test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
@@ -101,6 +65,7 @@ AC_DEFUN(jm_MACROS,
   AC_FUNC_GETLOADAVG([lib])
   AC_REQUIRE([jm_SYS_PROC_UPTIME])
   AC_REQUIRE([jm_FUNC_FTRUNCATE])
+  AC_REQUIRE([vb_FUNC_RENAME])
 
   AC_REPLACE_FUNCS(strcasecmp strncasecmp)
   AC_REPLACE_FUNCS(dup2)
@@ -115,9 +80,14 @@ AC_DEFUN(jm_MACROS,
   dnl used by e.g. intl/*domain.c and lib/canon-host.c
   AC_REPLACE_FUNCS(strdup)
 
-  AC_REPLACE_FUNCS(memchr memmove memcpy memset)
+  AC_REPLACE_FUNCS(memchr memcpy memmove memrchr memset)
   AC_CHECK_FUNCS(getpagesize)
 
+  AC_REPLACE_FUNCS(mkstemp)
+  if test $ac_cv_func_mkstemp != yes; then
+    AC_LIBOBJ(tempname)
+  fi
+
   # By default, argmatch should fail calling usage (1).
   AC_DEFINE(ARGMATCH_DIE, [usage (1)],
 	    [Define to the function xargmatch calls on failures.])
@@ -175,6 +145,7 @@ AC_DEFUN(jm_MACROS,
     strerror \
     strrchr \
     sysinfo \
+    wcrtomb \
     tzset \
   )
 
@@ -220,9 +191,56 @@ AC_DEFUN(jm_MACROS,
     AC_LIBOBJ(fsusage)
     AC_LIBOBJ(mountlist)
   fi
+  AC_REQUIRE([jm_AC_DOS])
 
 ])
 
+# These tests must be run before any use of AC_CHECK_TYPE,
+# because that macro compiles code that tests e.g., HAVE_UNISTD_H.
+# See the definition of ac_includes_default in `configure'.
+AC_DEFUN(jm_CHECK_ALL_HEADERS,
+[
+  AC_CHECK_HEADERS( \
+    errno.h  \
+    fcntl.h \
+    fenv.h \
+    float.h \
+    limits.h \
+    memory.h \
+    mntent.h \
+    mnttab.h \
+    netdb.h \
+    paths.h \
+    stdlib.h \
+    stddef.h \
+    stdint.h \
+    string.h \
+    sys/acl.h \
+    sys/filsys.h \
+    sys/fs/s5param.h \
+    sys/fs_types.h \
+    sys/fstyp.h \
+    sys/ioctl.h \
+    sys/mntent.h \
+    sys/mount.h \
+    sys/param.h \
+    sys/resource.h \
+    sys/socket.h \
+    sys/statfs.h \
+    sys/statvfs.h \
+    sys/systeminfo.h \
+    sys/time.h \
+    sys/timeb.h \
+    sys/vfs.h \
+    sys/wait.h \
+    syslog.h \
+    termios.h \
+    unistd.h \
+    utime.h \
+    values.h \
+  )
+])
+
 # This macro must be invoked before any tests that run the compiler.
 AC_DEFUN(jm_CHECK_ALL_TYPES,
 [
@@ -249,6 +267,7 @@ AC_DEFUN(jm_CHECK_ALL_TYPES,
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_C_LONG_DOUBLE])
 
+  AC_REQUIRE([jm_CHECK_ALL_HEADERS])
   AC_REQUIRE([AC_HEADER_DIRENT])
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_MEMBERS([struct stat.st_blksize],,,[$ac_includes_default

m4/libintl.m4

@@ -6,7 +6,7 @@
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 109
+# serial 110
 
 AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
 
@@ -289,7 +289,7 @@ strdup __argz_count __argz_stringify __argz_next])
    dnl Try to locate it.
    MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+     MKINSTALLDIRS="`CDPATH=:; cd $ac_aux_dir && pwd`/mkinstalldirs"
    fi
    if test -z "$MKINSTALLDIRS"; then
      MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"

m4/ls-mntd-fs.m4

@@ -1,4 +1,4 @@
-#serial 5
+#serial 10
 
 dnl From Jim Meyering.
 dnl
@@ -6,12 +6,10 @@ dnl This is not pretty.  I've just taken the autoconf code and wrapped
 dnl it in an AC_DEFUN.
 dnl
 
-AC_PREREQ(2.14a)
-
 # jm_LIST_MOUNTED_FILESYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 AC_DEFUN(jm_LIST_MOUNTED_FILESYSTEMS,
   [
-AC_CHECK_FUNCS(listmntent getmntent getmntinfo)
+AC_CHECK_FUNCS(listmntent getmntinfo)
 AC_CHECK_HEADERS(mntent.h)
 
 # Determine how to get the list of mounted filesystems.
@@ -239,6 +237,6 @@ if test -z "$ac_list_mounted_fs"; then
   # Can't build mountlist.c or anything that needs its functions
 fi
 
-AC_SHELL_IFELSE([test $ac_list_mounted_fs = found], [$1], [$2])dnl
+AS_IF([test $ac_list_mounted_fs = found], [$1], [$2])
 
   ])

m4/mbrtowc.m4

@@ -0,0 +1,18 @@
+#serial 2
+
+dnl From Paul Eggert
+
+AC_DEFUN(jm_FUNC_MBRTOWC,
+[
+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
+    jm_cv_func_mbrtowc,
+    [AC_TRY_LINK(
+       [@%:@include <wchar.h>],
+       [mbstate_t state; return ! (sizeof state && mbrtowc);],
+       jm_cv_func_mbrtowc=yes,
+       jm_cv_func_mbrtowc=no)])
+  if test $jm_cv_func_mbrtowc = yes; then
+    AC_DEFINE(HAVE_MBRTOWC, 1,
+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
+  fi
+])

m4/mbswidth.m4

@@ -1,4 +1,4 @@
-#serial 2
+#serial 4
 
 dnl autoconf tests required for use of mbswidth.c
 dnl From Bruno Haible.
@@ -8,7 +8,8 @@ AC_DEFUN(jm_PREREQ_MBSWIDTH,
   AC_REQUIRE([AC_HEADER_STDC])
   AC_REQUIRE([AM_C_PROTOTYPES])
   AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
-  AC_CHECK_FUNCS(isascii iswprint mbrtowc wcwidth)
+  AC_CHECK_FUNCS(isascii iswprint wcwidth)
+  jm_FUNC_MBRTOWC
   headers='
 #     if HAVE_WCHAR_H
 #      include <wchar.h>

m4/memcmp.m4

@@ -1,47 +1,8 @@
-#serial 5
-
-dnl A replacement for autoconf's AC_FUNC_MEMCMP that detects
-dnl the losing memcmp on some x86 Next systems.
-AC_DEFUN(jm_AC_FUNC_MEMCMP,
-[AC_CACHE_CHECK([for working memcmp], jm_cv_func_memcmp_working,
-[AC_TRY_RUN(
-[int
-main ()
-{
-  /* Some versions of memcmp are not 8-bit clean.  */
-  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-    exit (1);
-
-  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-     or more and with at least one buffer not starting on a 4-byte boundary.
-     William Lewis provided this test program.   */
-  {
-    char foo[21];
-    char bar[21];
-    int i;
-    for (i = 0; i < 4; i++)
-      {
-	char *a = foo + i;
-	char *b = bar + i;
-	strcpy (a, "--------01111111");
-	strcpy (b, "--------10000000");
-	if (memcmp (a, b, 16) >= 0)
-	  exit (1);
-      }
-    exit (0);
-  }
-}],
-   jm_cv_func_memcmp_working=yes,
-   jm_cv_func_memcmp_working=no,
-   jm_cv_func_memcmp_working=no)])
-test $jm_cv_func_memcmp_working = no \
-  && AC_LIBOBJ(memcmp)
-])
+#serial 6
 
 AC_DEFUN(jm_FUNC_MEMCMP,
-[AC_REQUIRE([jm_AC_FUNC_MEMCMP])dnl
- if test $jm_cv_func_memcmp_working = no; then
+[AC_REQUIRE([AC_FUNC_MEMCMP])dnl
+ if test $ac_cv_func_memcmp_working = no; then
    AC_DEFINE_UNQUOTED(memcmp, rpl_memcmp,
      [Define to rpl_memcmp if the replacement function should be used.])
  fi

m4/prereq.m4

@@ -1,4 +1,4 @@
-#serial 11
+#serial 18
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -7,13 +7,17 @@ AC_DEFUN(jm_PREREQ,
 [
   jm_PREREQ_ADDEXT
   jm_PREREQ_CANON_HOST
+  jm_PREREQ_DIRNAME
   jm_PREREQ_ERROR
   jm_PREREQ_GETPAGESIZE
+  jm_PREREQ_HASH
   jm_PREREQ_HUMAN
   jm_PREREQ_MBSWIDTH
+  jm_PREREQ_MEMCHR
   jm_PREREQ_QUOTEARG
   jm_PREREQ_READUTMP
   jm_PREREQ_REGEX
+  jm_PREREQ_TEMPNAME # called by mkstemp
 ])
 
 AC_DEFUN(jm_PREREQ_ADDEXT,
@@ -39,6 +43,24 @@ AC_DEFUN(jm_PREREQ_CANON_HOST,
                    netinet/in.h arpa/inet.h)
 ])
 
+AC_DEFUN(jm_PREREQ_DIRNAME,
+[
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(string.h)
+])
+
+AC_DEFUN(jm_PREREQ_GETPAGESIZE,
+[
+  AC_CHECK_FUNCS(getpagesize)
+  AC_CHECK_HEADERS(OS.h unistd.h)
+])
+
+AC_DEFUN(jm_PREREQ_HASH,
+[
+  AC_CHECK_HEADERS(stdlib.h stdbool.h)
+  AC_REQUIRE([jm_CHECK_DECLS])
+])
+
 # If you use human.c, you need the following files:
 # uintmax_t.m4 inttypes_h.m4 ulonglong.m4
 AC_DEFUN(jm_PREREQ_HUMAN,
@@ -49,16 +71,16 @@ AC_DEFUN(jm_PREREQ_HUMAN,
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
 ])
 
-AC_DEFUN(jm_PREREQ_GETPAGESIZE,
+AC_DEFUN(jm_PREREQ_MEMCHR,
 [
-  AC_CHECK_FUNCS(getpagesize)
-  AC_CHECK_HEADERS(OS.h unistd.h)
+  AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
 ])
 
 AC_DEFUN(jm_PREREQ_QUOTEARG,
 [
-  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  AC_CHECK_FUNCS(isascii iswprint)
+  jm_FUNC_MBRTOWC
+  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
   AC_MBSTATE_T
@@ -78,7 +100,8 @@ AC_DEFUN(jm_PREREQ_READUTMP,
 $ac_includes_default
 #ifdef HAVE_UTMPX_H
 # include <utmpx.h>
-#else
+#endif
+#ifdef HAVE_UTMP_H
 # include <utmp.h>
 #endif
 "
@@ -100,3 +123,11 @@ AC_DEFUN(jm_PREREQ_REGEX,
   AC_HEADER_STDC
   AC_FUNC_ALLOCA
 ])
+
+AC_DEFUN(jm_PREREQ_TEMPNAME,
+[
+  AC_HEADER_STDC
+  AC_HEADER_STAT
+  AC_CHECK_HEADERS(fcntl.h sys/time.h stdint.h unistd.h)
+  AC_CHECK_FUNCS(__secure_getenv gettimeofday)
+])

m4/regex.m4

@@ -1,4 +1,4 @@
-#serial 8
+#serial 9
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
@@ -28,6 +28,7 @@ AC_DEFUN(jm_INCLUDED_REGEX,
 	  {
 	    static struct re_pattern_buffer regex;
 	    const char *s;
+	    struct re_registers regs;
 	    re_set_syntax (RE_SYNTAX_POSIX_EGREP);
 	    /* Add this third left square bracket, [, to balance the
 	       three right ones below.  Otherwise autoconf-2.14 chokes.  */
@@ -39,7 +40,20 @@ AC_DEFUN(jm_INCLUDED_REGEX,
 	    /* This should succeed, but doesn't for e.g. glibc-2.1.3.  */
 	    s = re_compile_pattern ("{1", 2, &regex);
 
-	    exit (s ? 1 : 0);
+	    if (s)
+	      exit (1);
+
+	    /* The following example is derived from a problem report
+               against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
+	    s = re_compile_pattern ("[anù]*n", 7, &regex);
+	    if (s)
+	      exit (1);
+
+	    /* This should match, but doesn't for e.g. glibc-2.2.1.  */
+	    if (re_match (&regex, "an", 2, 0, &regs) != 2)
+	      exit (1);
+
+	    exit (0);
 	  }
 	],
 	       jm_cv_func_working_re_compile_pattern=yes,
@@ -51,10 +65,9 @@ AC_DEFUN(jm_INCLUDED_REGEX,
     fi
 
     test -n "$1" || AC_MSG_ERROR([missing argument])
-    syscmd([test -f $1])
-    ifelse(sysval, 0,
+    m4_syscmd([test -f $1])
+    ifelse(m4_sysval, 0,
       [
-
 	AC_ARG_WITH(included-regex,
 	[  --without-included-regex don't compile regex; this is the default on
                           systems with version 2 of the GNU C library

m4/rename.m4

@@ -0,0 +1,40 @@
+#serial 2
+
+dnl From Volker Borchert.
+dnl Determine whether rename works for source paths with a trailing slash.
+dnl The rename from SunOS 4.1.1_U1 doesn't.
+dnl
+dnl If it doesn't, then define RENAME_TRAILING_SLASH_BUG and arrange
+dnl to compile the wrapper function.
+dnl
+
+AC_DEFUN(vb_FUNC_RENAME,
+[
+ AC_CACHE_CHECK([whether rename is broken],
+  vb_cv_func_rename_trailing_slash_bug,
+  [
+    rm -rf conftest.d1 conftest.d2
+    mkdir conftest.d1 ||
+      AC_MSG_ERROR([cannot create temporary directory])
+    AC_TRY_RUN([
+#       include <stdio.h>
+        int
+        main ()
+        {
+          exit (rename ("conftest.d1/", "conftest.d2") ? 1 : 0);
+        }
+      ],
+      vb_cv_func_rename_trailing_slash_bug=no,
+      vb_cv_func_rename_trailing_slash_bug=yes,
+      dnl When crosscompiling, assume rename is broken.
+      vb_cv_func_rename_trailing_slash_bug=yes)
+
+      rm -rf conftest.d1 conftest.d2
+  ])
+  if test $vb_cv_func_rename_trailing_slash_bug = yes; then
+    AC_LIBOBJ(rename)
+    AC_DEFINE_UNQUOTED(RENAME_TRAILING_SLASH_BUG, 1,
+[Define if rename does not work for source paths with a trailing slash,
+   like the one from SunOS 4.1.1_U1.])
+  fi
+])

m4/utimes.m4

@@ -5,7 +5,7 @@ dnl then do case-insensitive s/utime/utimes/.
 
 AC_DEFUN(jm_FUNC_UTIMES_NULL,
 [AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null,
-[rm -f conftestdata; > conftestdata
+[rm -f conftest.data; > conftest.data
 AC_TRY_RUN([
 /* In case stat has been defined to rpl_stat, undef it here.  */
 #undef stat
@@ -13,9 +13,11 @@ AC_TRY_RUN([
 #include <sys/stat.h>
 main() {
 struct stat s, t;
-exit(!(stat ("conftestdata", &s) == 0 && utimes("conftestdata", (long *)0) == 0
-&& stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime
-&& t.st_mtime - s.st_mtime < 120));
+exit(!(stat ("conftest.data", &s) == 0
+       && utimes("conftest.data", (long *)0) == 0
+       && stat("conftest.data", &t) == 0
+       && t.st_mtime >= s.st_mtime
+       && t.st_mtime - s.st_mtime < 120));
 }],
   ac_cv_func_utimes_null=yes,
   ac_cv_func_utimes_null=no,

m4/xstrtoumax.m4

@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
 
 # autoconf tests required for use of xstrtoumax.c
 
@@ -7,7 +7,8 @@ AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-  AC_CHECK_HEADERS(stdlib.h)
+  AC_CHECK_DECLS([strtoul, strtoull])
+  AC_CHECK_HEADERS(limits.h stdlib.h)
 
   AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
     jm_cv_func_strtoumax_macro,
@@ -28,7 +29,13 @@ AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
   dnl so we need the replacement strtoull only if strtoumax does not exist.
   case "$ac_cv_type_unsigned_long_long,$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
     yes,no,no)
-      AC_REPLACE_FUNCS(strtoull)
+      AC_REPLACE_FUNCS(strtoull strtol)
+      ;;
+  esac
+
+  case "$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
+    no,no)
+      AC_REPLACE_FUNCS(strtoul strtol)
       ;;
   esac
 

man/help2man

@@ -27,7 +27,7 @@ use Text::Tabs qw(expand);
 use POSIX qw(strftime setlocale LC_TIME);
 
 my $this_program = 'help2man';
-my $this_version = '1.022';
+my $this_version = '1.24';
 my $version_info = <<EOT;
 GNU $this_program $this_version
 
@@ -59,18 +59,20 @@ EOT
 
 my $section = 1;
 my ($opt_name, @opt_include, $opt_output, $opt_no_info);
-
-# Parse options.
-Getopt::Long::config('bundling');
-GetOptions (
+my %opt_def = (
     'n|name=s'		=> \$opt_name,
     's|section=s'	=> \$section,
     'i|include=s'	=> sub { push @opt_include, [ pop, 1 ] },
     'I|opt-include=s'	=> sub { push @opt_include, [ pop, 0 ] },
     'o|output=s'	=> \$opt_output,
     'N|no-info'		=> \$opt_no_info,
-    help		=> sub { print $help_info; exit },
-    version		=> sub { print $version_info; exit },
+);
+
+# Parse options.
+Getopt::Long::config('bundling');
+GetOptions (%opt_def,
+    help    => sub { print $help_info; exit },
+    version => sub { print $version_info; exit },
 ) or die $help_info;
 
 die $help_info unless @ARGV == 1;
@@ -93,9 +95,9 @@ BEGIN { eval q(sub qr { '' =~ $_[0]; $_[0] }) if $] < 5.005 }
 #   verbatim text
 #
 
-for (@opt_include)
+while (@opt_include)
 {
-    my ($inc, $required) = @$_;
+    my ($inc, $required) = @{shift @opt_include};
 
     next unless -f $inc or $required;
     die "$this_program: can't open `$inc' ($!)\n"
@@ -134,9 +136,20 @@ for (@opt_include)
 	    next;
 	}
 
-	# Silently ignore anything before the first
-	# section--allows for comments and revision info.
-	next unless $key;
+	# Check for options before the first section--anything else is
+	# silently ignored, allowing the first for comments and
+	# revision info.
+	unless ($key)
+	{
+	    # handle options
+	    if (/^-/)
+	    {
+		local @ARGV = split;
+		GetOptions %opt_def;
+	    }
+
+	    next;
+	}
 
 	$hash->{$key} ||= '';
 	$hash->{$key} .= $_;
@@ -269,9 +282,11 @@ s/^\n+//;
 s/\n*$/\n/;
 s/\n\n+/\n\n/g;
 
-# Temporarily exchange leading dots and backslashes for tokens.
+# Temporarily exchange leading dots, apostrophes and backslashes for
+# tokens.
 s/^\./\x80/mg;
-s/\\/\x81/g;
+s/^'/\x81/mg;
+s/\\/\x82/g;
 
 # Start a new paragraph (if required) for these.
 s/([^\n])\n(Report +bugs|Email +bug +reports +to|Written +by)/$1\n\n$2/g;
@@ -366,7 +381,7 @@ while (length)
     {
 	$matched .= $& if %append;
 	$indent = length ($4 || "$1$3");
-	$content = ".TP\n\x82$2\n\x82$5\n";
+	$content = ".TP\n\x83$2\n\x83$5\n";
 	unless ($4)
 	{
 	    # Indent may be different on second line.
@@ -378,7 +393,7 @@ while (length)
     elsif (s/^ {1,10}([+-]\S.*)\n//)
     {
 	$matched .= $& if %append;
-	$content = ".HP\n\x82$1\n";
+	$content = ".HP\n\x83$1\n";
 	$indent = 80; # not continued
     }
 
@@ -387,7 +402,7 @@ while (length)
     {
 	$matched .= $& if %append;
 	$indent = length $1;
-	$content = ".TP\n\x82$2\n\x82$3\n";
+	$content = ".TP\n\x83$2\n\x83$3\n";
     }
 
     # Indented paragraph.
@@ -395,7 +410,7 @@ while (length)
     {
 	$matched .= $& if %append;
 	$indent = length $1;
-	$content = ".IP\n\x82$2\n";
+	$content = ".IP\n\x83$2\n";
     }
 
     # Left justified paragraph.
@@ -411,7 +426,7 @@ while (length)
     while (s/^ {$indent}(\S.*)\n//)
     {
 	$matched .= $& if %append;
-	$content .= "\x82$1\n"
+	$content .= "\x83$1\n"
     }
 
     # Move to next paragraph.
@@ -419,9 +434,10 @@ while (length)
 
     for ($content)
     {
-	# Leading dot protection.
-	s/\x82\./\x80/g;
-	s/\x82//g;
+	# Leading dot and apostrophe protection.
+	s/\x83\./\x80/g;
+	s/\x83'/\x81/g;
+	s/\x83//g;
 
 	# Convert options.
 	s/(^| )(-[][\w=-]+)/$1 . convert_option $2/mge;
@@ -485,9 +501,10 @@ for (@pre, (grep ! /^($filter)$/o, @include), @post)
 
 	for ($include{$_})
 	{
-	    # Replace leading dot an backslash tokens.
+	    # Replace leading dot, apostrophe and backslash tokens.
 	    s/\x80/\\&./g;
-	    s/\x81/\\e/g;
+	    s/\x81/\\&'/g;
+	    s/\x82/\\e/g;
 	    print;
 	}
     }

man/sha1sum.x

@@ -0,0 +1,4 @@
+[NAME]
+shasum \- compute and check SHA1 message digest
+[DESCRIPTION]
+.\" Add any additional description here