*** empty log message ***

downcase bulleted items
remove some periods

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

@@ -17,11 +17,12 @@ THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
 PREV_VERSION := $(shell cat $(prev_version_file))
 PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
 
-tag-package = $(shell echo "$(PACKAGE)" | tr a-z A-Z)
+tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
 tag-this-version = $(subst .,_,$(VERSION))
 tag-prev-version = $(subst .,_,$(PREV_VERSION))
 this-cvs-tag = $(tag-package)-$(tag-this-version)
 prev-cvs-tag = $(tag-package)-$(tag-prev-version)
+my_distdir = $(PACKAGE)-$(VERSION)
 
 # Verify that all source files using _() are listed in po/POTFILES.in.
 po-check:
@@ -30,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.
@@ -52,6 +56,10 @@ null_AM_MAKEFLAGS = \
   AUTOHEADER=false \
   MAKEINFO=false
 
+# Detect format-string/arg-list mismatches that would normally be obscured
+# by the use of _().  The --disable-nls effectively defines away that macro,
+# and building with CFLAGS='-Wformat -Werror' causes any format warning to be
+# treated as a failure.
 t=./=test
 my-distcheck: writable-files po-check
 	-rm -rf $(t)
@@ -82,12 +90,14 @@ 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 = fetish-ftp
+# 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-$$$$; \
@@ -104,12 +114,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; \
@@ -118,14 +128,17 @@ 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 \
 	    | 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;' \
@@ -148,13 +161,34 @@ automake_repo=:pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake
 .PHONY: wget-update
 wget-update:
 	$(WGET) $(ftp-gnu)/texinfo/texinfo.tex -O $(srcdir)/doc/texinfo.tex
-	$(WGET) $(ftp-gnu)/config/config.guess -O $(srcdir)/config.guess
-	$(WGET) $(ftp-gnu)/config/config.sub -O $(srcdir)/config.sub
-	cvs -d $(automake_repo) co -p automake/depcomp > depcomp
+	for f in config.guess config.sub; do \
+	  $(WGET) $(ftp-gnu)/config/$$f -O $(srcdir)/$$f; \
+	done
+	for f in depcomp missing; do \
+	  echo checking out $$f...; \
+	  cvs -d $(automake_repo) co -p automake/$$f > t$$$$ \
+	    && mv t$$$$ $$f; \
+	done
 
-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) \
@@ -163,10 +197,4 @@ alpha: writable-files po-check
 	chmod a-w $(release-archive-dir)/$(xd-delta)
 	echo $(VERSION) > $(prev_version_file)
 	cvs ci -m. $(prev_version_file)
-	@echo =====================================
-	@echo =====================================
-	@echo 'scp $(xd-delta) $(distdir).tar.gz \'
-	@echo '  $(b_host):$(b_real_dir)'
-	@echo '# send the /tmp/announcement e-mail'
-	@echo =====================================
-	@echo =====================================
+	@$(emit-rsync-commands)

THANKS

@@ -14,6 +14,7 @@ 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
@@ -27,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
@@ -51,6 +54,7 @@ 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               ckrackowiz@std.schuler-ag.com
@@ -60,23 +64,27 @@ Chuck Hedrick                       hedrick@klinzhai.rutgers.edu
 Clark Morgan                        cmorgan@aracnet.com
 Colin Plumb                         colin@nyx.net
 Collin Rogowski                     collin@rogowski.de
+Dale Scheetz                        dwarf@polaris.net
 Dan Hagerty                         hag@gnu.ai.it.edu
 Dan Pascu                           dan@services.iiruc.ro
 Daniel Bergstrom                    noa@melody.se
+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
@@ -111,6 +119,7 @@ Hans Verkuil                        hans@wyst.hobby.nl
 Harry Liu                           rliu@lek.ugcs.caltech.edu
 Herbert Xu                          herbert@gondor.apana.org.au
 Holger Berger                       hberger@ess.nec.de
+Hon-Yin Kok                         hkok@yoda.unl.edu
 Hugh Daniel                         hugh@xanadu.com
 Ian Jackson                         ijackson@chiark.greenend.org.uk
 Ian Lance Taylor                    ian@cygnus.com
@@ -148,14 +157,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
@@ -179,7 +192,9 @@ 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
@@ -191,16 +206,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
@@ -214,6 +235,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
@@ -236,6 +259,7 @@ Ralf W. Stephan                     stephan@tmt.de
 Ralph Loader                        loader@maths.ox.ac.uk
 Raul Miller                         moth@magenta.com
 Richard Braakman                    dark@xs4all.nl
+Richard Dawe                        richdawe@bigfoot.com
 Richard J. Rauenzahn                rrauenza@hairball.cup.hp.com
 Richard Sharman                     rsharman@magmacom.com
 Rick Sladkey                        jrs@world.std.com
@@ -253,6 +277,7 @@ Sander van Malssen                  svm@kozmix.ow.nl
 Santiago Vila Doncel                sanvila@unex.es
 Savochkin Andrey Vladimirovich      saw@msu.ru
 Scott Lurndal                       slurn@griffin.engr.sgi.com
+Stéphane Chazelas                   Stephane_CHAZELAS@yahoo.fr
 Stephen Gildea                      gildea@x.org
 Stephen Smoogen                     ??????????
 Steve McConnel                      steve@acadcomp.sil.org
@@ -273,13 +298,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,7 +376,7 @@ to the local time.
 
 @cindex pure numbers in date strings
 
-The precise intepretation of a pure decimal number depends
+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
@@ -474,7 +411,7 @@ year.
 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,
+revisions for the @sc{gnu} system were made by David MacKenzie, Jim Meyering,
 Paul Eggert and others.
 
 @cindex Pinard, F.

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;
@@ -427,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 \
@@ -425,9 +427,10 @@ pipeline.
 @dfn{failure}.  It can be used as a place holder in shell scripts
 where an unsuccessful command is needed.
 
-@code{false} ignores @emph{all} command line arguments, even @samp{--help}
-and @samp{--version}, since to do otherwise would change expected
-behavior that some programmers may be relying on.
+By default, @code{false} honors the @samp{--help} and @samp{--version}
+options.  However, that is contrary to @sc{POSIX}, so when the environment
+variable @env{POSIXLY_CORRECT} is set, @code{false} ignores @emph{all}
+command line arguments, including @samp{--help} and @samp{--version}.
 
 This version of @code{false} is implemented as a C program, and is thus
 more secure and faster than a shell script implementation, and may safely
@@ -446,11 +449,15 @@ be used as a dummy shell for the purpose of disabling accounts.
 @code{true} does nothing except return an exit status of 0, meaning
 @dfn{success}.  It can be used as a place holder in shell scripts
 where a successful command is needed, although the shell built-in
-command @code{:} (colon) does the same thing faster.
+command @code{:} (colon) may do the same thing faster.
+In most modern shells, @code{true} is built-in command, so when
+you use @samp{true} in a script, you're probably using the built-in
+command, not the one documented here.
 
-@code{true} ignores @emph{all} command line arguments, even @samp{--help}
-and @samp{--version}, since to do otherwise would change expected
-behavior that some programmers may be relying on.
+By default, @code{true} honors the @samp{--help} and @samp{--version}
+options.  However, that is contrary to @sc{POSIX}, so when the environment
+variable @env{POSIXLY_CORRECT} is set, @code{true} ignores @emph{all}
+command line arguments, including @samp{--help} and @samp{--version}.
 
 This version of @code{true} is implemented as a C program, and is thus
 more secure and faster than a shell script implementation, and may safely
@@ -2196,8 +2203,7 @@ information.
 @cindex time, printing or setting
 @cindex printing the current time
 
-@code{date} with no arguments prints the current time and date, in the
-format of the @samp{%c} directive (described below).  Synopses:
+Synopses:
 
 @example
 date [@var{option}]@dots{} [+@var{format}]
@@ -2205,6 +2211,9 @@ date [-u|--utc|--universal] @c this avoids a newline in the output
 [ MMDDhhmm[[CC]YY][.ss] ]
 @end example
 
+Invoking @code{date} with no @var{format} argument is equivalent to invoking
+@samp{date '+%a %b %e %H:%M:%S %Z %Y'}.
+
 @findex strftime @r{and @code{date}}
 @cindex time formats
 @cindex formatting times
@@ -2294,6 +2303,8 @@ locale's abbreviated month name (Jan@dots{}Dec)
 locale's full month name, variable length (January@dots{}December)
 @item %c
 locale's date and time (Sat Nov 04 12:02:33 EST 1989)
+@item %C
+century (year divided by 100 and truncated to an integer) (00@dots{}99)
 @item %d
 day of month (01@dots{}31)
 @item %D
@@ -2499,7 +2510,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
@@ -2564,7 +2575,7 @@ To print a date without the leading zero for one-digit days
 of the month, you can use the (GNU extension) @code{-} modifier to suppress
 the padding altogether.
 @example
-date -d=1may '+%B %-d'
+date -d 1may '+%B %-d'
 @end example
 
 @item
@@ -2593,31 +2604,31 @@ To convert a date string to the number of seconds since the epoch
 (which is 1970-01-01 00:00:00 UTC), use the @samp{--date} option with
 the @samp{%s} format.  That can be useful in sorting and/or graphing
 and/or comparing data by date.  The following command outputs the
-number of the seconds since the epoch for the time one second later
-than the epoch, but in a time zone five hours later (Cambridge, Massachusetts),
-thus a total of five hours and one second after the epoch:
+number of the seconds since the epoch for the time two minutes after the
+epoch:
 
 @example
-date --date='1970-01-01 00:00:01 UTC +5 hours' +%s
-18001
+date --date='1970-01-01 00:02:00 +0000' +%s
+120
 @end example
 
-Suppose you had @emph{not} specified time zone information in the example above.
-Then, @code{date} would have used your computer's idea of the time zone when
-interpreting the string.  Here's what you would get if you were in
-Greenwich, England:
+If you do not specify time zone information in the date string,
+@command{date} uses your computer's idea of the time zone when
+interpreting the string.  For example, if your computer's time zone is
+that of Cambridge, Massachusetts, which was then 5 hours (i.e., 18,000
+seconds) behind UTC:
 
 @example
 # local time zone used
-date --date='1970-01-01 00:00:01' +%s
-1
+date --date='1970-01-01 00:02:00' +%s
+18120
 @end example
 
 @item
 If you're sorting or graphing dated data, your raw date values may be
 represented as seconds since the epoch.  But few people can look at
 the date @samp{946684800} and casually note ``Oh, that's the first second
-of the year 2000.''
+of the year 2000 in Greenwich, England.''
 
 @example
 date --date='2000-01-01 UTC' +%s
@@ -2628,8 +2639,9 @@ To convert such an unwieldy number of seconds back to
 a more readable form, use a command like this:
 
 @smallexample
-date -d '1970-01-01 946684800 sec' +"%Y-%m-%d %T %z"
-2000-01-01 00:00:00 +0000
+# local time zone used
+date -d '1970-01-01 UTC 946684800 seconds' +"%Y-%m-%d %T %z"
+1999-12-31 19:00:00 -0500
 @end smallexample
 
 @end itemize
@@ -2959,7 +2971,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
@@ -3338,11 +3350,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,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2000-10-18.06}
+\def\texinfoversion{2000-12-11.07}
 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
 % Free Software Foundation, Inc.
@@ -688,13 +688,14 @@ 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 left margin next to the current
-% paragraph.  For more general purposes, use the \margin insertion class.
+% @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}
 %
-\def\inmargin#1{\strut\vadjust{%
+\def\doinmargin#1#2{\strut\vadjust{%
   \nobreak
   \kern-\strutdepth
   \vtop to \strutdepth{%
@@ -702,11 +703,39 @@ where each line of input produces a line of output.}
     \vss
     % if you have multiple lines of stuff to put here, you'll need to
     % make the vbox yourself of the appropriate size.
-    \llap{#1\hskip\inmarginspacing}%
+    \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).
@@ -2602,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.
@@ -4284,6 +4319,7 @@ width0pt\relax} \fi
   \gobble
 }
 
+
 % @quotation does normal linebreaking (hence we can't use \nonfillstart)
 % and narrows the margins.
 %
@@ -4306,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.
 

lib/ChangeLog

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

lib/Makefile.am

@@ -9,11 +9,12 @@ 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 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 \
@@ -29,9 +30,11 @@ noinst_HEADERS = \
   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 \
+  path-concat.h pathmax.h physmem.h posixtm.h \
+  quote.h quotearg.h readtokens.h \
   readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h sha.h \
-  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h
+  stdio-safer.h strverscmp.h unicodeio.h unistd-safer.h version-etc.h \
+  xalloc.h xstrtod.h xstrtol.h
 
 BUILT_SOURCES = getdate.c lstat.c stat.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)

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,11 +128,12 @@ 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 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 \
@@ -145,9 +150,11 @@ noinst_HEADERS = \
   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 \
+  path-concat.h pathmax.h physmem.h posixtm.h \
+  quote.h quotearg.h readtokens.h \
   readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h sha.h \
-  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h
+  stdio-safer.h strverscmp.h unicodeio.h unistd-safer.h version-etc.h \
+  xalloc.h xstrtod.h xstrtol.h
 
 
 BUILT_SOURCES = getdate.c lstat.c stat.c
@@ -162,140 +169,147 @@ charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 SUFFIXES = .sed .sin
 
 CLEANFILES = charset.alias ref-add.sed ref-del.sed
+EXEEXT =
+OBJEXT = o
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ANSI2KNR = ../src/ansi2knr
 libfetish_a_AR = $(AR) cru
-am_libfetish_a_OBJECTS =  getdate$U.o posixtm$U.o addext$U.o \
-argmatch$U.o backupfile$U.o basename$U.o canon-host$U.o closeout$U.o \
-diacrit$U.o dirname$U.o exclude$U.o filemode$U.o full-write$U.o \
-getopt$U.o getopt1$U.o getstr$U.o getugroups$U.o hard-locale$U.o \
-hash$U.o human$U.o idcache$U.o isdir$U.o linebuffer$U.o \
-localcharset$U.o long-options$U.o makepath$U.o mbswidth$U.o md5$U.o \
-memcasecmp$U.o memcoll$U.o modechange$U.o path-concat$U.o quote$U.o \
-quotearg$U.o readtokens$U.o safe-read$U.o same$U.o save-cwd$U.o \
-savedir$U.o sha$U.o stripslash$U.o unicodeio$U.o userspec$U.o \
-version-etc$U.o xgetcwd$U.o xgethostname$U.o xmalloc$U.o xstrdup$U.o \
-xstrtod$U.o xstrtol$U.o xstrtoul$U.o xstrtoumax$U.o yesno$U.o
-libfetish_a_OBJECTS =  $(am_libfetish_a_OBJECTS)
+am_libfetish_a_OBJECTS = getdate$U.$(OBJEXT) posixtm$U.$(OBJEXT) \
+addext$U.$(OBJEXT) argmatch$U.$(OBJEXT) backupfile$U.$(OBJEXT) \
+basename$U.$(OBJEXT) canon-host$U.$(OBJEXT) closeout$U.$(OBJEXT) \
+diacrit$U.$(OBJEXT) dirname$U.$(OBJEXT) dup-safer$U.$(OBJEXT) \
+exclude$U.$(OBJEXT) filemode$U.$(OBJEXT) fopen-safer$U.$(OBJEXT) \
+full-write$U.$(OBJEXT) getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) \
+getstr$U.$(OBJEXT) getugroups$U.$(OBJEXT) hard-locale$U.$(OBJEXT) \
+hash$U.$(OBJEXT) human$U.$(OBJEXT) idcache$U.$(OBJEXT) \
+isdir$U.$(OBJEXT) linebuffer$U.$(OBJEXT) localcharset$U.$(OBJEXT) \
+long-options$U.$(OBJEXT) makepath$U.$(OBJEXT) mbswidth$U.$(OBJEXT) \
+md5$U.$(OBJEXT) memcasecmp$U.$(OBJEXT) memcoll$U.$(OBJEXT) \
+modechange$U.$(OBJEXT) path-concat$U.$(OBJEXT) physmem$U.$(OBJEXT) \
+quote$U.$(OBJEXT) quotearg$U.$(OBJEXT) readtokens$U.$(OBJEXT) \
+safe-read$U.$(OBJEXT) same$U.$(OBJEXT) save-cwd$U.$(OBJEXT) \
+savedir$U.$(OBJEXT) sha$U.$(OBJEXT) stripslash$U.$(OBJEXT) \
+unicodeio$U.$(OBJEXT) userspec$U.$(OBJEXT) version-etc$U.$(OBJEXT) \
+xgetcwd$U.$(OBJEXT) xgethostname$U.$(OBJEXT) xmalloc$U.$(OBJEXT) \
+xstrdup$U.$(OBJEXT) xstrtod$U.$(OBJEXT) xstrtol$U.$(OBJEXT) \
+xstrtoul$U.$(OBJEXT) xstrtoumax$U.$(OBJEXT) yesno$U.$(OBJEXT)
+libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
 AR = ar
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CFLAGS = @CFLAGS@
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES =  $(libfetish_a_SOURCES)
-HEADERS =  $(noinst_HEADERS)
+DIST_SOURCES = $(libfetish_a_SOURCES)
+HEADERS = $(noinst_HEADERS)
 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-DEP_FILES =  @AMDEP@ $(DEPDIR)/__fpending.Po $(DEPDIR)/addext$U.Po \
