.

(ENABLE_NLS): Include libintl.h and define _ to gettext.
2025-09-10 07:59:52 +02:00 · 1996-09-02 16:31:23 +00:00 · 1996-09-02 16:18:59 +00:00 · 1996-09-02 16:18:48 +00:00 · 1996-09-02 15:59:22 +00:00 · 1996-09-02 15:53:04 +00:00
200 changed files with 9820 additions and 2792 deletions
--- a/153
+++ b/153
@@ -2,9 +2,9 @@ Notes on the GNU Translation Project
 ************************************

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

   If you found this `ABOUT-NLS' file inside a GNU distribution, you
 may assume that the distributed package does use GNU `gettext'
@@ -28,7 +28,7 @@ One advise in advance
   If you want to exploit the full power of internationalization, you
 should configure it using

-     ./configure --with-gnu-gettext
+     ./configure --with-included-gettext

 to force usage of internationalizing routines provided within this
 package, despite the existence of internationalizing capabilities in
@@ -58,7 +58,7 @@ the GNU `gettext' package is *not* required.  Installers may use
 special options at configuration time for changing the default
 behaviour.  The commands:

-     ./configure --with-gnu-gettext
+     ./configure --with-included-gettext
     ./configure --with-catgets
     ./configure --disable-nls

@@ -75,7 +75,7 @@ should use the more recent version of the GNU `gettext' library.  I.e.
 if the file `intl/VERSION' shows that the library which comes with this
 package is more recent, you should use

-     ./configure --with-gnu-gettext
+     ./configure --with-included-gettext

 to prevent auto-detection.

@@ -90,7 +90,7 @@ want to use the `catgets' functions use
 to enable the test for `catgets' (this causes no harm if `catgets' is
 not available on your system).  If you really select this option we
 would like to hear about the reasons because we cannot think of any
-good ones outself.
+good one ourself.

   Internationalized packages have usually many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
@@ -127,109 +127,96 @@ leaving `LANG' to `sv'.
 Translating Teams
 =================

-   The GNU `gettext' tool set contains *everything* maintainers need
-for internationalizing their packages for messages.  It also contains
-quite useful tools for helping translators at localizing messages to
-their native language, once a package has already been
-internationalized.
-
-   To achieve the GNU Translation Project, we need many interested
+   For the GNU Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
-Each translating team has its own mailing list, courtesy of Linux
-International.  You may reach your translating team at the address
+Each translation team has its own mailing list, courtesy of Linux
+International.  You may reach your translation team at the address
 `LL@li.org', replacing LL by the two-letter ISO 639 code for your
-language.  Language codes are *not* the same as country codes given in
-ISO 3166.  The following translating teams exist, as of January 1996:
+language.  Language codes are *not* the same as the country codes given
+in ISO 3166.  The following translation teams exist, as of May 1996:

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

-For example, you may reach the Chinese translating team by writing to
+For example, you may reach the Chinese translation team by writing to
 `zh@li.org'.

   If you'd like to volunteer to *work* at translating messages, you
 should become a member of the translating team for your own language.
 The subscribing address is *not* the same as the list itself, it has
-`-request' appended.  For example, Swedish people can send a message to
-`sv-request@li.org', having this message body:
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:

     subscribe

-   Keep in mind that team members should be interested in *working* at
-translations, or at solving translational difficulties, rather than
-merely lurking around.  If your team does not exist yet and you want to
-start one, please write to `gnu-translation@gnu.ai.mit.edu'; you will
-then reach the GNU coordinator for all translator teams.
+   Keep in mind that team members are expected to participate
+*actively* in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `gnu-translation@gnu.ai.mit.edu' to reach
+the GNU coordinator for all translator teams.

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

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

   Languages are not equally supported in all GNU packages.  The
 following matrix shows the current state of GNU internationalization,
-as of January 1996.  Listed are: internationalized packages, and
-languages for which work is in progress, or about to start.
+as of May 1996.  The matrix shows, in regard of each package, for which
+languages PO files have been submitted to translation coordination.

-          See note    cs de en fr it ja ko nl no pl pt sv
-                \   .-------------------------------------.
-     chess      (1) |    X  /                          X  |
-     clisp          |    X  X  X                          |
-     diffutils  (2) |       /  .                          |
-     fileutils      |    .  /                             |
-     flex       (3) |       /  .                          |
-     m4             |    -  /  -  -  .                 -  |
-     gettext        |    X  /  X        -     X  -     X  |
-     ptx            |    -  /  -                       -  |
-     recode         |    -  /  -           -        -     |
-     sh-utils       |    .  /  .                          |
-     sharutils      |    X  /  X     X     X        X  X  |
-     tar            |    X  /  X              -     X  X  |
-     textutils      |    .  /  .                          |
-     wdiff          | -  -  /  -  -                       |
-                    `-------------------------------------'
-                      cs de en fr it ja ko nl no pl pt sv
+                       cs de en es fi fr ja ko nl no pl pt sl sv
+                     .-------------------------------------------.
+     bash            |                []                         |  1
+     bison           |                []                         |  1
+     clisp           |    [] []       []                         |  3
+     cpio            |                []                         |  1
+     diffutils       |                []             []       [] |  3
+     enscript        |    []       [] []                   []    |  4
+     fileutils       |    []          []                []    [] |  4
+     findutils       |    []          []                         |  2
+     flex            |                []                         |  1
+     gcal            |    []                                     |  1
+     gettext         |    []          []    [] [] [] []    [] [] |  9
+     glibc           |    []    []          []                   |  3
+     grep            |          []    []    []       []    [] [] |  6
+     hello           |    []          []    []       [] [] []    |  6
+     m4              |    []          [] []                   [] |  4
+     make            |                                           |  0
+     mkid            |    []          []                         |  2
+     music           |                []                         |  1
+     ptx             |    []          []                      [] |  3
+     recode          |    []    []    []                   [] [] |  5
+     sh-utils        |    []          []                         |  2
+     sharutils       |    []          []       []             [] |  4
+     tar             |    []          []    []    []    [] [] [] |  7
+     textutils       |    []          []    [] []                |  4
+     wdiff           | [] []          []                      [] |  4
+                     `-------------------------------------------'
+                       cs de en es fi fr ja ko nl no pl pt sl sv
+                        1 17  1  3  1 22  1  6  3  3  4  3  6 10   81

-   The interpretation legend and notes are:
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.

-`/'
-     There is no PO file, this package merely defaults to this language.
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+GNU distribution.

-`.'
-     The effort of localizing this package has been undertaken by
-     someone, or by a translating team, and work is, or should be in
-     progress.
-
-`-'
-     A PO file for this package and this language is completed and is
-     currently available in a pretest release, or is all ready for
-     inclusion in the next release of this package.
-
-`X'
-     The localization of this package to this particular language is
-     fully completed, and now distributed through an official release.
-
-(1)
-     This package is translated to specific languages by methods
-     predating GNU `gettext'.  Translations are all kept on disk files,
-     and sources contain numbers where one normally expects strings.
-
-(2)
-     This package is planned to switch to GNU `gettext'.  For the time
-     being, it uses temporary means for internationalization.
-
-(3)
-     This package has its translatable strings marked, but does not use
-     GNU `gettext'.  A convenience patch may be available separately.
-
-   If January 1996 seems to be old, you may fetch a more recent copy of
+   If May 1996 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.

--- a/2
+++ b/2
@@ -31,7 +31,7 @@ The simplest way to compile this package is:
     `sh ./configure' instead to prevent `csh' from trying to execute
     `configure' itself.

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

  2. Type `make' to compile the package.
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 info_TEXINFOS = fileutils.texi
-EXTRA_DIST = perm.texi getdate.texi
+
+# FIXME: remove texinfo.tex when automake has been fixed to include it
+# automatically
+EXTRA_DIST = perm.texi getdate.texi texinfo.tex
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 0.31 from Makefile.am
+# Makefile.in generated automatically by automake 1.1c from Makefile.am

 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -39,12 +39,17 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@

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

 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
-INFOS = fileutils.info*
+INFOS = fileutils.info fileutils.info-[0-9] fileutils.info-[0-9][0-9]
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
@@ -60,20 +65,22 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
 	$(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST) $(DATA)
 DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
 	$(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST) $(DATA)
+
+TAR = tar
 default: all


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

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

-version.texi: stamp-vti
+version.texi: @MAINT@stamp-vti

 stamp-vti: fileutils.texi $(top_srcdir)/configure.in
-	echo "@set UPDATED `cd $(srcdir) && $(SHELL) mdate-sh fileutils.texi`" \
-	  > vti.tmp
+	echo "@set UPDATED `cd $(srcdir) \
+	  && $(SHELL) ./mdate-sh fileutils.texi`" > vti.tmp
 	echo "@set EDITION $(VERSION)" >> vti.tmp
 	echo "@set VERSION $(VERSION)" >> vti.tmp
 	if cmp -s vti.tmp $(srcdir)/version.texi; then \
@@ -91,23 +98,27 @@ clean-vti:
 distclean-vti:

 maintainer-clean-vti:
-	rm -f stamp-vti version.texi
+	@MAINT@rm -f stamp-vti version.texi

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


 .texi.info:
-	$(MAKEINFO) -I$(srcdir) $<
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`

 .texi.dvi:
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<

 install-info: $(INFO_DEPS)
-	$(top_srcdir)/mkinstalldirs $(infodir)
-	for file in $(INFO_DEPS); do		\
-	  for ifile in `cd $(srcdir) && echo $$file*`; do \
-	    $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
-	  done;					\
+	$(mkinstalldirs) $(infodir)
+	for file in $(INFO_DEPS); do \
+	  for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    if test -f $(srcdir)/$$ifile; then \
+	      $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+	    else : ; fi; \
+	  done; \
 	done

 uninstall-info:
@@ -131,9 +142,10 @@ tags: TAGS
 TAGS:


-subdir = doc
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist: $(DEP_DISTFILES)
+
+subdir = doc
+distdir: $(DEP_DISTFILES)
 	@for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
 	  test -f $(distdir)/$$file \
 	  || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
@@ -151,7 +163,7 @@ install-exec:

 install-data: install-info

-install: install-exec install-data
+install: install-exec install-data all
 	@:

 uninstall: uninstall-info
@@ -161,7 +173,7 @@ all: $(INFO_DEPS) Makefile
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 installdirs:
-	$(top_srcdir)/mkinstalldirs  $(infodir)
+	$(mkinstalldirs)  $(infodir)


 mostlyclean-generic:
@@ -169,6 +181,7 @@ mostlyclean-generic:

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

 distclean-generic:
 	rm -f Makefile $(DISTCLEANFILES)
@@ -191,7 +204,7 @@ maintainer-clean:  maintainer-clean-vti maintainer-clean-info \

 .PHONY: default mostlyclean-vti distclean-vti clean-vti \
 maintainer-clean-vti install-info uninstall-info mostlyclean-info \
-distclean-info clean-info maintainer-clean-info tags dist info dvi \
+distclean-info clean-info maintainer-clean-info tags distdir info dvi \
 check installcheck install-exec install-data install uninstall all \
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
--- a/doc/getdate.texi
+++ b/doc/getdate.texi
@@ -11,6 +11,30 @@
@cindex date input formats
@findex getdate

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

@example
-1970-9-17            # ISO 8601.
+1970-09-17           # ISO 8601.
 70-9-17              # This century assumed by default.
 70-09-17             # Leading zeros are ignored.
 9/17/72              # Common U.S. writing.
@@ -120,9 +144,10 @@ Here are the rules.
@cindex date format, ISO 8601
 For numeric months, the ISO 8601 format
@samp{@var{year}-@var{month}-@var{day}} is allowed, where @var{year} is
-any positive number, @var{month} is a number between 1 and 12, and
-@var{day} is a number between 1 and 31.  If @var{year} is less than 100,
-then 1900 is added to it to force a date in this century.  The construct
+any positive number, @var{month} is a number between 01 and 12, and
+@var{day} is a number between 01 and 31.  A leading zero must be present
+if a number is less than ten.  If @var{year} is less than 100, then 1900
+is added to it to force a date in this century.  The construct
@samp{@var{month}/@var{day}/@var{year}}, popular in the United States,
 is accepted.  Also @samp{@var{month}/@var{day}}, omitting the year.

--- a/doc/mdate-sh
+++ b/doc/mdate-sh
@@ -63,7 +63,7 @@ day=$2
 # Here we have to deal with the problem that the ls output gives either
 # the time of day or the year.
 case $3 in
-  *:*) set `date`; year=$6
+  *:*) set `date`; eval year=\$$#
       case $2 in
 	 Jan) nummonthtod=1;;
 	 Feb) nummonthtod=2;;
@@ -79,12 +79,11 @@ case $3 in
 	 Dec) nummonthtod=12;;
       esac
       # For the first six month of the year the time notation can also
-       # be used for file modified in the last year.
+       # be used for files modified in the last year.
       if (expr $nummonth \> $nummonthtod) > /dev/null;
       then
 	 year=`expr $year - 1`
-       fi
-       ;;
+       fi;;
  *) year=$3;;
 esac

--- a/doc/perm.texi
+++ b/doc/perm.texi
@@ -217,17 +217,14 @@ og-rxw

@cindex copying existing permissions
@cindex permissions, copying existing
-You can base part of a file's permissions on part of its existing
-permissions.  To do this, instead of using @samp{r}, @samp{w}, or
-@samp{x} after the operator, you use the letter @samp{u}, @samp{g}, or
-@samp{o}.  For example, the mode
-
+You can base a file's permissions on its existing permissions.  To do
+this, instead of using @samp{r}, @samp{w}, or @samp{x} after the
+operator, you use the letter @samp{u}, @samp{g}, or @samp{o}.  For
+example, the mode
@example
 o+g
@end example
-
@noindent
-@c FIXME describe the ls -l notation for showing permissions.
 adds the permissions for users who are in a file's group to the
 permissions that other users have for the file.  Thus, if the file
 started out as mode 664 (@samp{rw-rw-r--}), the above mode would change
--- a/doc/sh-utils.texi
+++ b/doc/sh-utils.texi
@@ -28,36 +28,39 @@
@ifinfo
@format
 START-INFO-DIR-ENTRY
-* Shell utilities: (sh-utils).		GNU shell utilities.
-* basename: (sh-utils)basename invocation.	Strip directory and suffix.
-* date: (sh-utils)date invocation.		Print/set system date and time.
-* dirname: (sh-utils)dirname invocation.	Strip non-directory suffix.
-* echo: (sh-utils)echo invocation.		Print a line of text.
-* env: (sh-utils)env invocation.		Modify the environment.
-* expr: (sh-utils)expr invocation.		Evaluate expressions.
-* false: (sh-utils)false invocation.		Do nothing, unsuccessfully.
-* groups: (sh-utils)groups invocation.		Print group names a user is in.
-* hostname: (sh-utils)hostname invocation.	Print or set system name.
-* id: (sh-utils)id invocation.			Print real/effective uid/gid.
-* logname: (sh-utils)logname invocation.	Print current login name.
-* nice: (sh-utils)nice invocation.		Modify scheduling priority.
-* nohup: (sh-utils)nohup invocation.		Immunize to hangups.
-* pathchk: (sh-utils)pathchk invocation.	Check file name portability.
-* printenv: (sh-utils)printenv invocation.	Print environment variables.
-* printf: (sh-utils)printf invocation.	        Format and print data.
-* pwd: (sh-utils)pwd invocation.	        Print working directory.
-* sleep: (sh-utils)sleep invocation.	        Delay for a specified time.
-* stty: (sh-utils)stty invocation.	        Print/change terminal settings.
-* su: (sh-utils)su invocation.	                Modify user and group id.
-* tee: (sh-utils)tee invocation.	        Redirect to multiple files.
-* test: (sh-utils)test invocation.	        File/string tests.
-* true: (sh-utils)true invocation.	        Do nothing, successfully.
-* tty: (sh-utils)tty invocation.	        Print terminal name.
-* uname: (sh-utils)uname invocation.	        Print system information.
-* users: (sh-utils)users invocation.	        Print current user names.
-* who: (sh-utils)who invocation.	        Print who is logged in.
-* whoami: (sh-utils)whoami invocation.		Print effective user id.
-* yes: (sh-utils)yes invocation.		Print a string indefinitely.
+* Shell utilities: (sh-utils).          GNU shell utilities.
+* basename: (sh-utils)basename invocation.      Strip directory and suffix.
+* chroot: (sh-utils)chroot invocation.          Specify the root directory.
+* date: (sh-utils)date invocation.              Print/set system date and time.
+* dirname: (sh-utils)dirname invocation.        Strip non-directory suffix.
+* echo: (sh-utils)echo invocation.              Print a line of text.
+* env: (sh-utils)env invocation.                Modify the environment.
+* expr: (sh-utils)expr invocation.              Evaluate expressions.
+* factor: (sh-utils)factor invocation.          Print prime factors
+* false: (sh-utils)false invocation.            Do nothing, unsuccessfully.
+* groups: (sh-utils)groups invocation.          Print group names a user is in.
+* hostname: (sh-utils)hostname invocation.      Print or set system name.
+* id: (sh-utils)id invocation.                  Print real/effective uid/gid.
+* logname: (sh-utils)logname invocation.        Print current login name.
+* nice: (sh-utils)nice invocation.              Modify scheduling priority.
+* nohup: (sh-utils)nohup invocation.            Immunize to hangups.
+* pathchk: (sh-utils)pathchk invocation.        Check file name portability.
+* printenv: (sh-utils)printenv invocation.      Print environment variables.
+* printf: (sh-utils)printf invocation.          Format and print data.
+* pwd: (sh-utils)pwd invocation.                Print working directory.
+* seq: (sh-utils)seq invocation.                Print numeric sequences
+* sleep: (sh-utils)sleep invocation.            Delay for a specified time.
+* stty: (sh-utils)stty invocation.              Print/change terminal settings.
+* su: (sh-utils)su invocation.                  Modify user and group id.
+* tee: (sh-utils)tee invocation.                Redirect to multiple files.
+* test: (sh-utils)test invocation.              File/string tests.
+* true: (sh-utils)true invocation.              Do nothing, successfully.
+* tty: (sh-utils)tty invocation.                Print terminal name.
+* uname: (sh-utils)uname invocation.            Print system information.
+* users: (sh-utils)users invocation.            Print current user names.
+* who: (sh-utils)who invocation.                Print who is logged in.
+* whoami: (sh-utils)whoami invocation.          Print effective user id.
+* yes: (sh-utils)yes invocation.                Print a string indefinitely.
 END-INFO-DIR-ENTRY
@end format
@end ifinfo
@@ -65,7 +68,7 @@ END-INFO-DIR-ENTRY
@ifinfo
 This file documents the GNU shell utilities.

-Copyright (C) 1994 Free Software Foundation, Inc.
+Copyright (C) 1994, 95, 96 Free Software Foundation, Inc.

 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -92,12 +95,12 @@ by the Foundation.
@titlepage
@title GNU @code{sh-utils}
@subtitle A set of shell utilities
-@subtitle for version @value{VERSION}, @value{RELEASEDATE}
+@subtitle for version @value{VERSION}, @value{UPDATED}
@author David MacKenzie et al.

@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1994 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 95, 96 Free Software Foundation, Inc.

 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -126,18 +129,21 @@ This manual minimally documents version @value{VERSION} of the GNU shell
 utilities.

@menu
-* Introduction::		Caveats, overview, and authors.
+* Introduction::                Caveats, overview, and authors.
 * Common options::              Common options.
-* Date input formats::		Specifying date strings.
+
+* Date input formats::          Specifying date strings.
 * Printing text::               echo printf yes
 * Conditions::                  false true test expr
 * Redirection::                 tee
 * File name manipulation::      dirname basename pathchk
-* Working context::		pwd stty printenv tty
+* Working context::             pwd stty printenv tty
 * User information::            id logname whoami groups users who
 * System context::              date uname hostname
-* Modified command invocation:: env nice nohup su
+* Modified command invocation:: chroot env nice nohup su
 * Delaying::                    sleep
+* Numeric operations::          factor seq
+
 * Index::                       General index.
@end menu
@end ifinfo
@@ -245,15 +251,13 @@ This section describes commands that display text strings.
@cindex text, displaying
@cindex arbitrary text, displaying

-Synopsis:
+@code{echo} writes each given @var{string} to standard output, with a
+space between each and a newline after the last one.  Synopsis:

@example
 echo [@var{option}]@dots{} [@var{string}]@dots{}
@end example

-@code{echo} writes each given @var{string} to standard output, with a
-space between each and a newline after the last one.
-
 The program accepts the following options.  Also see @ref{Common options}.

@table @samp
@@ -298,7 +302,7 @@ a valid octal number, it is printed literally.
@section @code{printf}: Format and print data

@pindex printf
-Synopsis:
+@code{printf} does formatted printing of text. Synopsis:

@example
 printf @var{format} [@var{argument}]@dots{}
@@ -699,9 +703,9 @@ Operands are either numbers or strings.  @code{expr} coerces
 anything appearing in an operand position to an integer or a string
 depending on the operation being applied to it.

-Strings are not quoted for @code{expr}, though you may need to quote
-them to protect characters with special meaning to the shell, e.g.,
-spaces.
+Strings are not quoted for @code{expr} itself, though you may need to
+quote them to protect characters with special meaning to the shell,
+e.g., spaces.

@cindex parentheses for grouping
 Operators may given as infix symbols or prefix keywords.  Parentheses
@@ -897,11 +901,11 @@ to change the input source or output destination of a command.  But one
 useful redirection is performed by a separate command, not by the shell;
 it's described here.

-
@menu
 * tee invocation::              Redirect output to multiple files.
@end menu

+
@node tee invocation
@section @code{tee}: Redirect output to multiple files

@@ -912,9 +916,7 @@ it's described here.

 The @code{tee} command copies standard input to standard output and also
 to any files given as arguments.  This is useful when you want not only
-to send some data down a pipe, but also to save a copy.
-
-Synopsis:
+to send some data down a pipe, but also to save a copy.  Synopsis:

@example
 tee [@var{option}]@dots{} [@var{file}]@dots{}
@@ -969,16 +971,16 @@ This section describes commands that manipulate file names.
@cindex file names, stripping directory and suffix
@cindex leading directory components, stripping

-Synopsis:
+@code{basename} removes any leading directory components from
+@var{name}.  Synopsis:

@example
 basename @var{name} [@var{suffix}]
@end example

-The @code{basename} command removes any leading directory components
-from @var{name}.  If @var{suffix} is specified and is identical
-to the end of @var{name}, it is removed from @var{name} as well.
-@code{basename} prints the result on standard output.
+If @var{suffix} is specified and is identical to the end of @var{name},
+it is removed from @var{name} as well.  @code{basename} prints the
+result on standard output.

 The only options are @samp{--help} and @samp{--version}.  @xref{Common
 options}.
@@ -992,15 +994,15 @@ options}.
@cindex stripping non-directory suffix
@cindex non-directory suffix, stripping

-Synopsis:
+@code{dirname} prints all but the final slash-delimited component of
+a string (presumably a filename).  Synopsis:

@example
 dirname @var{name}
@end example

-@code{dirname} prints all but the final slash-delimited component
-of @var{name}.  If @var{name} is a single component,
-@code{dirname} prints @samp{.} (meaning the current directory).
+If @var{name} is a single component, @code{dirname} prints @samp{.}
+(meaning the current directory).

 The only options are @samp{--help} and @samp{--version}.  @xref{Common
 options}.
@@ -1014,7 +1016,7 @@ options}.
@cindex valid file names, checking for
@cindex portable file names, checking for

-Synopsis:
+@code{pathchk} checks portability of filenames.  Synopsis:

@example
 pathchk [@var{option}]@dots{} @var{name}@dots{}
@@ -1108,6 +1110,14 @@ The only options are a lone @samp{--help} or
@cindex terminal settings
@cindex line settings of terminal

+@code{stty} prints or changes terminal characteristics, such as baud rate.
+Synopses:
+
+@example
+stty [@var{setting}]@dots{}
+stty [@var{option}]
+@end example
+
 If given no arguments, @code{stty} prints the baud rate, line
 discipline number (on systems that support it), and line settings
 that have been changed from the values set by @samp{stty sane}.
@@ -1117,13 +1127,6 @@ standard input.
@code{stty} accepts many non-option arguments that change aspects of
 the terminal line operation, as described below.

-Synopses:
-
-@example
-stty [@var{setting}]@dots{}
-stty [@var{option}]
-@end example
-
 The program accepts the following options.  Also see @ref{Common options}.

@table @samp
@@ -1277,7 +1280,7 @@ Translate carriage return to newline.  May be negated.
@opindex ixon
@kindex C-s/C-q flow control
@cindex XON/XOFF flow control
-Enable XON/XOFF flow control (that is, @key{CTRL-s}/@key{CTRL-Q}).  May
+Enable XON/XOFF flow control (that is, @kbd{CTRL-S}/@kbd{CTRL-Q}).  May
 be negated.

@item ixoff
@@ -1599,7 +1602,7 @@ For GNU stty, giving a value of @code{^-} or @code{undef} disables that
 special character.  (This is incompatible with Ultrix @code{stty},
 which uses  a value of @samp{u} to disable a special character.  GNU
@code{stty} treats a value @samp{u} like any other, namely to set that
-special character to @key{u}.)
+special character to @key{U}.)

@table @samp

@@ -1735,7 +1738,7 @@ of: 0 50 75 110 134 134.5 150 200 300 600 1200 1800 2400 4800 9600
@cindex printing all or some environment variables
@cindex environment variables, printing

-Synopsis:
+@code{printenv} prints environment variable values.  Synopsis:

@example
 printenv [@var{option}] [@var{variable}]@dots{}
@@ -1765,9 +1768,8 @@ Exit status:
@cindex print terminal file name
@cindex terminal file name, printing

-@code{tty} prints the file name of the tty connected to its standard
-input.  It prints @samp{not a tty} if standard input is not a tty.
-
+@code{tty} prints the file name of the terminal connected to its standard
+input.  It prints @samp{not a tty} if standard input is not a terminal.
 Synopsis:

@example
@@ -1792,8 +1794,8 @@ Print nothing; only return an exit status.
 Exit status:

@display
-0 if standard input is a tty
-1 if standard input is not a tty
+0 if standard input is a terminal
+1 if standard input is not a terminal
 2 if given incorrect arguments
 3 if a write error occurs
@end display
@@ -1826,10 +1828,8 @@ logins, groups, and so forth.
@cindex effective uid and gid, printing
@cindex printing real and effective uid and gid

-@noindent @code{id} prints information about the given user, or the process
-running it if no user is specified.
-
-Synopsis:
+@code{id} prints information about the given user, or the process
+running it if no user is specified.  Synopsis:

@example
 id [@var{option}]@dots{} [@var{username}]
@@ -1923,11 +1923,9 @@ options}.
@cindex supplementary groups, printing

@code{groups} prints the names of the primary and any supplementary
-groups that each given @var{username}, or the current process if none
-are given, is in.  If user names are given, the name of each user is
-printed before the list of that user's groups.
-
-Synopsis:
+groups for each given @var{username}, or the current process if no names
+are given.  If names are given, the name of each user is printed before
+the list of that user's groups.  Synopsis:

@example
 groups [@var{username}]@dots{}
@@ -1951,9 +1949,7 @@ options}.
 names of users currently logged in to the current host.  Each user name
 corresponds to a login session, so if a user has more than one login
 session, that user's name will appear the same number of times in the
-output.
-
-Synopsis:
+output. Synopsis:

@example
 users [@var{file}]
@@ -1976,6 +1972,7 @@ options}.
@cindex printing current user information
@cindex information, about current users

+@code{who} prints information about users who are currently logged on.
 Synopsis:

@example
@@ -2085,10 +2082,8 @@ 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:
+@code{date} with no arguments prints the current time and date, in the
+format of the @samp{%c} directive (described below).  Synopses:

@example
 date [@var{option}]@dots{} [+@var{format}]
@@ -2107,10 +2102,10 @@ directives, which start with @samp{%}, characters in the format string
 are printed unchanged.  The directives are described below.

@menu
-* Time directives::             %[HIklMprsSTXZ]
+* Time directives::             %[HIklMprsSTXzZ]
 * Date directives::             %[aAbBcdDhjmUwWxyY]
 * Literal directives::          %[%nt]
-* Padding::			Pad with zeroes, spaces (%_), or nothing (%-).
+* Padding::                     Pad with zeroes, spaces (%_), or nothing (%-).
 * Setting the time::            Changing the system clock.
 * Options for date::            Instead of the current time.
 * Examples of date::            Examples.
@@ -2155,10 +2150,9 @@ time, 24-hour (hh:mm:ss)
@item %X
 locale's time representation (%H:%M:%S)
@item %z
-RFC-822 style numeric time zone (e.g., -0600 or +0100), or nothing
-if no time zone is determinable.
-Note that this value reflects the @emph{current} time zone.
-It isn't changed by the @samp{--date} option.
+RFC-822 style numeric time zone (e.g., -0600 or +0100), or nothing if no
+time zone is determinable.  This value reflects the @emph{current} time
+zone.  It isn't changed by the @samp{--date} option.
@item %Z
 time zone (e.g., EDT), or nothing if no timezone is
 determinable.
@@ -2197,11 +2191,19 @@ day of year (001@dots{}366)
@item %m
 month (01@dots{}12)
@item %U
-week number of year with Sunday as first day of week (00@dots{}53)
+week number of year with Sunday as first day of week (00@dots{}53).
+Days in a new year preceding the first Sunday are in week zero.
+@item %V
+week number of year with Monday as first day of the week as a decimal
+(01@dots{}53). If the week containing January 1 has four or more days in
+the new year, then it is considered week 1; otherwise, it is week 53 of
+the previous year, and the next week is week 1. (See the ISO 8601: 1988
+standard.)
@item %w
 day of week (0@dots{}6) with 0 corresponding to Sunday
@item %W
-week number of year with Monday as first day of week (00@dots{}53)
+week number of year with Monday as first day of week (00@dots{}53).
+Days in a new year preceding the first Monday are in week zero.
@item %x
 locale's date representation (mm/dd/yy)
@item %y
@@ -2351,10 +2353,8 @@ If @samp{--utc} is also specified, use @samp{GMT} in place of @samp{%z}.
@itemx --reference=@var{file}
@opindex -r
@opindex --reference
-Display the time and date as obtained from a reference @var{file},
-instead of the current time and date.  Each file has a few timestamps
-associated with it.  In this context, the time and date of the last
-modification are used.
+Display the time and date reference according to the last modification
+time of @var{file}, instead of the current time and date.

@item -s @var{datestr}
@itemx --set=@var{datestr}
@@ -2456,9 +2456,7 @@ Mon, 25 Mar 1996 23:34:17 -0600

@code{uname} prints information about the machine and operating system
 it is run on.  If no options are given, @code{uname} acts as if the
-@code{-s} option were given.
-
-Synopsis:
+@code{-s} option were given. Synopsis:

@example
 uname [@var{option}]@dots{}
@@ -2543,9 +2541,7 @@ Print the operating system version.
 With no arguments, @code{hostname} prints the name of the current host
 system.  With one argument, it sets the current host name to the
 specified string.  You must have appropriate privileges to set the host
-name.
-
-Synopsis:
+name. Synopsis:

@example
 hostname [@var{name}]
@@ -2567,6 +2563,7 @@ different than the current one: a modified environment, as a different
 user, etc.

@menu
+* chroot invocation::           Modify the root directory.
 * env invocation::              Modify environment variables.
 * nice invocation::             Modify scheduling priority.
 * nohup invocation::            Immunize to hangups.
@@ -2574,17 +2571,42 @@ user, etc.
@end menu


+@node chroot invocation
+@section @code{chroot}: Run a command with a different root directory
+
+@pindex chroot
+@cindex running a program in a specified root directory
+@cindex root directory, running a program in a specified
+
+@code{chroot} runs a command with a specified root directory.
+On many systems, only the super-user can do this.
+Synopses:
+
+@example
+chroot @var{newroot} [@var{command} [@var{args}]@dots{}]
+chroot @var{option}
+@end example
+
+Ordinarily, filenames are looked up starting at the root of the
+directory structure, i.e., @file{/}.  @code{chroot} changes the root to
+the directory @var{newroot} (which must exist) and then runs
+@var{command} with optional @var{args}.  If @var{command} is not
+specified, the default is the value of the @code{SHELL} environment
+variable or @code{/bin/sh} if not set, invoked with the @samp{-i} option.
+
+The only options are @samp{--help} and @samp{--version}.  @xref{Common
+options}.
+
+
@node env invocation
@section @code{env}: Run a command in a modified environment

@pindex env
@cindex environment, running a program in a modified
-@cindex modified environment, running a program in
+@cindex modified environment, running a program in a
+@cindex running a program in a modified environment

-@code{env} runs a command with an environment modified as specified
-by the command line arguments.
-
-Synopses:
+@code{env} runs a command with a modified environment.  Synopses:

@example
 env [@var{option}]@dots{} [@var{name}=@var{value}]@dots{} @c
@@ -2639,6 +2661,13 @@ Start with an empty environment, ignoring the inherited environment.
@cindex priority, modifying
@cindex appropriate privileges

+@code{nice} prints or modifies the scheduling priority of a job.
+Synopsis:
+
+@example
+nice [@var{option}]@dots{} [@var{command} [@var{arg}]@dots{}]
+@end example
+
 If no arguments are given, @code{nice} prints the current scheduling
 priority, which it inherited.  Otherwise, @code{nice} runs the given
@var{command} with its scheduling priority adjusted.  If no
@@ -2647,12 +2676,6 @@ priority, which it inherited.  Otherwise, @code{nice} runs the given
 adjustment.  The priority can be adjusted by @code{nice} over the range
 of -20 (the highest priority) to 19 (the lowest).

-Synopsis:
-
-@example
-nice [@var{option}]@dots{} [@var{command} [@var{arg}]@dots{}]
-@end example
-
@cindex conflicts with shell built-ins
@cindex built-in shell commands, conflicts with
 Because most shells have a built-in command by the same name, using the
@@ -2678,24 +2701,24 @@ Add @var{adjustment} instead of 10 to the command's priority.
@pindex nohup
@cindex hangups, immunity to
@cindex immunity to hangups
+@cindex logging out and continuing to run

@flindex nohup.out
@code{nohup} runs the given @var{command} with hangup signals ignored,
 so that the command can continue running in the background after you log
-out.
-
-Synopsis:
+out. Synopsis:

@example
 nohup @var{command} [@var{arg}]@dots{}
@end example

@flindex nohup.out
-Also, the scheduling priority is increased by 5.  If standard output is a
-tty, 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 command is not run.
+@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 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
+command is not run.

 If @code{nohup} creates either @file{nohup.out} or
@file{$HOME/nohup.out}, it creates it with no ``group'' or ``other''
@@ -2721,9 +2744,7 @@ options}.

@code{su} allows one user to temporarily become another user.  It runs a
 command (often an interactive shell) with the real and effective user
-id, group id, and supplemental groups of a given @var{user}.
-
-Synopsis:
+id, group id, and supplemental groups of a given @var{user}. Synopsis:

@example
 su [@var{option}]@dots{} [@var{user} [@var{arg}]@dots{}]
@@ -2865,7 +2886,7 @@ might find this idea strange at first.
@cindex delaying commands
@cindex commands for delaying

-Perhaps @code{wait} or other commands should be described here also?
+@c Perhaps @code{wait} or other commands should be described here also?

@menu
 * sleep invocation::            Delay for a specified time.
@@ -2880,7 +2901,6 @@ Perhaps @code{wait} or other commands should be described here also?

@code{sleep} pauses for an amount of time specified by the sum of
 the values of the command line arguments.
-
 Synopsis:

@example
@@ -2906,6 +2926,82 @@ The only options are @samp{--help} and @samp{--version}.  @xref{Common
 options}.


+@node Numeric operations
+@chapter Numeric operations
+
+@cindex numeric operations
+These programs do numerically-related operations.
+
+@menu
+* factor invocation::              Show factors of numbers.
+* seq invocation::                 Print sequences of numbers.
+@end menu
+
+
+@node factor invocation
+@section @code{factor}: Print prime factors
+
+@pindex factor
+@cindex prime factors
+
+@code{factor} prints prime factors.  Synopses:
+
+@example
+factor [@var{number}]@dots{}
+factor @var{option}
+@end example
+
+If no @var{number} is specified on the command line, @code{factor} reads
+numbers from standard input, delimited by newlines, tabs, or spaces.
+
+The only options are @samp{--help} and @samp{--version}.  @xref{Common
+options}.
+
+
+@node seq invocation
+@section @code{seq}: Print numeric sequences
+
+@pindex seq
+@cindex numeric sequences
+@cindex sequence of numbers
+
+@code{seq} prints a sequence of numbers to standard output.  Synopses:
+
+@example
+seq [@var{option}]@dots{} [@var{first} [@var{step}]] @var{last}@dots{}
+@end example
+
+@code{seq} prints the numbers from @var{first} to @var{last} by
+@var{step}.  By default, @var{first} and @var{step} are both 1, and each
+number is printed on its own line.  All numbers can be reals, not just
+integers.
+
+The program accepts the following options.  Also see @ref{Common options}.
+
+@table @samp
+@item -f @var{format}
+@itemx --format=@var{format}
+@opindex -f @var{format}
+@opindex --format=@var{format}
+@cindex formatting of numbers in @code{seq}
+Print all numbers using @var{format}; default @samp{%g}.
+@var{format} must contain exactly one of the standarding float output
+formats @samp{%e}, @samp{%f}, or @samp{%g}.
+
+@item -s @var{string}
+@itemx --separator=@var{string}
+@cindex separator for numbers in @code{seq}
+Separate numbers with @var{string}; default is a newline.
+The output always terminates with a newline.
+
+@item -w
+@itemx --equal-width
+Print all numbers with the same width, by padding with leading zeroes.
+(To have other kinds of padding, use @samp{--format}).
+
+@end table
+
+
@node Index
@unnumbered Index

--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -1,6 +1,7 @@
 %% TeX macros to handle texinfo files

-%   Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 1994 Free Software Foundation, Inc.
+%  Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
+%                94, 95, 1996 Free Software Foundation, Inc.

 %This texinfo.tex file is free software; you can redistribute it and/or
 %modify it under the terms of the GNU General Public License as
@@ -14,8 +15,8 @@

 %You should have received a copy of the GNU General Public License
 %along with this texinfo.tex file; see the file COPYING.  If not, write
-%to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
-%USA.
+%to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+%Boston, MA 02111-1307, USA.


 %In other words, you are welcome to use, share and improve this program.
@@ -34,7 +35,7 @@

 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 1.9 $
+\deftexinfoversion$Revision: 1.10 $
 \message{Loading texinfo package [Version \texinfoversion]:}

 % If in a .fmt file, print the version number
@@ -69,7 +70,7 @@
 % Avoid using \@M directly, because that causes trouble
 % if the definition is written into an index file.
 \global\let\tiepenalty = \@M
- \gdef\tie{\lvvmode\penalty\tiepenalty\ }
+ \gdef\tie{\leavevmode\penalty\tiepenalty\ }
 }
 \let\~ = \tie                  % And make it available as @~.

@@ -536,17 +537,34 @@ where each line of input produces a line of output.}
 \def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount
 \leftline{\hskip\leftskip{\rm#1}}}}

+% @inmargin{TEXT} puts TEXT in the margin next to the current paragraph.
+
+\def\inmargin#1{%
+\strut\vadjust{\nobreak\kern-\strutdepth
+  \vtop to \strutdepth{\baselineskip\strutdepth\vss
+  \llap{\rightskip=\inmarginspacing \vbox{\noindent #1}}\null}}}
+\newskip\inmarginspacing \inmarginspacing=1cm
+\def\strutdepth{\dp\strutbox}
+
 %\hbox{{\rm#1}}\hfil\break}}

 % @include file    insert text of that file as input.
-
-\def\include{\parsearg\includezzz}
-%Use \input\thisfile to avoid blank after \input, which may be an active
-%char (in which case the blank would become the \input argument).
-%The grouping keeps the value of \thisfile correct even when @include
-%is nested.
-\def\includezzz #1{\begingroup
-\def\thisfile{#1}\input\thisfile
+% Allow normal characters that  we make active in the argument (a file name).
+\def\include{\begingroup
+  \catcode`\\=12
+  \catcode`~=12
+  \catcode`^=12
+  \catcode`_=12
+  \catcode`|=12
+  \catcode`<=12
+  \catcode`>=12
+  \catcode`+=12
+  \parsearg\includezzz}
+% Restore active chars for included file.
+\def\includezzz#1{\endgroup\begingroup
+  % Read the included file in a group so nested @include's work.
+  \def\thisfile{#1}%
+  \input\thisfile
 \endgroup}

 \def\thisfile{}
@@ -631,6 +649,15 @@ where each line of input produces a line of output.}
  \let\printindex = \relax
  \let\pxref = \relax
  \let\settitle = \relax
+  \let\setchapternewpage = \relax
+  \let\setchapterstyle = \relax
+  \let\everyheading = \relax
+  \let\evenheading = \relax
+  \let\oddheading = \relax
+  \let\everyfooting = \relax
+  \let\evenfooting = \relax
+  \let\oddfooting = \relax
+  \let\headings = \relax
  \let\include = \relax
  \let\lowersections = \relax
  \let\down = \relax
@@ -654,6 +681,11 @@ where each line of input produces a line of output.}
 \def\menu{\doignore{menu}}
 \def\direntry{\doignore{direntry}}

+% @dircategory CATEGORY  -- specify a category of the dir file
+% which this file should belong to.  Ignore this in TeX.
+
+\def\dircategory{\comment}
+
 % Ignore text until a line `@end #1'.
 %
 \def\doignore#1{\begingroup
@@ -689,7 +721,7 @@ where each line of input produces a line of output.}
    \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
    \immediate\write16{  to use a workaround.}
    \immediate\write16{}
-    \warnedobstrue
+    \global\warnedobstrue
    \fi
 }

@@ -765,15 +797,17 @@ where each line of input produces a line of output.}
 % Since we want to separate VAR from REST-OF-LINE (which might be
 % empty), we can't just use \parsearg; we have to insert a space of our
 % own to delimit the rest of the line, and then take it out again if we
-% didn't need it.
+% didn't need it.  Make sure the catcode of space is correct to avoid
+% losing inside @example, for instance.
 %
-\def\set{\parsearg\setxxx}
+\def\set{\begingroup\catcode` =10 \parsearg\setxxx}
 \def\setxxx#1{\setyyy#1 \endsetyyy}
 \def\setyyy#1 #2\endsetyyy{%
  \def\temp{#2}%
  \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
  \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
  \fi
+  \endgroup
 }
 % Can't use \xdef to pre-expand #2 and save some time, since \temp or
 % \next or other control sequences that we've defined might get us into
@@ -910,6 +944,21 @@ where each line of input produces a line of output.}
 \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
  node \samp{\ignorespaces#1{}}}

+\def\macro#1{\begingroup\ignoresections\catcode`\#=6\def\macrotemp{#1}\parsearg\macroxxx}
+\def\macroxxx#1#2 \end macro{%
+\expandafter\gdef\macrotemp#1{#2}%
+\endgroup}
+
+%\def\linemacro#1{\begingroup\ignoresections\catcode`\#=6\def\macrotemp{#1}\parsearg\linemacroxxx}
+%\def\linemacroxxx#1#2 \end linemacro{%
+%\let\parsearg=\relax
+%\edef\macrotempx{\csname M\butfirst\expandafter\string\macrotemp\endcsname}%
+%\expandafter\xdef\macrotemp{\parsearg\macrotempx}%
+%\expandafter\gdef\macrotempx#1{#2}%
+%\endgroup}
+
+%\def\butfirst#1{}
+
 \message{fonts,}

 % Font-change commands.
@@ -920,12 +969,16 @@ where each line of input produces a line of output.}
 \def\sf{\fam=\sffam \tensf}
 \let\li = \sf % Sometimes we call it \li, not \sf.

+% We don't need math for this one.
+\def\ttsl{\tenttsl}
+
 %% Try out Computer Modern fonts at \magstephalf
 \let\mainmagstep=\magstephalf

 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
-\def\setfont#1#2{\font#1=\fontprefix#2}
+% #3 is the font's design size, #4 is a scale factor
+\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}

 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
@@ -933,29 +986,46 @@ where each line of input produces a line of output.}
 \ifx\fontprefix\undefined
 \def\fontprefix{cm}
 \fi
+% Support font families that don't use the same naming scheme as CM.
+\def\rmshape{r}
+\def\rmbshape{bx}		%where the normal face is bold
+\def\bfshape{b}
+\def\bxshape{bx}
+\def\ttshape{tt}
+\def\ttbshape{tt}
+\def\ttslshape{sltt}
+\def\itshape{ti}
+\def\itbshape{bxti}
+\def\slshape{sl}
+\def\slbshape{bxsl}
+\def\sfshape{ss}
+\def\sfbshape{ss}
+\def\scshape{csc}
+\def\scbshape{csc}

 \ifx\bigger\relax
 \let\mainmagstep=\magstep1
-\setfont\textrm{r12}
-\setfont\texttt{tt12}
+\setfont\textrm\rmshape{12}{1000}
+\setfont\texttt\ttshape{12}{1000}
 \else
-\setfont\textrm{r10 scaled \mainmagstep}
-\setfont\texttt{tt10 scaled \mainmagstep}
+\setfont\textrm\rmshape{10}{\mainmagstep}
+\setfont\texttt\ttshape{10}{\mainmagstep}
 \fi
 % Instead of cmb10, you many want to use cmbx10.
 % cmbx10 is a prettier font on its own, but cmb10
 % looks better when embedded in a line with cmr10.