-$(DEPDIR)/alloca.Po $(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po \
-$(DEPDIR)/backupfile$U.Po $(DEPDIR)/basename$U.Po \
-$(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po $(DEPDIR)/closeout$U.Po \
-$(DEPDIR)/diacrit$U.Po $(DEPDIR)/dirname$U.Po $(DEPDIR)/dup2.Po \
-$(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po $(DEPDIR)/exclude$U.Po \
-$(DEPDIR)/fileblocks.Po $(DEPDIR)/filemode$U.Po $(DEPDIR)/fnmatch.Po \
-$(DEPDIR)/fsusage.Po $(DEPDIR)/ftruncate.Po $(DEPDIR)/full-write$U.Po \
-$(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po $(DEPDIR)/gethostname.Po \
-$(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po $(DEPDIR)/getopt$U.Po \
-$(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po $(DEPDIR)/getstr$U.Po \
-$(DEPDIR)/getugroups$U.Po $(DEPDIR)/getusershell.Po \
-$(DEPDIR)/group-member.Po $(DEPDIR)/hard-locale$U.Po \
-$(DEPDIR)/hash$U.Po $(DEPDIR)/human$U.Po $(DEPDIR)/idcache$U.Po \
-$(DEPDIR)/isdir$U.Po $(DEPDIR)/lchown.Po $(DEPDIR)/linebuffer$U.Po \
-$(DEPDIR)/localcharset$U.Po $(DEPDIR)/long-options$U.Po \
-$(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po $(DEPDIR)/malloc.Po \
-$(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po $(DEPDIR)/memcasecmp$U.Po \
-$(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po \
-$(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po \
-$(DEPDIR)/memset.Po $(DEPDIR)/mktime.Po $(DEPDIR)/modechange$U.Po \
-$(DEPDIR)/mountlist.Po $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
-$(DEPDIR)/path-concat$U.Po $(DEPDIR)/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)/sha$U.Po $(DEPDIR)/stat.Po $(DEPDIR)/stime.Po \
-$(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
-$(DEPDIR)/strdup.Po $(DEPDIR)/strftime.Po $(DEPDIR)/stripslash$U.Po \
-$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
-$(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \
-$(DEPDIR)/strtol.Po $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
-$(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po $(DEPDIR)/unicodeio$U.Po \
-$(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po $(DEPDIR)/version-etc$U.Po \
-$(DEPDIR)/xgetcwd$U.Po $(DEPDIR)/xgethostname$U.Po \
-$(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
-$(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
-$(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
-DIST_COMMON =  README $(noinst_HEADERS) ChangeLog Makefile.am \
-Makefile.in TODO __fpending.c alloca.c atexit.c chown.c dup2.c error.c \
-error.h euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c \
-getdate.c getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
+@AMDEP@DEP_FILES = $(DEPDIR)/__fpending.Po $(DEPDIR)/addext$U.Po \
+@AMDEP@ $(DEPDIR)/alloca.Po $(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po \
+@AMDEP@ $(DEPDIR)/backupfile$U.Po $(DEPDIR)/basename$U.Po \
+@AMDEP@ $(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po \
+@AMDEP@ $(DEPDIR)/closeout$U.Po $(DEPDIR)/diacrit$U.Po \
+@AMDEP@ $(DEPDIR)/dirname$U.Po $(DEPDIR)/dup-safer$U.Po \
+@AMDEP@ $(DEPDIR)/dup2.Po $(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \
+@AMDEP@ $(DEPDIR)/exclude$U.Po $(DEPDIR)/fileblocks.Po \
+@AMDEP@ $(DEPDIR)/filemode$U.Po $(DEPDIR)/fnmatch.Po \
+@AMDEP@ $(DEPDIR)/fopen-safer$U.Po $(DEPDIR)/fsusage.Po \
+@AMDEP@ $(DEPDIR)/ftruncate.Po $(DEPDIR)/full-write$U.Po \
+@AMDEP@ $(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po \
+@AMDEP@ $(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po \
+@AMDEP@ $(DEPDIR)/getloadavg.Po $(DEPDIR)/getopt$U.Po \
+@AMDEP@ $(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po \
+@AMDEP@ $(DEPDIR)/getstr$U.Po $(DEPDIR)/getugroups$U.Po \
+@AMDEP@ $(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \
+@AMDEP@ $(DEPDIR)/hard-locale$U.Po $(DEPDIR)/hash$U.Po \
+@AMDEP@ $(DEPDIR)/human$U.Po $(DEPDIR)/idcache$U.Po $(DEPDIR)/isdir$U.Po \
+@AMDEP@ $(DEPDIR)/lchown.Po $(DEPDIR)/linebuffer$U.Po \
+@AMDEP@ $(DEPDIR)/localcharset$U.Po $(DEPDIR)/long-options$U.Po \
+@AMDEP@ $(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po $(DEPDIR)/malloc.Po \
+@AMDEP@ $(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po \
+@AMDEP@ $(DEPDIR)/memcasecmp$U.Po $(DEPDIR)/memchr.Po \
+@AMDEP@ $(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po $(DEPDIR)/memcpy.Po \
+@AMDEP@ $(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \
+@AMDEP@ $(DEPDIR)/mkstemp.Po $(DEPDIR)/mktime.Po \
+@AMDEP@ $(DEPDIR)/modechange$U.Po $(DEPDIR)/mountlist.Po \
+@AMDEP@ $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
+@AMDEP@ $(DEPDIR)/path-concat$U.Po $(DEPDIR)/physmem$U.Po \
+@AMDEP@ $(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po $(DEPDIR)/quote$U.Po \
+@AMDEP@ $(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po \
+@AMDEP@ $(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
+@AMDEP@ $(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po \
+@AMDEP@ $(DEPDIR)/safe-read$U.Po $(DEPDIR)/same$U.Po \
+@AMDEP@ $(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po \
+@AMDEP@ $(DEPDIR)/sha$U.Po $(DEPDIR)/stat.Po $(DEPDIR)/stime.Po \
+@AMDEP@ $(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
+@AMDEP@ $(DEPDIR)/strdup.Po $(DEPDIR)/strftime.Po \
+@AMDEP@ $(DEPDIR)/stripslash$U.Po $(DEPDIR)/strncasecmp.Po \
+@AMDEP@ $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po \
+@AMDEP@ $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po $(DEPDIR)/strtol.Po \
+@AMDEP@ $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
+@AMDEP@ $(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \
+@AMDEP@ $(DEPDIR)/tempname.Po $(DEPDIR)/unicodeio$U.Po \
+@AMDEP@ $(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po \
+@AMDEP@ $(DEPDIR)/version-etc$U.Po $(DEPDIR)/xgetcwd$U.Po \
+@AMDEP@ $(DEPDIR)/xgethostname$U.Po $(DEPDIR)/xmalloc$U.Po \
+@AMDEP@ $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
+@AMDEP@ $(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
+@AMDEP@ $(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
+DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \
+TODO __fpending.c alloca.c atexit.c chown.c dup2.c error.c error.h \
+euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c \
+getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
 getusershell.c group-member.c lchown.c malloc.c memchr.c memcmp.c \
-memcpy.c memmove.c memrchr.c memset.c mktime.c mountlist.c nanosleep.c \
-obstack.c obstack.h putenv.c readutmp.c realloc.c regex.c 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)
@@ -324,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)
@@ -338,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)
@@ -412,6 +430,8 @@ memrchr_.c: memrchr.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memrchr.c; then echo $(srcdir)/memrchr.c; else echo memrchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memrchr_.c
 memset_.c: memset.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memset.c; then echo $(srcdir)/memset.c; else echo memset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memset_.c
+mkstemp_.c: mkstemp.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkstemp.c; then echo $(srcdir)/mkstemp.c; else echo mkstemp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkstemp_.c
 mktime_.c: mktime.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c
 modechange_.c: modechange.c $(ANSI2KNR)
@@ -424,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)
@@ -440,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)
@@ -492,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)
@@ -518,26 +544,44 @@ xstrtoumax_.c: xstrtoumax.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoumax.c; then echo $(srcdir)/xstrtoumax.c; else echo xstrtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoumax_.c
 yesno_.c: yesno.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/yesno.c; then echo $(srcdir)/yesno.c; else echo yesno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > yesno_.c
-__fpending_.o addext_.o alloca_.o argmatch_.o atexit_.o backupfile_.o \
-basename_.o canon-host_.o chown_.o closeout_.o diacrit_.o dirname_.o \
-dup2_.o error_.o euidaccess_.o exclude_.o fileblocks_.o filemode_.o \
-fnmatch_.o fsusage_.o ftruncate_.o full-write_.o getdate_.o \
-getgroups_.o gethostname_.o getline_.o getloadavg_.o getopt_.o \
-getopt1_.o getpass_.o getstr_.o getugroups_.o getusershell_.o \
-group-member_.o hard-locale_.o hash_.o human_.o idcache_.o isdir_.o \
-lchown_.o linebuffer_.o localcharset_.o long-options_.o lstat_.o \
-makepath_.o malloc_.o mbswidth_.o md5_.o memcasecmp_.o memchr_.o \
-memcmp_.o memcoll_.o memcpy_.o memmove_.o memrchr_.o memset_.o \
-mktime_.o modechange_.o mountlist_.o nanosleep_.o obstack_.o \
-path-concat_.o 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 sha_.o stat_.o stime_.o stpcpy_.o \
-strcasecmp_.o strcspn_.o strdup_.o strftime_.o stripslash_.o \
-strncasecmp_.o strndup_.o strnlen_.o strpbrk_.o strstr_.o strtod_.o \
-strtol_.o strtoul_.o strtoull_.o strtoumax_.o strverscmp_.o \
-unicodeio_.o userspec_.o utime_.o version-etc_.o xgetcwd_.o \
-xgethostname_.o xmalloc_.o xstrdup_.o xstrtod_.o xstrtol_.o xstrtoul_.o \
-xstrtoumax_.o yesno_.o : $(ANSI2KNR)
+__fpending_.$(OBJEXT) addext_.$(OBJEXT) alloca_.$(OBJEXT) \
+argmatch_.$(OBJEXT) atexit_.$(OBJEXT) backupfile_.$(OBJEXT) \
+basename_.$(OBJEXT) canon-host_.$(OBJEXT) chown_.$(OBJEXT) \
+closeout_.$(OBJEXT) diacrit_.$(OBJEXT) dirname_.$(OBJEXT) \
+dup-safer_.$(OBJEXT) dup2_.$(OBJEXT) error_.$(OBJEXT) \
+euidaccess_.$(OBJEXT) exclude_.$(OBJEXT) fileblocks_.$(OBJEXT) \
+filemode_.$(OBJEXT) fnmatch_.$(OBJEXT) fopen-safer_.$(OBJEXT) \
+fsusage_.$(OBJEXT) ftruncate_.$(OBJEXT) full-write_.$(OBJEXT) \
+getdate_.$(OBJEXT) getgroups_.$(OBJEXT) gethostname_.$(OBJEXT) \
+getline_.$(OBJEXT) getloadavg_.$(OBJEXT) getopt_.$(OBJEXT) \
+getopt1_.$(OBJEXT) getpass_.$(OBJEXT) getstr_.$(OBJEXT) \
+getugroups_.$(OBJEXT) getusershell_.$(OBJEXT) group-member_.$(OBJEXT) \
+hard-locale_.$(OBJEXT) hash_.$(OBJEXT) human_.$(OBJEXT) \
+idcache_.$(OBJEXT) isdir_.$(OBJEXT) lchown_.$(OBJEXT) \
+linebuffer_.$(OBJEXT) localcharset_.$(OBJEXT) long-options_.$(OBJEXT) \
+lstat_.$(OBJEXT) makepath_.$(OBJEXT) malloc_.$(OBJEXT) \
+mbswidth_.$(OBJEXT) md5_.$(OBJEXT) memcasecmp_.$(OBJEXT) \
+memchr_.$(OBJEXT) memcmp_.$(OBJEXT) memcoll_.$(OBJEXT) \
+memcpy_.$(OBJEXT) memmove_.$(OBJEXT) memrchr_.$(OBJEXT) \
+memset_.$(OBJEXT) mkstemp_.$(OBJEXT) mktime_.$(OBJEXT) \
+modechange_.$(OBJEXT) mountlist_.$(OBJEXT) nanosleep_.$(OBJEXT) \
+obstack_.$(OBJEXT) path-concat_.$(OBJEXT) physmem_.$(OBJEXT) \
+posixtm_.$(OBJEXT) putenv_.$(OBJEXT) quote_.$(OBJEXT) \
+quotearg_.$(OBJEXT) readtokens_.$(OBJEXT) readutmp_.$(OBJEXT) \
+realloc_.$(OBJEXT) regex_.$(OBJEXT) rename_.$(OBJEXT) rmdir_.$(OBJEXT) \
+rpmatch_.$(OBJEXT) safe-read_.$(OBJEXT) same_.$(OBJEXT) \
+save-cwd_.$(OBJEXT) savedir_.$(OBJEXT) sha_.$(OBJEXT) stat_.$(OBJEXT) \
+stime_.$(OBJEXT) stpcpy_.$(OBJEXT) strcasecmp_.$(OBJEXT) \
+strcspn_.$(OBJEXT) strdup_.$(OBJEXT) strftime_.$(OBJEXT) \
+stripslash_.$(OBJEXT) strncasecmp_.$(OBJEXT) strndup_.$(OBJEXT) \
+strnlen_.$(OBJEXT) strpbrk_.$(OBJEXT) strstr_.$(OBJEXT) \
+strtod_.$(OBJEXT) strtol_.$(OBJEXT) strtoul_.$(OBJEXT) \
+strtoull_.$(OBJEXT) strtoumax_.$(OBJEXT) strverscmp_.$(OBJEXT) \
+tempname_.$(OBJEXT) unicodeio_.$(OBJEXT) userspec_.$(OBJEXT) \
+utime_.$(OBJEXT) version-etc_.$(OBJEXT) xgetcwd_.$(OBJEXT) \
+xgethostname_.$(OBJEXT) xmalloc_.$(OBJEXT) xstrdup_.$(OBJEXT) \
+xstrtod_.$(OBJEXT) xstrtol_.$(OBJEXT) xstrtoul_.$(OBJEXT) \
+xstrtoumax_.$(OBJEXT) yesno_.$(OBJEXT) : $(ANSI2KNR)
 .y.c:
 	$(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c
 	if test -f y.tab.h; then \
@@ -556,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`; \
@@ -569,134 +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)/__fpending.Po
-@AMDEP@include $(DEPDIR)/addext$U.Po
-@AMDEP@include $(DEPDIR)/alloca.Po
-@AMDEP@include $(DEPDIR)/argmatch$U.Po
-@AMDEP@include $(DEPDIR)/atexit.Po
-@AMDEP@include $(DEPDIR)/backupfile$U.Po
-@AMDEP@include $(DEPDIR)/basename$U.Po
-@AMDEP@include $(DEPDIR)/canon-host$U.Po
-@AMDEP@include $(DEPDIR)/chown.Po
-@AMDEP@include $(DEPDIR)/closeout$U.Po
-@AMDEP@include $(DEPDIR)/diacrit$U.Po
-@AMDEP@include $(DEPDIR)/dirname$U.Po
-@AMDEP@include $(DEPDIR)/dup2.Po
-@AMDEP@include $(DEPDIR)/error.Po
-@AMDEP@include $(DEPDIR)/euidaccess.Po
-@AMDEP@include $(DEPDIR)/exclude$U.Po
-@AMDEP@include $(DEPDIR)/fileblocks.Po
-@AMDEP@include $(DEPDIR)/filemode$U.Po
-@AMDEP@include $(DEPDIR)/fnmatch.Po
-@AMDEP@include $(DEPDIR)/fsusage.Po
-@AMDEP@include $(DEPDIR)/ftruncate.Po
-@AMDEP@include $(DEPDIR)/full-write$U.Po
-@AMDEP@include $(DEPDIR)/getdate$U.Po
-@AMDEP@include $(DEPDIR)/getgroups.Po
-@AMDEP@include $(DEPDIR)/gethostname.Po
-@AMDEP@include $(DEPDIR)/getline.Po
-@AMDEP@include $(DEPDIR)/getloadavg.Po
-@AMDEP@include $(DEPDIR)/getopt$U.Po
-@AMDEP@include $(DEPDIR)/getopt1$U.Po
-@AMDEP@include $(DEPDIR)/getpass.Po
-@AMDEP@include $(DEPDIR)/getstr$U.Po
-@AMDEP@include $(DEPDIR)/getugroups$U.Po
-@AMDEP@include $(DEPDIR)/getusershell.Po
-@AMDEP@include $(DEPDIR)/group-member.Po
-@AMDEP@include $(DEPDIR)/hard-locale$U.Po
-@AMDEP@include $(DEPDIR)/hash$U.Po
-@AMDEP@include $(DEPDIR)/human$U.Po
-@AMDEP@include $(DEPDIR)/idcache$U.Po
-@AMDEP@include $(DEPDIR)/isdir$U.Po
-@AMDEP@include $(DEPDIR)/lchown.Po
-@AMDEP@include $(DEPDIR)/linebuffer$U.Po
-@AMDEP@include $(DEPDIR)/localcharset$U.Po
-@AMDEP@include $(DEPDIR)/long-options$U.Po
-@AMDEP@include $(DEPDIR)/lstat.Po
-@AMDEP@include $(DEPDIR)/makepath$U.Po
-@AMDEP@include $(DEPDIR)/malloc.Po
-@AMDEP@include $(DEPDIR)/mbswidth$U.Po
-@AMDEP@include $(DEPDIR)/md5$U.Po
-@AMDEP@include $(DEPDIR)/memcasecmp$U.Po
-@AMDEP@include $(DEPDIR)/memchr.Po
-@AMDEP@include $(DEPDIR)/memcmp.Po
-@AMDEP@include $(DEPDIR)/memcoll$U.Po
-@AMDEP@include $(DEPDIR)/memcpy.Po
-@AMDEP@include $(DEPDIR)/memmove.Po
-@AMDEP@include $(DEPDIR)/memrchr.Po
-@AMDEP@include $(DEPDIR)/memset.Po
-@AMDEP@include $(DEPDIR)/mktime.Po
-@AMDEP@include $(DEPDIR)/modechange$U.Po
-@AMDEP@include $(DEPDIR)/mountlist.Po
-@AMDEP@include $(DEPDIR)/nanosleep.Po
-@AMDEP@include $(DEPDIR)/obstack.Po
-@AMDEP@include $(DEPDIR)/path-concat$U.Po
-@AMDEP@include $(DEPDIR)/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)/sha$U.Po
-@AMDEP@include $(DEPDIR)/stat.Po
-@AMDEP@include $(DEPDIR)/stime.Po
-@AMDEP@include $(DEPDIR)/stpcpy.Po
-@AMDEP@include $(DEPDIR)/strcasecmp.Po
-@AMDEP@include $(DEPDIR)/strcspn.Po
-@AMDEP@include $(DEPDIR)/strdup.Po
-@AMDEP@include $(DEPDIR)/strftime.Po
-@AMDEP@include $(DEPDIR)/stripslash$U.Po
-@AMDEP@include $(DEPDIR)/strncasecmp.Po
-@AMDEP@include $(DEPDIR)/strndup.Po
-@AMDEP@include $(DEPDIR)/strnlen.Po
-@AMDEP@include $(DEPDIR)/strpbrk.Po
-@AMDEP@include $(DEPDIR)/strstr.Po
-@AMDEP@include $(DEPDIR)/strtod.Po
-@AMDEP@include $(DEPDIR)/strtol.Po
-@AMDEP@include $(DEPDIR)/strtoul.Po
-@AMDEP@include $(DEPDIR)/strtoull.Po
-@AMDEP@include $(DEPDIR)/strtoumax.Po
-@AMDEP@include $(DEPDIR)/strverscmp.Po
-@AMDEP@include $(DEPDIR)/unicodeio$U.Po
-@AMDEP@include $(DEPDIR)/userspec$U.Po
-@AMDEP@include $(DEPDIR)/utime.Po
-@AMDEP@include $(DEPDIR)/version-etc$U.Po
-@AMDEP@include $(DEPDIR)/xgetcwd$U.Po
-@AMDEP@include $(DEPDIR)/xgethostname$U.Po
-@AMDEP@include $(DEPDIR)/xmalloc$U.Po
-@AMDEP@include $(DEPDIR)/xstrdup$U.Po
-@AMDEP@include $(DEPDIR)/xstrtod$U.Po
-@AMDEP@include $(DEPDIR)/xstrtol$U.Po
-@AMDEP@include $(DEPDIR)/xstrtoul$U.Po
-@AMDEP@include $(DEPDIR)/xstrtoumax$U.Po
-@AMDEP@include $(DEPDIR)/yesno$U.Po
-
-mostlyclean-depend:
-
-clean-depend:
+@AMDEP@@_am_include@ $(DEPDIR)/__fpending.Po
+@AMDEP@@_am_include@ $(DEPDIR)/addext$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/alloca.Po
+@AMDEP@@_am_include@ $(DEPDIR)/argmatch$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/atexit.Po
+@AMDEP@@_am_include@ $(DEPDIR)/backupfile$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/basename$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/canon-host$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/chown.Po
+@AMDEP@@_am_include@ $(DEPDIR)/closeout$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/diacrit$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dirname$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dup-safer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/dup2.Po
+@AMDEP@@_am_include@ $(DEPDIR)/error.Po
+@AMDEP@@_am_include@ $(DEPDIR)/euidaccess.Po
+@AMDEP@@_am_include@ $(DEPDIR)/exclude$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fileblocks.Po
+@AMDEP@@_am_include@ $(DEPDIR)/filemode$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fnmatch.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fopen-safer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/fsusage.Po
+@AMDEP@@_am_include@ $(DEPDIR)/ftruncate.Po
+@AMDEP@@_am_include@ $(DEPDIR)/full-write$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getdate$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getgroups.Po
+@AMDEP@@_am_include@ $(DEPDIR)/gethostname.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getline.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getloadavg.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getopt$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getopt1$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getpass.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getstr$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getugroups$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/getusershell.Po
+@AMDEP@@_am_include@ $(DEPDIR)/group-member.Po
+@AMDEP@@_am_include@ $(DEPDIR)/hard-locale$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/hash$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/human$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/idcache$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/isdir$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/lchown.Po
+@AMDEP@@_am_include@ $(DEPDIR)/linebuffer$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/localcharset$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/long-options$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/lstat.Po
+@AMDEP@@_am_include@ $(DEPDIR)/makepath$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/malloc.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mbswidth$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/md5$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcasecmp$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memchr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcoll$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memcpy.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memmove.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memrchr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/memset.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mkstemp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mktime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/modechange$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/mountlist.Po
+@AMDEP@@_am_include@ $(DEPDIR)/nanosleep.Po
+@AMDEP@@_am_include@ $(DEPDIR)/obstack.Po
+@AMDEP@@_am_include@ $(DEPDIR)/path-concat$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/physmem$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/posixtm$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/putenv.Po
+@AMDEP@@_am_include@ $(DEPDIR)/quote$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/quotearg$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/readtokens$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/readutmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/realloc.Po
+@AMDEP@@_am_include@ $(DEPDIR)/regex.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rename.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rmdir.Po
+@AMDEP@@_am_include@ $(DEPDIR)/rpmatch.Po
+@AMDEP@@_am_include@ $(DEPDIR)/safe-read$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/same$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/save-cwd$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/savedir$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/sha$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stat.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stpcpy.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strcasecmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strcspn.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strdup.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strftime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/stripslash$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strncasecmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strndup.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strnlen.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strpbrk.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strstr.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtod.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtol.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoul.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoull.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strtoumax.Po
+@AMDEP@@_am_include@ $(DEPDIR)/strverscmp.Po
+@AMDEP@@_am_include@ $(DEPDIR)/tempname.Po
+@AMDEP@@_am_include@ $(DEPDIR)/unicodeio$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/userspec$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/utime.Po
+@AMDEP@@_am_include@ $(DEPDIR)/version-etc$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xgetcwd$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xgethostname$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xmalloc$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrdup$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtod$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtol$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtoul$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/xstrtoumax$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/yesno$U.Po
 
 distclean-depend:
 	-rm -rf $(DEPDIR)
 
-maintainer-clean-depend:
-
 @AMDEP@CCDEPMODE = @CCDEPMODE@
 
 .c.o:
@@ -705,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 \
@@ -720,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:
 
@@ -757,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/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.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

@@ -43,26 +43,32 @@ void *memrchr ();
 
 #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 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).  */
-size_t
-dir_name_r (const char *path, const char **result)
+/* 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 *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;
     }
@@ -78,10 +84,11 @@ dir_name_r (const char *path, const char **result)
 
       if (path < slash)
 	{
-	  slash = memrchr (path, '/', slash - path);
+	  size_t len = slash - path;
+	  slash = memrchr (path, '/', len);
 	  if (BACKSLASH_IS_PATH_SEPARATOR)
 	    {
-	      char *b = memrchr (path, '\\', slash - path);
+	      char const *b = memrchr (path, '\\', len);
 	      if (b && slash < b)
 		slash = b;
 	    }
@@ -91,27 +98,23 @@ dir_name_r (const char *path, const char **result)
   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;
     }
@@ -126,14 +129,18 @@ dir_name_r (const char *path, const char **result)
    (by effectively ignoring them).  */
 
 char *
-dir_name (const char *path)
+dir_name (char const *path)
 {
-  const char *result;
+  char const *result;
   size_t length = dir_name_r (path, &result);
-  char *newpath = (char *) malloc (length + 1);
+  int append_dot = (length && length == FILESYSTEM_PREFIX_LEN (newpath));
+  char *newpath = (char *) malloc (length + append_dot + 1);
   if (newpath == 0)
     return 0;
   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;
 }
@@ -170,7 +177,7 @@ main ()
     {
       char path[MAX_BUFF_LEN];
       char expected_result[MAX_BUFF_LEN];
-      char *result;
+      char const *result;
       sscanf (buff, "%s %s", path, expected_result);
       result = dir_name (path);
       if (strcmp (result, expected_result))

lib/dirname.h

@@ -28,7 +28,4 @@
 char *
 dir_name PARAMS ((const char *path));
 
-size_t
-dir_name_r PARAMS ((const char *path, const char **result));
-
 #endif /* not DIRNAME_H_ */

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 IN_CTYPE_DOMAIN(c) 1
-# else
-#  define IN_CTYPE_DOMAIN(c) isascii(c)
-# endif
-
-# define ISUPPER(c) (IN_CTYPE_DOMAIN (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/getdate.y

@@ -990,7 +990,8 @@ get_date (const char *p, const time_t *now)
 
   /* Let mktime deduce tm_isdst if we have an absolute time stamp,
      or if the relative time stamp mentions days, months, or years.  */
-  if (pc.dates_seen | pc.days_seen | pc.times_seen | pc.rel_day | pc.rel_month | pc.rel_year)
+  if (pc.dates_seen | pc.days_seen | pc.times_seen | pc.rel_day
+      | pc.rel_month | pc.rel_year)
     tm.tm_isdst = -1;
 
   /* But if the input explicitly specifies local time with or without
@@ -1037,6 +1038,7 @@ get_date (const char *p, const time_t *now)
     {
       tm.tm_mday += ((pc.day_number - tm.tm_wday + 7) % 7
 		     + 7 * (pc.day_ordinal - (0 < pc.day_ordinal)));
+      tm.tm_isdst = -1;
       Start = mktime (&tm);
       if (Start == (time_t) -1)
 	return Start;

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/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,16 +116,8 @@ void
 setusershell ()
 {
   default_index = 0;
-  if (shellstream == NULL)
-    shellstream = fopen (SHELLS_FILE, "r");
-  else
-    {
-#ifdef HAVE_FSEEKO
-      fseeko (shellstream, 0, 0);
-#else
-      fseek (shellstream, 0L, 0);
-#endif
-    }
+  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
@@ -153,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;
 		      }
@@ -162,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.h

@@ -145,7 +145,7 @@ 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__)
+#if defined __GNUC__ && defined __i386__
 static inline md5_uint32
 rol(md5_uint32 x, int n)
 {

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

@@ -21,12 +21,12 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <stdlib.h>
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+#include <stdlib.h>
+
 #undef __ptr_t
 #if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
 # define __ptr_t void *

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

@@ -524,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)
@@ -581,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/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.  */

lib/regex.h

@@ -160,6 +160,11 @@ typedef unsigned long int reg_syntax_t;
    this bit set, and it won't affect anything in the normal case. */
 #define RE_DEBUG (RE_NO_GNU_OPS << 1)
 
+/* If this bit is set, a syntactically invalid interval is treated as
+   a string of ordinary characters.  For example, the ERE 'a{1' is
+   treated as 'a\{1'.  */
+#define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
+
 /* This global variable defines the particular regexp syntax to use (for
    some interfaces).  When a regexp is compiled, the syntax used is
    stored in the pattern buffer, so changing this does not affect
@@ -199,7 +204,8 @@ extern reg_syntax_t re_syntax_options;
    | RE_NO_BK_VBAR)
 
 #define RE_SYNTAX_POSIX_EGREP						\
-  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
+  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES			\
+   | RE_INVALID_INTERVAL_ORD)
 
 /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
 #define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
@@ -523,11 +529,11 @@ extern int re_exec _RE_ARGS ((const char *));
 #   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
-#endif
+#define __restrict_arr
 
 /* POSIX compatibility.  */
 extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,

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/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.
@@ -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) \
@@ -515,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
@@ -607,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;
@@ -785,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;
@@ -879,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
@@ -1059,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;
@@ -1121,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
@@ -1151,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;
 	  {
@@ -1276,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

@@ -163,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
@@ -304,7 +304,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 	  else
 	    {
 	      unsigned long int tmp_long;
-	      if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+	      if (xstrtoul (g, NULL, 0, &tmp_long, NULL) != LONGINT_OK
 		  || tmp_long > MAXGID)
 		return _(E_invalid_group);
 	      *gid = tmp_long;

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,213 @@
+2001-04-21  Jim Meyering  <meyering@lucent.com>
+
+	* rmdir-errno.m4: Write to a new file, so that a restrictive umask
+	doesn't interfere.
+
+2001-04-21  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* ftruncate.m4: Check for chsize.
+	Link with ftruncate.o unconditionally if ftruncate is missing.
+	This was required when cross-compiling to i586-mingw32msvc.
+
+2001-03-24  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4: Require autoconf-2.49d.
+
+2001-03-20  Bruno Haible  <haible@clisp.cons.org>
+
+        * iconv.m4 (jm_ICONV): Recommend GNU libiconv.
+
+2001-03-17  Jim Meyering  <meyering@lucent.com>
+
+	* memcmp.m4 (jm_AC_FUNC_MEMCMP): Remove my copy of AC_FUNC_MEMCMP,
+	now that the version in autoconf is equivalent.
+	(jm_FUNC_MEMCMP): Adjust to use AC_FUNC_MEMCMP.
+
+	* error.m4 (jm_PREREQ_ERROR): Invoke AC_FUNC_STRERROR_R.
+	Suggestion from Akim Demaille.
+
+	* prereq.m4 (jm_PREREQ): Add jm_PREREQ_TEMPNAME.
+	(jm_PREREQ_TEMPNAME): New function.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	* jm-macros.m4 (jm_MACROS): Use mkstemp replacement if the system
+	lacks mkstemp.  Compile our own tempname.c if we compile our own
+	mkstemp.c, as mkstemp relies on tempname.
+
+2001-03-01  Jim Meyering  <meyering@lucent.com>
+
+	* dos.m4 (jm_AC_DOS): Remove extra backslashes, now that
+	AH_VERBATIM really does output its argument verbatim.
+
+2001-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	* jm-macros.m4 (jm_CHECK_ALL_HEADERS): Check for sys/resource.h.
+
+2001-02-17  Jim Meyering  <meyering@lucent.com>
+
+	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Don't check for
+	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.
@@ -35,7 +245,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>
@@ -241,7 +451,7 @@
 2000-05-26  Bruno Haible  <haible@clisp.cons.org>
 
 	* glibc21.m4: New file.
-	* jm-macros.m4: (jm_MACROS): Call jm_GLIBC21.
+	* jm-macros.m4 (jm_MACROS): Call jm_GLIBC21.
 
 2000-05-28  Jim Meyering  <meyering@lucent.com>
 
@@ -292,7 +502,7 @@
 	* rmdir-errno.m4 (fetish_FUNC_RMDIR_NOTEMPTY): New macro and file.
 	* jm-macros.m4: Require fetish_FUNC_RMDIR_NOTEMPTY.
 
-	* nanosleep.m4: (jm_FUNC_NANOSLEEP): Save and restore LIBS around
+	* nanosleep.m4 (jm_FUNC_NANOSLEEP): Save and restore LIBS around
 	AC_SEARCH_LIBS call for nanosleep.
 	(LIB_NANOSLEEP): Set and AC_SUBST.
 
@@ -341,13 +551,13 @@
 2000-04-17  Jim Meyering  <meyering@lucent.com>
 
 	Get it right :-)
-	* jm-macros.m4: (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Emit the
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Emit the
 	actual #define via AH_VERBATIM.  Don't need separate AC_DEFINE.
 	Suggestion from Akim Demaille.
 
 2000-04-14  Jim Meyering  <meyering@lucent.com>
 
-	* jm-macros.m4: (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Use the one-arg form
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES) [_GNU_SOURCE]: Use the one-arg form
 	of AC_DEFINE.  Otherwise, the #ifndef in AH_VERBATIM gets clobbered.
 
 2000-04-13  Jim Meyering  <meyering@lucent.com>
@@ -476,7 +686,7 @@
 
 2000-02-05  Jim Meyering  <meyering@lucent.com>
 
-	* jm-macros.m4: (jm_CHECK_ALL_TYPES): Require most macros.
+	* jm-macros.m4 (jm_CHECK_ALL_TYPES): Require most macros.
 	Remove explicit use of AC_HEADER_TIME.  It is required by
 	jm_CHECK_TYPE_STRUCT_TIMESPEC.  Using AC_HEADER_TIME and
 	`AC_REQUIRE'ing jm_CHECK_TYPE_STRUCT_TIMESPEC provoked a but
@@ -537,10 +747,10 @@
 	(jm_FILE_SYSTEM_USAGE): Take two parameters.
 
 	* ftruncate.m4: New file (derived from part of fileutils/configure.in).
-	* jm-macros.m4: (jm_FUNC_FTRUNCATE): AC_REQUIRE it.
+	* jm-macros.m4 (jm_FUNC_FTRUNCATE): AC_REQUIRE it.
 	(jm_CHECK_ALL_TYPES): Require AC_HEADER_MAJOR and AC_HEADER_DIRENT.
 
-	* jm-macros.m4: (OPTIONAL_BIN_PROGS, OPTIONAL_BIN_ZCRIPTS, MAN):
+	* jm-macros.m4 (OPTIONAL_BIN_PROGS, OPTIONAL_BIN_ZCRIPTS, MAN):
 	AC_SUBST these here, rather than just in sh-util/configure.in, so
 	that the now-shared-by-fileutils-and-textutils lib/Makefile.am are
 	all the same.
@@ -630,7 +840,7 @@
 
 	* d-type.m4 (jm_CHECK_TYPE_STRUCT_DIRENT_D_TYPE): Rename from
 	jm_STRUCT_DIRENT_D_TYPE.
-	* d-ino.m4: (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Rename from
+	* d-ino.m4 (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Rename from
 	jm_STRUCT_DIRENT_D_INO.
 	* utimbuf.m4 (jm_CHECK_TYPE_STRUCT_UTIMBUF): Rename from
 	jm_STRUCT_UTIMBUF.
@@ -819,7 +1029,7 @@
 
 1999-07-15  Jim Meyering  <meyering@ascend.com>
 
-	* jm-macros.m4: (AC_CHECK_FUNCS): Check for getpagesize.
+	* jm-macros.m4 (AC_CHECK_FUNCS): Check for getpagesize.
 
 1999-05-22  Jim Meyering  <meyering@ascend.com>
 

m4/Makefile.am

@@ -11,6 +11,7 @@ chown.m4 \
 codeset.m4 \
 d-ino.m4 \
 d-type.m4 \
+dos.m4 \
 error.m4 \
 fnmatch.m4 \
 fpending.m4 \
@@ -40,6 +41,7 @@ link-follow.m4 \
 ls-mntd-fs.m4 \
 lstat.m4 \
 malloc.m4 \
+mbrtowc.m4 \
 mbstate_t.m4 \
 mbswidth.m4 \
 memcmp.m4 \
@@ -51,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,6 +129,7 @@ chown.m4 \
 codeset.m4 \
 d-ino.m4 \
 d-type.m4 \
+dos.m4 \
 error.m4 \
 fnmatch.m4 \
 fpending.m4 \
@@ -154,6 +159,7 @@ link-follow.m4 \
 ls-mntd-fs.m4 \
 lstat.m4 \
 malloc.m4 \
+mbrtowc.m4 \
 mbstate_t.m4 \
 mbswidth.m4 \
 memcmp.m4 \
@@ -165,6 +171,7 @@ putenv.m4 \
 readdir.m4 \
 realloc.m4 \
 regex.m4 \
+rename.m4 \
 rmdir-errno.m4 \
 search-libs.m4 \
 st_dm_mode.m4 \
@@ -182,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 \
@@ -220,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:
 
@@ -255,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 16
+#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([
@@ -72,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/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/ftruncate.m4

@@ -1,27 +1,14 @@
-#serial 2
+#serial 3
 
-# See if we need to emulate a missing ftruncate function using fcntl.
+# See if we need to emulate a missing ftruncate function using fcntl or chsize.
 
 AC_DEFUN(jm_FUNC_FTRUNCATE,
 [
   AC_CHECK_FUNCS(ftruncate, , [ftruncate_missing=yes])
 
   if test "$ftruncate_missing" = yes; then
-    AC_CHECK_HEADERS(unistd.h)
-    AC_MSG_CHECKING([fcntl emulation of ftruncate])
-    AC_CACHE_VAL(fu_cv_sys_ftruncate_emulation,
-    [AC_TRY_LINK([
-#include <sys/types.h>
-#include <fcntl.h>], [
-#if !defined(F_CHSIZE) && !defined(F_FREESP)
-  chsize();
-#endif
-  ],
-      fu_cv_sys_ftruncate_emulation=yes,
-      fu_cv_sys_ftruncate_emulation=no)])
-    AC_MSG_RESULT($fu_cv_sys_ftruncate_emulation)
-    if test $fu_cv_sys_ftruncate_emulation = yes; then
-      AC_LIBOBJ(ftruncate)
-    fi
+    AC_CHECK_HEADERS([unistd.h])
+    AC_CHECK_FUNCS([chsize])
+    AC_LIBOBJ(ftruncate)
   fi
 ])

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])

m4/iconv.m4

@@ -1,13 +1,13 @@
-#serial 1
+#serial 3
 
 dnl From Bruno Haible.
 
 AC_DEFUN(jm_ICONV,
 [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable libiconv installed).
+  dnl those with the standalone portable GNU libiconv installed).
   AC_CACHE_CHECK(for iconv, jm_cv_func_iconv, [
-    jm_cv_func_iconv="no, consider installing libiconv"
+    jm_cv_func_iconv="no, consider installing GNU libiconv"
     jm_cv_lib_iconv=no
     AC_TRY_LINK([#include <stdlib.h>
 #include <iconv.h>],
@@ -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 26
+#serial 35   -*- autoconf -*-
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
 AC_DEFUN(jm_MACROS,
 [
-  AC_PREREQ(2.14a)
+  AC_PREREQ(2.49d)
 
   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])
@@ -102,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)
@@ -119,6 +83,11 @@ AC_DEFUN(jm_MACROS,
   AC_REPLACE_FUNCS(memchr memcpy memmove memrchr memset)
   AC_CHECK_FUNCS(getpagesize)
 
+  AC_REPLACE_FUNCS(mkstemp)
+  if test $ac_cv_func_mkstemp != yes; then
+    AC_LIBOBJ(tempname)
+  fi
+
   # By default, argmatch should fail calling usage (1).
   AC_DEFINE(ARGMATCH_DIE, [usage (1)],
 	    [Define to the function xargmatch calls on failures.])
@@ -176,6 +145,7 @@ AC_DEFUN(jm_MACROS,
     strerror \
     strrchr \
     sysinfo \
+    wcrtomb \
     tzset \
   )
 
@@ -221,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,
 [
@@ -250,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 13
+#serial 18
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -10,12 +10,14 @@ AC_DEFUN(jm_PREREQ,
   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,
@@ -53,6 +55,12 @@ AC_DEFUN(jm_PREREQ_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,
@@ -70,8 +78,9 @@ AC_DEFUN(jm_PREREQ_MEMCHR,
 
 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
@@ -91,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
 "
@@ -113,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/rmdir-errno.m4

@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 # When rmdir fails because the specified directory is not empty, it sets
 # errno to some value, usually ENOTEMPTY.  However, on some AIX systems,
@@ -25,12 +25,12 @@ extern int errno;
 	  int val;
 	  rmdir ("confdir2");
 	  val = errno;
-	  s = fopen ("confdir2/file", "w");
+	  s = fopen ("confdir2/errno", "w");
 	  fprintf (s, "%d\n", val);
 	  exit (0);
 	}
 	],
-      fetish_cv_func_rmdir_errno_not_empty=`cat confdir2/file`,
+      fetish_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`,
       fetish_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4',
       fetish_cv_func_rmdir_errno_not_empty=ENOTEMPTY
       )

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/rm.x

@@ -13,24 +13,6 @@ the \fI\-f\fR or \fI\-\-force\fR option is not given,
 .B rm
 prompts the user for whether to remove the file.  If the response
 does not begin with `y' or `Y', the file is skipped.
-.LP
-GNU
-.BR rm ,
-like every program that uses the getopt function to parse its
-arguments, lets you use the
-.I \-\-
-option to indicate that all following arguments are non-options.  To
-remove a file called `\-f' in the current directory, you could type
-either
-.RS
-rm \-\- \-f
-.RE
-or
-.RS
-rm ./\-f
-.RE
-The Unix
-.B rm
-program's use of a single `\-' for this purpose predates the
-development of the getopt standard syntax.
 .SH OPTIONS
+[SEE ALSO]
+shred(1)

old/fileutils/NEWS

@@ -1,4 +1,90 @@
-Changes in release 4.01:
+Changes in release 4.1:
+[4.0.45]
+* dd conv=sync,block now pads only with spaces
+* ls's -1 option no longer cancels the effect of a preceding -l
+* regenerate configure using a patched version of autoconf-2.49e to work
+    around a bug in its test for a working memcmp function
+* ls: fix off-by-one error introduced with the previous change
+[4.0.44]
+* ls: When given two or more arguments but the only one that exists is a
+    directory, don't treat it as if it were the only argument.  Before,
+    `mkdir d; ls no-dir d 2>/dev/null' would act like `ls d' and produce
+    no output.  Now, it prints `d:'.
+* touch -d 'last friday' would use a time stamp that was one hour off
+    (e.g., 23:00 on *thursday* rather than 00:00 of the preceding friday)
+    when run such that the current time and the target date/time fall on
+    opposite sides of a daylight savings time transition.
+    This problem arises only with relative date strings like `last monday'.
+    It is not a problem with strings that include absolute dates.
+[4.0.43]
+* regenerate configure-related files using autoconf-2.49d
+[4.0.42]
+* Using ls's short-named `-H' option evokes the warning that the
+   meaning of `-H' will soon change.  Use `--si' instead.
+[4.0.41]
+* fix bug in rm introduced in 4.0.38: `chmod 0 f; rm f' would no longer prompt
+    before removal.
+[4.0.40]
+* portability fixes, mainly for UnixWare 7.1.1
+[4.0.39]
+* cp and mv accept --strip-trailing-slashes, not just --strip-trailing-slash
+[4.0.38]
+* ls --full-time now implies -l;  before, without -l it was a no-op
+[4.0.37]
+* portability fixes for SunOS4.1.1, Fujitsu (f300-fujitsu-uxpv4.1_ES),
+    and Unicos (alphaev5-cray-unicosmk2.0.5.X)
+[4.0.36]
+* `mv dir/ new-name' no longer fails on SunOS4.1.1U
+* attempting to use mv to move a symlink onto itself no longer removes
+    the symlink
+* `cp -R directory file' no longer removes `file'.  now it fails and gives
+    a diagnostic
+* The manual now warns that ls's --full-time format string is planned
+    to change in a future release.
+* ls -l's time stamp format now depends on LC_TIME, not LC_MESSAGES,
+    as POSIX requires.
+* ls -l now reports the year for files even slightly in the future, as
+    POSIX requires.  This helps warn users about clock skew problems.
+* `cp -d file symlink-to-some-other-file' no longer fails
+* performance improvements for ls
+[4.0.35]
+* ln --backup=simple --suffix=SUFFIX once again uses SUFFIX
+* install: Likewise.
+[4.0.34]
+* fix a bug (introduced in 4.0z) that made `chown 123:456 file' act like
+    `chown 123:123 file'.  Other uses with a numeric group ID would cause
+    chown to fail when it shouldn't have.
+* the chown and chgrp programs preserve set-uid and set-gid bits, even on
+    systems for which the chown function call resets those bits.
+* `ls -L dangling-symlink' now fails (per POSIX) rather than printing the
+    link name
+* dd no longer honors the just-added `B' suffix on skip= and seek= arguments.
+* `mkdir no-such-dir/' no longer fails on NetBSD systems
+[4.0.33]
+* dd now accepts skip=nB and seek=nB, to advance past some number of bytes, n,
+    that need not be a multiple of the block size.
+* dd (without conv=notrunc) now complains only when ftruncate fails on a
+    regular file, a directory, or a shared memory object -- not when it fails
+    to truncate other types of files, like /dev/fd0.
+* chmod --changes (-c) once again issues diagnostics only for the files
+    with changed permissions
+* mkdir now gives one diagnostic (rather than two) for certain failures
+* mkdir portability fix for NetBSD
+[4.0.32]
+* touch now interprets a lone numeric argument of 8 or 10 digits as a file name,
+  rather than as a date/time in the obsolescent `MMDDhhmm[YY]' format.
+* mkdir no longer sets the permissions of the final directory component
+  if it already exists (this bug, too, was introduced recently)
+* ls's --full-time format string is now locale dependent
+[4.0.31]
+* mkdir: fix a bug introduced in 4.0.30 whereby `mkdir existing-dir' would
+  succeed.  Now it fails, as it should (and used to).
+[4.0.30]
+* mkdir: fix a bug introduced in 4.0.28 whereby parent directories created
+  via `mkdir -p' would have permissions that did not account for the umask
+[4.0.29]
+* ls.c wouldn't compile on some systems: fix it
+* `cp -R --parents dir1/ dir2' failed on NetBSD, due to a portability problem
 [4.0.28]
 * ls is much more efficient on systems (e.g., linux-2.4.*) that store file
     type information in directory entries.
@@ -33,7 +119,7 @@ Changes in release 4.01:
 * cp -p and mv now try to preserve uid even if you're not root, as per POSIX.2.
   This affects behavior only on hosts that let you give files away via chmod.
 * du would fail when given `.' or `..' followed by other command line arguments
-* Using cp's short-named `-P' option evokes the warning that that the
+* Using cp's short-named `-P' option evokes the warning that the
    meaning of `-P' will soon change.  Use `--parents' instead.
 * chgrp, chmod, and chown: when used with the --verbose option, might give an
   invalid diagnostic (due to clobbered errno) when failing.

old/sh-utils/ChangeLog

@@ -1,3 +1,165 @@
+2001-03-09  Jim Meyering  <meyering@lucent.com>
+
+	* src/factor.c: Include wheel-size.h.
+	(WHEEL_START): Adjust definition.
+	(wheel_tab[]): Remove body of definition.
+	Include generated file, wheel.h, instead.
+
+	* src/wheel-gen.pl: New file.
+	* src/Makefile.am (noinst_HEADERS): Add wheel.h wheel-size.h.
+	(EXTRA_DIST): Add wheel-gen.pl.
+	(PERL): Define.
+	(wheel-size.h, wheel.h): New rules.
+	(BUILT_SOURCES): Add wheel.h and wheel-size.h.
+	(MAINTAINERCLEANFILES): Define.
+
+2001-04-20  Jim Meyering  <meyering@lucent.com>
+
+	* doc/sh-utils.texi (false invocation): Describe how --help and
+	--version are treated with and without POSIXLY_CORRECT.
+	(true invocation): Likewise.  Forwarded by Michael Stone.
+
+2001-03-18  Jim Meyering  <meyering@lucent.com>
+
+	* tests/Fetish.pm: If the $DJDIR envvar is defined, set SHELL
+	to $DJDIR/bin/bash.exe.  Patch from Richard Dawe, based on a
+	suggestion from Eli Zaretskii.
+
+2001-03-10  Jim Meyering  <meyering@lucent.com>
+
+	* doc/sh-utils.texi (date invocation): Correct the description of how
+	date works when given no format.  Reported by Ole Laursen.
+
+2001-03-09  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.maint (my_distdir): Define new variable, and use this
+	in place of most old uses of $(distdir).
+
+	* src/date.c (usage): Describe %C.
+	* doc/sh-utils.texi (Date directives): Likewise.
+
+	* tests/help-version: Ensure that /dev/full is a character device
+	(using test -c) as well as being writable, before trying to write to it.
+	Otherwise, the test could mistakenly append a newline to an existing,
+	regular, writable, /dev/full file.
+	Suggested by Ulrich Drepper.
+
+2001-03-07  Jim Meyering  <meyering@lucent.com>
+
+	* tests/stty/Makefile.am (EXTRA_DIST): Remove input-tty.
+	* tests/Makefile.am (EXTRA_DIST): Add input-tty.
+
+	* tests/stty/basic-1: Reflect change in location of input-tty.
+	* tests/stty/row-col: Likewise.
+	* tests/stty/input-tty: Move this file...
+	* tests/input-tty: ... to here.
+
+2001-02-24  Paul Eggert  <eggert@twinsun.com>
+
+	* doc/sh-utils.texi: Fix typo: '-d=1may' -> '-d 1may'.
+	Fix and clarify time zone usage in 'date' examples.
+
+2001-02-04  Jim Meyering  <meyering@lucent.com>
+
+	* src/factor.c (usage): Tweak --help output: it prints the _prime_
+	factors, not just any factors.
+
+2001-02-03  Jim Meyering  <meyering@lucent.com>
+
+	Improve the performance of `factor' (more than 2x speed-up for large N).
+	* src/factor.c (wheel_tab): New global table.
+	(WHEEL_START, WHEEL_END): Define.
+	(factor): Remove the loop that special-cased `2'.
+	Instead of incrementing by `2', use the offsets from the wheel table.
+	From Michael Steffens.
+
+2000-11-27  Prashant TR  <rprash@wilco-int.com>
+
+	* src/test.c (eaccess) [__MSDOS__]: Just use access.
+
+2001-01-26  Jim Meyering  <meyering@lucent.com>
+
+	* src/dirname.c (main): Declare local result as non-const, now
+	that it's freed.
+
+2001-01-20  Jim Meyering  <meyering@lucent.com>
+
+	* configure.in: Remove jm_CHECK_ALL_TYPES.
+	Now it's invoked by jm_MACROS.
+
+2001-01-04  Jim Meyering  <meyering@lucent.com>
+
+	* src/date.c (main): Fail when --rfc-822 (-R) is specified along
+	with a format string.  Reported by Jochen Hein.
+
+2000-12-17  Jim Meyering  <meyering@lucent.com>
+
+	* doc/texinfo.tex: Update from master repository.
+	* config.sub: Likewise.
+	* config.guess: Likewise.
+
+	* djgpp: New directory.
+	* djgpp/*: New files.
+	* Makefile.am (SUBDIRS): Add djgpp.
+	* configure.in (AC_OUTPUT): Add djgpp/Makefile.
+	From Prashant TR.
+
+2000-12-08  Jim Meyering  <meyering@lucent.com>
+
+	* src/dirname.c: Include xalloc.h.
+	(main): Use dir_name rather than the underlying dir_name_r.
+	The former now handles cwd-relative names with drive-letter prefixes.
+
+2000-12-02  Jim Meyering  <meyering@lucent.com>
+
+	* src/seq.c (valid_format): Move pre-increment to a separate statement
+	to avoid a warning.
+
+	* src/id.c: Move dcls of globals used only in main...
+	(main): ...to here.
+	(usage): Clarify option descriptions.
+
+2000-11-18  Jim Meyering  <meyering@lucent.com>
+
+	* po/Makefile.in.in: Sync with the one from fileutils.
+
+	* configure, config.h.in, Makefile.in, etc.: Regenerate using the
+	very latest version (in CVS) of autoconf.
+
+2000-11-17  Jim Meyering  <meyering@lucent.com>
+
+	* GNUmakefile (.NOTPARALLEL): New target.  Prevent unwanted parallelism.
+	Suggestion from Ulrich Drepper.
+
+	* src/pinky.c: Explicitly include sys/types.h before including system.h.
+	* src/uptime.c: Likewise.
+	* src/users.c: Likewise.
+	* src/who.c: Likewise.
+
+2000-11-13  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sys2.h (ST_TIME_CMP_NS): Fix typo: ST_MTIM_NSEC should
+	be tested with #ifdef, not with #if.
+
+2000-11-12  Jim Meyering  <meyering@lucent.com>
+
+	* src/date.c (show_date): Add a comment explaining why the
+	format string must not be translatable via _().  From Paul Eggert.
+
+2000-10-31  Jim Meyering  <meyering@lucent.com>
+
+	* doc/sh-utils.texi: Clean up indentation and punctuation.
+	Fix a couple typos.  From Brian Youmans.
+
+2000-10-30  Jim Meyering  <meyering@lucent.com>
+
+	* configure, config.h.in, Makefile.in, etc.: Regenerate using the
+	very latest version (in CVS) of autoconf.
+
+2000-10-29  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0.11.
+
 2000-10-27  Jim Meyering  <meyering@lucent.com>
 
 	* src/date.c (usage): Mention the time zone, UTC, and write the date
@@ -38,6 +200,7 @@
 	* src/date.c (TZ_UTC0, MAYBE_SET_TZ_UTC0, set_tz): Remove.
 	(batch_convert): Don't futz with TZ.
 	(main): -u now parses all dates as UTC, not just some.
+	Reported by Karl-Michael Schneider.
 	* tests/date/Test.pm (utc-0, utc-1, relative-2): Adjust to
 	above change.
 
@@ -346,7 +509,7 @@
 2000-03-12  Jim Meyering  <meyering@lucent.com>
 
 	Merge from textutils.
-	* src/system.h: (O_BINARY, O_TEXT): Define if necessary.
+	* src/system.h (O_BINARY, O_TEXT): Define if necessary.
 	(SET_BINARY, SET_BINARY2): Define.
 	(DEV_BSIZE): Define to BBSIZE if appropriate.
 
@@ -857,7 +1020,7 @@
 	* src/false.c: New file.
 	* src/true.sh: Removed.
 	* src/false.sh: Removed.
-	* src/Makefile.am: (bin_PROGRAMS): Add true and false.
+	* src/Makefile.am (bin_PROGRAMS): Add true and false.
 	(bin_SCRIPTS): Remove true and false.
 	(EXTRA_DIST): Remove false.sh and true.sh.
 	* man/true.1in: New file.
@@ -1152,7 +1315,7 @@
 
 	Running `id USER' doesn't report any groups if there is no entry
 	for USER in /etc/group.  Always include the one from /etc/passwd.
-	* src/id.c: (xgetgroups): Take new parameter, gid, and pass
+	* src/id.c (xgetgroups): Take new parameter, gid, and pass
 	it to getugroups.
 	(print_group_list): Call getpwuid and adjust calls to xgetgroups
 	to include new parameter.
@@ -1488,7 +1651,7 @@
 	* configure.in (jm_MACROS): New wrapper macro.
 	Remove uses of most jm_* macros.
 
-	* acconfig.h: (chown): Add undef.
+	* acconfig.h (chown): Add undef.
 	(D_INO_IN_DIRENT): Likewise.
 	(D_TYPE_IN_DIRENT): Likewise.
 	(ssize_t): Likewise.
@@ -2066,7 +2229,7 @@ Thu May  1 00:10:11 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 
 Sun Apr 27 18:30:53 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 
-	* src/printf.c: (cfcc_msg): File-scope constant.
+	* src/printf.c (cfcc_msg): File-scope constant.
 	(STRTOX): Use new constant as error message format string in macro.
 	Suggestion from Andreas Schwab.
 	(STRTOX): Don't fail because of extra character(s) following a
@@ -2080,7 +2243,7 @@ Sun Apr  6 14:29:14 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 	(xstrtod, xstrtol, xstrtoul): Remove functions.
 	Use the STRTOX instead.
 
-	* src/printf.c: (STRTOX): Interpret arguments like 'a and "a
+	* src/printf.c (STRTOX): Interpret arguments like 'a and "a
 	as POSIX requires.  Derived from a patch by Dennis Henriksen.
 
 Sun Mar 23 15:20:17 1997  Jim Meyering  <meyering@na-net.ornl.gov>
@@ -2132,7 +2295,7 @@ Tue Mar 18 06:46:54 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 
 Thu Mar 13 21:27:36 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 
-	* lib/mktime.c: (TIME_T_MIN): Work around a bug in Cray C 5.0.3.0.
+	* lib/mktime.c (TIME_T_MIN): Work around a bug in Cray C 5.0.3.0.
 
 Wed Feb 19 23:06:46 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 
@@ -2224,7 +2387,7 @@ Wed Jan 22 20:12:31 1997  Jim Meyering  <meyering@na-net.ornl.gov>
 	* lib/strftime.c (_strftime_copytm):
 	New function, to work around Solaris 2.5 tzset bug.
 
-	* m4/mktime.m4: (AM_FUNC_MKTIME): Fix bug in mktime test -- don't
+	* m4/mktime.m4 (AM_FUNC_MKTIME): Fix bug in mktime test -- don't
 	test now, test a couple of thousand times.
 
 	* m4/strftime.m4 (main): Use TZ=GMT0, not TZ=GMT, since only GMT0 is
@@ -3743,7 +3906,7 @@ Mon Aug  7 23:27:54 1995  Jim Meyering  (meyering@comco.com)
 
 Fri Jun 23 23:04 1995  Jim Meyering  (meyering@comco.com)
 
-	* configure.in: (AC_REPLACE_FUNCS): Add memcpy and memset.
+	* configure.in (AC_REPLACE_FUNCS): Add memcpy and memset.
 	Add checks for floor, modf, and rint -- all used by seq.c.
 
 Mon Jun 12 00:26:54 1995  Jim Meyering  (meyering@comco.com)
@@ -3793,7 +3956,7 @@ Fri May 12 21:25:50 1995  Jim Meyering  (meyering@comco.com)
 
 Tue Apr 18 22:57:43 1995  Jim Meyering  (meyering@comco.com)
 
-	* configure.in: (AC_OUTPUT): Use echo, not date, to avoid creating
+	* configure.in (AC_OUTPUT): Use echo, not date, to avoid creating
 	unnecessary conflicts for people using version control software
 	like RCS and CVS.
 	(AC_ARG_PROGRAM): Use it.

old/sh-utils/NEWS

@@ -1,6 +1,15 @@
 Changes in release 2.1
- [2.0k]
+ [2.0.12]
+* date -d 'last friday' would print a date/time that was one hour off
+    (e.g., 23:00 on *thursday* rather than 00:00 of the preceding friday)
+    when run such that the current time and the target date/time fall on
+    opposite sides of a daylight savings time transition.
+    This problem arose only with relative date strings like `last monday'.
+    It was not a problem with strings that include absolute dates.
+ [2.0.11]
+* setting the date now works properly, even when using -u
 * `date -f - < /dev/null' no longer dumps core
+* some DOS/Windows portability changes
  [2.0j]
 * `date -d DATE' now parses certain relative DATEs correctly
  [2.0i]

old/textutils/ChangeLog

@@ -1,3 +1,718 @@
+2001-04-22  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0.14.
+
+	* configure: Regenerate using a patched copy of autoconf-2.49e to
+	work around a bug in its test for a working memcmp function.
+
+2001-03-28  Paul Eggert  <eggert@twinsun.com>
+
+	* src/cksum.c: Fix bugs when computing length of large files.
+	Add overflow and write error checks.  Use uint_fast32_t, not
+	unsigned long, to do checksum calculation, as C99 says
+	uint_fast32_t should be no slower and might be faster.
+
+	Include <stdio.h> and "system.h" even if CRCTAB is defined,
+	so that the code will compile if CRCTAB is defined.
+	Include "human.h" if CRCTAB is not defined.
+	(uint_fast32_t): Define if it appears that stdint.h didn't.
+	(BIT, remainder, main, crctab): Use uint_fast32_t, not unsigned long,
+	for checksums.
+	(fill_r, remainder, main): Use ANSI prototypes.
+	(fill_r, remainder, main): Omit duplicate code.
+	(main): Use uintmax_t, not unsigned long, for file lengths.
+	Use size_t, not long, for result of fread.
+	Check for overflow when computing file lengths.
+	Check for write error immediately after printing a line, so that
+	we don't write to stdout indefinitely after an error.
+
+2001-04-14  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (default_sort_size): Leave a 1/16 margin for RSS.
+	Suggestion from Solar Designer.
+
+2001-04-14  Jim Meyering  <meyering@lucent.com>
+
+	* src/wc.c (usage): Tweak --help output: s/line,/newline,/
+
+2001-04-13  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (main): Add a comment justifying the use of
+	`multi-character' rather than `multibyte' in a diagnostic.
+	From Paul Eggert.
+
+2001-04-12  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (RLIMIT_AS): Do not define; just use conditional
+	code, since RLIMIT_RSS is similar (and is not standardized).
+	(default_sort_size): Don't allocate more than the RSS limit,
+	if this host has such a limit.
+
+2001-03-20  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, doc/textutils.texi: sort now accepts long options and
+        checks POSIX option syntax.
+
+	* doc/textutils.texi: Document --, -, sort long options, and
+	sort -o after files.
+
+	* src/sort.c: Include <getopt.h>.
+	(usage, main): Add support for long options, and check option
+	syntax as POSIX requires, though (as usual for GNU apps)
+	options can follow file names unless POSIXLY_CORRECT is set.
+	Many diagnostic revamped.
+	(long_options): New constant.
+	(badfieldspec): New arg MSGID.  Mark as noreturn.
+	(parse_field_count): New arg MSGID; if null, just return null on error.
+	(new_key): Renamed from key_init.  All callers changed.  Now allocates
+	the new key.
+
+2001-03-18  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0.13.
+
+	* tests/Fetish.pm: If the $DJDIR envvar is defined, set SHELL
+	to $DJDIR/bin/bash.exe.  Patch from Richard Dawe, based on a
+	suggestion from Eli Zaretskii.
+
+2001-03-17  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c, src/tail.c, src/uniq.c (usage):
+	Warn that the +N form will be withdrawn.
+	* doc/textutils.texi: Likewise.
+
+2001-03-08  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, doc/textutils.texi: Document pr changes.
+
+	* src/pr.c: Include mbswidth.h.
+	(standard_header, header, test_suite): Remove.
+	(date_format, date_text, file_text, header_width_available): New vars.
+	(long_options, main, init_header, usage):
+	Add new -D or --date-format option.
+	(CHARS_FOR_DATE_AND_PAGE, T_BUF_FMT, T_BUF_SIZE, NO_DATE): Remove.
+	(init_header): Allow arbitrary width for date format.  Change
+	"Page %5d" to "Page %d", since the code no longer assumes fixed width.
+	Do not assume that localtime succeeds.
+	(init_header, print_header, usage): Do not truncate headers.
+	(init_header, print_header): Defer width calculations until
+	page is printed, since "Page 100000" is wider than "Page 1".
+	Count columns, not bytes, in page headers.
+	Custom headers take up only the center, not the whole header.
+	(print_header): Use printf rather than fprintf(stdout).
+
+	* po/Makefile.in.in (install-data-yes): Install LC_TIME locale
+	for all packages, not just for fileutils.
+	(uninstall): Remove LC_TIME locale too.
+
+	* src/sys2.h (INT_STRLEN_BOUND): New macro.
+
+	* tests/pr/0F, tests/pr/0FF, tests/pr/2-S_f-t_notab,
+          tests/pr/2-Sf-t_notab, tests/pr/2f-t_notab,
+          tests/pr/2s_f-t_notab, tests/pr/2s_w60f-t_nota,
+          tests/pr/2sf-t_notab, tests/pr/2sw60f-t_notab,
+          tests/pr/2w60f-t_notab, tests/pr/3-0F, tests/pr/3-5l17f-t,
+          tests/pr/3-FF, tests/pr/3a2l17-FF, tests/pr/3a3f-0F,
+          tests/pr/3a3l15-t, tests/pr/3a3l8f-t, tests/pr/3b2l17-FF,
+          tests/pr/3b3f-0F, tests/pr/3b3f-0FF, tests/pr/3b3f-FF,
+          tests/pr/3b3l15-t, tests/pr/3b3l8f-t, tests/pr/3f-0F,
+          tests/pr/3f-FF, tests/pr/3l17f-t, tests/pr/3l24-t,
+          tests/pr/3ml17f-t, tests/pr/3ml24-FF, tests/pr/3ml24-t,
+          tests/pr/3ml24-t-FF, tests/pr/4-7l24-FF, tests/pr/4l24-FF,
+          tests/pr/a2l15-FF, tests/pr/a2l17-FF, tests/pr/a3-0F,
+          tests/pr/a3f-0F, tests/pr/a3f-0FF, tests/pr/a3f-FF,
+          tests/pr/a3l15-t, tests/pr/a3l17f-lm, tests/pr/a3l8f-t,
+          tests/pr/b2l15-FF, tests/pr/b2l17-FF, tests/pr/b3-0F,
+          tests/pr/b3f-0F, tests/pr/b3f-0FF, tests/pr/b3f-FF,
+          tests/pr/b3l15-t, tests/pr/b3l17f-lm, tests/pr/b3l8f-t,
+          tests/pr/FF, tests/pr/Ja3l17f-lm, tests/pr/Jb3l17f-lm,
+          tests/pr/Jml17f-lm-lo, tests/pr/l17f-t, tests/pr/l24-FF,
+          tests/pr/l24-t, tests/pr/ml17f-0F, tests/pr/ml17f-lm-lo,
+          tests/pr/ml17f-t, tests/pr/ml17f-t-0F, tests/pr/ml20-FF-t,
+          tests/pr/ml24-FF, tests/pr/ml24-t, tests/pr/ml24-t-FF,
+          tests/pr/n+2-5l17f-0FF, tests/pr/n+2l17f-0FF,
+          tests/pr/n+2l17f-bl, tests/pr/n+3-7l24-FF,
+          tests/pr/n+3l17f-0FF, tests/pr/n+3l17f-bl,
+          tests/pr/n+3ml13f-bl-FF, tests/pr/n+3ml17f-bl-tn,
+          tests/pr/n+3ml17f-tn-bl, tests/pr/n+4-8a2l17-FF,
+          tests/pr/n+4b2l10f-0FF, tests/pr/n+5-8b3l10f-FF,
+          tests/pr/n+5a3l6f-0FF, tests/pr/n+6a2l17-FF,
+          tests/pr/n+6b3l6f-FF, tests/pr/n+7l24-FF,
+          tests/pr/n+8l20-FF, tests/pr/nJml17f-lmlmlo,
+          tests/pr/nJml17f-lmlolm, tests/pr/nl17f-bl,
+          tests/pr/nN1+3l17f-bl, tests/pr/nN15l17f-bl,
+          tests/pr/nSml13-bl-FF, tests/pr/nSml13-t-t-FF,
+          tests/pr/nSml13-t-tFFFF, tests/pr/nSml17-bl-FF,
+          tests/pr/nSml17-t-t-FF, tests/pr/nSml17-t-tFFFF,
+          tests/pr/o3a3l17f-tn, tests/pr/o3a3Sl17f-tn,
+          tests/pr/o3a3Snl17f-tn, tests/pr/o3b3l17f-tn,
+          tests/pr/o3b3Sl17f-tn, tests/pr/o3b3Snl17f-tn,
+          tests/pr/o3Jml17f-lm-lo, tests/pr/o3ml17f-bl-tn,
+          tests/pr/o3mSl17f-bl-tn, tests/pr/o3mSnl17fbltn,
+          tests/pr/Test.pm, tests/pr/W-72l17f-ll, tests/pr/W20l17f-ll,
+          tests/pr/W26l17f-ll, tests/pr/W27l17f-ll,
+          tests/pr/W28l17f-ll, tests/pr/W35a3l17f-lm,
+          tests/pr/W35b3l17f-lm, tests/pr/W35Ja3l17f-lm,
+          tests/pr/W35Jb3l17f-lm, tests/pr/W35Jml17f-lmlo,
+          tests/pr/W35ml17f-lm-lo, tests/pr/W72Jl17f-ll,
+          tests/pr/w72l17f-ll:
+	Adjust to minor spacing changes in pr headers.
+
+2001-03-11  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (die): New message arg, to describe failures
+	better.  All callers changed.
+
+2001-03-11  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c: Decrease buffer size when only merging or checking.
+	(sort_size): Now the user-specified sort size.
+	(MIN_MERGE_BUFFER_SIZE): New macro.
+	(MIN_SORT_SIZE): Use it.
+	(merge_buffer_size): New variable.
+	(fillbuf): Increase merge_buffer_size if a longer line is encountered.
+	(checkfp, mergefps): Do not allocate a buffer smaller than
+	merge_buffer_size.
+	(sort): Use the default_sort_size if sort_size is zero.
+	(main): Do not set sort_size to default_sort_size.
+
+2001-03-06  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (sort): If all the input files are empty, create
+	an empty output file.
+	* tests/sort/Test.pm: Test for this.
+
+2001-03-13  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (merge): Move declarations of local variables into
+	the inner scope where they're used.
+	(sort): Likewise.
+
+2001-03-06  Paul Eggert  <eggert@sic.twinsun.com>
+
+	Avoid the need for a copy of the input file when the input and
+	output overlap, e.g. 'sort F -o F'.  With -m, though, a copy
+	is still needed sometimes.
+
+	* doc/textutils.texi: 'sort F -o F' no longer needs to copy F.
+
+	* src/sort.c: Do not include closeout.h.
+	(xfopen): Use stdout if *how != 'r'.
+	(mergefps): Remove FPS arg.
+	Open all input files, and close all files when done.
+	If OFP is null, open the output file (but after opening input files).
+	All callers changed.
+	(first_same_file): New function.
+	(sort, merge): Remove arg OFP; we now open the output file as needed.
+	All callers changed.
+	(merge): New arg MAX_MERGE.  All callers changed.
+	(sort):	For "sort F -o F", close the input before opening the output.
+	(main): Do not use close_stdout; 'sort' and 'merge' now close stdout.
+	(This also fixes a close-stdout-twice bug.)
+	Remove test for overlapping input and output files, as 'sort' no longer
+	needs to worry about overlap, and 'merge' checks for overlap itself.
+	Use first_same_file to inform 'merge' about how much to merge at
+	the top level, to avoid overlap.
+
+2001-03-12  Jim Meyering  <meyering@lucent.com>
+
+	`fmt --prefix=S' would not work properly for any string S containing
+	a byte with the high bit set.
+	* src/fmt.c (prefix): Declare to be of type unsigned char, not `char'.
+	(get_prefix): Likewise for local, `p'.
+	Reported by François Pinard.
+
+	Add a test for the above-fixed problem.
+	* tests/fmt: New directory/files.
+	* configure.in (AC_OUTPUT): Add tests/fmt/Makefile.
+	* tests/Makefile.am (SUBDIRS): Add fmt.
+
+2001-03-05  Andreas Schwab  <schwab@suse.de>
+
+	* src/tac.c (save_stdin): Use mkstemp to create temporary file.
+
+2001-03-09  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.maint (my_distdir): Define new variable, and use this
+	in place of most old uses of $(distdir).
+
+	* tests/help-version: Ensure that /dev/full is a character device
+	(using test -c) as well as being writable, before trying to write to it.
+	Otherwise, the test could mistakenly append a newline to an existing,
+	regular, writable, /dev/full file.
+	Suggested by Ulrich Drepper.
+
+2001-03-08  Jim Meyering  <meyering@lucent.com>
+
+	* tests/sha1sum/sample-vec: Insert the `--text' argument for each test.
+	Reported by Matthew Smith.
+
+2001-03-04  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.maint (my_distdir): Define.
+	Use it in place of $(distdir) almost everywhere.
+
+	* Version 2.0.12.
+
+	* Makefile.maint (alpha): Use $(PACKAGE)-$(VERSION), not $(distdir),
+	since the latter now has a `$(top_distdir)/' prefix.
+
+2001-03-01  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (die): New function.
+	(create_temp_file, xfopen, xfclose, write_bytes, sort_buffer_size,
+	fillbuf, main): Use it to regularize error messages.  The only change
+	in behavior is that write_bytes and the final close used to say "write
+	error" but now give just the output file name, which should be enough.
+
+2001-03-01  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (xfclose): Add FILE arg, and report the file name
+	on error.  All callers changed.
+
+2001-03-01  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (main): When fclose (stdin) fails, do not mention
+	the output file in the error message; mention "-" instead.
+
+2001-02-28  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (xfopen): Set have_read_stdin to 1 only if file is "-".
+	Use fopen_safer, not fopen, to avoid subtle bugs when fopen returns
+	stdin, stdout, or stderr.
+	(xfclose): stdout is no longer a special case.
+	(main): Close output file, don't just flush it; there might be
+	an error on the close.
+
+2001-02-27  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (initbuf): If the desired size cannot be
+	allocated, repeatedly halve it until allocation succeeds.
+	Reported by Solar Designer.
+
+2001-02-26  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (parse_field_count): Comment fix.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c: Tune allocation and comparison of nodes
+	representing temp files.  This improved CPU performance of
+	'sort -S 1 *.[ch]' by 17% on my host.
+
+	(struct tempnode): name member now uses struct hack.
+	(temphead): Now a pointer, not a structure.  All uses changed.
+	(create_temp_file): Allocate node using struct hack.
+	(zaptemp): Free node using struct hack.  Use pointer comparison, not
+	string comparison.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (eolchar, trim_trailing_blanks): Now static.
+
+2001-02-25  Paul Eggert  <eggert@twinsun.com>
+
+	'sort' race condition fixes.
+
+	Defend against a DoS attack where someone else creates a
+	temporary file with the same name as ours.  Use mkstemp to do
+	this, supplying our own mkstemp if the system doesn't have one.
+
+	Also, fix a race condition during cleanup on hosts without
+	sigaction.
+
+	* src/sort.c (NAME_MAX_IN_DIR): Remove.
+	(sigprocmask, sigset_t): New macros, defined only on older hosts.
+	(caught_signals): New var.
+	(xtmpfopen, tempname): Removed.
+	(create_temp_file): New function, combining the functions of the old
+	xtmpfopen and tempname.  All callers changed.
+	Use mkstemp to create the file.
+	(sighandler): On hosts without sigaction, ignore signals while
+	cleaning up, instead of letting them interrupt cleanup.
+	(main): Initialize caught_signals.  On hosts with sigaction, block all
+	caught signals while handling one.  Remove duplicate code.
+
+2001-02-22  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (keycompare): Move declarations of locals, lena and lenb,
+	into the inner scope where they are used.
+
+2001-02-19  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (AUTHORS): Add Paul Eggert.
+
+	* src/wc.c (wc): Rename innermost `buf' to avoid shadowing warning.
+	(wc): Rename local `wc' to avoid shadowing function name.
+
+2001-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	Fix a race condition: freed storage accessed during a signal handler.
+
+	* src/sort.c (struct tempnode.next): Now volatile.
+	(zaptemp): Free the file name after removing it from the temp list,
+	not before, because a signal can arrive between the two actions
+	and cleanup () traverses the list.
+
+2001-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	Check for input size, and do not overallocate memory.
+	Also check for memory quotas.
+
+	Revamp storage management so that line tables and character data are
+	taken from the same buffer.  Line tables are now in reverse order,
+	since they grow down while the character data grow up.
+
+	* src/sort.c:
+	(<sys/resource.h>): Include if HAVE_SYS_RESOURCE_H.
+	(struct rlimit, getrlimit): Define a replacement if RLIMIT_DATA
+	is not defined.
+	(RLIMIT_AS): Define to RLIMIT_DATA if not defined.
+	(struct lines): Remove.
+	(struct buffer): New members nlines, line_bytes, eof.
+	Remove member newline_free; no longer needed, since the code no longer
+	runs out of line table space.
+	(SORTALLOC_MIN, SORTALLOC_DEFAULT_MIN): Remove.
+	(sort_size): Renamed from sortalloc; now applies to the sum of the
+	character data and the line table, not just the character data.
+	(MIN_SORT_SIZE, INPUT_FILE_SIZE_GUESS): New macros.
+	(linelength): remove.
+	(specify_sort_size): Don't worry about the distinction between the
+	character data and the line table; that is now the caller's
+	responsibility.
+	(default_sort_size): Return the value, instead of being executed for
+	side effect.  Return half of available memory, or 1/16 of total memory,
+	whichever is greater; except do not exceed 1/2 of quota.
+	(sort_buffer_size): New function.
+	(initbuf): New arg LINE_BYTES.  Ensure that the line array is properly
+	aligned.  Initialize the new set of struct buffer members.
+	(buffer_linelim): New function.
+	(fillbuf): Return int, not size_t, since the callers merely care
+	whether the result is nonzero.  New arg FILE so that error messages
+	can report the file name.  Keep track of eof.  Initialize the line
+	table too, taking its memory from the input buffer's memory; this
+	subsumes the old findlines function and removes the need for worrying
+	about running out of line table entries.
+	(checkfp, mergefps, sortlines, merge, sort): Adjust to the new storage
+	management regime, in particular the fact that line tables are now
+	filled in by fillbuf and are in reverse order.
+	(checkfp): Now takes char *, not const char *, since subroutines
+	require that now.  Rewrite to avoid lint and duplicate code.
+	If line length alloc calculation overflows,
+	simply allocate enough memory to hold the line.
+	(mergefps): New arg FILES, used for buffer size calculation and error
+	messages.  Rewrite to avoid lint.  Do not loop if savealloc*2
+	overflows.
+	(mergefps, merge): Zap temporary files eagerly rather than lazily;
+	this is needed because we now pass FILES to mergefps.
+	(sortlines): Args now point at end of arrays, not at beginnings.
+	(sort): Do not allocate temporary line array for sortlines;
+	instead, take the space from the same buffer.
+	(main): Adjust to sort_size and default_sort_size changes.
+
+2001-02-18  Jim Meyering  <meyering@lucent.com>
+
+	Rename test input files to avoid conflicts on case-insensitive
+	file systems.
+	* tests/pr/2-Sf-t_notab: Rename from 2Sf-t_notab.
+	* tests/pr/2-S_f-t_notab: Rename from 2S_f-t_notab.
+	* tests/pr/W-72l17f-ll: Rename from W72l17f-ll.
+	* tests/pr/Test.pm: Update file names to reflect renamings.
+	Reported by Matthew Smith.
+
+2001-01-20  Jim Meyering  <meyering@lucent.com>
+
+	* configure.in: Remove jm_CHECK_ALL_TYPES.
+	Now it's invoked by jm_MACROS.
+
+2001-01-17  Jim Meyering  <meyering@lucent.com>
+
+	* src/cksum.c (main): Use PACKAGE, not GNU_PACKAGE.
+	* src/tsort.c (main): Likewise.
+	* src/sort.c (main): Likewise.
+	(usage): Convert each TAB in --help output to a sequence of 8 spaces.
+
+2001-01-07  Jim Meyering  <meyering@lucent.com>
+
+	* src/tail.c (usage): Split a string that was longer than 2048 bytes.
+
+2001-01-03  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (main): Remove embedded \n from diagnostic.
+
+2001-01-02  Jim Meyering  <meyering@lucent.com>
+
+	* src/od.c (ulonglong_t): Define place-holder type to avoid some #if
+	directives.
+	(LONGEST_INTEGRAL_TYPE): Remove definition.
+	(MAX_INTEGRAL_TYPE_SIZE): Use ulonglong_t instead of
+	LONGEST_INTEGRAL_TYPE.
+	(print_long_long): Compile this function even on systems without
+	long long support.
+	(decode_one_format): Remove #if directive.
+
+	* src/od.c (decode_one_format): Guard use of print_long_long with
+	`#if HAVE_UNSIGNED_LONG_LONG'.  From Darren Salt.
+	Change all `#ifdef HAVE_UNSIGNED_LONG_LONG' to use `#if' instead.
+
+2000-12-23  Jim Meyering  <meyering@lucent.com>
+
+	* src/sys2.h [HAVE_INTTYPES_H]: Include <inttypes.h>.
+
+2000-12-19  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0.11.
+
+2000-12-18  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, doc/textutils.texi: New "sort" option -S SIZE.
+
+	* src/sys2.h (UINTMAX_MAX): New macro, taken from C99.
+
+	* src/sort.c: Include physmem.h.
+	(SORTALLOC, mergealloc, LINEALLOC): Remove.
+	(sortalloc): Default to zero at program startup.
+	(SORTALLOC_MIN, SORTALLOC_DEFAULT_MIN): New macros.
+	(usage, main): Add support for new -S SIZE option.
+	(specify_sort_size, default_sort_size): New functions.
+	(initlines): Do not let alloc exceed limit.
+	(findlines): Likewise.
+	(checkfp, mergefps, sort): Use sortalloc to size everything
+	else, instead of relying on precomputed sizes.
+
+2000-12-17  Jim Meyering  <meyering@lucent.com>
+
+	* doc/texinfo.tex: Update from master repository.
+	* config.sub: Likewise.
+	* config.guess: Likewise.
+
+2000-12-11  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0.10.
+
+2000-12-07  Jim Meyering  <meyering@lucent.com>
+
+	* src/od.c (address_base): Declare to be static.
+
+2000-12-06  Paul Eggert  <eggert@twinsun.com>
+
+	* src/od.c (address_base, address_pad_len): New var.
+	(output_address_fmt_string, address_fmt_buffer, address_pad): Remove.
+	(flag_pseudo_start): Now int, not long int.
+	(pseudo_offset): Now off_t, not long int.
+	(n_specs, n_specs_allocated): Now size_t, not unsigned int.
+	(format_address, format_address_none, format_address_std,
+	format_address_label): Now accepts an extra char argument (an extra
+	char to print if nonzero), and prints instead of returning a string.
+	All callers changed.
+	(bytes_per_block): Now size_t, not int.
+	(format_address_none): Do not even print the extra char argument.
+	This simplifies the callers.
+	(format_address_std, format_address_label): Print off_t ourself
+	instead of trying to use autoconfigured format.  This is faster and
+	more portable.
+	(format_address_paren): New function.
+	(dump): Remove unnecessary cast.
+	(expand_address_fmt): Remove.
+	(main): Use size_t, off_t, etc. instead of builtin types where this is
+	advisable.  Adjust to above changes.  Remove unnecessary cast.
+
+2000-12-03  Jim Meyering  <meyering@lucent.com>
+
+	* src/tail.c (tail_file): Initialize ignore, dev, and ino members,
+	when tailing forever and the open failed.  Otherwise, we could get
+	uninitialized memory references of those fields in recheck.
+	* tests/tail-2/Makefile.am (TESTS): Add assert-2.
+	* tests/tail-2/assert-2: New file.
+
+	* Version 2.0.9.
+
+	Make od print valid addresses for offsets of 2^32 and larger, and
+	allow byte offset (-j) and byte count (-N) to be 2^32 and larger.
+
+	* src/od.c (MAX_ADDRESS_LENGTH): Don't hard-code as a literal.
+	Rather, define in terms of the type, off_t.
+	(string_min): Declare to be of type size_t.
+	(flag_dump_strings): Declare to be of type int.
+	(print_s_char): Declare the n_bytes parameter and the local, `i',
+	to be of type off_t.
+	(print_char): Likewise.
+	(print_s_short): Likewise.
+	(print_short): Likewise.
+	(print_int): Likewise.
+	(print_long): Likewise.
+	(print_long_long): Likewise.
+	(print_float): Likewise.
+	(print_double): Likewise.
+	(print_long_double): Likewise.
+	(dump_hexl_mode_trailer): Likewise.
+	(print_named_ascii): Likewise.
+	(print_ascii): Likewise.
+	(write_block): Likewise.
+	(print_ascii): Declare local, `print_function' with a prototype.
+	Change a few `>' comparisons to the equivalent `<' form.
+	(parse_options): Declare `tmp' to be of type uintmax_t.
+	Use xstrtoumax, not xstrtoul.
+	Fail if the specified offset if larger than OFF_T_MAX.
+	(dump_strings): Declare local `i' to be of type size_t.
+	Remove the now-unnecessary cast-to-off_t.
+	(main) [IF_LINT]: Initialize desired_width to avoid a warning.
+	Declare `tmp' to be of type uintmax_t.
+	Use xstrtoumax, not xstrtoul.
+	Fail if minimum string length is larger than SIZE_MAX.
+	Fail if specified width is larger than ULONG_MAX.
+
+	* src/od.c (format_address): Use off_t, not long unsigned_int as the
+	parameter type.
+	(format_address_none): Likewise.  Mark parameter as unused.
+	(format_address_std): Likewise.
+	(format_address_label): Likewise.
+	(print_ascii): Mark format string parameter as unused.
+	(write_block): Use off_t, not long unsigned_int as offset type.
+	(expand_address_fmt): New function.
+	(main): Use it to expand each address format string template.
+	Reported by Mark Nudelman, via Andreas Jaeger.
+
+	* src/sys2.h (OFF_T_MIN): Define here instead.
+	(OFF_T_MAX): Likewise.
+	(CHAR_BIT): Define.
+
+	* src/tail.c (parse_options): Use xstrtoumax to parse the byte and line
+	offset.  Give a better diagnostic when the requested offset is still
+	representable but larger than OFF_T_MAX.
+	(OFF_T_MIN): Remove definition.
+	(OFF_T_MAX): Likewise.
+
+2000-12-02  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (checkfp): Rename local `buf' to avoid shadowing previous
+	declaration.
+
+	* src/sort.c (NONZERO): Define and use it to make the code a tiny
+	bit more readable.
+
+	* doc/textutils.texi (sort invocation): Clarify how -t works
+	when a sort key specifies a range of fields.  From Karl O. Pinc.
+
+2000-11-26  Paul Eggert  <eggert@twinsun.com>
+
+	* src/od.c (skip): Use lseek instead of worrying about fseeko or fseek.
+	This should be portable, as we seek before doing any I/O.
+	(fseeko): Remove; no longer used.
+
+2000-11-30  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c: s/SIZE_T_MAX/SIZE_MAX/.
+
+2000-11-30  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sys2.h: Include <stdint.h> if HAVE_STDINT_H.
+	(SIZE_MAX): Renamed from SIZE_T_MAX, as C99 uses SIZE_MAX.
+	All uses changed.
+
+2000-11-30  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c: SIZE_MAX is not defined, so s/SIZE_MAX/SIZE_T_MAX/, and...
+	* src/sys2.h (SIZE_T_MAX): ... define.
+
+2000-11-29  Paul Eggert  <eggert@twinsun.com>
+
+	Port GNU "sort" to hosts where sizes don't fit in "int",
+	e.g. 64-bit Solaris (sparc).
+
+	* src/sort.c ("human.h", "xstrtol.h"): Include.
+	(struct line): length member is now size_t, not int.
+	(struct lines): Likewise for used, alloc, limit members.
+	(struct buffer): Likewise for used, alloc, left, newline_free members.
+	(struct keyfield): Likewise for sword, schar, eword, echar members.
+	(sortalloc, mergealloc, linelength): Now size_t, not int.
+
+	(initbuf, fillbuf, initlines, begfield, limfield, findlines,
+	numcompare, getmonth, keycompare, compare, checkfp, mergefps,
+	sortlines, sort): Accept, return, and use size_t for sizes, not int.
+
+	(fillbuf, initlines, findlines, checkfp, sort): Check for overflow
+	when computing buffer sizes.
+
+	(begfield, limfield): Do not index past end of array.
+
+	(checkfp): Return a boolean, not a line number, as the line
+	number may not fit in int.  All callers changed.  Use
+	uintmax_t for line numbers, not int.
+
+	(sort): Don't allocate tmp until we need it (and know the right size).
+
+	(parse_field_count): New function.
+
+	(main): Use it to check for overflow in field counts.
+	"outfile" is now a pointer to const.
+
+2000-11-27  Jim Meyering  <meyering@lucent.com>
+
+	* src/checksum.h: Don't include system.h here.
+	* src/md5.c: Include config.h, stdio.h, sys/types.h. and system.h here
+	instead.
+	* src/sha1sum.c: Likewise.
+
+2000-11-18  Paul Eggert  <eggert@twinsun.com>
+
+	* src/pr.c (main): Do not assume EOF == -1.
+	Handle the case correctly when digits options immediately precede a
+	non-option.
+
+2000-11-18  Jim Meyering  <meyering@lucent.com>
+
+	* doc/textutils.texi: Change GNU to @sc{gnu} in many places.
+	Update to use the Free Documentation Licence.
+
+	* configure, config.h.in, Makefile.in, etc.: Regenerate using the
+	very latest version (in CVS) of autoconf.
+
+2000-11-17  Jim Meyering  <meyering@lucent.com>
+
+	* GNUmakefile (.NOTPARALLEL): New target.  Prevent unwanted parallelism.
+	Suggestion from Ulrich Drepper.
+
+2000-11-16  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* tsort.c: Include sys/types.h before system.h.
+
+2000-11-16  Jim Meyering  <meyering@lucent.com>
+
+	* src/join.c: Declare global `tab' to be of type *unsigned* char,
+	so join works with 8-bit delimiter characters.
+	Reported by Antonio Rendas.
+	* tests/join/Test.pm (8-bit-t): New test for the above fix.
+
+2000-11-13  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sys2.h (ST_TIME_CMP_NS): Fix typo: ST_MTIM_NSEC should
+	be tested with #ifdef, not with #if.
+
+2000-11-11  Jim Meyering  <meyering@lucent.com>
+
+	* doc/textutils.texi: More minor rewording and grammar correction.
+	From Brian Youmans.
+
+2000-11-06  Paul Eggert  <eggert@twinsun.com>
+
+	* src/od.c (skip): st_size is not defined for directories.
+
+2000-11-03  Jim Meyering  <meyering@lucent.com>
+
+	* tests/sha1sum/sample-vec: New file, with tests derived from
+	http://csrc.nist.gov/cryptval/shs/sha1-vectors.zip
+	* tests/sha1sum/Makefile.am (TESTS): Add sample-vec.
+
+2000-10-30  Jim Meyering  <meyering@lucent.com>
+
+	* configure, config.h.in, Makefile.in, etc.: Regenerate using the
+	very latest version (in CVS) of autoconf.
+
+	* src/wc.c: Include "system.h" after wctype.h (not before)
+	to avoid a compilation error on Solaris 5.5.1 systems.
+	Reported by Vin Shelton.
+
 2000-10-23  Jim Meyering  <meyering@lucent.com>
 
 	* Makefile.maint: Clean up version-related variables.
@@ -521,7 +1236,7 @@
 	(squeeze_filter, set_initialize, main): Use size_t and ssize_t in
 	place of long and int in several decls.
 	(read_and_delete, read_and_xlate): Likewise, and remove assertion.
-	* tests/tr/Test.pm: (o-rep-1, o-rep-2): New tests.
+	* tests/tr/Test.pm (o-rep-1, o-rep-2): New tests.
 
 	* src/cut.c: Correct copying notice to use GPL, per author's request.
 	* src/paste.c: Likewise.
@@ -718,7 +1433,7 @@
 
 	* lib/linebuffer.c (readline): Do not leave room for an extra
 	byte after the newline; it's no longer needed.
-	* src/sort.c: (sortalloc, mergealloc, fillbuf, checkfp, mergefps):
+	* src/sort.c (sortalloc, mergealloc, fillbuf, checkfp, mergefps):
 	Likewise.
 
 	* lib/memcoll.c (memcoll): The two arguments cannot be
@@ -1321,7 +2036,7 @@
 	* src/sys2.h (TOLOWER): Define.
 	(TOUPPER): Define.
 	* src/join.c (TOLOWER): Remove definition.
-	* src/md5sum.c: (TOLOWER): Remove definition.
+	* src/md5sum.c (TOLOWER): Remove definition.
 
 1999-04-30  Jim Meyering  <meyering@ascend.com>
 
@@ -1473,7 +2188,7 @@
 
 1999-03-13  Jim Meyering  <meyering@ascend.com>
 
-	* src/tac.c: (tac_mem): `#if-0'-out this unused function.
+	* src/tac.c (tac_mem): `#if-0'-out this unused function.
 	(tac_stdin_to_mem): Likewise.
 
 	* doc/textutils.texi (cut invocation): Describe --output-delimiter.
@@ -2303,7 +3018,7 @@
 
 1998-01-16  Jim Meyering  <meyering@na-net.ornl.gov>
 
-	* src/sort.c: (mergefps): Add braces to avoid ambiguous `else' stmt.
+	* src/sort.c (mergefps): Add braces to avoid ambiguous `else' stmt.
 	(nls_set_fraction): Likewise.
 
 	* src/sort.c: Guard inclusion of langinfo.h also with HAVE_LANGINFO_H,
@@ -2595,7 +3310,7 @@
 
 1997-10-14  Jim Meyering  <meyering@na-net.ornl.gov>
 
-	* src/sort.c: (_NL_ITEM) [!defined]: Define.
+	* src/sort.c (_NL_ITEM) [!defined]: Define.
 	From from Ørn E. Hansen.
 
 	* src/sort.c: Use STREQ in place of most uses of strcmp.
@@ -4034,7 +4749,7 @@ Wed Feb 28 20:32:48 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	(noinst_HEADERS): Rename from HEADERS.
 	(INCLUDES): Remove -I.. and -I$(srcdir).  automake-0.30 adds these
 	to DEFS automatically.
-	* lib/Makefile.am: (noinst_HEADERS): Rename from HEADERS.
+	* lib/Makefile.am (noinst_HEADERS): Rename from HEADERS.
 
 Wed Feb 21 18:56:27 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
@@ -4303,7 +5018,7 @@ Tue Nov 14 23:10:54 1995  Jim Meyering  (meyering@comco.com)
 	(cleanup_fatal): Renamed from cleanup.  Call cleanup, then exit.
 	Update callers.
 
-	* tac.c: (cleanup): Don't exit.
+	* tac.c (cleanup): Don't exit.
 	(cleanup_fatal): New function.  Call cleanup, then exit.
 	(sighandler): New function.
 	(cleanup_fatal): Renamed from cleanup.  Call cleanup, then exit.
@@ -4563,7 +5278,7 @@ Sat Sep 23 15:43:46 1995  Jim Meyering  (meyering@comco.com)
 
 	* Makefile.in (DISTFILES): Add README.alpha.
 
-	* lib/Makfile.in: (GETOPT, MEMCHR, REGEX): New variables.
+	* lib/Makfile.in (GETOPT, MEMCHR, REGEX): New variables.
 	(OBJECTS): Use them instead of hardcoding object file names.
 	Suggested by Ulrich Drepper.
 
@@ -4640,7 +5355,7 @@ Sun Jul 30 00:01:58 1995  Jim Meyering  (meyering@comco.com)
 
 	* md5sum.c (md5_check): Use getline instead of fgets.
 
-	* lib/Makefile.in: (SOURCES): Add getline.c.
+	* lib/Makefile.in (SOURCES): Add getline.c.
 	(OBJECTS): Add getline.o.
 	(DISTFILES): Add getline.h.
 	(getline.o): Depend on getline.h.
@@ -4713,7 +5428,7 @@ Fri Jul 21 01:21:49 1995  Jim Meyering  (meyering@comco.com)
 	(split_3): No longer parse the `new format.'  There is only one
 	valid format now: the compatible one.
 
-	* lib/Makefile.in: (SOURCES): Add md5.c.
+	* lib/Makefile.in (SOURCES): Add md5.c.
 	(OBJECTS): Add md5.o.
 	(DISTFILES): Add md5.h.
 	(md5.o): Depend on md5.h.
@@ -4913,10 +5628,10 @@ Sun Jun 11 00:39:50 1995  Jim Meyering  (meyering@comco.com)
 
 	* md5sum.c: New file.  From Ulrich Drepper.
 	* md5-test.rfc: New file.
-	* Makefile.in: (PROGS): Add md5sum.
+	* Makefile.in (PROGS): Add md5sum.
 	(check): Run a recursive make in each subdirectory.
-	* man/Makefile.in: (MANFILES): Add md5sum.1.
-	* src/Makefile.in: (SOURCES): Add md5sum.c.
+	* man/Makefile.in (MANFILES): Add md5sum.1.
+	* src/Makefile.in (SOURCES): Add md5sum.c.
 	(OBJECTS): Add md5sum.o.
 	(PROGS): Add md5sum.
 	(check): Add basic checks for md5sum.
@@ -5037,7 +5752,7 @@ Thu Apr 20 23:09:33 1995  Jim Meyering  (meyering@comco.com)
 
 Tue Apr 18 22:57:43 1995  Jim Meyering  (meyering@comco.com)
 
-	* configure.in: (AC_OUTPUT): Use echo, not date, to avoid creating
+	* configure.in (AC_OUTPUT): Use echo, not date, to avoid creating
 	unnecessary conflicts for people using version control software
 	like RCS and CVS.
 	(AC_ARG_PROGRAM): Use it.

old/textutils/NEWS

@@ -1,4 +1,41 @@
 Changes in release 2.1
+[2.0.14]
+* sort now accepts long options like "--reverse" and "--".
+* sort now checks option syntax as POSIX requires, except that (as usual
+  for GNU) options can follow file names unless POSIXLY_CORRECT is set.
+  For example, invalid positional combinations like "sort +1 -r -2" are
+  now rejected as per POSIX.
+* The next POSIX standard will require that obsolescent 'sort'
+  positional options like +1 be treated as file names, not options.
+  Please use 'sort -k' instead.
+[2.0.13]
+* pr accepts new -D or --date option, to specify date format.
+* The following changes are required by POSIX:
+  - If POSIXLY_CORRECT is set, dates in pr headers now look something like
+    'Dec  4 23:59 2001', with the exact appearance affected by LC_TIME.
+  - pr -h now affects only the center header string, not the entire header.
+  - pr no longer truncates headers.
+* Spacing in pr headers has been adjusted slightly.
+* `fmt --prefix=S' now works when S contains a byte with the high bit set
+[2.0.12]
+* sort has improved performance when using very little main memory
+* sort has improved memory management
+* sort is no longer susceptible to certain denial of service attacks
+* sort no longer suffers from a race condition whereby an interrupt received
+    during cleanup could cause it to fail to remove temporary files.
+    This problem could arise only on hosts without sigaction.
+[2.0.11]
+* sort accepts new -S SIZE option, to specify main-memory usage.
+[2.0.10]
+* od is faster and more portable than it was in 2.0.9
+* tail avoids an uninitialized memory reference
+[2.0.9]
+* od now prints valid addresses for offsets of 2^32 and larger, and allows
+    the byte offset (-j) and byte count (-N) arguments to be 2^32 and larger.
+* tail now works with line and byte counts of 2^32 and larger, on systems
+    with large file support
+* join now works with an 8-bit delimiter
+* fix a compilation failure on some Solaris systems with wc.c
 [2.0.8]
 * od now supports 8-byte integers, assuming they're printable with e.g., %lld
 * new program: sha1sum

po/Makefile.in.in

@@ -1,5 +1,5 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# -*- Makefile -*- for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997, 2000 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file file be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
@@ -150,6 +150,11 @@ install-data-yes: all
 	      true; \
 	    fi; \
 	  fi; \
+	  timedir=$$destdir/$$lang/LC_TIME; \
+	  rm -fr $$timedir; \
+	  ln -s LC_MESSAGES $$timedir \
+	  || (mkdir $$timedir && ln $$dir/* $$timedir); \
+	  echo "installing $$timedir as an alias for $$dir"; \
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
 	  if test -x "$(MKINSTALLDIRS)"; then \
@@ -171,12 +176,14 @@ uninstall:
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  for dir in $(localedir) $(gnulocaledir); do \
+	    for lc in LC_MESSAGES LC_TIME; do \
+	      for x in '' .m; do \
+		rm -f $(DESTDIR)$$dir/$$lang/$$lc/$(PACKAGE)$(INSTOBJEXT)$$x; \
+	      done; \
+	    done; \
+	  done; \
 	done
-	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
 
 check: all
 
@@ -202,26 +209,30 @@ distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: update-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	  cp -p $(srcdir)/$$file $(distdir); \
 	done
 
 update-po: Makefile
 	$(MAKE) $(PACKAGE).pot
-	PATH=`pwd`/../src:$$PATH; \
-	cd $(srcdir); \
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
 	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
+	  if $(MSGMERGE) $(srcdir)/$$lang.po \
+	                 $(srcdir)/$(PACKAGE).pot -o $$lang.new.po; then \
+	    if cmp $$lang.new.po $(srcdir)/$$lang.po >/dev/null; then \
+	      echo "$$lang.po is unchanged"; \
+	      rm -f $$lang.new.po; \
+	    else \
+	      echo "updating $$lang.po"; \
+	      rm -f $(srcdir)/$$lang.po; \
+	      mv $$lang.new.po $(srcdir)/$$lang.po; \
+	    fi; \
 	  else \
 	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
+	    rm -f $$lang.new.po; \
+	    exit 1; \
 	  fi; \
 	done
 
@@ -246,3 +257,7 @@ Makefile: Makefile.in.in ../config.status POTFILES
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
+
+# Tell version 3.79 and up of GNU make to not build goals in this
+# directory in parallel.
+.NOTPARALLEL:

src/checksum.h

@@ -2,7 +2,6 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#include "system.h"
 
 /* For long options that have no equivalent short option, use a
    non-character as a pseudo short option, starting with CHAR_MAX + 1.  */

src/chgrp.c

@@ -1,5 +1,5 @@
 /* chgrp -- change group ownership of files
-   Copyright (C) 89, 90, 91, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 89, 90, 91, 1995-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 #include "quote.h"
 #include "savedir.h"
 #include "xstrtol.h"
+#include "chown-core.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chgrp"
@@ -52,54 +53,9 @@ struct group *getgrnam ();
 # define endgrent() ((void) 0)
 #endif
 
-enum Change_status
-{
-  CH_NOT_APPLIED,
-  CH_SUCCEEDED,
-  CH_FAILED,
-  CH_NO_CHANGE_REQUESTED
-};
-
-enum Verbosity
-{
-  /* Print a message for each file that is processed.  */
-  V_high,
-
-  /* Print a message for each file whose attributes we change.  */
-  V_changes_only,
-
-  /* Do not be verbose.  This is the default. */
-  V_off
-};
-
-int lstat ();
-
-static int change_dir_group PARAMS ((const char *dir, gid_t group,
-				     const struct stat *statp));
-
 /* The name the program was run with. */
 char *program_name;
 
-/* If nonzero, and the systems has support for it, change the ownership
-   of symbolic links rather than any files they point to.  */
-static int change_symlinks = 1;
-
-/* When change_symlinks is set, this should be set to `lstat', otherwise,
-   it should be `stat'.  */
-static int (*xstat) ();
-
-/* If nonzero, change the ownership of directories recursively. */
-static int recurse;
-
-/* If nonzero, force silence (no error messages). */
-static int force_silent;
-
-/* Level of verbosity.  */
-static enum Verbosity verbosity = V_off;
-
-/* The name of the group to which ownership of the files is being given. */
-static const char *groupname;
-
 /* The argument to the --reference option.  Use the group ID of this file.
    This file must exist.  */
 static char *reference_file;
@@ -127,38 +83,6 @@ static struct option const long_options[] =
   {0, 0, 0, 0}
 };
 
-/* Tell the user how/if the group of FILE has been changed.
-   CHANGED describes what (if anything) has happened. */
-
-static void
-describe_change (const char *file, enum Change_status changed)
-{
-  const char *fmt;
-
-  if (changed == CH_NOT_APPLIED)
-    {
-      printf (_("neither symbolic link %s nor referent has been changed\n"),
-	      quote (file));
-      return;
-    }
-
-  switch (changed)
-    {
-    case CH_SUCCEEDED:
-      fmt = _("group of %s changed to %s\n");
-      break;
-    case CH_FAILED:
-      fmt = _("failed to change group of %s to %s\n");
-      break;
-    case CH_NO_CHANGE_REQUESTED:
-      fmt = _("group of %s retained as %s\n");
-      break;
-    default:
-      abort ();
-    }
-  printf (fmt, quote (file), groupname);
-}
-
 /* Set *G according to NAME. */
 
 static void
@@ -166,9 +90,8 @@ parse_group (const char *name, gid_t *g)
 {
   struct group *grp;
 
-  groupname = name;
   if (*name == '\0')
-    error (1, 0, _("can not change to null group"));
+    error (1, 0, _("cannot change to null group"));
 
   grp = getgrnam (name);
   if (grp == NULL)
@@ -193,139 +116,6 @@ parse_group (const char *name, gid_t *g)
   endgrent ();		/* Save a file descriptor. */
 }
 
-/* Change the ownership of FILE to GID GROUP.
-   If it is a directory and -R is given, recurse.
-   Return 0 if successful, 1 if errors occurred. */
-
-static int
-change_file_group (int cmdline_arg, const char *file, gid_t group)
-{
-  struct stat file_stats;
-  int errors = 0;
-
-  if ((*xstat) (file, &file_stats))
-    {
-      if (force_silent == 0)
-	error (0, errno, _("getting attributes of %s"), quote (file));
-      return 1;
-    }
-
-  if (group != file_stats.st_gid)
-    {
-      int fail;
-      int symlink_changed = 1;
-      int saved_errno;
-
-      if (S_ISLNK (file_stats.st_mode) && change_symlinks)
-	{
-	  fail = lchown (file, (uid_t) -1, group);
-
-	  /* Ignore the failure if it's due to lack of support (ENOSYS)
-	     and this is not a command line argument.  */
-	  if (!cmdline_arg && fail && errno == ENOSYS)
-	    {
-	      fail = 0;
-	      symlink_changed = 0;
-	    }
-	}
-      else
-	{
-	  fail = chown (file, (uid_t) -1, group);
-	}
-
-      /* Save errno, since in verbose mode, describe_change might change it.  */
-      saved_errno = errno;
-
-      if (verbosity == V_high || (verbosity == V_changes_only && !fail))
-	{
-	  enum Change_status ch_status = (! symlink_changed ? CH_NOT_APPLIED
-					  : (fail ? CH_FAILED : CH_SUCCEEDED));
-	  describe_change (file, ch_status);
-	}
-
-      if (fail)
-	{
-	  errors = 1;
-	  if (force_silent == 0)
-	    {
-	      /* Give a more specific message.  Some systems set errno
-		 to EPERM for both `inaccessible file' and `user not a member
-		 of the specified group' errors.  */
-	      if (saved_errno == EPERM && !group_member (group))
-		{
-		  error (0, saved_errno, _("you are not a member of group %s"),
-			 quote (groupname));
-		}
-	      else if (saved_errno == EINVAL && group > MAXUID)
-		{
-		  error (0, 0, _("%s: invalid group number"),
-			 quote (groupname));
-		}
-	      else
-		{
-		  error (0, saved_errno, _("changing group of %s"),
-			 quote (file));
-		}
-	    }
-	}
-    }
-  else if (verbosity == V_high)
-    {
-      describe_change (file, CH_NO_CHANGE_REQUESTED);
-    }
-
-  if (recurse && S_ISDIR (file_stats.st_mode))
-    errors |= change_dir_group (file, group, &file_stats);
-
-  return errors;
-}
-
-/* Recursively change the ownership of the files in directory DIR
-   to GID GROUP.
-   STATP points to the results of lstat on DIR.
-   Return 0 if successful, 1 if errors occurred. */
-
-static int
-change_dir_group (const char *dir, gid_t group, const struct stat *statp)
-{
-  char *name_space, *namep;
-  char *path;			/* Full path of each entry to process. */
-  unsigned dirlength;		/* Length of `dir' and '\0'. */
-  unsigned filelength;		/* Length of each pathname to process. */
-  unsigned pathlength;		/* Bytes allocated for `path'. */
-  int errors = 0;
-
-  name_space = savedir (dir, statp->st_size);
-  if (name_space == NULL)
-    {
-      if (force_silent == 0)
-	error (0, errno, "%s", quote (dir));
-      return 1;
-    }
-
-  dirlength = strlen (dir) + 1;	/* + 1 is for the trailing '/'. */
-  pathlength = dirlength + 1;
-  /* Give `path' a dummy value; it will be reallocated before first use. */
-  path = xmalloc (pathlength);
-  strcpy (path, dir);
-  path[dirlength - 1] = '/';
-
-  for (namep = name_space; *namep; namep += filelength - dirlength)
-    {
-      filelength = dirlength + strlen (namep) + 1;
-      if (filelength > pathlength)
-	{
-	  pathlength = filelength * 2;
-	  path = xrealloc (path, pathlength);
-	}
-      strcpy (path + dirlength, namep);
-      errors |= change_file_group (0, path, group);
-    }
-  free (path);
-  free (name_space);
-  return errors;
-}
-
 void
 usage (int status)
 {
@@ -364,9 +154,10 @@ Change the group membership of each FILE to GROUP.\n\
 int
 main (int argc, char **argv)
 {
-  gid_t group;
+  gid_t gid;
   int errors = 0;
   int optc;
+  struct Chown_option chopt;
 
   program_name = argv[0];
   setlocale (LC_ALL, "");
@@ -375,7 +166,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  recurse = force_silent = 0;
+  chopt_init (&chopt);
 
   while ((optc = getopt_long (argc, argv, "Rcfhv", long_options, NULL)) != -1)
     {
@@ -387,22 +178,22 @@ main (int argc, char **argv)
 	  reference_file = optarg;
 	  break;
 	case DEREFERENCE_OPTION:
-	  change_symlinks = 0;
+	  chopt.dereference = DEREF_ALWAYS;
 	  break;
 	case 'R':
-	  recurse = 1;
+	  chopt.recurse = 1;
 	  break;
 	case 'c':
-	  verbosity = V_changes_only;
+	  chopt.verbosity = V_changes_only;
 	  break;
 	case 'f':
-	  force_silent = 1;
+	  chopt.force_silent = 1;
 	  break;
 	case 'h':
-	  change_symlinks = 1;
+	  chopt.dereference = DEREF_NEVER;
 	  break;
 	case 'v':
-	  verbosity = V_high;
+	  chopt.verbosity = V_high;
 	  break;
 	case_GETOPT_HELP_CHAR;
 	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@@ -417,24 +208,26 @@ main (int argc, char **argv)
       usage (1);
     }
 
-  if (change_symlinks)
-    xstat = lstat;
-  else
-    xstat = stat;
-
   if (reference_file)
     {
       struct stat ref_stats;
       if (stat (reference_file, &ref_stats))
 	error (1, errno, _("getting attributes of %s"), quote (reference_file));
 
-      group = ref_stats.st_gid;
+      chopt.group_name = gid_to_name (ref_stats.st_gid);
+      gid = ref_stats.st_gid;
     }
   else
-    parse_group (argv[optind++], &group);
+    {
+      chopt.group_name = argv[optind++];
+      parse_group (chopt.group_name, &gid);
+    }
 
   for (; optind < argc; ++optind)
-    errors |= change_file_group (1, argv[optind], group);
+    errors |= change_file_owner (1, argv[optind], (uid_t) -1, gid,
+				 (uid_t) -1, (gid_t) -1, &chopt);
+
+  chopt_free (&chopt);
 
   exit (errors);
 }

src/chmod.c

@@ -95,6 +95,31 @@ static struct option const long_options[] =
   {0, 0, 0, 0}
 };
 
+static int
+mode_changed (const char *file, mode_t old_mode)
+{
+  struct stat new_stats;
+
+  if (lstat (file, &new_stats))
+    {
+      if (force_silent == 0)
+	error (0, errno, _("getting new attributes of %s"), quote (file));
+      return 0;
+    }
+
+#ifdef S_ISLNK
+  if (S_ISLNK (new_stats.st_mode)
+      && stat (file, &new_stats))
+    {
+      if (force_silent == 0)
+	error (0, errno, _("getting new attributes of %s"), quote (file));
+      return 0;
+    }
+#endif
+
+  return old_mode != new_stats.st_mode;
+}
+
 /* Tell the user how/if the MODE of FILE has been changed.
    CHANGED describes what (if anything) has happened. */
 
@@ -166,7 +191,9 @@ change_file_mode (const char *file, const struct mode_change *changes,
   fail = chmod (file, newmode);
   saved_errno = errno;
 
-  if (verbosity == V_high || (verbosity == V_changes_only && !fail))
+  if (verbosity == V_high
+      || (verbosity == V_changes_only
+	  && !fail && mode_changed (file, file_stats.st_mode)))
     describe_change (file, newmode, (fail ? CH_FAILED : CH_SUCCEEDED));
 
   if (fail)
@@ -310,7 +337,12 @@ main (int argc, char **argv)
 	case '-':
 	case '=':
 	  if (modeind != 0 && modeind != thisind)
-	    error (1, 0, _("invalid mode"));
+	    {
+	      static char char_string[2] = {0, 0};
+	      char_string[0] = c;
+	      error (1, 0, _("invalid character %s in mode string %s"),
+		     quote_n (0, char_string), quote_n (1, argv[thisind]));
+	    }
 	  modeind = thisind;
 	  break;
 	case REFERENCE_FILE_OPTION:
@@ -348,7 +380,7 @@ main (int argc, char **argv)
 	     : mode_compile (argv[modeind], MODE_MASK_ALL));
 
   if (changes == MODE_INVALID)
-    error (1, 0, _("invalid mode"));
+    error (1, 0, _("invalid mode string: %s"), quote (argv[modeind]));
   else if (changes == MODE_MEMORY_EXHAUSTED)
     xalloc_die ();
   else if (changes == MODE_BAD_REFERENCE)

src/chown-core.c

@@ -0,0 +1,366 @@
+/* chown-core.c -- core functions for changing ownership.
+   Copyright (C) 2000 Free Software Foundation.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   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.  */
+
+/* Extracted from chown.c/chgrp.c and librarified by Jim Meyering.  */
+
+#include <config.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <pwd.h>
+#include <grp.h>
+
+#include "system.h"
+#include "error.h"
+#include "lchown.h"
+#include "quote.h"
+#include "savedir.h"
+#include "chown-core.h"
+#include "xalloc.h"
+
+/* The number of decimal digits required to represent the largest value of
+   type `unsigned int'.  This is enough for an 8-byte unsigned int type.  */
+#define UINT_MAX_DECIMAL_DIGITS 20
+
+#ifndef _POSIX_VERSION
+struct group *getgrnam ();
+struct group *getgrgid ();
+#endif
+
+int lstat ();
+
+void
+chopt_init (struct Chown_option *chopt)
+{
+  chopt->verbosity = V_off;
+  chopt->dereference = DEREF_NEVER;
+  chopt->recurse = 0;
+  chopt->force_silent = 0;
+  chopt->user_name = 0;
+  chopt->group_name = 0;
+}
+
+void
+chopt_free (struct Chown_option *chopt)
+{
+  /* Deliberately do not free chopt->user_name or ->group_name.
+     They're not always allocated.  */
+}
+
+/* Convert N to a string, and return a pointer to that string in memory
+   allocated from the heap.  */
+
+static char *
+uint_to_string (unsigned int n)
+{
+  char buf[UINT_MAX_DECIMAL_DIGITS + 1];
+  char *p = buf + sizeof buf;
+
+  *--p = '\0';
+
+  do
+    *--p = '0' + (n % 10);
+  while ((n /= 10) != 0);
+
+  return xstrdup (p);
+}
+
+/* Convert the numeric group-id, GID, to a string stored in xmalloc'd memory,
+   and return it.  If there's no corresponding group name, use the decimal
+   representation of the ID.  */
+
+char *
+gid_to_name (gid_t gid)
+{
+  struct group *grp = getgrgid (gid);
+  return grp ? xstrdup (grp->gr_name) : uint_to_string (gid);
+}
+
+/* Convert the numeric user-id, UID, to a string stored in xmalloc'd memory,
+   and return it.  If there's no corresponding user name, use the decimal
+   representation of the ID.  */
+
+char *
+uid_to_name (uid_t uid)
+{
+  struct passwd *pwd = getpwuid (uid);
+  return pwd ? xstrdup (pwd->pw_name) : uint_to_string (uid);
+}
+
+/* Tell the user how/if the user and group of FILE have been changed.
+   If USER is NULL, give the group-oriented messages.
+   CHANGED describes what (if anything) has happened. */
+
+static void
+describe_change (const char *file, enum Change_status changed,
+		 char const *user, char const *group)
+{
+  const char *fmt;
+  char *spec;
+  int spec_allocated = 0;
+
+  if (changed == CH_NOT_APPLIED)
+    {
+      printf (_("neither symbolic link %s nor referent has been changed\n"),
+	      quote (file));
+      return;
+    }
+
+  if (user)
+    {
+      if (group)
+	{
+	  spec = xmalloc (strlen (user) + 1 + strlen (group) + 1);
+	  stpcpy (stpcpy (stpcpy (spec, user), ":"), group);
+	  spec_allocated = 1;
+	}
+      else
+	{
+	  spec = (char *) user;
+	}
+    }
+  else
+    {
+      spec = (char *) group;
+    }
+
+  switch (changed)
+    {
+    case CH_SUCCEEDED:
+      fmt = (user
+	     ? _("changed ownership of %s to %s\n")
+	     : _("changed group of %s to %s\n"));
+      break;
+    case CH_FAILED:
+      fmt = (user
+	     ? _("failed to change ownership of %s to %s\n")
+	     : _("failed to change group of %s to %s\n"));
+      break;
+    case CH_NO_CHANGE_REQUESTED:
+      fmt = (user
+	     ? _("ownership of %s retained as %s\n")
+	     : _("group of %s retained as %s\n"));
+      break;
+    default:
+      abort ();
+    }
+
+  printf (fmt, quote (file), spec);
+
+  if (spec_allocated)
+    free (spec);
+}
+
+/* Recursively change the ownership of the files in directory DIR to user-id,
+   UID, and group-id, GID, according to the options specified by CHOPT.
+   STATP points to the results of lstat on DIR.
+   Return 0 if successful, 1 if errors occurred. */
+
+static int
+change_dir_owner (const char *dir, uid_t uid, gid_t gid,
+		  uid_t old_uid, gid_t old_gid,
+		  const struct stat *statp,
+		  struct Chown_option const *chopt)
+{
+  char *name_space, *namep;
+  char *path;			/* Full path of each entry to process. */
+  unsigned dirlength;		/* Length of `dir' and '\0'. */
+  unsigned filelength;		/* Length of each pathname to process. */
+  unsigned pathlength;		/* Bytes allocated for `path'. */
+  int errors = 0;
+
+  name_space = savedir (dir, statp->st_size);
+  if (name_space == NULL)
+    {
+      if (chopt->force_silent == 0)
+	error (0, errno, "%s", quote (dir));
+      return 1;
+    }
+
+  dirlength = strlen (dir) + 1;	/* + 1 is for the trailing '/'. */
+  pathlength = dirlength + 1;
+  /* Give `path' a dummy value; it will be reallocated before first use. */
+  path = xmalloc (pathlength);
+  strcpy (path, dir);
+  path[dirlength - 1] = '/';
+
+  for (namep = name_space; *namep; namep += filelength - dirlength)
+    {
+      filelength = dirlength + strlen (namep) + 1;
+      if (filelength > pathlength)
+	{
+	  pathlength = filelength * 2;
+	  path = xrealloc (path, pathlength);
+	}
+      strcpy (path + dirlength, namep);
+      errors |= change_file_owner (0, path, uid, gid, old_uid, old_gid,
+				   chopt);
+    }
+  free (path);
+  free (name_space);
+  return errors;
+}
+
+/* Change the ownership of FILE to user-id, UID, and group-id, GID,
+   provided it presently has owner OLD_UID and group OLD_GID.
+   Honor the options specified by CHOPT.
+   If FILE is a directory and -R is given, recurse.
+   Return 0 if successful, 1 if errors occurred. */
+
+int
+change_file_owner (int cmdline_arg, const char *file, uid_t uid, gid_t gid,
+		   uid_t old_uid, gid_t old_gid,
+		   struct Chown_option const *chopt)
+{
+  struct stat file_stats;
+  uid_t new_uid;
+  gid_t new_gid;
+  int errors = 0;
+  int is_symlink;
+  int is_directory;
+
+  if (lstat (file, &file_stats))
+    {
+      if (chopt->force_silent == 0)
+	error (0, errno, _("getting attributes of %s"), quote (file));
+      return 1;
+    }
+
+  /* If it's a symlink and we're dereferencing, then use stat
+     to get the attributes of the referent.  */
+  if (S_ISLNK (file_stats.st_mode))
+    {
+      if (chopt->dereference == DEREF_ALWAYS
+	  && stat (file, &file_stats))
+	{
+	  if (chopt->force_silent == 0)
+	    error (0, errno, _("getting attributes of %s"), quote (file));
+	  return 1;
+	}
+
+      is_symlink = 1;
+
+      /* With -R, don't traverse through symlinks-to-directories.
+	 But of course, this will all change with POSIX's new
+	 -H, -L, -P options.  */
+      is_directory = 0;
+    }
+  else
+    {
+      is_symlink = 0;
+      is_directory = S_ISDIR (file_stats.st_mode);
+    }
+
+  if ((old_uid == (uid_t) -1 || file_stats.st_uid == old_uid)
+      && (old_gid == (gid_t) -1 || file_stats.st_gid == old_gid))
+    {
+      new_uid = (uid == (uid_t) -1 ? file_stats.st_uid : uid);
+      new_gid = (gid == (gid_t) -1 ? file_stats.st_gid : gid);
+      if (new_uid != file_stats.st_uid || new_gid != file_stats.st_gid)
+	{
+	  int fail;
+	  int symlink_changed = 1;
+	  int saved_errno;
+	  int called_lchown = 0;
+
+	  if (is_symlink)
+	    {
+	      if (chopt->dereference == DEREF_NEVER)
+		{
+		  called_lchown = 1;
+		  fail = lchown (file, new_uid, new_gid);
+
+		  /* Ignore the failure if it's due to lack of support (ENOSYS)
+		     and this is not a command line argument.  */
+		  if (!cmdline_arg && fail && errno == ENOSYS)
+		    {
+		      fail = 0;
+		      symlink_changed = 0;
+		    }
+		}
+	      else if (chopt->dereference == DEREF_ALWAYS)
+		{
+		  /* Applying chown to a symlink and expecting it to affect
+		     the referent is not portable.  So instead, open the
+		     file and use fchown on the resulting descriptor.  */
+		  int fd = open (file, O_RDONLY | O_NONBLOCK | O_NOCTTY);
+		  fail = (fd == -1 ? 1 : fchown (fd, new_uid, new_gid));
+		}
+	      else
+		{
+		  /* FIXME */
+		  abort ();
+		}
+	    }
+	  else
+	    {
+	      fail = chown (file, new_uid, new_gid);
+	    }
+	  saved_errno = errno;
+
+	  if (chopt->verbosity == V_high
+	      || (chopt->verbosity == V_changes_only && !fail))
+	    {
+	      enum Change_status ch_status = (! symlink_changed
+					      ? CH_NOT_APPLIED
+					      : (fail
+						 ? CH_FAILED : CH_SUCCEEDED));
+	      describe_change (file, ch_status,
+			       chopt->user_name, chopt->group_name);
+	    }
+
+	  if (fail)
+	    {
+	      if (chopt->force_silent == 0)
+		error (0, saved_errno, (uid != (uid_t) -1
+					? _("changing ownership of %s")
+					: _("changing group of %s")),
+		       quote (file));
+	      errors = 1;
+	    }
+	  else
+	    {
+	      /* The change succeeded.  On some systems, the chown function
+		 resets the `special' permission bits.  When run by a
+		 `privileged' user, this program must ensure that at least
+		 the set-uid and set-group ones are still set.  */
+	      if (file_stats.st_mode & ~(S_IFMT | S_IRWXUGO)
+		  /* If we called lchown above (which means this is a symlink),
+		     then skip it.  */
+		  && ! called_lchown)
+		{
+		  if (chmod (file, file_stats.st_mode))
+		    {
+		      error (0, saved_errno,
+			     _("unable to restore permissions of %s"),
+			     quote (file));
+		      fail = 1;
+		    }
+		}
+	    }
+	}
+      else if (chopt->verbosity == V_high)
+	{
+	  describe_change (file, CH_NO_CHANGE_REQUESTED,
+			   chopt->user_name, chopt->group_name);
+	}
+    }
+
+  if (chopt->recurse && is_directory)
+    errors |= change_dir_owner (file, uid, gid,
+				old_uid, old_gid, &file_stats, chopt);
+  return errors;
+}