-\setfont\textbf{b10 scaled \mainmagstep}
-\setfont\textit{ti10 scaled \mainmagstep}
-\setfont\textsl{sl10 scaled \mainmagstep}
-\setfont\textsf{ss10 scaled \mainmagstep}
-\setfont\textsc{csc10 scaled \mainmagstep}
+\setfont\textbf\bfshape{10}{\mainmagstep}
+\setfont\textit\itshape{10}{\mainmagstep}
+\setfont\textsl\slshape{10}{\mainmagstep}
+\setfont\textsf\sfshape{10}{\mainmagstep}
+\setfont\textsc\scshape{10}{\mainmagstep}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep

 % A few fonts for @defun, etc.
-\setfont\defbf{bx10 scaled \magstep1} %was 1314
-\setfont\deftt{tt10 scaled \magstep1}
+\setfont\defbf\bxshape{10}{\magstep1} %was 1314
+\setfont\deftt\ttshape{10}{\magstep1}
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}

 % Fonts for indices and small examples.
@@ -963,66 +1033,70 @@ where each line of input produces a line of output.}
 % because texinfo normally uses the slanted fonts for that.
 % Do not make many font distinctions in general in the index, since they
 % aren't very useful.
-\setfont\ninett{tt9}
-\setfont\indrm{r9}
-\setfont\indit{sl9}
+\setfont\ninett\ttshape{9}{1000}
+\setfont\indrm\rmshape{9}{1000}
+\setfont\indit\slshape{9}{1000}
 \let\indsl=\indit
 \let\indtt=\ninett
+\let\indttsl=\ninett
 \let\indsf=\indrm
 \let\indbf=\indrm
-\setfont\indsc{csc10 at 9pt}
+\setfont\indsc\scshape{10}{900}
 \font\indi=cmmi9
 \font\indsy=cmsy9

 % Fonts for headings
-\setfont\chaprm{bx12 scaled \magstep2}
-\setfont\chapit{ti12 scaled \magstep2}
-\setfont\chapsl{sl12 scaled \magstep2}
-\setfont\chaptt{tt12 scaled \magstep2}
-\setfont\chapsf{ss12 scaled \magstep2}
+\setfont\chaprm\rmbshape{12}{\magstep2}
+\setfont\chapit\itbshape{10}{\magstep3}
+\setfont\chapsl\slbshape{10}{\magstep3}
+\setfont\chaptt\ttbshape{12}{\magstep2}
+\setfont\chapttsl\ttslshape{10}{\magstep3}
+\setfont\chapsf\sfbshape{12}{\magstep2}
 \let\chapbf=\chaprm
-\setfont\chapsc{csc10 scaled\magstep3}
+\setfont\chapsc\scbshape{10}{\magstep3}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3

-\setfont\secrm{bx12 scaled \magstep1}
-\setfont\secit{ti12 scaled \magstep1}
-\setfont\secsl{sl12 scaled \magstep1}
-\setfont\sectt{tt12 scaled \magstep1}
-\setfont\secsf{ss12 scaled \magstep1}
-\setfont\secbf{bx12 scaled \magstep1}
-\setfont\secsc{csc10 scaled\magstep2}
+\setfont\secrm\rmbshape{12}{\magstep1}
+\setfont\secit\itbshape{10}{\magstep2}
+\setfont\secsl\slbshape{10}{\magstep2}
+\setfont\sectt\ttbshape{12}{\magstep1}
+\setfont\secttsl\ttslshape{10}{\magstep2}
+\setfont\secsf\sfbshape{12}{\magstep1}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep2}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2

-% \setfont\ssecrm{bx10 scaled \magstep1}    % This size an font looked bad.
-% \setfont\ssecit{cmti10 scaled \magstep1}    % The letters were too crowded.
-% \setfont\ssecsl{sl10 scaled \magstep1}
-% \setfont\ssectt{tt10 scaled \magstep1}
-% \setfont\ssecsf{ss10 scaled \magstep1}
+% \setfont\ssecrm\bxshape{10}{\magstep1}    % This size an font looked bad.
+% \setfont\ssecit\itshape{10}{\magstep1}    % The letters were too crowded.
+% \setfont\ssecsl\slshape{10}{\magstep1}
+% \setfont\ssectt\ttshape{10}{\magstep1}
+% \setfont\ssecsf\sfshape{10}{\magstep1}

-%\setfont\ssecrm{b10 scaled 1315}	% Note the use of cmb rather than cmbx.
-%\setfont\ssecit{ti10 scaled 1315}	% Also, the size is a little larger than
-%\setfont\ssecsl{sl10 scaled 1315}	% being scaled magstep1.
-%\setfont\ssectt{tt10 scaled 1315}
-%\setfont\ssecsf{ss10 scaled 1315}
+%\setfont\ssecrm\bfshape{10}{1315}	% Note the use of cmb rather than cmbx.
+%\setfont\ssecit\itshape{10}{1315}	% Also, the size is a little larger than
+%\setfont\ssecsl\slshape{10}{1315}	% being scaled magstep1.
+%\setfont\ssectt\ttshape{10}{1315}
+%\setfont\ssecsf\sfshape{10}{1315}

 %\let\ssecbf=\ssecrm

-\setfont\ssecrm{bx12 scaled \magstephalf}
-\setfont\ssecit{ti12 scaled \magstephalf}
-\setfont\ssecsl{sl12 scaled \magstephalf}
-\setfont\ssectt{tt12 scaled \magstephalf}
-\setfont\ssecsf{ss12 scaled \magstephalf}
-\setfont\ssecbf{bx12 scaled \magstephalf}
-\setfont\ssecsc{csc10 scaled \magstep1}
+\setfont\ssecrm\rmbshape{12}{\magstephalf}
+\setfont\ssecit\itbshape{10}{1315}
+\setfont\ssecsl\slbshape{10}{1315}
+\setfont\ssectt\ttbshape{12}{\magstephalf}
+\setfont\ssecttsl\ttslshape{10}{\magstep1}
+\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{\magstep1}
 \font\sseci=cmmi12 scaled \magstephalf
 \font\ssecsy=cmsy10 scaled \magstep1
 % The smallcaps and symbol fonts should actually be scaled \magstep1.5,
 % but that is not a standard magnification.

 % Fonts for title page:
-\setfont\titlerm{bx12 scaled \magstep3}
+\setfont\titlerm\rmbshape{12}{\magstep3}
 \let\authorrm = \secrm

 % In order for the font changes to affect most math symbols and letters,
@@ -1041,33 +1115,33 @@ where each line of input produces a line of output.}
 % The font-changing commands redefine the meanings of \tenSTYLE, instead
 % of just \STYLE.  We do this so that font changes will continue to work
 % in math mode, where it is the current \fam that is relevant in most
-% cases, not the current.  Plain TeX does, for example,
-% \def\bf{\fam=\bffam \tenbf}  By redefining \tenbf, we obviate the need
-% to redefine \bf itself.
+% cases, not the current font.  Plain TeX does \def\bf{\fam=\bffam
+% \tenbf}, for example.  By redefining \tenbf, we obviate the need to
+% redefine \bf itself.
 \def\textfonts{%
  \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
  \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
-  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
+  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl
  \resetmathfonts}
 \def\chapfonts{%
  \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
  \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
-  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
+  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl
  \resetmathfonts}
 \def\secfonts{%
  \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
  \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
-  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
+  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy \let\tenttsl=\secttsl
  \resetmathfonts}
 \def\subsecfonts{%
  \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
  \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
-  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
+  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl
  \resetmathfonts}
 \def\indexfonts{%
  \let\tenrm=\indrm \let\tenit=\indit \let\tensl=\indsl
  \let\tenbf=\indbf \let\tentt=\indtt \let\smallcaps=\indsc
-  \let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy
+  \let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy \let\tenttsl=\indttsl
  \resetmathfonts}

 % Set up the default fonts, so we can use them for creating boxes.
@@ -1078,9 +1152,9 @@ where each line of input produces a line of output.}
 \newcount\fontdepth \fontdepth=0

 % Fonts for short table of contents.
-\setfont\shortcontrm{r12}
-\setfont\shortcontbf{bx12}
-\setfont\shortcontsl{sl12}
+\setfont\shortcontrm\rmshape{12}{1000}
+\setfont\shortcontbf\bxshape{12}{1000}
+\setfont\shortcontsl\slshape{12}{1000}

 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
 %% serif) and @ii for TeX italic
@@ -1112,10 +1186,11 @@ where each line of input produces a line of output.}
 }
 \let\ttfont=\t
 \def\samp #1{`\tclose{#1}'\null}
-\def\key #1{{\tt \nohyphenation \uppercase{#1}}\null}
+\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}

 \let\file=\samp
+\let\url=\samp % perhaps include a hypertex \special eventually

 % @code is a modification of @t,
 % which makes spaces the same size as normal in the surrounding text.
@@ -1141,7 +1216,7 @@ where each line of input produces a line of output.}
 }

 % We *must* turn on hyphenation at `-' and `_' in \code.
-% Otherwise, it is too hard to avoid overful hboxes
+% Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.

 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
@@ -1170,12 +1245,19 @@ where each line of input produces a line of output.}

 % @kbd is like @code, except that if the argument is just one @key command,
 % then @kbd has no effect.
-
+%
 \def\xkey{\key}
 \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
 \ifx\one\xkey\ifx\threex\three \key{#2}%
-\else\tclose{\look}\fi
-\else\tclose{\look}\fi}
+\else{\tclose{\ttsl\look}}\fi
+\else{\tclose{\ttsl\look}}\fi}
+
+% Check if we are currently using a typewriter font.  Since all the
+% Computer Modern typewriter fonts have zero interword stretch (and
+% shrink), and it is reasonable to expect all typewriter fonts to have
+% this property, we can check that font parameter.
+% 
+\def\ifmonospace{\ifdim\fontdimen3\font=0pt }

 % Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
 % argument is to make the input look right: @dmn{pt} instead of
@@ -1440,7 +1522,7 @@ July\or August\or September\or October\or November\or December\fi

 \newif\ifitemxneedsnegativevskip

-\def\itemxpar{\par\ifitemxneedsnegativevskip\vskip-\parskip\nobreak\fi}
+\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi}

 \def\internalBitem{\smallbreak \parsearg\itemzzz}
 \def\internalBitemx{\itemxpar \parsearg\itemzzz}
@@ -1711,10 +1793,10 @@ July\or August\or September\or October\or November\or December\fi
 \flushcr}

 % @multitable macros
-% Amy Hendrickson, 8/18/94
+% Amy Hendrickson, 8/18/94, 3/6/96
 %
-% @multitable ... @endmultitable will make as many columns as desired.
-% Contents of each column will wrap at width given in preamble. Width
+% @multitable ... @end multitable will make as many columns as desired.
+% Contents of each column will wrap at width given in preamble.  Width
 % can be specified either with sample text given in a template line,
 % or in percent of \hsize, the current width of text on page.

@@ -1723,10 +1805,10 @@ July\or August\or September\or October\or November\or December\fi
 % To make preamble:
 %
 % Either define widths of columns in terms of percent of \hsize: 
-%   @multitable @percentofhsize .2 .3 .5
+%   @multitable @columnfractions .25 .3 .45
 %   @item ...
 %
-%   Numbers following @percentofhsize are the percent of the total
+%   Numbers following @columnfractions are the percent of the total
 %   current hsize to be used for each column. You may use as many
 %   columns as desired.

@@ -1734,7 +1816,16 @@ July\or August\or September\or October\or November\or December\fi
 %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
 %   @item ...
 %   using the widest term desired in each column.
-
+%
+% For those who want to use more than one line's worth of words in
+% the preamble, break the line within one argument and it
+% will parse correctly, i.e.,
+%
+%     @multitable {Column 1 template} {Column 2 template} {Column 3 
+%      template}
+% Not:
+%     @multitable {Column 1 template} {Column 2 template} 
+%      {Column 3 template}

 % Each new table line starts with @item, each subsequent new column 
 % starts with @tab. Empty columns may be produced by supplying @tab's
@@ -1759,71 +1850,84 @@ July\or August\or September\or October\or November\or December\fi
 %     
 %         They will wrap at the width determined by the template.
 %   @item@tab@tab This will be in third column.
-%   @endmultitable
+%   @end multitable

 % Default dimensions may be reset by user.
-% @intableparskip will set vertical space between paragraphs in table.
-% @intableparindent will set paragraph indent in table.
-% @spacebetweencols will set horizontal space to be left between columns.
-% @spacebetweenlines will set vertical space to be left between lines.
+% @multitableparskip is vertical space between paragraphs in table.
+% @multitableparindent is paragraph indent in table.
+% @multitablecolmargin is horizontal space to be left between columns.
+% @multitablelinespace is space to leave between table items;
+%   0 means it depends on current normal line spacing.

 %%%%
 % Dimensions 

-\newdimen\intableparskip
-\newdimen\intableparindent
-\newdimen\spacebetweencols
-\newdimen\spacebetweenlines
-\intableparskip=0pt
-\intableparindent=6pt
-\spacebetweencols=12pt
-\spacebetweenlines=12pt
+\newskip\multitableparskip
+\newskip\multitableparindent
+\newdimen\multitablecolspace
+\newskip\multitablelinespace
+\multitableparskip=0pt
+\multitableparindent=6pt
+\multitablecolspace=12pt
+\multitablelinespace=0pt

 %%%%
 % Macros used to set up halign preamble:
 \let\endsetuptable\relax
 \def\xendsetuptable{\endsetuptable}
-\let\percentofhsize\relax
-\def\xpercentofhsize{\percentofhsize}
+\let\columnfractions\relax
+\def\xcolumnfractions{\columnfractions}
 \newif\ifsetpercent

+%% 2/1/96, to allow fractions to be given with more than one digit.
+\def\pickupwholefraction#1 {\global\advance\colcount by1 %
+\expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}%
+\setuptable}
+
 \newcount\colcount
 \def\setuptable#1{\def\firstarg{#1}%
 \ifx\firstarg\xendsetuptable\let\go\relax%
 \else
-  \ifx\firstarg\xpercentofhsize\global\setpercenttrue%
+  \ifx\firstarg\xcolumnfractions\global\setpercenttrue%
  \else
    \ifsetpercent
-       \if#1.\else%
-       \global\advance\colcount by1 %
-       \expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}%
-       \fi
+       \let\go\pickupwholefraction   % In this case arg of setuptable
+                                     % is the decimal point before the
+                                     % number given in percent of hsize.
+                                     % We don't need this so we don't use it.
    \else
       \global\advance\colcount by1
       \setbox0=\hbox{#1}%
       \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
    \fi%
  \fi%
-  \let\go\setuptable%
+\ifx\go\pickupwholefraction\else\let\go\setuptable\fi%
 \fi\go}
+
 %%%%
 % multitable syntax
-\def\tab{&}
+\def\tab{&\hskip1sp\relax} % 2/2/96
+                           % tiny skip here makes sure this column space is
+                           % maintained, even if it is never used.
+

 %%%%
-% @multitable ... @endmultitable definitions:
+% @multitable ... @end multitable definitions:

-\def\multitable#1\item{\bgroup
+\def\multitable{\parsearg\dotable}
+
+\def\dotable#1{\bgroup
 \let\item\cr
 \tolerance=9500
 \hbadness=9500
-\parskip=\intableparskip
-\parindent=\intableparindent
+\setmultitablespacing
+\parskip=\multitableparskip
+\parindent=\multitableparindent
 \overfullrule=0pt
 \global\colcount=0\relax%
 \def\Emultitable{\global\setpercentfalse\global\everycr{}\cr\egroup\egroup}%
 % To parse everything between @multitable and @item :
-\def\one{#1}\expandafter\setuptable\one\endsetuptable
+\setuptable#1 \endsetuptable
 % Need to reset this to 0 after \setuptable.
 \global\colcount=0\relax% 
 %
@@ -1834,9 +1938,9 @@ July\or August\or September\or October\or November\or December\fi
 \halign\bgroup&\global\advance\colcount by 1\relax%
 \vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
 % In order to keep entries from bumping into each other
- % we will add a \leftskip of \spacebetweencols to all columns after
+ % we will add a \leftskip of \multitablecolspace to all columns after
 % the first one.
- %  If a template has been used, we will add \spacebetweencols 
+ %  If a template has been used, we will add \multitablecolspace 
 % to the width of each template entry.
 %  If user has set preamble in terms of percent of \hsize
 % we will use that dimension as the width of the column, and
@@ -1848,21 +1952,42 @@ July\or August\or September\or October\or November\or December\fi
  \ifsetpercent
  \else
   % If user has <not> set preamble in terms of percent of \hsize
-   % we will advance \hsize by \spacebetweencols 
-  \advance\hsize by \spacebetweencols
+   % we will advance \hsize by \multitablecolspace 
+  \advance\hsize by \multitablecolspace
  \fi
- % In either case we will make \leftskip=\spacebetweencols:
-\leftskip=\spacebetweencols
+ % In either case we will make \leftskip=\multitablecolspace:
+\leftskip=\multitablecolspace
 \fi
-\noindent##}\cr%
+\noindent##%\par
+%\vskip\multitablelinespace
+}\cr%
 % \everycr will reset column counter, \colcount, at the end of
 % each line. Every column  entry will cause \colcount to advance by one. 
 % The table preamble
 % looks at the current \colcount to find the correct column width.
-\global\everycr{\noalign{\nointerlineskip\vskip\spacebetweenlines
+\global\everycr{\noalign{\nointerlineskip\vskip\multitablelinespace 
 \filbreak%% keeps underfull box messages off when table breaks over pages.
 \global\colcount=0\relax}}}

+\def\setmultitablespacing{% test to see if user has set \multitablelinespace.
+% If so, do nothing. If not, give it an appropriate dimension based on
+% current baselineskip.
+\ifdim\multitablelinespace=0pt
+\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
+\global\advance\multitablelinespace by-\ht0\fi
+%% Test to see if parskip is larger than space between lines of
+%% table. If not, do nothing. 
+%%        If so, set to same dimension as multitablelinespace.
+\ifdim\multitableparskip>\multitablelinespace
+\global\multitableparskip=\multitablelinespace
+\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
+                                      %% than skip between lines in the table.
+\fi%
+\ifdim\multitableparskip=0pt
+\global\multitableparskip=\multitablelinespace
+\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
+                                      %% than skip between lines in the table.
+\fi}
 \message{indexing,}
 % Index generation facilities

@@ -3847,7 +3972,7 @@ July\or August\or September\or October\or November\or December\fi
  \setbox0=\hbox{\printednodename}%
  \ifdim \wd0 = 0pt
    % No printed node name was explicitly given.
-    \ifx\SETxref-automatic-section-title\thisisundefined
+    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
      % Use the node name inside the square brackets.
      \def\printednodename{\ignorespaces #1}%
    \else
@@ -4250,11 +4375,13 @@ July\or August\or September\or October\or November\or December\fi
 }

 % Allow control of the text dimensions.  Parameters in order: textheight;
-% textwidth; \voffset; \hoffset (!); binding offset.  All require a dimension;
+% textwidth; voffset; hoffset; binding offset; topskip.
+% All require a dimension;
 % header is additional; added length extends the bottom of the page.

-\def\changepagesizes#1#2#3#4#5{
+\def\changepagesizes#1#2#3#4#5#6{
 \global\vsize= #1
+ \global\topskip= #6
 \advance\vsize by \topskip
 \global\voffset= #3
 \global\hsize= #2
@@ -4267,13 +4394,20 @@ July\or August\or September\or October\or November\or December\fi
 \global\normaloffset= #4
 \global\bindingoffset= #5}

-% This layout is compatible with Latex on A4 paper.
-
-\def\afourlatex{\changepagesizes{22cm}{15cm}{7mm}{4.6mm}{5mm}}
+% A specific text layout, 24x15cm overall, intended for A4 paper.  Top margin
+% 29mm, hence bottom margin 28mm, nominal side margin 3cm.
+\def\afourlatex
+        {\global\tolerance=700
+        \global\hfuzz=1pt
+        \setleading{12pt}
+        \global\parskip 15pt plus 1pt
+        \advance\baselineskip by 1.6pt
+        \changepagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}
+        }

 % Use @afourwide to print on European A4 paper in wide format.
 \def\afourwide{\afourpaper
-\changepagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}}
+\changepagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}}

 % Define macros to output various characters with catcode for normal text.
 \catcode`\"=\other
@@ -4322,14 +4456,7 @@ July\or August\or September\or October\or November\or December\fi
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
 % Subroutine for the previous macro.
-\def\_{\lvvmode \kern.06em \vbox{\hrule width.3em height.1ex}}
-
-% \lvvmode is equivalent in function to \leavevmode.
-% Using \leavevmode runs into trouble when written out to
-% an index file due to the expansion of \leavevmode into ``\unhbox
-% \voidb@x'' ---which looks to TeX like ``\unhbox \voidb\x'' due to our
-% magic tricks with @.
-\def\lvvmode{\vbox to 0pt{}}
+\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}}

 \catcode`\|=\active
 \def|{{\tt \char '174}}
--- a/doc/textutils.texi
+++ b/doc/textutils.texi
@@ -26,31 +26,31 @@
@ifinfo
@format
 START-INFO-DIR-ENTRY
-* Text utilities: (textutils).  	GNU text utilities.
-* cat: (textutils)cat invocation.		Concatenate and write files.
-* cksum: (textutils)cksum invocation.		Print @sc{POSIX} CRC checksum.
-* comm: (textutils)comm invocation.		Compare sorted files by line.
-* csplit: (textutils)csplit invocation.		Split by context.
-* cut: (textutils)cut invocation.		Print selected parts of lines.
-* expand: (textutils)expand invocation.		Convert tabs to spaces.
-* fmt: (textutils)fmt invocation.		Reformat paragraph text.
-* fold: (textutils)fold invocation.		Wrap long input lines.
-* head: (textutils)head invocation.		Output the first part of files.
-* join: (textutils)join invocation.		Join lines on a common field.
-* md5sum: (textutils)md5sum invocation.		Print or check message-digests.
-* nl: (textutils)nl invocation.			Number lines and write files.
-* od: (textutils)od invocation.			Dump files in octal, etc.
-* paste: (textutils)paste invocation.		Merge lines of files.
-* pr: (textutils)pr invocation.			Paginate or columnate files.
-* sort: (textutils)sort invocation.		Sort text files.
-* split: (textutils)split invocation.		Split into fixed-size pieces.
-* sum: (textutils)sum invocation.		Print traditional checksum.
-* tac: (textutils)tac invocation.		Reverse files.
-* tail: (textutils)tail invocation.		Output the last part of files.
-* tr: (textutils)tr invocation.			Translate characters.
-* unexpand: (textutils)unexpand invocation.	Convert spaces to tabs.
-* uniq: (textutils)uniq invocation.		Uniqify files.
-* wc: (textutils)wc invocation.			Byte, word, and line counts.
+* Text utilities: (textutils).          GNU text utilities.
+* cat: (textutils)cat invocation.               Concatenate and write files.
+* cksum: (textutils)cksum invocation.           Print @sc{POSIX} CRC checksum.
+* comm: (textutils)comm invocation.             Compare sorted files by line.
+* csplit: (textutils)csplit invocation.         Split by context.
+* cut: (textutils)cut invocation.               Print selected parts of lines.
+* expand: (textutils)expand invocation.         Convert tabs to spaces.
+* fmt: (textutils)fmt invocation.               Reformat paragraph text.
+* fold: (textutils)fold invocation.             Wrap long input lines.
+* head: (textutils)head invocation.             Output the first part of files.
+* join: (textutils)join invocation.             Join lines on a common field.
+* md5sum: (textutils)md5sum invocation.         Print or check message-digests.
+* nl: (textutils)nl invocation.                 Number lines and write files.
+* od: (textutils)od invocation.                 Dump files in octal, etc.
+* paste: (textutils)paste invocation.           Merge lines of files.
+* pr: (textutils)pr invocation.                 Paginate or columnate files.
+* sort: (textutils)sort invocation.             Sort text files.
+* split: (textutils)split invocation.           Split into fixed-size pieces.
+* sum: (textutils)sum invocation.               Print traditional checksum.
+* tac: (textutils)tac invocation.               Reverse files.
+* tail: (textutils)tail invocation.             Output the last part of files.
+* tr: (textutils)tr invocation.                 Translate characters.
+* unexpand: (textutils)unexpand invocation.     Convert spaces to tabs.
+* uniq: (textutils)uniq invocation.             Uniqify files.
+* wc: (textutils)wc invocation.                 Byte, word, and line counts.
 END-INFO-DIR-ENTRY
@end format
@end ifinfo
@@ -58,7 +58,7 @@ END-INFO-DIR-ENTRY
@ifinfo
 This file documents the GNU text utilities.

-Copyright (C) 1994, 95 Free Software Foundation, Inc.
+Copyright (C) 1994, 95, 96 Free Software Foundation, Inc.

 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -85,12 +85,12 @@ by the Foundation.
@titlepage
@title GNU @code{textutils}
@subtitle A set of text utilities
-@subtitle for version @value{VERSION}, @value{RELEASEDATE}
+@subtitle for version @value{VERSION}, @value{UPDATED}
@author David MacKenzie et al.

@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1994, 95 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 95, 96 Free Software Foundation, Inc.

 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -733,7 +733,7 @@ address.
 These commands reformat the contents of files.

@menu
-* fmt invocation::		Reformat paragraph text.
+* fmt invocation::              Reformat paragraph text.
 * pr invocation::               Paginate or columnate files for printing.
 * fold invocation::             Wrap input lines to fit in specified width.
@end menu
@@ -827,7 +827,7 @@ room to balance line lengths.
@item -p @var{prefix}
@itemx --prefix=@var{prefix}
 Only lines beginning with @var{prefix} (possibly preceded by whitespace)
-are subject to formatting. The prefix and any preceding whitespace is
+are subject to formatting. The prefix and any preceding whitespace are
 stripped for the formatting and then re-attached to each formatted output
 line.  One use is to format certain kinds of program comments, while
 leaving the code unchanged.
@@ -1407,7 +1407,7 @@ contents of files.
 * wc invocation::               Print byte, word, and line counts.
 * sum invocation::              Print checksum and block counts.
 * cksum invocation::            Print CRC checksum and byte counts.
-* md5sum invocation::		Print or check message-digests.
+* md5sum invocation::           Print or check message-digests.
@end menu


@@ -1772,8 +1772,8 @@ like @code{1.0e-34} and @code{10e100}.  Use this option only if there
 is no alternative;  it is much slower than @samp{-n} and numbers with
 too many significant digits will be compared as if they had been
 truncated.  In addition, numbers outside the range of representable
-double precision floating point numbers are treated as if they were zeroes.
-@c FIXME: Someday there will be an option to warn about underflow and overflow.
+double precision floating point numbers are treated as if they were
+zeroes; overflow and underflow are not reported.

@item -i
@opindex -i
@@ -1796,6 +1796,21 @@ Sort numerically: the number begins each line; specifically, it consists
 of optional whitespace, an optional @samp{-} sign, and zero or more
 digits, optionally followed by a decimal point and zero or more digits.

+@code{sort -n} uses what might be considered an unconventional method
+to compare strings representing floating point numbers.  Rather than
+first converting each string to the C @code{double} type and then
+comparing those values, sort aligns the decimal points in the two
+strings and compares the strings a character at a time.  One benefit
+of using this approach is its speed.  In practice this is much more
+efficient than performing the two corresponding string-to-double (or even
+string-to-integer) conversions and then comparing doubles.  In addition,
+there is no corresponding loss of precision.  Converting each string to
+@code{double} before comparison would limit precision to about 16 digits
+on most systems.
+
+Neither a leading @samp{+} nor exponential notation is recognized.
+To compare such strings numerically, use the @samp{-g} option.
+
@item -r
@opindex -r
@cindex reverse sorting
@@ -2739,8 +2754,8 @@ ones, to tabs.
@end table


-@c		What's GNU?
-@c		Arnold Robbins
+@c              What's GNU?
+@c              Arnold Robbins
@node Opening the software toolbox
@chapter Opening the software toolbox

--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -7,3 +7,4 @@ safe-lstat.c
 safe-lstat.h
 getdate.tab.c
 .deps
+group_member.c
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,30 +1,32 @@
 ## Process this file with automake to produce Makefile.in
 noinst_LIBRARIES = fu

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

 INCLUDES = -I.. -I$(srcdir)

-fu_SOURCES = getdate.c posixtm.c argmatch.c backupfile.c basename.c \
-dirname.c error.c fileblocks.c filemode.c \
-full-write.c getopt.c getopt1.c getversion.c group-member.c idcache.c \
-isdir.c long-options.c makepath.c modechange.c obstack.c \
+fu_SOURCES = getdate.c getline.c posixtm.c argmatch.c backupfile.c \
+dirname.c fileblocks.c filemode.c \
+full-write.c getversion.c idcache.c \
+isdir.c long-options.c makepath.c modechange.c path-concat.c \
 safe-read.c save-cwd.c savedir.c stripslash.c userspec.c xgetcwd.c \
 xmalloc.c xstrdup.c xstrtol.c xstrtoul.c yesno.c

 fu_LIBADD = @LIBOBJS@ @ALLOCA@

 noinst_HEADERS = argmatch.h backupfile.h error.h fnmatch.h fsusage.h \
-getopt.h group-member.h long-options.h makepath.h modechange.h mountlist.h \
-obstack.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h
+getline.h getopt.h group-member.h long-options.h makepath.h modechange.h \
+mountlist.h obstack.h path-concat.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h

 BUILT_SOURCES = getdate.c posixtm.c

 # Since this directory contains two parsers, we have to be careful to avoid
 # running two $(YACC)s during parallel makes.  See below.
-getdate.c: getdate.y
+getdate.c: @MAINT@getdate.y
 	@echo expect 10 shift/reduce conflicts
 	$(YACC) $(srcdir)/getdate.y
 	mv y.tab.c getdate.c
@@ -33,7 +35,7 @@ getdate.c: getdate.y
 # The artificial dependency on getdate.c keeps the two parsers from being
 # built in parallel.  Enforcing this little bit of sequentiality lets
 # everyone (even those without bison) still run mostly parallel builds.
-posixtm.c: posixtm.y getdate.c
+posixtm.c: @MAINT@posixtm.y getdate.c
 	$(YACC) $(srcdir)/posixtm.y
 	mv y.tab.c posixtm.tab.c
 	sed -e 's/yy/zz/g' posixtm.tab.c > tposixtm.c
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 0.31 from Makefile.am
+# Makefile.in generated automatically by automake 1.1c from Makefile.am

 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -40,57 +40,56 @@ transform = @program_transform_name@

 noinst_LIBRARIES = fu

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

 INCLUDES = -I.. -I$(srcdir)

-fu_SOURCES = getdate.c posixtm.c argmatch.c backupfile.c basename.c \
-dirname.c error.c fileblocks.c filemode.c \
-full-write.c getopt.c getopt1.c getversion.c group-member.c idcache.c \
-isdir.c long-options.c makepath.c modechange.c obstack.c \
+fu_SOURCES = getdate.c getline.c posixtm.c argmatch.c backupfile.c \
+dirname.c fileblocks.c filemode.c \
+full-write.c getversion.c idcache.c \
+isdir.c long-options.c makepath.c modechange.c path-concat.c \
 safe-read.c save-cwd.c savedir.c stripslash.c userspec.c xgetcwd.c \
 xmalloc.c xstrdup.c xstrtol.c xstrtoul.c yesno.c

 fu_LIBADD = @LIBOBJS@ @ALLOCA@

 noinst_HEADERS = argmatch.h backupfile.h error.h fnmatch.h fsusage.h \
-getopt.h group-member.h long-options.h makepath.h modechange.h mountlist.h \
-obstack.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h
+getline.h getopt.h group-member.h long-options.h makepath.h modechange.h \
+mountlist.h obstack.h path-concat.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h

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

 noinst_LIBFILES = libfu.a

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

-DIST_COMMON = Makefile.am Makefile.in alloca.c fileblocks.c fnmatch.c \
-fsusage.c ftruncate.c mountlist.c
+DIST_COMMON = Makefile.am Makefile.in


 PACKAGE = @PACKAGE@
@@ -100,13 +99,33 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
 	$(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST) $(DATA)
 DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \
 	$(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST) $(DATA)
+
+TAR = tar
+DEP_FILES = $(srcdir)/.deps/alloca.P $(srcdir)/.deps/argmatch.P \
+$(srcdir)/.deps/backupfile.P $(srcdir)/.deps/dirname.P \
+$(srcdir)/.deps/error.P $(srcdir)/.deps/fileblocks.P \
+$(srcdir)/.deps/filemode.P $(srcdir)/.deps/fnmatch.P \
+$(srcdir)/.deps/fsusage.P $(srcdir)/.deps/ftruncate.P \
+$(srcdir)/.deps/full-write.P $(srcdir)/.deps/getdate.P \
+$(srcdir)/.deps/getline.P $(srcdir)/.deps/getopt.P \
+$(srcdir)/.deps/getopt1.P $(srcdir)/.deps/getversion.P \
+$(srcdir)/.deps/idcache.P $(srcdir)/.deps/isdir.P \
+$(srcdir)/.deps/long-options.P $(srcdir)/.deps/makepath.P \
+$(srcdir)/.deps/modechange.P $(srcdir)/.deps/mountlist.P \
+$(srcdir)/.deps/obstack.P $(srcdir)/.deps/path-concat.P \
+$(srcdir)/.deps/posixtm.P $(srcdir)/.deps/safe-read.P \
+$(srcdir)/.deps/save-cwd.P $(srcdir)/.deps/savedir.P \
+$(srcdir)/.deps/stripslash.P $(srcdir)/.deps/userspec.P \
+$(srcdir)/.deps/xgetcwd.P $(srcdir)/.deps/xmalloc.P \
+$(srcdir)/.deps/xstrdup.P $(srcdir)/.deps/xstrtol.P \
+$(srcdir)/.deps/xstrtoul.P $(srcdir)/.deps/yesno.P
 SOURCES = $(fu_SOURCES)
 OBJECTS = $(fu_OBJECTS)

 default: all


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

 Makefile: $(top_builddir)/config.status Makefile.in
@@ -115,14 +134,14 @@ Makefile: $(top_builddir)/config.status Makefile.in
 mostlyclean-noinstLIBRARIES:

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

 distclean-noinstLIBRARIES:

 maintainer-clean-noinstLIBRARIES:

 .c.o:
-	$(COMPILE) $<
+	$(COMPILE) -c $<

 mostlyclean-compile:
 	rm -f *.o core
@@ -135,17 +154,17 @@ distclean-compile:
 maintainer-clean-compile:
 $(fu_OBJECTS): ../config.h

-libfu.a: $(fu_OBJECTS) $(fu_LIBADD)
+libfu.a: $(fu_OBJECTS) $(fu_DEPENDENCIES)
 	rm -f libfu.a
 	$(AR) cru libfu.a $(fu_OBJECTS) $(fu_LIBADD)
 	$(RANLIB) libfu.a

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

 tags: TAGS

-TAGS:
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES)
 	here=`pwd` && cd $(srcdir) && etags $(ETAGS_ARGS) $(SOURCES) $(HEADERS) -o $$here/TAGS

 mostlyclean-tags:
@@ -153,55 +172,40 @@ mostlyclean-tags:
 clean-tags:

 distclean-tags:
-	rm -f TAGS ID

 maintainer-clean-tags:
+	rm -f TAGS ID
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

 subdir = lib
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist: $(DEP_DISTFILES)
+distdir: $(DEP_DISTFILES)
 	@for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
 	  test -f $(distdir)/$$file \
 	  || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \
 	done
-alloca.o: alloca.c
-argmatch.o: argmatch.c
-backupfile.o: backupfile.c backupfile.h
-basename.o: basename.c
-dirname.o: dirname.c
-error.o: error.c
-fileblocks.o: fileblocks.c
-filemode.o: filemode.c
-fnmatch.o: fnmatch.c
-fsusage.o: fsusage.c fsusage.h
-ftruncate.o: ftruncate.c
-full-write.o: full-write.c
-getdate.o: getdate.c
-getopt.o: getopt.c
-getopt1.o: getopt1.c getopt.h
-getversion.o: getversion.c backupfile.h
-group-member.o: group-member.c group-member.h
-idcache.o: idcache.c
-isdir.o: isdir.c
-long-options.o: long-options.c long-options.h
-makepath.o: makepath.c makepath.h
-modechange.o: modechange.c modechange.h
-mountlist.o: mountlist.c mountlist.h
-obstack.o: obstack.c obstack.h
-posixtm.o: posixtm.c
-safe-read.o: safe-read.c
-save-cwd.o: save-cwd.c ../config.h save-cwd.h error.h
-savedir.o: savedir.c
-stripslash.o: stripslash.c
-userspec.o: userspec.c
-xgetcwd.o: xgetcwd.c pathmax.h
-xmalloc.o: xmalloc.c
-xstrdup.o: xstrdup.c
-xstrtol.o: xstrtol.c xstrtol.h
-xstrtoul.o: xstrtoul.c xstrtol.c xstrtol.h
-yesno.o: yesno.c

+MKDEP = gcc -MM $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+
+-include $(srcdir)/.deps/.P
+$(srcdir)/.deps/.P: $(BUILT_SOURCES)
+	cd $(srcdir) && test -d .deps || mkdir .deps
+	echo > $@
+
+-include $(DEP_FILES)
+$(DEP_FILES): $(srcdir)/.deps/.P
+
+$(srcdir)/.deps/%.P: $(srcdir)/%.c
+	@echo "mkdeps $< > $@"
+	@re=`echo 's,^$(srcdir)//*,,g;s, $(srcdir)//*, ,g' | sed 's,\.,\\\\.,g'`; \
+	  $(MKDEP) $< | sed "$$re" > $@-tmp
+	@if test -n "$o"; then			\
+	  sed 's/\.o:/$$o:/' $@-tmp > $@;	\
+	  rm $@-tmp;				\
+	else					\
+	  mv $@-tmp $@;				\
+	fi
 info:

 dvi:
@@ -214,7 +218,7 @@ install-exec:

 install-data: 

-install: install-exec install-data
+install: install-exec install-data all
 	@:

 uninstall: 
@@ -231,6 +235,7 @@ mostlyclean-generic:

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

 distclean-generic:
 	rm -f Makefile $(DISTCLEANFILES)
@@ -259,7 +264,7 @@ maintainer-clean:  maintainer-clean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags dist info dvi check installcheck \
+clean-tags maintainer-clean-tags distdir info dvi check installcheck \
 install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
@@ -267,7 +272,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean

 # Since this directory contains two parsers, we have to be careful to avoid
 # running two $(YACC)s during parallel makes.  See below.
-getdate.c: getdate.y
+getdate.c: @MAINT@getdate.y
 	@echo expect 10 shift/reduce conflicts
 	$(YACC) $(srcdir)/getdate.y
 	mv y.tab.c getdate.c
@@ -276,7 +281,7 @@ getdate.c: getdate.y
 # The artificial dependency on getdate.c keeps the two parsers from being
 # built in parallel.  Enforcing this little bit of sequentiality lets
 # everyone (even those without bison) still run mostly parallel builds.
-posixtm.c: posixtm.y getdate.c
+posixtm.c: @MAINT@posixtm.y getdate.c
 	$(YACC) $(srcdir)/posixtm.y
 	mv y.tab.c posixtm.tab.c
 	sed -e 's/yy/zz/g' posixtm.tab.c > tposixtm.c
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

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

--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 /* David MacKenzie <djm@gnu.ai.mit.edu>.
   Some algorithms adapted from GNU Emacs. */
@@ -63,12 +63,12 @@ char *malloc ();
 #endif

 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define ISASCII(c) 1
+# define IN_CTYPE_DOMAIN(c) 1
 #else
-# define ISASCII(c) isascii(c)
+# define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif

-#define ISDIGIT(c) (ISASCII ((unsigned char) (c)) \
+#define ISDIGIT(c) (IN_CTYPE_DOMAIN ((unsigned char) (c)) \
 		    && isdigit ((unsigned char) (c)))

 #if defined (HAVE_UNISTD_H)
@@ -105,7 +105,7 @@ static int version_number ();

 char *
 find_backup_file_name (file)
-     char *file;
+     const char *file;
 {
  char *dir;
  char *base_versions;
@@ -137,7 +137,8 @@ find_backup_file_name (file)

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

 static char *
 make_version_name (file, version)
-     char *file;
+     const char *file;
     int version;
 {
  char *backup_name;
@@ -189,12 +190,12 @@ make_version_name (file, version)

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

  version = 0;
  if (!strncmp (base, backup, base_length) && ISDIGIT (backup[base_length]))
@@ -212,7 +213,8 @@ version_number (base, backup, base_length)

 static char *
 concat (str1, str2)
-     char *str1, *str2;
+     const char *str1;
+     const char *str2;
 {
  char *newstr;
  int str1_length = strlen (str1);
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 /* When to make backup files. */
 enum backup_type
@@ -36,7 +36,7 @@ extern enum backup_type backup_type;
 extern char *simple_backup_suffix;

 #ifdef __STDC__
-char *find_backup_file_name (char *file);
+char *find_backup_file_name (const char *file);
 #else
 char *find_backup_file_name ();
 #endif
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -12,11 +12,11 @@
   GNU General Public License for more details.

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

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

 /* Return NAME with any leading path stripped off.
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -15,31 +15,31 @@
   General Public License for more details.

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

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

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

 #ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
 #endif

 /* Returns the canonical hostname associated with HOST (allocated in a static
@@ -53,24 +53,24 @@ canon_host (host)

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

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

      if (addr && strcmp (he->h_name, addr) == 0)
 	/* gethostbyname() cheated!  Lookup the host name via the address
 	   this time to get the actual host name.  */
 	he = gethostbyaddr (he->h_addr, he->h_length, he->h_addrtype);
-#endif /* HAVE_GETHOSTBYADDR */
+# endif /* HAVE_GETHOSTBYADDR */

      if (he)
 	return (char *) (he->h_name);
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/error.h
+++ b/lib/error.h
@@ -16,22 +16,22 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #ifndef _error_h_
-#define _error_h_
+# define _error_h_

-#ifndef __attribute__
+# ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-#  define __attribute__(Spec) /* empty */
-# endif
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+#   define __attribute__(Spec) /* empty */
+#  endif
 /* The __-protected variants of `format' and `printf' attributes
   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#   define __format__ format
+#   define __printf__ printf
+#  endif
 # endif
-#endif

-#if defined (__STDC__) && __STDC__
+# if defined (__STDC__) && __STDC__

 /* Print a message with `fprintf (stderr, FORMAT, ...)';
   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
@@ -49,11 +49,11 @@ extern void error_at_line (int status, int errnum, const char *fname,
   function without parameters instead.  */
 extern void (*error_print_progname) (void);

-#else
+# else
 void error ();
 void error_at_line ();
 extern void (*error_print_progname) ();
-#endif
+# endif

 /* This variable is incremented each time `error' is called.  */
 extern unsigned int error_message_count;
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -15,51 +15,51 @@ Library General Public License for more details.

 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+not, write to the Free Software Foundation, Inc., 59 Temple Place -
+Suite 330, Boston, MA 02111-1307, USA.  */

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

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

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

 #ifdef S_IEXEC
-#ifndef S_IXUSR
-#define S_IXUSR S_IEXEC
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP (S_IEXEC >> 3)
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH (S_IEXEC >> 6)
-#endif
+# ifndef S_IXUSR
+#  define S_IXUSR S_IEXEC
+# endif
+# ifndef S_IXGRP
+#  define S_IXGRP (S_IEXEC >> 3)
+# endif
+# ifndef S_IXOTH
+#  define S_IXOTH (S_IEXEC >> 6)
+# endif
 #endif /* S_IEXEC */

 #if defined (HAVE_UNISTD_H) || defined (_LIBC)
-#include <unistd.h>
+# include <unistd.h>
 #endif

 #ifdef _POSIX_VERSION
-#include <limits.h>
-#if !defined(NGROUPS_MAX) || NGROUPS_MAX < 1
-#undef NGROUPS_MAX
-#define NGROUPS_MAX sysconf (_SC_NGROUPS_MAX)
-#endif /* NGROUPS_MAX */
+# include <limits.h>
+# if !defined(NGROUPS_MAX) || NGROUPS_MAX < 1
+#  undef NGROUPS_MAX
+#  define NGROUPS_MAX sysconf (_SC_NGROUPS_MAX)
+# endif /* NGROUPS_MAX */

 #else /* not _POSIX_VERSION */
 uid_t getuid ();
 gid_t getgid ();
 uid_t geteuid ();
 gid_t getegid ();
-#include <sys/param.h>
-#if !defined(NGROUPS_MAX) && defined(NGROUPS)
-#define NGROUPS_MAX NGROUPS
-#endif /* not NGROUPS_MAX and NGROUPS */
+# include <sys/param.h>
+# if !defined(NGROUPS_MAX) && defined(NGROUPS)
+#  define NGROUPS_MAX NGROUPS
+# endif /* not NGROUPS_MAX and NGROUPS */
 #endif /* not POSIX_VERSION */

 #include <errno.h>
@@ -68,20 +68,31 @@ extern int errno;
 #endif

 #if defined(EACCES) && !defined(EACCESS)
-#define EACCESS EACCES
+# define EACCESS EACCES
 #endif

 #ifndef F_OK
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
+# define F_OK 0
+# define X_OK 1
+# define W_OK 2
+# define R_OK 4
 #endif

+#if !defined (S_IROTH) && defined (R_OK)
+# define S_IROTH R_OK
+#endif
+
+#if !defined (S_IWOTH) && defined (W_OK)
+# define S_IWOTH W_OK
+#endif
+
+#if !defined (S_IXOTH) && defined (X_OK)
+# define S_IXOTH X_OK
+#endif

 #ifdef _LIBC

-#define group_member __group_member
+# define group_member __group_member

 #else

@@ -100,11 +111,11 @@ static gid_t egid;
 /* Nonzero if UID, GID, EUID, and EGID have valid values. */
 static int have_ids = 0;

-#ifdef HAVE_GETGROUPS
+# ifdef HAVE_GETGROUPS
 int group_member ();
-#else
-#define group_member(gid)	0
-#endif
+# else
+#  define group_member(gid)	0
+# endif

 #endif

--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -12,32 +12,32 @@
   GNU General Public License for more details.

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

 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */

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

 #if !defined (HAVE_ST_BLOCKS) && !defined(_POSIX_VERSION)
-#include <sys/types.h>
-#include <sys/param.h>
+# include <sys/types.h>
+# include <sys/param.h>

-#ifndef NINDIR
+# ifndef NINDIR
 /* Some SysV's, like Irix, seem to lack these.  Hope they're correct. */
 /* Size of a indirect block, in bytes. */
-#ifndef BSIZE
-#define BSIZE 1024
-#endif
+#  ifndef BSIZE
+#   define BSIZE 1024
+#  endif

 /* Number of inode pointers per indirect block. */
-#define NINDIR (BSIZE/sizeof(daddr_t))
-#endif /* !NINDIR */
+#  define NINDIR (BSIZE/sizeof(daddr_t))
+# endif /* !NINDIR */

 /* Number of direct block addresses in an inode. */
-#define NDIR	10
+# define NDIR	10

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

@@ -63,4 +63,8 @@ st_blocks (size)

  return datablks + indrblks;
 }
+#else
+/* This declaration is solely to ensure that after preprocessing
+   this file is never empty.  */
+extern int textutils_fileblocks_unused;
 #endif
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -14,8 +14,8 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/fnmatch.h
+++ b/lib/fnmatch.h
@@ -1,48 +1,57 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.

-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.

-This library is distributed in the hope that it will be useful,
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.

-You should have received a copy of the GNU Library General Public
-License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #ifndef	_FNMATCH_H

 #define	_FNMATCH_H	1

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

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

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

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

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

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

 #ifdef	__cplusplus
 }
-
 #endif

 #endif /* fnmatch.h */
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -37,7 +37,11 @@ int statfs ();
 #include <sys/vfs.h>
 #endif

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

@@ -90,7 +94,8 @@ adjust_blocks (blocks, fromsize, tosize)

 int
 get_fs_usage (path, disk, fsp)
-     char *path, *disk;
+     const char *path;
+     const char *disk;
     struct fs_usage *fsp;
 {
 #if defined (STAT_STATFS3_OSF1)
@@ -178,8 +183,11 @@ get_fs_usage (path, disk, fsp)
  /* Empirically, the block counts on most SVR3 and SVR3-derived
     systems seem to always be in terms of 512-byte blocks,
     no matter what value f_bsize has.  */
-# if _AIX
+# if _AIX || defined(_CRAY)
 #  define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_bsize, 512)
+#  ifdef _CRAY
+#   define f_bavail f_bfree
+#  endif
 # else
 #  define CONVERT_BLOCKS(b) (b)
 #  ifndef _SEQUENT_		/* _SEQUENT_ is DYNIX/ptx.  */
--- a/lib/fsusage.h
+++ b/lib/fsusage.h
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 /* Space usage statistics for a filesystem.  Blocks are 512-byte. */
 struct fs_usage
@@ -25,8 +25,13 @@ struct fs_usage
  long fsu_ffree;		/* Free file nodes. */
 };

-#if __STDC__
-int get_fs_usage (char *path, char *disk, struct fs_usage *fsp);
+#ifndef __P
+#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+#define __P(args) args
 #else
-int get_fs_usage ();
-#endif
+#define __P(args) ()
+#endif  /* GCC.  */
+#endif  /* Not __P.  */
+
+int get_fs_usage __P ((const char *path, const char *disk,
+		       struct fs_usage *fsp));
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -12,20 +12,20 @@
   GNU General Public License for more details.

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

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

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

 #include <sys/types.h>

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

 #include <errno.h>
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -12,13 +12,17 @@
   GNU General Public License for more details.

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

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

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

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

-Copyright (C) 1993 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996 Free Software Foundation, Inc.

 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -14,27 +14,45 @@ General Public License for more details.

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

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

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

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

-#if STDC_HEADERS
-#include <stdlib.h>
-#else
+#if defined __GNU_LIBRARY__ && HAVE_GETDELIM
+
+int
+getline (lineptr, n, stream)
+     char **lineptr;
+     size_t *n;
+     FILE *stream;
+{
+  return getdelim (lineptr, n, '\n', stream);
+}
+
+
+#else /* ! have getdelim */
+
+# define NDEBUG
+# include <assert.h>
+
+# if STDC_HEADERS
+#  include <stdlib.h>
+# else
 char *malloc (), *realloc ();
-#endif
+# endif

 /* Always add at least this many bytes when extending the buffer.  */
-#define MIN_CHUNK 64
+# define MIN_CHUNK 64

 /* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
   + OFFSET (and null-terminate it). *LINEPTR is a pointer returned from
@@ -48,7 +66,7 @@ getstr (lineptr, n, stream, terminator, offset)
     size_t *n;
     FILE *stream;
     char terminator;
-     int offset;
+     size_t offset;
 {
  int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
  char *read_pos;		/* Where we're reading into *LINEPTR. */
@@ -124,3 +142,14 @@ getline (lineptr, n, stream)
 {
  return getstr (lineptr, n, stream, '\n', 0);
 }
+
+int
+getdelim (lineptr, n, delimiter, stream)
+     char **lineptr;
+     size_t *n;
+     int delimiter;
+     FILE *stream;
+{
+  return getstr (lineptr, n, stream, delimiter, 0);
+}
+#endif
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -1,17 +1,36 @@
+/*  Copyright (C) 1995 Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #ifndef _getline_h_
-#define _getline_h_ 1
+# define _getline_h_ 1

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

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

 int
-  getline __P ((char **_lineptr, size_t *_n, FILE *_stream));
+getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));

-#endif /* _getline_h_ */
+int
+getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+
+#endif
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -3,7 +3,7 @@
   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
   before changing it!

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

   This program is free software; you can redistribute it and/or modify it
@@ -18,7 +18,7 @@

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

 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
   Ditto for AIX 3.2 and <stdlib.h>.  */
@@ -53,12 +53,28 @@

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

+#ifdef VMS
+#include <unixlib.h>
+#if HAVE_STRING_H - 0
+#include <string.h>
+#endif
+#endif
+
+#ifdef WIN32
+/* It's not Unix, really.  See?  Capital letters.  */
+#include <windows.h>
+#define getpid() GetCurrentProcessId()
+#endif
+
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
   When compiling libc, the _ macro is predefined.  */
@@ -166,7 +182,7 @@ static enum
 /* Value of POSIXLY_CORRECT environment variable.  */
 static char *posixly_correct;

-#ifdef	__GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__
 /* We want to avoid inclusion of string.h with non-GNU libraries
   because there are many ways it can cause trouble.
   On some systems, it contains special magic macros that don't work
@@ -217,6 +233,12 @@ extern int strlen (const char *);
 static int first_nonopt;
 static int last_nonopt;

+/* Bash 2.0 gives us an environment variable containing flags
+   indicating ARGV elements that should not be considered arguments.  */
+
+static const char *nonoption_flags;
+static int nonoption_flags_len;
+
 /* Exchange two adjacent subsequences of ARGV.
   One subsequence is elements [first_nonopt,last_nonopt)
   which contains all the non-options that have been skipped so far.
@@ -226,6 +248,10 @@ static int last_nonopt;
   `first_nonopt' and `last_nonopt' are relocated so that they describe
   the new indices of the non-options in ARGV after they are moved.  */

+#if defined (__STDC__) && __STDC__
+static void exchange (char **);
+#endif
+
 static void
 exchange (argv)
     char **argv;
@@ -284,6 +310,9 @@ exchange (argv)

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

+#if defined (__STDC__) && __STDC__
+static const char *_getopt_initialize (const char *);
+#endif
 static const char *
 _getopt_initialize (optstring)
     const char *optstring;
@@ -315,6 +344,21 @@ _getopt_initialize (optstring)
  else
    ordering = PERMUTE;

+  if (posixly_correct == NULL)
+    {
+      /* Bash 2.0 puts a special variable in the environment for each
+	 command it runs, specifying which ARGV elements are the results of
+	 file name wildcard expansion and therefore should not be
+	 considered as options.  */
+      char var[100];
+      sprintf (var, "_%d_GNU_nonoption_argv_flags_", getpid ());
+      nonoption_flags = getenv (var);
+      if (nonoption_flags == NULL)
+	nonoption_flags_len = 0;
+      else
+	nonoption_flags_len = strlen (nonoption_flags);
+    }
+
  return optstring;
 }

@@ -391,10 +435,24 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      optind = 1;		/* Don't scan ARGV[0], the program name.  */
    }

+  /* Test whether ARGV[optind] points to a non-option argument.
+     Either it does not have option syntax, or there is an environment flag
+     from the shell indicating it is not an option.  */
+#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
+		     || (optind < nonoption_flags_len			      \
+			 && nonoption_flags[optind] == '1'))
+
  if (nextchar == NULL || *nextchar == '\0')
    {
      /* Advance to the next ARGV-element.  */

+      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+	 moved back by the user (who may also have changed the arguments).  */
+      if (last_nonopt > optind)
+	last_nonopt = optind;
+      if (first_nonopt > optind)
+	first_nonopt = optind;
+
      if (ordering == PERMUTE)
 	{
 	  /* If we have just processed some options following some non-options,
@@ -408,8 +466,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	  /* Skip any additional non-options
 	     and extend the range of non-options previously skipped.  */

-	  while (optind < argc
-		 && (argv[optind][0] != '-' || argv[optind][1] == '\0'))
+	  while (optind < argc && NONOPTION_P)
 	    optind++;
 	  last_nonopt = optind;
 	}
@@ -447,7 +504,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      /* If we have come to a non-option and did not permute it,
 	 either stop the scan or describe it to the caller and pass it by.  */

-      if ((argv[optind][0] != '-' || argv[optind][1] == '\0'))
+      if (NONOPTION_P)
 	{
 	  if (ordering == REQUIRE_ORDER)
 	    return EOF;
@@ -479,8 +536,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)

  if (longopts != NULL
      && (argv[optind][1] == '-'
-	  || (long_only && (argv[optind][2]
-			    || !my_index (optstring, argv[optind][1])))))
+	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
    {
      char *nameend;
      const struct option *p;
@@ -493,8 +549,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
 	/* Do nothing.  */ ;

-#ifdef lint
-      indfound = 0;  /* Avoid spurious compiler warning.  */
+#ifdef lint		/* Suppress `used before initialized' warning.  */
+      indfound = 0;
 #endif

      /* Test all long options for either exact match
@@ -528,6 +584,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		     argv[0], argv[optind]);
 	  nextchar += strlen (nextchar);
 	  optind++;
+	  optopt = 0;
 	  return '?';
 	}

@@ -544,18 +601,20 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	      else
 		{
 		  if (opterr)
-		   if (argv[optind - 1][1] == '-')
-		    /* --option */
-		    fprintf (stderr,
-		     _("%s: option `--%s' doesn't allow an argument\n"),
-		     argv[0], pfound->name);
-		   else
-		    /* +option or -option */
-		    fprintf (stderr,
-		     _("%s: option `%c%s' doesn't allow an argument\n"),
-		     argv[0], argv[optind - 1][0], pfound->name);
+		    if (argv[optind - 1][1] == '-')
+		      /* --option */
+		      fprintf (stderr,
+			_("%s: option `--%s' doesn't allow an argument\n"),
+			       argv[0], pfound->name);
+		    else
+		      /* +option or -option */
+		      fprintf (stderr,
+			_("%s: option `%c%s' doesn't allow an argument\n"),
+			       argv[0], argv[optind - 1][0], pfound->name);

 		  nextchar += strlen (nextchar);
+
+		  optopt = pfound->val;
 		  return '?';
 		}
 	    }
@@ -567,9 +626,10 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		{
 		  if (opterr)
 		    fprintf (stderr,
-			   _("%s: option `%s' requires an argument\n"),
-			   argv[0], argv[optind - 1]);
+			     _("%s: option `%s' requires an argument\n"),
+			     argv[0], argv[optind - 1]);
 		  nextchar += strlen (nextchar);
+		  optopt = pfound->val;
 		  return optstring[0] == ':' ? ':' : '?';
 		}
 	    }
@@ -604,6 +664,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	    }
 	  nextchar = (char *) "";
 	  optind++;
+	  optopt = 0;
 	  return '?';
 	}
    }
@@ -663,8 +724,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		  {
 		    /* 1003.2 specifies the format of this message.  */
 		    fprintf (stderr,
-			   _("%s: option requires an argument -- %c\n"),
-			   argv[0], c);
+			     _("%s: option requires an argument -- %c\n"),
+			     argv[0], c);
 		  }
 		optopt = c;
 		if (optstring[0] == ':')
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -13,7 +13,7 @@

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

 #ifndef _GETOPT_H
 #define _GETOPT_H 1
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -14,7 +14,7 @@

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -12,13 +12,13 @@
   GNU General Public License for more details.

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

 /* Written by David MacKenzie. */

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

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

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

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

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

 /* Like `getgroups', but for user USERNAME instead of for
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -12,25 +12,25 @@
   GNU General Public License for more details.

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

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

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

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

 #include <stdio.h>
 #include <ctype.h>

 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 char *malloc ();
 char *realloc ();
--- a/lib/getversion.c
+++ b/lib/getversion.c
@@ -12,11 +12,15 @@
   GNU General Public License for more details.

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

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

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

 #ifdef STDC_HEADERS
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -12,22 +12,22 @@
   GNU General Public License for more details.

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

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

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

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

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

 #include "group-member.h"
--- a/lib/group-member.h
+++ b/lib/group-member.h
@@ -1,5 +1,5 @@
 #ifndef _group_member_h_
-#define _group_member_h_ 1
+# define _group_member_h_ 1

 int
  group_member ();
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -12,15 +12,19 @@
   GNU General Public License for more details.

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

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

-#if defined(USG) || defined(STDC_HEADERS)
+#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
 #else
 #include <strings.h>
@@ -199,7 +203,7 @@ getgidbyname (group)
      group_alist = tail;
      return &tail->id.g;
    }
-  
+
  tail->next = nogroup_alist;
  nogroup_alist = tail;
  return 0;
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -12,10 +12,10 @@
   GNU General Public License for more details.

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

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -12,11 +12,10 @@
   GNU General Public License for more details.

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

-/* Written by David MacKenzie <djm@gnu.ai.mit.edu> and
-   Jim Meyering <meyering@cs.utexas.edu>.  */
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Jim Meyering.  */

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/makepath.h
+++ b/lib/makepath.h
@@ -1,15 +1,15 @@
 #if __STDC__
-#undef __P
-#define __P(args) args
+# undef __P
+# define __P(args) args
 #else
-#define __P(args) ()
+# define __P(args) ()
 #endif

 int
-  make_path __P ((const char *_argpath,
-		  int _mode,
-		  int _parent_mode,
-		  uid_t _owner,
-		  gid_t _group,
-		  int _preserve_existing,
-		  const char *_verbose_fmt_string));
+make_path __P ((const char *_argpath,
+		int _mode,
+		int _parent_mode,
+		uid_t _owner,
+		gid_t _group,
+		int _preserve_existing,
+		const char *_verbose_fmt_string));
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -13,8 +13,8 @@
   GNU General Public License for more details.

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

 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>.  */

--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -1,3 +1,22 @@
+/* Case-insensitive buffer comparator.
+   Copyright (C) 1996 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Jim Meyering (meyering@na-net.ornl.gov) */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -6,11 +25,11 @@
 #include <ctype.h>

 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-#define ISASCII(c) 1
+#define IN_CTYPE_DOMAIN(c) 1
 #else
-#define ISASCII(c) isascii(c)
+#define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif
-#define ISUPPER(c) (ISASCII (c) && isupper (c))
+#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))

 #if _LIBC || STDC_HEADERS
 # define TOLOWER(c) tolower (c)
--- a/lib/memcasecmp.h
+++ b/lib/memcasecmp.h
@@ -1,8 +1,8 @@
 #undef __P
 #if defined (__STDC__) && __STDC__
-#define __P(args) args
+# define __P(args) args
 #else
-#define __P(args) ()
+# define __P(args) ()
 #endif

 int
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -20,7 +20,8 @@ GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/memcmp.c
+++ b/lib/memcmp.c
@@ -15,8 +15,8 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/lib/memmove.c
+++ b/lib/memmove.c
@@ -4,21 +4,25 @@
   By David MacKenzie <djm@gnu.ai.mit.edu>.  */

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

-void
+void *
 memmove (dest, source, length)
     char *dest;
     const char *source;
     unsigned length;
 {
+  char *d0 = dest;
  if (source < dest)
    /* Moving from low mem to hi mem; start at end.  */
    for (source += length, dest += length; length; --length)
      *--dest = *--source;
  else if (source != dest)
-    /* Moving from hi mem to low mem; start at beginning.  */
-    for (; length; --length)
-      *dest++ = *source++;
+    {
+      /* Moving from hi mem to low mem; start at beginning.  */
+      for (; length; --length)
+	*dest++ = *source++;
+    }
+  return (void *) d0;
 }
--- a/lib/memset.c
+++ b/lib/memset.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 char *
 memset (str, c, len)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -15,8 +15,8 @@ Library General Public License for more details.

 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+not, write to the Free Software Foundation, Inc., 59 Temple Place -
+Suite 330, Boston, MA 02111-1307, USA.  */

 /* Define this to have a standalone program to test this implementation of
   mktime.  */
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

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

@@ -72,7 +72,7 @@ static int oatoi ();

 struct mode_change *
 mode_compile (mode_string, masked_ops)
-     register char *mode_string;
+     const char *mode_string;
     unsigned masked_ops;
 {
  struct mode_change *head;	/* First element of the linked list. */
@@ -244,7 +244,7 @@ invalid:
 unsigned short
 mode_adjust (oldmode, changes)
     unsigned oldmode;
-     register struct mode_change *changes;
+     const struct mode_change *changes;
 {
  unsigned short newmode;	/* The adjusted mode and one operand. */
  unsigned short value;		/* The other operand. */
--- a/lib/modechange.h
+++ b/lib/modechange.h
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 /* Masks for the `flags' field in a `struct mode_change'. */

@@ -44,12 +44,14 @@ struct mode_change
 #define MODE_INVALID (struct mode_change *) 0
 #define MODE_MEMORY_EXHAUSTED (struct mode_change *) 1

-#ifdef __STDC__
-struct mode_change *mode_compile (char *, unsigned);
-unsigned short mode_adjust (unsigned, struct mode_change *);
-void mode_free (struct mode_change *);
-#else
-struct mode_change *mode_compile ();
-unsigned short mode_adjust ();
-void mode_free ();
-#endif
+#ifndef __P
+# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+#  define __P(args) args
+# else
+#  define __P(args) ()
+# endif  /* GCC.  */
+#endif  /* Not __P.  */
+
+struct mode_change *mode_compile __P ((const char *, unsigned));
+unsigned short mode_adjust __P ((unsigned, const struct mode_change *));
+void mode_free __P ((struct mode_change *));
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -80,6 +80,10 @@ void error ();
 #include <sys/statfs.h>
 #endif

+#ifdef MOUNTED_LISTMNTENT
+#include <mntent.h>
+#endif
+
 #ifdef MOUNTED_GETMNTENT2	/* SVR4.  */
 #include <sys/mnttab.h>
 #endif
@@ -195,6 +199,36 @@ read_filesystem_list (need_fs_type, all_fs)
  me->me_next = NULL;
  mount_list = mtail = me;

+#ifdef MOUNTED_LISTMNTENT
+  {
+    struct tabmntent *mntlist, *p;
+    struct mntent *mnt;
+    struct mount_entry *me;
+    
+    /* the third and fourth arguments could be used to filter mounts,
+       but Crays doesn't seem to have any mounts that we want to
+       remove. Specifically, automount create normal NFS mounts.
+       */
+
+    if(listmntent(&mntlist, KMTAB, NULL, NULL) < 0)
+      return NULL;
+    p = mntlist;
+    while(p){
+      mnt = p->ment;
+      me = (struct mount_entry*) xmalloc(sizeof (struct mount_entry));
+      me->me_devname = xstrdup(mnt->mnt_fsname);
+      me->me_mountdir = xstrdup(mnt->mnt_dir);
+      me->me_type = xstrdup(mnt->mnt_type);
+      me->me_dev = -1;
+      me->me_next = NULL;
+      mtail->me_next = me;
+      mtail = me;
+      p = p->next;
+    }
+    freemntlist(mntlist);
+  }
+#endif
+
 #ifdef MOUNTED_GETMNTENT1	/* 4.3BSD, SunOS, HP-UX, Dynix, Irix.  */
  {
    struct mntent *mnt;
--- a/lib/mountlist.h
+++ b/lib/mountlist.h
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 /* A mount table entry. */
 struct mount_entry
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -12,8 +12,8 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #include "obstack.h"

@@ -31,7 +31,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #if defined (_LIBC) || !defined (__GNU_LIBRARY__)


-#ifdef __STDC__
+#if defined (__STDC__) && __STDC__
 #define POINTER void *
 #else
 #define POINTER char *
@@ -267,7 +267,7 @@ _obstack_newchunk (h, length)
   This is here for debugging.
   If you use it in a program, you are probably losing.  */

-#ifdef __STDC__
+#if defined (__STDC__) && __STDC__
 /* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
   obstack.h because it is just for debugging.  */
 int _obstack_allocated_p (struct obstack *h, POINTER obj);
@@ -374,7 +374,7 @@ obstack_free (h, obj)
 /* Now define the functional versions of the obstack macros.
   Define them to simply use the corresponding macros to do the job.  */

-#ifdef __STDC__
+#if defined (__STDC__) && __STDC__
 /* These function definitions do not work with non-ANSI preprocessors;
   they won't pass through the macro names in parentheses.  */

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

 /* Summary:

--- a/lib/path-concat.c
+++ b/lib/path-concat.c
@@ -0,0 +1,58 @@
+/* path-concat.c -- concatenate two arbitrary pathnames
+   Copyright (C) 1996 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+char *malloc ();
+char *stpcpy ();
+
+/* Concatenate two pathname components, DIR and BASE, in newly-allocated
+   storage and return the result.  Return 0 if out of memory.  Add a slash
+   between DIR and BASE in the result if neither would contribute one.
+   If each would contribute at least one, elide one from the end of DIR.
+   Otherwise, simply concatenate DIR and BASE.  In any case, if
+   BASE_IN_RESULT is non-NULL, set *BASE_IN_RESULT to point to the copy of
+   BASE in the returned concatenation.  */
+
+char *
+path_concat (const char *dir, const char *base, char **base_in_result)
+{
+  char *p;
+  char *p_concat;
+
+  p_concat = malloc (strlen (dir) + strlen (base) + 2);
+  if (!p_concat)
+    return 0;
+
+  p = stpcpy (p_concat, dir);
+
+  if (*(p - 1) == '/' && *base == '/')
+    --p;
+  else if (*(p - 1) != '/' && *base != '/')
+    p = stpcpy (p, "/");
+
+  if (base_in_result)
+    *base_in_result = p;
+
+  stpcpy (p, base);
+
+  return p_concat;
+}
--- a/lib/path-concat.h
+++ b/lib/path-concat.h
@@ -0,0 +1,9 @@
+#if __STDC__
+# undef __P
+# define __P(args) args
+#else
+# define __P(args) ()
+#endif
+
+char *
+path_concat __P ((const char *dir, const char *base, char **base_in_result));
--- a/lib/pathmax.h
+++ b/lib/pathmax.h
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifndef _PATHMAX_H
 #define _PATHMAX_H
--- a/lib/posixtm.y
+++ b/lib/posixtm.y
@@ -12,28 +12,50 @@
   GNU General Public License for more details.

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

 /* Written by Jim Kingdon and David MacKenzie. */
 %{
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* The following block of alloca-related preprocessor directives is here
+   solely to allow compilation by non GNU-C compilers of the C parser
+   produced from this file by old versions of bison.  Newer versions of
+   bison include a block similar to this one in bison.simple.  */
+
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #else
-#ifdef sparc
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #else
 #ifdef _AIX
 #pragma alloca
 #else
-char *alloca ();
+void *alloca ();
 #endif
 #endif
 #endif

 #include <stdio.h>
 #include <sys/types.h>
+
+#ifdef TM_IN_SYS_TIME
+#include <sys/time.h>
+#else
 #include <time.h>
+#endif
+
+/* Some old versions of bison generate parsers that use bcopy.
+   That loses on systems that don't provide the function, so we have
+   to redefine it here.  */
+#if !defined (HAVE_BCOPY) && defined (HAVE_MEMCPY) && !defined (bcopy)
+#define bcopy(from, to, len) memcpy ((to), (from), (len))
+#endif

 #define YYDEBUG 1

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

 #include <errno.h>

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

 /* Define-away any (possibly conflicting) prototype of putenv.
@@ -29,26 +29,26 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define putenv _sys_putenv

 #if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 #if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
-#include <string.h>
+# include <string.h>
 #endif
 #if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
-#include <unistd.h>
+# include <unistd.h>
 #endif

 #undef putenv

 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
-#define strchr index
+# define strchr index
 #endif
 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_MEMCPY)
-#define memcpy(d,s,n) bcopy ((s), (d), (n))
+# define memcpy(d,s,n) bcopy ((s), (d), (n))
 #endif

 #if HAVE_GNU_LD
-#define environ __environ
+# define environ __environ
 #else
 extern char **environ;
 #endif
--- a/lib/readtokens.c
+++ b/lib/readtokens.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

   Written by Jim Meyering. */

@@ -28,23 +28,23 @@
   */

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

 #include <stdio.h>

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

 #if defined (STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
+# include <string.h>
 /* An ANSI string.h and pre-ANSI memory.h might conflict.  */
-#if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)
-#include <memory.h>
-#endif /* not STDC_HEADERS and HAVE_MEMORY_H */
+# if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)
+#  include <memory.h>
+# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
 #else /* not STDC_HEADERS and not HAVE_STRING_H */
-#include <strings.h>
+# include <strings.h>
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */

--- a/lib/readtokens.h
+++ b/lib/readtokens.h
@@ -1,12 +1,12 @@
 #ifndef H_READTOKENS_H
-#define H_READTOKENS_H
+# define H_READTOKENS_H

-#ifndef INITIAL_TOKEN_LENGTH
-#define INITIAL_TOKEN_LENGTH 20
-#endif
+# ifndef INITIAL_TOKEN_LENGTH
+#  define INITIAL_TOKEN_LENGTH 20
+# endif

-#ifndef TOKENBUFFER_DEFINED
-#define TOKENBUFFER_DEFINED
+# ifndef TOKENBUFFER_DEFINED
+#  define TOKENBUFFER_DEFINED
 struct tokenbuffer
 {
  long size;
@@ -14,14 +14,14 @@ struct tokenbuffer
 };
 typedef struct tokenbuffer token_buffer;

-#endif /* not TOKENBUFFER_DEFINED */
+# endif /* not TOKENBUFFER_DEFINED */

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

 void init_tokenbuffer __P ((token_buffer *tokenbuffer));

--- a/lib/regex.c
+++ b/lib/regex.c
@@ -16,8 +16,8 @@
   GNU General Public License for more details.

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

 /* AIX requires this to be the first thing in the file. */
 #if defined (_AIX) && !defined (REGEX_MALLOC)
@@ -173,32 +173,32 @@ init_syntax_once ()
   eliminate the && through constant folding."  */

 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-#define ISASCII(c) 1
+#define IN_CTYPE_DOMAIN(c) 1
 #else
-#define ISASCII(c) isascii(c)
+#define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif

 #ifdef isblank
-#define ISBLANK(c) (ISASCII (c) && isblank (c))
+#define ISBLANK(c) (IN_CTYPE_DOMAIN (c) && isblank (c))
 #else
 #define ISBLANK(c) ((c) == ' ' || (c) == '\t')
 #endif
 #ifdef isgraph
-#define ISGRAPH(c) (ISASCII (c) && isgraph (c))
+#define ISGRAPH(c) (IN_CTYPE_DOMAIN (c) && isgraph (c))
 #else
-#define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c))
+#define ISGRAPH(c) (IN_CTYPE_DOMAIN (c) && isprint (c) && !isspace (c))
 #endif

-#define ISPRINT(c) (ISASCII (c) && isprint (c))
-#define ISDIGIT(c) (ISASCII (c) && isdigit (c))
-#define ISALNUM(c) (ISASCII (c) && isalnum (c))
-#define ISALPHA(c) (ISASCII (c) && isalpha (c))
-#define ISCNTRL(c) (ISASCII (c) && iscntrl (c))
-#define ISLOWER(c) (ISASCII (c) && islower (c))
-#define ISPUNCT(c) (ISASCII (c) && ispunct (c))
-#define ISSPACE(c) (ISASCII (c) && isspace (c))
-#define ISUPPER(c) (ISASCII (c) && isupper (c))
-#define ISXDIGIT(c) (ISASCII (c) && isxdigit (c))
+#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c))
+#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
+#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c))
+#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
+#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c))
+#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c))
+#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (c))
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))
+#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c))

 #ifndef NULL
 #define NULL (void *)0
@@ -4505,9 +4505,9 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
 #endif

                if ((re_opcode_t) p1[3] == exactn
-		    && ! ((int) p2[1] * BYTEWIDTH > (int) p1[4]
-			  && (p2[1 + p1[4] / BYTEWIDTH]
-			      & (1 << (p1[4] % BYTEWIDTH)))))
+		    && ! ((int) p2[1] * BYTEWIDTH > (int) p1[5]
+			  && (p2[2 + p1[5] / BYTEWIDTH]
+			      & (1 << (p1[5] % BYTEWIDTH)))))
                  {
  		    p[-3] = (unsigned char) pop_failure_jump;
                    DEBUG_PRINT3 ("  %c != %c => pop_failure_jump.\n",
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -14,8 +14,8 @@
   GNU General Public License for more details.

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

 #ifndef __REGEXP_LIBRARY_H__
 #define __REGEXP_LIBRARY_H__
@@ -42,7 +42,7 @@ typedef unsigned reg_syntax_t;
 #define RE_BACKSLASH_ESCAPE_IN_LISTS (1)

 /* If this bit is not set, then + and ? are operators, and \+ and \? are
-     literals. 
+     literals.
   If set, then \+ and \? are operators and + and ? are literals.  */
 #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)

@@ -58,7 +58,7 @@ typedef unsigned reg_syntax_t;
        ^  is an anchor if it is at the beginning of a regular
           expression or after an open-group or an alternation operator;
        $  is an anchor if it is at the end of a regular expression, or
-           before a close-group or an alternation operator.  
+           before a close-group or an alternation operator.

   This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
   POSIX draft 11.2 says that * etc. in leading positions is undefined.
@@ -69,7 +69,7 @@ typedef unsigned reg_syntax_t;
 /* If this bit is set, then special characters are always special
     regardless of where they are in the pattern.
   If this bit is not set, then special characters are special only in
-     some contexts; otherwise they are ordinary.  Specifically, 
+     some contexts; otherwise they are ordinary.  Specifically,
     * + ? and intervals are only special when not after the beginning,
     open-group, or alternation operator.  */
 #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
@@ -91,7 +91,7 @@ typedef unsigned reg_syntax_t;
 #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)

 /* If this bit is set, either \{...\} or {...} defines an
-     interval, depending on RE_NO_BK_BRACES. 
+     interval, depending on RE_NO_BK_BRACES.
   If not set, \{, \}, {, and } are literals.  */
 #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)

@@ -116,7 +116,7 @@ typedef unsigned reg_syntax_t;
   If not set, then \<digit> is a back-reference.  */
 #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)

-/* If this bit is set, then | is an alternation operator, and \| is literal. 
+/* If this bit is set, then | is an alternation operator, and \| is literal.
   If not set, then \| is an alternation operator, and | is literal.  */
 #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)

@@ -142,7 +142,7 @@ extern reg_syntax_t re_syntax_options;

 /* Define combinations of the above bits for the standard possibilities.
   (The [[[ comments delimit what gets put into the Texinfo file, so
-   don't delete them!)  */ 
+   don't delete them!)  */
 /* [[[begin syntaxes]]] */
 #define RE_SYNTAX_EMACS 0

@@ -209,7 +209,7 @@ extern reg_syntax_t re_syntax_options;
 #ifdef RE_DUP_MAX
 #undef RE_DUP_MAX
 #endif
-#define RE_DUP_MAX ((1 << 15) - 1) 
+#define RE_DUP_MAX ((1 << 15) - 1)


 /* POSIX `cflags' bits (i.e., information for `regcomp').  */
@@ -221,7 +221,7 @@ extern reg_syntax_t re_syntax_options;
 /* If this bit is set, then ignore case when matching.
   If not set, then case is significant.  */
 #define REG_ICASE (REG_EXTENDED << 1)
- 
+
 /* If this bit is set, then anchors do not match at newline
     characters in the string.
   If not set, then anchors do match at newlines.  */
@@ -260,7 +260,7 @@ typedef enum
  REG_EESCAPE,		/* Trailing backslash.  */
  REG_ESUBREG,		/* Invalid back reference.  */
  REG_EBRACK,		/* Unmatched left bracket.  */
-  REG_EPAREN,		/* Parenthesis imbalance.  */ 
+  REG_EPAREN,		/* Parenthesis imbalance.  */
  REG_EBRACE,		/* Unmatched \{.  */
  REG_BADBR,		/* Invalid contents of \{\}.  */
  REG_ERANGE,		/* Invalid range end.  */
@@ -279,7 +279,7 @@ typedef enum
   compiled, the `re_nsub' field is available.  All other fields are
   private to the regex routines.  */

-#ifndef RE_TRANSLATE_TYPE 
+#ifndef RE_TRANSLATE_TYPE
 #define RE_TRANSLATE_TYPE char *
 #endif

@@ -295,7 +295,7 @@ struct re_pattern_buffer
  unsigned long allocated;

 	/* Number of bytes actually used in `buffer'.  */
-  unsigned long used;	
+  unsigned long used;

        /* Syntax setting with which the pattern was compiled.  */
  reg_syntax_t syntax;
@@ -339,7 +339,7 @@ struct re_pattern_buffer
  unsigned no_sub : 1;

        /* If set, a beginning-of-line anchor doesn't match at the
-           beginning of the string.  */ 
+           beginning of the string.  */
  unsigned not_bol : 1;

        /* Similarly for an end-of-line anchor.  */
@@ -446,7 +446,7 @@ extern int re_match


 /* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
-extern int re_match_2 
+extern int re_match_2
  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
             int length1, const char *string2, int length2,
             int start, struct re_registers *regs, int stop));
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -0,0 +1,81 @@
+/* rpmatch - determine whether string value is affirmation or negative
+	     response according to current locale's data
+Copyright (C) 1996 Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if STDC_HEADERS || _LIBC
+# include <stdlib.h>
+#endif
+
+#include <regex.h>
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+
+static int
+try (response, pattern, match, nomatch, lastp, re)
+     const char *response;
+     const char *pattern;
+     const int match;
+     const int nomatch;
+     const char **lastp;
+     regex_t *re;
+{
+  if (pattern != *lastp)
+    {
+      /* The pattern has changed.  */
+      if (*lastp)
+	{
+	  /* Free the old compiled pattern.  */
+	  regfree (re);
+	  *lastp = NULL;
+	}
+      /* Compile the pattern and cache it for future runs.  */
+      if (regcomp (re, pattern, REG_EXTENDED) != 0)
+	return -1;
+      *lastp = pattern;
+    }
+
+  /* See if the regular expression matches RESPONSE.  */
+  return regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
+}
+
+
+int
+rpmatch (response)
+     const char *response;
+{
+  /* Match against one of the response patterns, compiling the pattern
+     first if necessary.  */
+
+  /* We cache the response patterns and compiled regexps here.  */
+  static const char *yesexpr, *noexpr;
+  static regex_t yesre, nore;
+  int result;
+
+  return ((result = try (response, _("^[yY][[:alpha:]]*"), 1, 0,
+			 &yesexpr, &yesre))
+	  ? result
+	  : try (response, _("^[nN][[:alpha:]]*"), 0, -1, &noexpr, &nore));
+}
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -12,18 +12,18 @@
   GNU General Public License for more details.

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

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

 #include <sys/types.h>

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

 #include <errno.h>
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

 /* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */

--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

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

--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -19,23 +19,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.  */

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

 #include <errno.h>

 #if _LIBC || HAVE_STDLIB_H
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 #if _LIBC || HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #if _LIBC || HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif

 #ifndef	HAVE_GNU_LD
-#define	__environ	environ
+# define	__environ	environ
 #endif

 int
--- a/lib/setenv.h
+++ b/lib/setenv.h
@@ -1,12 +1,12 @@
 #ifndef SETENV_H
-#define SETENV_H 1
+# define SETENV_H 1

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

 int
  setenv __P ((const char *name, const char *value, int replace));
--- a/lib/stime.c
+++ b/lib/stime.c
@@ -12,11 +12,15 @@
   GNU General Public License for more details.

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

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

+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/time.h>

--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -12,8 +12,8 @@
    GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -11,20 +11,20 @@
   GNU General Public License for more details.

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

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

 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #else
-#include <strings.h>
-#ifndef strchr
-#define strchr index
-#endif
+# include <strings.h>
+# ifndef strchr
+#  define strchr index
+# endif
 #endif

 /* Return the length of the maximum inital segment of S
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -12,8 +12,12 @@
   GNU General Public License for more details.

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

 #ifdef STDC_HEADERS
 #include <string.h>
@@ -23,10 +27,6 @@ char *malloc ();
 char *strcpy ();
 #endif

-#if !__STDC__
-#define const
-#endif
-
 /* Return a newly allocated copy of STR,
   or 0 if out of memory. */

--- a/lib/strftime.c
+++ b/lib/strftime.c
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -12,13 +12,17 @@
   GNU General Public License for more details.

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

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

 /* Remove trailing slashes from PATH.
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -0,0 +1,49 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#ifdef STDC_HEADERS
+# include <string.h>
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
+
+/* Duplicate S, returning an identical malloc'd string.  */
+char *
+strndup (s, n)
+     const char *s;
+     size_t n;
+{
+  char *new = malloc (n + 1);
+
+  if (new == NULL)
+    return NULL;
+
+  memcpy (new, s, n);
+  new[n] = '\0';
+
+  return new;
+}
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -13,8 +13,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 # include <config.h>
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -1,49 +1,116 @@
-/* strstr.c -- return the offset of one string within another
-   Copyright (C) 1989, 1990 Free Software Foundation, Inc.
+/* Copyright (C) 1994 Free Software Foundation, Inc.
+This file is part of the GNU C Library.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.

-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.

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

-/* Author:
-	Mike Rendell			Department of Computer Science
-	michael@garfield.mun.edu	Memorial University of Newfoundland
-	..!uunet!garfield!michael	St. John's, Nfld., Canada
-	(709) 737-4550			A1C 5S7
-*/
+/*
+ * My personal strstr() implementation that beats most other algorithms.
+ * Until someone tells me otherwise, I assume that this is the
+ * fastest implementation of strstr() in C.
+ * I deliberately chose not to comment it.  You should have at least
+ * as much fun trying to understand it, as I had to write it :-).
+ *
+ * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de	*/

-/* Return the starting address of string S2 in S1;
-   return 0 if it is not found. */
+#include <string.h>
+#include <sys/types.h>
+
+typedef unsigned chartype;

 char *
-strstr (s1, s2)
-     char *s1;
-     char *s2;
+strstr (phaystack, pneedle)
+     const char *phaystack;
+     const char *pneedle;
 {
-  int i;
-  char *p1;
-  char *p2;
-  char *s = s1;
+  register const unsigned char *haystack, *needle;
+  register chartype b, c;

-  for (p2 = s2, i = 0; *s; p2 = s2, i++, s++)
+  haystack = (const unsigned char *) phaystack;
+  needle = (const unsigned char *) pneedle;
+
+  b = *needle;
+  if (b != '\0')
    {
-      for (p1 = s; *p1 && *p2 && *p1 == *p2; p1++, p2++)
-	;
-      if (!*p2)
-	break;
-    }
-  if (!*p2)
-    return s1 + i;
+      haystack--;				/* possible ANSI violation */
+      do
+	{
+	  c = *++haystack;
+	  if (c == '\0')
+	    goto ret0;
+	}
+      while (c != b);

+      c = *++needle;
+      if (c == '\0')
+	goto foundneedle;
+      ++needle;
+      goto jin;
+
+      for (;;)
+        {
+          register chartype a;
+	  register const unsigned char *rhaystack, *rneedle;
+
+	  do
+	    {
+	      a = *++haystack;
+	      if (a == '\0')
+		goto ret0;
+	      if (a == b)
+		break;
+	      a = *++haystack;
+	      if (a == '\0')
+		goto ret0;
+shloop:	    }
+          while (a != b);
+
+jin:	  a = *++haystack;
+	  if (a == '\0')
+	    goto ret0;
+
+	  if (a != c)
+	    goto shloop;
+
+	  rhaystack = haystack-- + 1;
+	  rneedle = needle;
+	  a = *rneedle;
+
+	  if (*rhaystack == a)
+	    do
+	      {
+		if (a == '\0')
+		  goto foundneedle;
+		++rhaystack;
+		a = *++needle;
+		if (*rhaystack != a)
+		  break;
+		if (a == '\0')
+		  goto foundneedle;
+		++rhaystack;
+		a = *++needle;
+	      }
+	    while (*rhaystack == a);
+
+	  needle = rneedle;		   /* took the register-poor aproach */
+
+	  if (a == '\0')
+	    break;
+        }
+    }
+foundneedle:
+  return (char*) haystack;
+ret0:
  return 0;
 }
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -11,8 +11,8 @@
   GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1995 Free Software Foundation, Inc.
-
+/* Copyright (C) 1991, 92, 94, 95, 96 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.
@@ -16,7 +15,8 @@ GNU General Public License for more details.

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

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -57,18 +57,41 @@ extern int errno;
 # define UNSIGNED 0
 # define INT LONG int
 #else
-# define strtol strtoul
 # define INT unsigned LONG int
 #endif

+/* Determine the name.  */
+#if UNSIGNED
+# ifdef USE_WIDE_CHAR
+#  ifdef QUAD
+#   define strtol wcstouq
+#  else
+#   define strtol wcstoul
+#  endif
+# else
+#  ifdef QUAD
+#   define strtol strtouq
+#  else
+#   define strtol strtoul
+#  endif
+# endif
+#else
+# ifdef USE_WIDE_CHAR
+#  ifdef QUAD
+#   define strtol wcstoq
+#  else
+#   define strtol wcstol
+#  endif
+# else
+#  ifdef QUAD
+#   define strtol strtoq
+#  endif
+# endif
+#endif
+
 /* If QUAD is defined, we are defining `strtoq' or `strtouq',
   operating on `long long int's.  */
 #ifdef QUAD
-# if UNSIGNED
-#  define strtoul strtouq
-# else
-#  define strtol strtoq
-# endif
 # define LONG long long
 # undef LONG_MIN
 # define LONG_MIN LONG_LONG_MIN
@@ -84,13 +107,41 @@ extern int errno;
 # endif
 #else
 # define LONG long
+
+# ifndef ULONG_MAX
+#  define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
+# endif
+# ifndef LONG_MAX
+#  define LONG_MAX ((long int) (ULONG_MAX >> 1))
+# endif
+#endif
+
+#ifdef USE_WIDE_CHAR
+# include <wchar.h>
+# include <wctype.h>
+# define L_(ch) L##ch
+# define UCHAR_TYPE wint_t
+# define STRING_TYPE wchar_t
+# define ISSPACE(ch) iswspace (ch)
+# define ISALPHA(ch) iswalpha (ch)
+# define TOUPPER(ch) towupper (ch)
+#else
+# define L_(ch) ch
+# define UCHAR_TYPE unsigned char
+# define STRING_TYPE char
+# define ISSPACE(ch) isspace (ch)
+# define ISALPHA(ch) isalpha (ch)
+# define TOUPPER(ch) toupper (ch)
 #endif

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

 #ifdef USE_NUMBER_GROUPING
@@ -108,8 +159,8 @@ extern int errno;

 INT
 INTERNAL (strtol) (nptr, endptr, base, group)
-     const char *nptr;
-     char **endptr;
+     const STRING_TYPE *nptr;
+     STRING_TYPE **endptr;
     int base;
     int group;
 {
@@ -117,9 +168,9 @@ INTERNAL (strtol) (nptr, endptr, base, group)
  register unsigned LONG int cutoff;
  register unsigned int cutlim;
  register unsigned LONG int i;
-  register const char *s;
-  register unsigned char c;
-  const char *save, *end;
+  register const STRING_TYPE *s;
+  register UCHAR_TYPE c;
+  const STRING_TYPE *save, *end;
  int overflow;

 #ifdef USE_NUMBER_GROUPING
@@ -151,21 +202,21 @@ INTERNAL (strtol) (nptr, endptr, base, group)
  if (base < 0 || base == 1 || base > 36)
    base = 10;

-  s = nptr;
+  save = s = nptr;

  /* Skip white space.  */
-  while (isspace (*s))
+  while (ISSPACE (*s))
    ++s;
-  if (*s == '\0')
+  if (*s == L_('\0'))
    goto noconv;

  /* Check for a sign.  */
-  if (*s == '-')
+  if (*s == L_('-'))
    {
      negative = 1;
      ++s;
    }
-  else if (*s == '+')
+  else if (*s == L_('+'))
    {
      negative = 0;
      ++s;
@@ -173,14 +224,14 @@ INTERNAL (strtol) (nptr, endptr, base, group)
  else
    negative = 0;

-  if (base == 16 && s[0] == '0' && toupper (s[1]) == 'X')
+  if (base == 16 && s[0] == L_('0') && TOUPPER (s[1]) == L_('X'))
    s += 2;

  /* If BASE is zero, figure it out ourselves.  */
  if (base == 0)
-    if (*s == '0')
+    if (*s == L_('0'))
      {
-	if (toupper (s[1]) == 'X')
+	if (TOUPPER (s[1]) == L_('X'))
 	  {
 	    s += 2;
 	    base = 16;
@@ -199,9 +250,9 @@ INTERNAL (strtol) (nptr, endptr, base, group)
    {
      /* Find the end of the digit string and check its grouping.  */
      end = s;
-      for (c = *end; c != '\0'; c = *++end)
-	if (c != thousands && !isdigit (c) &&
-	    (!isalpha (c) || toupper (c) - 'A' + 10 >= base))
+      for (c = *end; c != L_('\0'); c = *++end)
+	if (c != thousands && (c < L_('0') || c > L_('9'))
+	    && (!ISALPHA (c) || TOUPPER (c) - L_('A') + 10 >= base))
 	  break;
      if (*s == thousands)
 	end = s;
@@ -217,14 +268,14 @@ INTERNAL (strtol) (nptr, endptr, base, group)

  overflow = 0;
  i = 0;
-  for (c = *s; c != '\0'; c = *++s)
+  for (c = *s; c != L_('\0'); c = *++s)
    {
      if (s == end)
 	break;
-      if (isdigit (c))
-	c -= '0';
-      else if (isalpha (c))
-	c = toupper (c) - 'A' + 10;
+      if (c >= L_('0') && c <= L_('9'))
+	c -= L_('0');
+      else if (ISALPHA (c))
+	c = TOUPPER (c) - L_('A') + 10;
      else
 	break;
      if (c >= base)
@@ -246,13 +297,15 @@ INTERNAL (strtol) (nptr, endptr, base, group)
  /* Store in ENDPTR the address of one character
     past the last character we converted.  */
  if (endptr != NULL)
-    *endptr = (char *) s;
+    *endptr = (STRING_TYPE *) s;

 #if !UNSIGNED
  /* Check for a value that is within the range of
     `unsigned LONG int', but outside the range of `LONG int'.  */
-  if (i > (negative ?
-	   -(unsigned LONG int) LONG_MIN : (unsigned LONG int) LONG_MAX))
+  if (overflow == 0
+      && i > (negative
+	      ? -((unsigned LONG int) (LONG_MIN + 1)) + 1
+	      : (unsigned LONG int) LONG_MAX))
    overflow = 1;
 #endif

@@ -270,23 +323,40 @@ INTERNAL (strtol) (nptr, endptr, base, group)
  return (negative ? -i : i);

 noconv:
-  /* There was no number to convert.  */
+  /* We must handle a special case here: the base is 0 or 16 and the
+     first two characters and '0' and 'x', but the rest are no
+     hexadecimal digits.  This is no error case.  We return 0 and
+     ENDPTR points to the `x`.  */
  if (endptr != NULL)
-    *endptr = (char *) nptr;
+    if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
+	&& save[-2] == L_('0'))
+      *endptr = (STRING_TYPE *) &save[-1];
+    else
+      /*  There was no number to convert.  */
+      *endptr = (STRING_TYPE *) nptr;
+
  return 0L;
 }

 /* External user entry point.  */

+#undef __P
+#if defined (__STDC__) && __STDC__
+# define __P(args) args
+#else
+# define __P(args) ()
+#endif
+
+/* Prototype.  */
+INT strtol __P ((const STRING_TYPE *nptr, STRING_TYPE **endptr,
+			    int base));
+
+
 INT
 strtol (nptr, endptr, base)
-     const char *nptr;
-     char **endptr;
+     const STRING_TYPE *nptr;
+     STRING_TYPE **endptr;
     int base;
 {
  return INTERNAL (strtol) (nptr, endptr, base, 0);
 }
-
-#ifdef weak_symbol
-weak_symbol (strtol)
-#endif
--- a/lib/strtoul.c
+++ b/lib/strtoul.c
@@ -1,21 +1,22 @@
 /* Copyright (C) 1991 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.
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.

-The GNU C Library is distributed in the hope that it will be useful,
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.

-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 #define	UNSIGNED	1

-#include "strtol.c"
+#include <strtol.c>
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -12,8 +12,8 @@
   GNU General Public License for more details.

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

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

--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -12,20 +12,13 @@
   GNU General Public License for more details.

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

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

 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
+# include <config.h>
 #endif

 #include <stdio.h>
@@ -36,9 +29,9 @@ extern int errno;
 #include <sys/types.h>
 #include "pathmax.h"

-#if !defined(_POSIX_VERSION) && !defined(HAVE_GETCWD)
+#ifndef HAVE_GETCWD
 char *getwd ();
-#define getcwd(buf, max) getwd (buf)
+# define getcwd(buf, max) getwd (buf)
 #else
 char *getcwd ();
 #endif
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -12,13 +12,13 @@
   GNU General Public License for more details.

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

 /* Written by Jim Meyering, meyering@comco.com */

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

 #include <sys/types.h>
@@ -28,7 +28,7 @@ char *xmalloc ();
 char *xrealloc ();

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

 char *
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -12,23 +12,23 @@
   GNU General Public License for more details.

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

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

 #if __STDC__
-#define VOID void
+# define VOID void
 #else
-#define VOID char
+# define VOID char
 #endif

 #include <sys/types.h>

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

 #ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
+# define EXIT_FAILURE 1
 #endif

 /* Exit value when the requested amount of memory is not available.
--- a/lib/xstrdup.c
+++ b/lib/xstrdup.c
@@ -12,10 +12,14 @@
   GNU General Public License for more details.

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

-#if defined(USG) || defined(STDC_HEADERS)
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
 #else
 #include <strings.h>
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -18,11 +18,11 @@
 /* Written by Jim Meyering.  */

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

 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 double strtod ();
 #endif
--- a/lib/xstrtod.h
+++ b/lib/xstrtod.h
@@ -1,13 +1,13 @@
 #ifndef XSTRTOD_H
-#define XSTRTOD_H 1
+# define XSTRTOD_H 1

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

 int
  xstrtod __P ((const char *str, const char **ptr, double *result));
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -1,3 +1,22 @@
+/* A more useful interface to strtol.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is 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.  */
+
+/* Jim Meyering (meyering@na-net.ornl.gov) */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
--- a/lib/xstrtoul.h
+++ b/lib/xstrtoul.h
@@ -1,7 +1,7 @@
 #ifndef _xstrtoul_h_
-#define _xstrtoul_h_ 1
+# define _xstrtoul_h_ 1

-#define STRING_TO_UNSIGNED 1
-#include "xstrtol.h"
+# define STRING_TO_UNSIGNED 1
+# include "xstrtol.h"

 #endif /* _xstrtoul_h_ */
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -12,26 +12,41 @@
   GNU General Public License for more details.

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

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <ctype.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 #include <stdio.h>

 /* Read one line from standard input
   and return nonzero if that line begins with y or Y,
   otherwise return 0. */

+int rpmatch ();
+
 int
 yesno ()
 {
+  /* We make some assumptions here:
+     a) leading white space in the response are not vital
+     b) the first 128 characters of the answer are enough (the rest can
+	be ignored)
+     I cannot think for a situation where this is not ok.  --drepper@gnu  */
+  char buf[128];
+  int len = 0;
  int c;
-  int rv;

-  fflush (stderr);
-  c = getchar ();
-  rv = (c == 'y') || (c == 'Y');
-  while (c != EOF && c != '\n')
-    c = getchar ();
+  while ((c = getchar ()) != EOF && c != '\n')
+    if ((len > 0 && len < 127) || (len == 0 && !isspace (c)))
+      buf[len++] = c;
+  buf[len] = '\0';

-  return rv;
+  return rpmatch (buf) == 1;
 }
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,677 @@
+Mon Sep  2 10:59:10 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* POTFILES.in: Add lib/rpmatch.c.
+
+	* lib/rpmatch.c (ENABLE_NLS): Include libintl.h and define _ to
+	gettext.
+
+	* src/*.c (usage): Tell where to report bugs.
+
+Sat Aug 31 18:48:18 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/touch.c (utime_now): Protoize.
+	Reported by David S. Miller (davem@caip.rutgers.edu).
+
+Sun Aug 25 22:43:15 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* acinclude.m4 (AM_FUNC_MKTIME): New macro.
+	* configure.in (AM_FUNC_MKTIME): Use it.
+	(AC_REPLACE_FUNCS): Remove mktime.
+
+Wed Aug 21 23:17:04 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/Makefile.am (EXTRA_DIST): Remove ansi2knr.1 and ansi2knr.c.
+	Automake includes them automatically.
+
+	* configure.in (AM_INIT_AUTOMAKE): Use it.
+	(AM_PROG_INSTALL): Remove.  AM_INIT_AUTOMAKE does this.
+	(AC_PROG_MAKE_SET): Likewise.
+
+Sun Aug 18 09:52:39 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (jm_MAINTAINER_MODE, fp_C_PROTOTYPES): Rename with
+	AM_ prefix for latest automake/aclocal.
+
+	* lib/Makefile.am (noinst_HEADERS): Add path-concat.h.
+	(fu_SOURCES): Add path-concat.c.
+
+	* src/mv.c: Include path-concat.h.
+	(movefile): Use path_concat instead of open-coding its functionality.
+	Declare pointer parameters const as appropriate.
+
+	* src/cp.c: Include path-concat.h.
+	(do_copy): Check path_concat return value.
+	(path_concat): Remove function.
+
+	* lib/path-concat.h: New file.
+	* lib/path-concat.c (path_concat): New file.  Just like the function
+	from cp.c except the stand-alone version uses malloc instead of
+	xmalloc.
+
+	* configure.in (ALL_LINGUAS): Add Dutch (nl).
+
+Fri Aug 16 21:59:24 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/chgrp.c (parse_group): Don't abort when given a group number
+	larger than INT_MAX.  Fix bug whereby root could run
+	`chgrp INVALID-GROUP FILE' and it wouldn't fail, but rather would
+	change FILE's group to some indeterminate value.  This problem
+	was reported as Debian Bug#4119 via Erick Branderhorst
+	(branderh@IAEhv.nl).
+	Declare pointer parameters const as appropriate.
+
+Thu Aug  1 22:12:15 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/system.h (ST_NBLOCKS) [_CRAY]: Special case for Cray.
+	* lib/fsusage.c (get_fs_usage) [STAT_STATFS4] [_CRAY]: Define
+	f_bavail to f_bfree.
+	From Johan Danielsson.
+
+Wed Jul 31 23:39:23 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/ln.c [LINK_TYPE]: Remove macro.  NLS messages aren't
+	extracted from macros.  Reported by Santiago Vila.
+	(link_type_string): New global variable to be used instead of
+	LINK_TYPE.
+	(main): Set it here.
+	(do_link): Use it (instead of macro) here.
+
+Tue Jul 30 23:24:18 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (AC_CHECK_HEADERS): Add sys/fs/s5param.h.
+	* lib/fsusage.c [HAVE_SYS_FS_S5PARAM_H]: Include sys/fs/s5param.h
+	to work around bug in sys/filsys.h of Fujitsu UXP/V.
+	From by Johan Danielsson.
+
+	* src/cp.c (DO_CHOWN): New macro -- derived from code in copy.
+	(copy): Use DO_CHOWN to assure that any newly-created symbolic
+	links have proper owner and group.
+
+Sat Jul 27 17:22:14 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/system.h (bindtextdomain) [!ENABLE_NLS]: Undefine to avoid
+	redefinition warnings on solaris.
+	(textdomain) [!ENABLE_NLS]: Likewise.
+
+Thu Jul 25 21:10:42 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/chgrp.c (main): Fix typo in getopt_long string: s/n/h/.
+	Reported by Ken Pizzini.
+
+Wed Jul 24 22:24:37 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dircolors.c (usage): Remove -h.  It is not an option.
+	Reported by Ulrich Drepper.
+
+Sun Jul 21 11:58:48 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (AC_CHECK_HEADERS): Add sys/timeb.h for lib/getdate.y.
+	This was a problem for SCO OSR5.  From Bela Lubkin <belal@sco.com>.
+	(statvfs test): Arrange for this test to fail (as it should) for
+	SCO OSR5.  Suggestion from Bela Lubkin.
+
+	* src/Makefile.am (BUILT_SOURCES): Remove @MAINT@.
+	(dircolors.h): Remove @MAINT@.  These prevented `make distcheck'
+	from working sometimes.
+
+	* lib/yesno.c (yesno) [!HAVE_RPMATCH]: Remove function since we'll
+	always use the rpmatch-based version.
+	Declare rpmatch.
+
+	* lib/rpmatch.c [STDC_HEADERS]: Guard inclusion of stdlib.h.
+	(_) [!_]: Define it.
+	(try): Add RESPONSE parameter.
+	(rpmatch): Update caller.
+	Anchor regular expressions to beginning of string.
+
+	* configure.in (AC_CHECK_FUNCS): Don't check rpmatch.
+
+	* acconfig.h (HAVE_OBSTACK): Undef it.
+
+	The following is from Ulrich Drepper.
+
+	* configure.in (AC_REPLACE_FUNCS): Add rpmatch.
+	* lib/Makefile.am (EXTRA_DIST): Add rpmatch.c.
+	* lib/rpmatch.c: New file.
+	* lib/yesno.c (yesno): New rpmatch-based version of the function.
+	* config.h.in (HAVE_RPMATCH): Undef it.
+
+	* lib/Makefile.am (EXTRA_DIST): Put error.c and obstack.c here...
+	(fu_SOURCES): Instead of here.
+
+	* configure.in (AC_CHECK_FUNCS): Add rpmatch.
+	Add checks for error_at_line and obstacks so systems with GNU libc
+	don't compile and link with distributed error.c and obstack.c.
+
+	* configure.in (AC_REPLACE_FUNCS): Replace getline.c.
+	Add related check for the getdelim function.  As done in gettext.
+
+Sat Jul 20 17:01:56 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/Makefile.am (fu_SOURCES): Remove error.c, and obstack.c.
+	(EXTRA_DIST): Add error.c, and obstack.c.
+
+	* configure.in (PACKAGE_VERSION): Use space instead of hyphen to
+	separate PACKAGE and VERSION.
+
+Fri Jul 19 23:28:36 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/cp.c (path_concat): Rewrite to return new parameter.
+	(do_copy): Update uses of path_concat to use new parameter.
+	Use that new pointer to compute correct offset for make_path_private.
+	Before, cp --recursive --parents SRC DEST failed when SRC was
+	an absolute file name.  E.g.,
+	  % cd /tmp; rm -rf d f; mkdir d; touch f; cp -PR /tmp/f d
+	  cp: tmp: No such file or directory
+	Reported by Horst von Brand vonbrand@sleipnir.valparaiso.cl.
+
+Thu Jul 18 21:58:51 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/install.c [_AIX]: Add #pragma alloca.
+	From Bernd Leibing <bernd.leibing@rz.uni-ulm.de>.
+
+	* src/chgrp.c (main): Initialize for internationalized message support:
+	call setlocale, bindtextdomain, and textdomain.  Reported by
+	Michel Robitaille <robitail@IRO.UMontreal.CA>.
+
+Wed Jul 17 22:37:40 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (ALL_LINGUAS): Add polish (pl).
+
+Mon Jul 15 23:42:57 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* Many files: Update FSF address.
+
+Sun Jul 14 07:53:45 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/du.c (usage): Sort option descriptions in dictionary order.
+
+Sat Jul 13 07:34:24 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dircolors.c (long_options): Add missing last line of NULL
+	entries.  From Ralph Loader <loader@maths.ox.ac.uk>.
+
+Thu Jul 11 21:50:48 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* Version 3.13.
+
+	* dircolors.1: New file -- but just a pointer to texinfo docs.
+	* man/Makefile.am (man_MANS): Add dircolors.1.
+
+	* configure.in (VERSION): Bump to 3.13.
+
+Wed Jul 10 22:57:29 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* aclocal.m4 (fp_PROG_CC_STDC): Include sys/stat.h in test program
+	so that DYNIX/ptx V4.1.3 doesn't use `-Xc -D__EXTENSIONS__' -- with
+	those options on that system, sys/stat.h gets compile errors.
+	With help from Marcus Daniels.
+
+	* getopt.c: Update from gettext-0.10.23.
+	* getopt1.c: Likewise.
+	* getopt.h: Likewise.
+
+Tue Jul  9 20:19:44 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dircolors.c (usage): Improve --help message.  From Karl Berry.
+	(long_options): Add print-data-base and print-database.
+
+	* src/dircolors.c (dc_parse_stream): Don't give `unrecognized keyword'
+	message unless we've processed a matching TERM directive.  Reported
+	by Karl Berry and François Pinard.
+
+	* src/install.c (UID_T_MAX): Use `(unsigned long)1' rather than
+	`(uid_t)1' to avoid problems on systems where uid_t is signed.
+	(GID_T_MAX): Likewise for gid_t.
+	From Kjetil Torgrim Homme <kjetilho@ifi.uio.no>.
+
+Sun Jul  7 22:40:08 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/ls.c: Change initial colors for `color_indicator' to match
+	those currently in dircolors.hin.  From Joshua Cowan.
+
+	* src/dircolors.hin: Recognize more filename extensions.
+	From Joshua Cowan.
+
+	* src/Makefile.am (CLEANFILES): Add dcgen.  From Joshua Cowan
+	<jcowan@jcowan.reslife.okstate.edu>.
+
+	* src/Makefile.am (MAINTAINERCLEANFILES): Add dircolors.h.
+
+	* configure.in (AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Use it.
+	* acconfig.h [GWINSZ_IN_SYS_IOCTL]: Add #undef.
+
+	* src/ls.c: Include termios.h.
+	Guard inclusion of sys/ioctl.h with #ifdef GWINSZ_IN_SYS_IOCTL,
+	rather than HAVE_SYS_IOCTL_H.  Modelled after sh-utils' stty.c
+	at suggestion from Chip Bennett <BennettC@j64.stratcom.af.mil>
+	to make ls adjust its idea of screen width upon window resize
+	on systems (SunOS, Solaris) where TIOCGWINSZ is defined in
+	termios.h, and not sys/ioctl.h.
+
+	* aclocal.m4 (AM_SYS_POSIX_TERMIOS): New macro, derived from test
+	in the configure.in from sh-utils.
+	(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Likewise.
+
+Sat Jul  6 12:46:27 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/cp-aux.c (usage): Factor out backup-related text into
+	separate string/printf statement so translators deal with only
+	one corresponding string in .pot file.
+	* src/install.c (usage): Likewise.
+	* src/ln.c (usage): Likewise.
+	* src/mv.c (usage): Likewise.
+	Suggestion from Santiago Vila Doncel.
+
+	* configure.in (AC_REPLACE_FUNCS): Add group_member.
+	(AC_LINK_FILES): Create link lib/group_member.c to lib/group-member.c.
+	* lib/Makefile.am (fu_SOURCES): Remove group-member.c.
+	(EXTRA_DIST): Add group-member.c here.
+
+Fri Jul  5 22:16:13 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dircolors.c [!STDC_HEADERS]: Declare free.
+	From Marcus Daniels.
+
+Thu Jul  4 12:34:50 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dd.c (usage): Remove space before newline in usage message.
+	* src/mknod.c (usage): Likewise.
+	* src/mv.c (usage): Likewise.
+
+	* src/Makefile.am (libexec_PROGRAMS): Regenerate using patched
+	automake-1.0 to work around rm -f bug on Solaris2.4.
+	Reported by Kaveh Ghazi.
+
+	* src/ls.c: Make `dir --version' and `vdir --version' print their
+	names, not `ls'.
+	Reported by Ulrich Drepper.
+
+Wed Jul  3 17:41:15 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dircolors.c: Include sys/types.h before system.h.
+	From Jim Blandy (jimb@cyclic.com).
+
+	* src/chgrp.c [!MAXUID]: Define after inclusion of system.h to avoid
+	warning about redefinition on SunOS4, Solaris2.4 and SGI-irix5.3.
+	From Kaveh Ghazi.  Also, Santiago Vila Doncel reported that defining
+	MAXUID before including system.h caused a compilation failure on some
+	ConvexOS system.
+
+Tue Jul  2 22:56:03 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (VERSION): Bump to 3.12q.
+
+	* src/system.h [!EXIT_SUCCESS]: Define it.
+	[!EXIT_FAILURE]: Define it.
+
+	* lib/strndup.c (strndup): Include stdio.h and sys/types.h to
+	get definition of NULL and size_t on SunOS4.1.3.
+
+Mon Jul  1 23:47:29 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/ln.c (do_link): Update messages to ease translation.
+	Suggestion from Santiago Vila.
+
+Sun Jun 30 16:41:45 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/install.c (usage): Fix typo, 3nd->3rd, in usage message.
+	From Santiago Vila Doncel.
+
+Sat Jun 29 00:33:31 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (PACKAGE_VERSION): Add `GNU ' prefix so we see
+	it in the output of --version.  Reported by RMS.
+
+	* src/Makefile.am (BUILT_SOURCES): Guard dependency on dircolors.h
+	with @MAINT@ so it won't be removed with a casual disctlean.
+	(EXTRA_DIST): Add dcgen.pl and dircolors.hin.
+
+Fri Jun 28 22:56:00 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dircolors.c (dc_parse_stream): Move `enum states' dcl into
+	this function.
+
+	* src/ln.c (do_link): Allow `ln -sf --backup k k' to succeed in
+	creating the self-referential symlink, since doing so doesn't
+	remove the source but merely renames it.
+
+Wed Jun 26 06:58:58 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* ln.c (same_name): New function.
+	(do_link): Use it to test reliably whether A and B (from
+	ln --force A B) are hard links to the same file.
+	From Andreas Schwab.
+
+Tue Jun 25 00:03:43 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/getline.c: New file.
+	* lib/getline.h: New file.
+	* lib/Makefile.am (fu_SOURCES): Add getline.c.
+	(noinst_HEADERS): Add getline.h.
+
+Mon Jun 24 22:39:02 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (AC_REPLACE_FUNCS): Add strndup.
+	(AC_PATH_PROG): Check for perl.
+
+	* ls.c (decode_switches): Allow 0 as argument to --tabsize (-T) option.
+	Interpret as a directive to use no TAB characters to separate columns.
+	(indent): Handle TABSIZE == 0.
+
+	* dircolors.c (dc_parse_stream): Remove spurious newline in
+	error message.
+	(dc_parse_stream): Give `unrecognized keyword' diagnostic for
+	misspelled `TERM' keyword as well as for others.
+
+Sun Jun 23 12:58:32 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* dircolors.hin: New file.
+	* dcgen.pl: New file.
+	* src/Makefile.am (dircolors.h): Add a rule to create this file.
+	(dcgen): Likewise.
+
+	* dircolors.c (parse_line): Rewrite to avoid modifying LINE.
+	Put LINE first in parameter list.
+	Adjust caller.
+	(dc_parse_stream): Free KEYWD and ARG.
+	(main): Give diagnostic for unreasonable combinations of
+	options/arguments.
+
+	* lib/Makefile.am (EXTRA_DIST): Add strndup.c.
+	* configure.in (AC_REPLACE_FUNCS): Add strndup.
+	* strndup.c: New file.  From id-utils-3.0k.
+	(strndup): Deansify.
+	[!STDC_HEADERS]: Include string.h and stdlib.h.
+
+Sat Jun 22 16:57:53 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* dircolors.c: Major overhaul.  No longer read from /etc/DIR_COLORS
+	or from ~/.dircolors.  Defaults are now compiled in.  If you specify
+	a file on the command line, it is used instead of the compiled-in
+	defaults.
+	(main): New option --print-database (-p).
+	Detect write failure.
+	Add --bourne-shell and --c-shell aliases for --sh and --csh resp.
+
+Tue Jun 18 20:54:05 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* cp.c (copy_reg): Cast both sides of comparison to size_t
+	to avoid a warning about `comparison between signed and unsigned'
+	from gcc -Wall.
+	Declare pointer parameters const as appropriate.
+
+	* ln.c (do_link): Refine last change so we don't disallow commands
+	like `ln --force A B' when A and B are hard links to the same file.
+	See comments in the source.  Reported by Erik Naggum <erik@naggum.no>
+	and Andreas Schwab.
+
+	* ls.c (decode_switches): Correct typo in error messages:
+	enironment -> environment.  From Santiago Vila Doncel
+	<sanvila@unex.es>.
+
+	* aclocal.m4: Update from gettext-0.10.20.
+	* ABOUT-NLS: Likewise.
+	* intl/*: Likewise.
+
+	* cp.c (do_copy): Change message from `missing file argument' to
+	more precise `missing destination file'.  From Karl Berry.
+
+	* ln.c (STREQ): Remove macro definition
+	* system.h (STREQ): Add it here instead.
+	* cp.c (do_copy): Use STREQ here instead of strcmp(...) == 0.
+	* ls.c (parse_ls_color): Likewise.
+	* df.c (selected_fstype, excluded_fstype, show_disk, main): Likewise.
+
+	* cp.c (do_copy): When the force and backup options have been
+	specified and the source and destination are the same name for an
+	existing, regular file, convert the user's command, e.g.
+	`cp --force --backup foo foo' to `cp --force foo fooSUFFIX'
+	where SUFFIX is determined by any version control options used.
+	(usage): Update --help message.
+	At urging of (most recently) Karl Berry.
+
+Sun Jun 16 13:40:22 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* doc/Makefile.am (EXTRA_DIST): Add texinfo.tex.
+
+	* Makefile.am (cvs-dist): Use -c option in cvs tag command.
+
+Sat Jun 15 22:21:09 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (ALL_LINGUAS): Add pt.
+	(AC_REPLACE_FUNCS): Add basename.
+
+	* Makefile.am (EXTRA_DIST): Add basename.c.
+	(fu_SOURCES): Remove basename.c.
+
+Thu Jun  6 21:57:08 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* po/Makefile.in.in: Update from gettext-0.10.16.
+	* intl/*: Likewise.
+	* ABOUT-NLS: Likewise.
+	* aclocal.m4 (AC_REPLACE_GNU_GETOPT): Move definition to precede
+	gettext-related ones.
+	Update from gettext-0.10.16.
+
+Sat Jun  1 12:44:51 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* ls.c: Rename options and internal variables to reflect change to
+	--color=WHEN where WHEN is never, always, or auto (for consistency
+	with e.g. cp --sparse=WHEN.  For at least a while, the original
+	slackware-supported arguments `none', `force', `yes', etc will be
+	supported but deprecated by lack of documentation.
+	(decode_switches): Use STDOUT_FILENO instead of `1' in isatty test.
+	(usage): Update/add description of the --color option.
+
+	* ls.c: Declare pointer parameters const as appropriate.
+
+Tue May 28 18:39:49 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* dd.c (print_stats): Don't mark "%u %s" as a translatable string.
+	* mv.c (main): Don't mark "%s" as a translatable string.
+	From Göran Uddeborg.
+
+Thu May 23 07:50:38 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* ls.c (usage): Make --literal (-N) description clearer.
+
+	* acconfig.h (MOUNTED_LISTMNTENT): Add it.
+	* fsusage [_CRAY]: Don't include sys/filsys.h because although
+	Unicos-9 has it, it's not needed and would cause other problems
+	because it requires inclusion of other, non-standard headers.
+	* mountlist.c (read_filesystem_list) [MOUNTED_LISTMNTENT]: New
+	function.
+	From Johan Danielsson (joda@pdc.kth.se).
+
+	* configure.in (AC_CHECK_FUNCS): Add listmntent for Unicos-9.
+	Define MOUNTED_LISTMNTENT #ifdef _CRAY and HAVE_GETMNTENT.
+	With an initial patch from Johan Danielsson.
+
+Wed May 22 18:58:01 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (LINGUAS): Add sv.
+
+Tue May 21 07:06:30 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/euidaccess.c (euidaccess) [!S_IROTH]: Define.
+	[!S_IWOTH]: Define.
+	[!S_IXOTH]: Define.
+	Marcus Daniels <marcus@sysc.pdx.edu> reported that m68k NEXTSTEP 3.2
+	doesn't define S_IROTH or S_IWOTH unless some posix compile option
+	is used and associated symbols defined.
+
+Sun May 19 09:32:51 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* chown.c: New option: --no-dereference (-h).  Solaris 5.4's chown
+	provides -h.
+	(change_file_owner): Use lchown if --no-dereference (-h) was given.
+	(usage): Update.
+	(main): Fail if user requests --no-dereference on a system that
+	doesn't have support for it.
+
+	* chgrp.c: New option: --no-dereference (-h).
+	[!MAXUID]: Define to INT_MAX.
+	(change_file_group): Use lchown if --no-dereference (-h) was given.
+	(usage): Update.
+	(main): Fail if user requests --no-dereference on a system that
+	doesn't have support for it.
+
+Wed May 15 22:54:31 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* fsusage.c (get_fs_usage): Declare parameter PATH to be const.
+	* fsusage.h: Update prototype to match.
+
+	* chmod.c (describe_change): Declare pointer parameters to be const.
+	(change_file_mode): Likewise.
+	(change_dir_mode): Likewise.
+
+	* ln.c (do_link): Declare pointer parameters to be const.
+
+	* df.c (main): Fail with a diagnostic if both --human-readable and
+	--portability are used.
+	Likewise if --megabytes and --portability are used.
+	Rearrange function definitions to precede respective uses to obviate
+	all forward dcls. Remove forward dcls.
+	Declare parameters const as appropriate.
+
+	* modechange.c (mode_compile): Declare parameter MODE_STRING const.
+	Remove register attribute.
+	(mode_adjust): Likewise for CHANGES.
+	* modechange.h: Reflect above changes in prototypes.
+
+	* lib/Makefile.am (getdate.c): Disable dependencies that can
+	require rerunning YACC when not in maintainer mode.
+	(posixtm.c): Likewise.
+
+Tue May 14 23:36:54 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* dd.c (print_stats): Restructure pluralization of error message
+	so it's easier to translate.  Reported by Göran Uddeborg
+	<gvran@uddeborg.pp.se>.
+	* mv.c (main): Likewise.
+
+Tue May  7 22:10:20 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* configure.in: Require autoconf-2.10.
+
+	* aclocal.m4 (jm_MAINTAINER_MODE): New macro.
+	* configure.in (jm_MAINTAINER_MODE): Use it.
+
+Sun May  5 20:27:47 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* src/Makefile.am (bin_PROGRAMS): Add dircolors.
+	(DEFS): Add -DSHAREDIR=\"$(datadir)\".
+	(GNUVER): Remove definition of unused variable.
+
+Sat May  4 20:54:32 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* system.h [IN_CTYPE_DOMAIN]: Rename from ISASCII.
+	* backupfile.c [IN_CTYPE_DOMAIN]: Rename from ISASCII.
+
+	* dircolors.c: Make enumerated constants upper case.
+	(main): Don't use ANSI-style string concatenation.
+	Add `static' and/or `const' to some file scope variables.
+
+Wed May  1 00:20:00 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* lib/Makefile.am (EXTRA_DIST): Add strcasecmp.c.
+	* configure.in (AC_REPLACE_FUNCS): Add strcasecmp.
+
+	* ls.c (parse_ls_color, usage): Remove support for alternate spellings:
+	--colours and LS_COLOURS.
+	(parse_ls_color): Reverse sense of test for LS_COLORS environment
+	variable and return -- save a level of indentation on a 100+-line
+	block.
+
+Mon Apr 29 22:07:41 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* POTFILES.in: Add chgrp.c.  From François Pinard.
+	Add dircolors.c.
+	* dircolors.c: New file.  Written by H. Peter Anvin.
+
+Sun Apr 28 16:32:38 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* ls.c: Apply color ls changes by Peter Anvin <Peter.Anvin@linux.org>
+	and Dennis Flaherty <dennisf@denix.elk.miles.com> based on original
+	patches by Greg Lee <lee@uhunix.uhcc.hawaii.edu>.  And on top of all
+	that, a few changes from Ulrich Drepper.
+
+	* ls.c (parse_ls_color): Use strcpy to initialize 3-character array.
+	Automatic aggregate initialization isn't portable.
+	Remove all ^L's.
+	(get_funky_string): Declare static and move to precede single
+	caller: parse_ls_color.
+	Make some globals `static' and/or `const'.
+	(LEN_STR_PAIR): New macro.
+	(color_indicator): Use it in this declaration.
+	(parse_ls_color): Use error, not fprintf.
+	(decode_switches): Add a comment.
+	(print_name_with_quoting): Add braces around inner if-else
+	statement to clarify.
+
+	* configure.in: Add a comment that fp_C_PROTOTYPES must precede
+	AC_C_INLINE.  Otherwise, some systems lose because the value
+	AC_C_INLINE choses with plain `cc' is different from that chosen
+	when using the ANSI-mode C compiler.  From Kaveh Ghazi.
+
+	* fileblocks.c [HAVE_ST_BLOCKS || _POSIX_VERSION]: Add extern dcl
+	of unused variable so that after preprocessing, the file will never
+	be empty.  Otherwise, some compilers in ANSI mode (among them, the
+	Dec Alpha OSF 2.0 C compiler) reject empty files.  From Kaveh Ghazi.
+	Indent CPP conditionals.
+
+Fri Apr 26 05:52:03 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* ls.c (usage): Add newline at end of printf format string.
+
+Wed Apr 24 21:33:43 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* ln.c (do_link): Remove duplicate `if (lstat(...' block.
+
+	* ln.c (do_link): With --force, don't remove DEST when it's
+	the same as SOURCE.  Before, `ln -f FILE FILE' would remove FILE.
+	Reported by Bruno Haible (haible@ilog.fr).
+
+	* mkdir.c (main): Use verbose_fmt_string, not string literal in
+	call to make_path for --parents.  Reported by Ulrich Drepper.
+
+	* doc/mdate-sh: Get year as last rather than 6th field in output
+	of date.  Otherwise, people with 2-word TZ (like `MET DST') lost.
+	From Andreas Schwab.
+
+Tue Apr 23 22:05:35 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* src/*.c, src/*.h: Update Copyright years to include 1996.
+
+	* aclocal.m4 (AC_REPLACE_GNU_GETOPT): New macro.
+	* configure.in: Use it.
+	* lib/Makefile.am (fu_SOURCES): Remove getopt.c and getopt1.c.
+	(EXTRA_DIST): Add getopt.c and getopt1.c
+
+	* configure.in (AC_CHECK_FUNCS): Add lchown.
+	* chgrp.c [HAVE_LCHOWN]: Define chown to lchown.
+	* chown.c [HAVE_LCHOWN]: Likewise.
+	* cp.c [HAVE_LCHOWN]: Likewise.
+	* mv.c [HAVE_LCHOWN]: Likewise.
+	Suggested by François Pinard.
+
+	* backupfile.c (find_backup_file_name, max_backup_version,
+	make_version_name, version_number, concat): Const-ify decls of
+	formal parameters.
+	* backupfile.h: Likewise.
+
+	* du.c (usage): The long-named arg is --human-readable, not --human.
+	* df.c: Be consistent.  Accept --human-readable, not just --human.
+	(usage): Reflect the change.
+	From Karl Berry.
+
+Sun Apr 21 08:04:51 1996  Jim Meyering  (meyering@na-net.ornl.gov)
+
+	* df.c (usage): Reflect that now --no-sync is the default.
+
+	* Makefile.am (LDADD): Put @INTLLIBS@ before package library.
+
 Sat Apr 20 22:48:59 1996  Jim Meyering  (meyering@na-net.ornl.gov)

 	* ls.c: Include xstrtol.h.
@@ -114,13 +788,13 @@ Sun Mar 10 22:36:11 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	Link an nls file.
 	(AC_OUTPUT): Reflect addition of two new directories, intl and po.
 	Create po/Makefile.
-  	From François Pinard.
+	From François Pinard.

 Thu Mar  7 20:26:07 1996  Jim Meyering  (meyering@na-net.ornl.gov)

 	* df.c (main): Tell read_filesystem_list that it should determine
 	file system type when the user specifies --print-type or -T.
- 	From Michael Rendell <michael@cs.mun.ca>.
+	From Michael Rendell <michael@cs.mun.ca>.

 Tue Feb 27 23:13:46 1996  Jim Meyering  (meyering@na-net.ornl.gov)

@@ -149,7 +823,7 @@ Thu Feb 15 23:08:41 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	destroy the source file.  Before, running the commands
 	cd /tmp; rm -f a a~; : > a; echo A > a~; cp -b -V simple a~ a
 	would leave two zero-length files: a and a~.
- 	Reported by Martin C. Martin <mcm@cs.cmu.edu>.
+	Reported by Martin C. Martin <mcm@cs.cmu.edu>.

 Mon Feb 12 23:23:25 1996  Jim Meyering  (meyering@na-net.ornl.gov)

@@ -350,7 +1024,7 @@ Sun Oct 29 06:06:13 1995  Jim Meyering  (meyering@comco.com)

 	* touch.c: Change long option name `--file' to `--reference'.
 	Leave --file as an alias, for now.  It will be removed later.
- 	(usage): Reflect option name change.  From Franc,ois Pinard.
+	(usage): Reflect option name change.  From Franc,ois Pinard.

 Wed Oct 18 23:09:55 1995  Jim Meyering  (meyering@comco.com)

@@ -420,8 +1094,8 @@ Sun Oct  1 13:22:36 1995  Jim Meyering  (meyering@comco.com)
 Tue Sep 26 23:05:01 1995  Jim Meyering  (meyering@comco.com)

 	* man/Makefile.in (install-data, uninstall): Use sed not basename.
- 	The GNU Coding Standard suggests that only a select set of
- 	relatively standard utilities be used in Makefiles.  basename is
+	The GNU Coding Standard suggests that only a select set of
+	relatively standard utilities be used in Makefiles.  basename is
 	not among them.  Suggested by Ulrich Drepper.

 Mon Sep 25 23:12:37 1995  Jim Meyering  <meyering@gremlin.comco.com>
@@ -443,7 +1117,7 @@ Mon Aug  7 23:27:54 1995  Jim Meyering  (meyering@comco.com)
 Fri Aug  4 22:11:06 1995  Jim Meyering  (meyering@comco.com)

 	* install.c (isnumber): Rename to is_number to avoid conflict with
-  	FreeBSD 2.0.5 macro definition.  Reported by David O'Brien
+	FreeBSD 2.0.5 macro definition.  Reported by David O'Brien
 	(obrien@sea.legent.com).

 	* lib/save-cwd.c: New file.
@@ -602,9 +1276,9 @@ Mon Feb 20 22:54:39 1995  Jim Meyering  (meyering@comco.com)

 Sat Feb 11 07:52:01 1995  Jim Meyering  (meyering@comco.com)

-        * configure.in (AC_REPLACE_FUNCS): Add memcmp, memcpy, and memset.
-        (AC_CHECK_FUNCS): Add strchr and strrchr.
-        * lib/Makefile.in (SOURCES): Add memcmp.c, memcpy.c, and memset.c.
+	* configure.in (AC_REPLACE_FUNCS): Add memcmp, memcpy, and memset.
+	(AC_CHECK_FUNCS): Add strchr and strrchr.
+	* lib/Makefile.in (SOURCES): Add memcmp.c, memcpy.c, and memset.c.

 	* system.h: Remove index/rindex and bcmp/bcopy/bzero references.
 	Separate errno declaration from STDC_HEADERS.
@@ -615,7 +1289,7 @@ Sat Feb 11 07:52:01 1995  Jim Meyering  (meyering@comco.com)
 	* fsusage.c (get_fs_usage, statfs): Use safe_read, and safe_stat
 	rather than bare read and stat.  From Bruno Haible.

-        * lib/Makefile.in (DISTFILES): Add error.h.
+	* lib/Makefile.in (DISTFILES): Add error.h.

 	* chgrp.c, chmod.c, chown.c, cp-hash.c, cp.c, df.c, du.c, install.c,
 	ln.c, ls.c, mv.c, mvdir.c, rm.c, touch.c: Rename SAFE_STAT and
@@ -665,16 +1339,16 @@ Sun Dec  4 14:53:12 1994  Jim Meyering  (meyering@comco.com)

 Fri Nov 11 11:15:20 1994  Jim Meyering  (meyering@comco.com)

-        * mknod.c (my_strtol): New function.
-        (main): Use it instead of atoi to convert argument strings to
-        major and minor device numbers.  Now, mknod diagnoses invalid
-        device numbers and accepts octal and hexadecimal as well as
-        decimal string arguments.  Ralf Lammers
-        <rlammers@physik.uni-osnabrueck.de> suggested that mknod accept
-        hex device numbers for compatibility with HPUX's mknod program.
+	* mknod.c (my_strtol): New function.
+	(main): Use it instead of atoi to convert argument strings to
+	major and minor device numbers.  Now, mknod diagnoses invalid
+	device numbers and accepts octal and hexadecimal as well as
+	decimal string arguments.  Ralf Lammers
+	<rlammers@physik.uni-osnabrueck.de> suggested that mknod accept
+	hex device numbers for compatibility with HPUX's mknod program.

-        * configure.in (AC_REPLACE_FUNCS): Add strtol.
-        * lib/Makefile.in (SOURCES): Add strtol.c.
+	* configure.in (AC_REPLACE_FUNCS): Add strtol.
+	* lib/Makefile.in (SOURCES): Add strtol.c.

 Sun Nov 06 00:18:56 1994  Jim Meyering  (meyering@comco.com)

--- a/old/fileutils/NEWS
+++ b/old/fileutils/NEWS
@@ -1,17 +1,41 @@
+Changes in release 3.14:
+* chgrp no longer aborts when given a group number larger than INT_MAX
+* chgrp now fails when run by root with an unrecognized group name
+* when possible, cp -p preserves owner/group even on symlinks in case
+  they're in a directory that has the sticky-bit set.
+* cp --recursive --parents SRC DEST works when SRC is an absolute file name.
+
 Changes in release 3.13:
-* df no longer invokes the sync system call by default.
-  Use --sync to invoke sync before getting file system sizes.
+* ls properly determines window size on SunOS and Solaris systems
+* ls accepts new option --color[=WHEN] where WHEN is `always', `never',
+  or `auto'.  --color=never is the default.  --color is equivalent
+  to --color=always.
+* new program: dircolors
+* ls allows 0 as argument to --tabsize (-T) option.  Using --tabsize=0
+  inhibits the use of TAB characters for separating columns.
+* you can create a backup of FILE with cp --force --backup FILE FILE.  Before,
+  that command failed saying that ``FILE' and `FILE' are the same file'.
+* uses automake-generated Makefile templates
+* chown and chgrp accept new option --no-dereference (-h)
+* ln -f FILE FILE fails with a diagnostic rather than silently removing FILE
+* when building on systems that have getopt_long (most GNU-oriented ones),
+  the system-provided function will be used -- so executables may be a
+  little smaller
+* cp -p, and mv modify owner and/or group of symlinks on systems
+  (like Solaris) that provide the lchown system call.
+* df no longer invokes the sync system call by default.  You can use the
+  --sync option to make df invoke sync before getting file system sizes.
 * internationalized diagnostic messages
 * mkdir accepts new option: --verbose
-* cp has been fixed so that the full file name it uses for the destination
-  in `cp file D/' is `D/file', not `D//file'.
+* `cp file D/' uses the full file name `D/file' instead of `D//file'.
 * cp --backup a~ a fails instead of silently destroying the source file
 * df and du have new options --human-readable (-h) and --megabytes (-m).
 * install now honors --backup (-b), --suffix=SUFFIX (-S SUFFIX), and
  --version-control=WORD (-V WORD) options just as cp, ln, and mv do.
 * ln --verbose output is less prone to misinterpretation
 * ls -o works like -lG;  for compatibility with other versions of ls
-* cp has a new option to control creation of sparse files
+* cp has a new option to control creation of sparse files:
+  --sparse={auto,always,never}.  --sparse=auto is the default.
 * rm -rf '' behaves properly on SunOS 4 systems
 * touch: rename long option name, --file, to --reference.
  `touch --file' will continue to work a little longer.
@@ -29,6 +53,7 @@ Changes in release 3.13:
 * du works on SunOS 4 systems even when accounting is enabled
 * many programs that convert strings to integers now use strtol or strtoul
  and detect overflow
+
 User-visible changes in release 3.12:
 * None.
 User-visible changes in release 3.11:
--- a/Show More
+++ b/Show More