.

files and the last one is not a directory.  From Karl Berry.
Call error (0, 0, ... then usage (1) -- instead of calling usage
with two arguments.

ABOUT-NLS

@@ -134,7 +134,7 @@ Each translation team has its own mailing list, courtesy of Linux
 International.  You may reach your translation team at the address
 `LL@li.org', replacing LL by the two-letter ISO 639 code for your
 language.  Language codes are *not* the same as the country codes given
-in ISO 3166.  The following translation teams exist, as of May 1996:
+in ISO 3166.  The following translation teams exist, as of August 1996:
 
      Arabic `ar', Chinese `zh', Czech `cs', Danish `da', Dutch `nl',
      English `en', Esperanto `eo', Finnish `fi', French `fr', German
@@ -172,39 +172,40 @@ Available Packages
 
    Languages are not equally supported in all GNU packages.  The
 following matrix shows the current state of GNU internationalization,
-as of May 1996.  The matrix shows, in regard of each package, for which
-languages PO files have been submitted to translation coordination.
+as of August 1996.  The matrix shows, in regard of each package, for
+which languages PO files have been submitted to translation
+coordination.
 
                        cs de en es fi fr ja ko nl no pl pt sl sv
                      .-------------------------------------------.
-     bash            |                []                         |  1
-     bison           |                []                         |  1
+     bash            |                []       []                |  2
+     bison           |                []       []                |  2
      clisp           |    [] []       []                         |  3
-     cpio            |                []                         |  1
+     cpio            |    []          []             []          |  3
      diffutils       |                []             []       [] |  3
-     enscript        |    []       [] []                   []    |  4
-     fileutils       |    []          []                []    [] |  4
-     findutils       |    []          []                         |  2
+     enscript        |    []       [] []       []          []    |  5
+     fileutils       |    []          []       []    [] []    [] |  6
+     findutils       |    []          []       []    []       [] |  5
      flex            |                []                         |  1
      gcal            |    []                                     |  1
-     gettext         |    []          []    [] [] [] []    [] [] |  9
+     gettext         |    []    []    []    [] [] [] []    [] [] | 10
      glibc           |    []    []          []                   |  3
-     grep            |          []    []    []       []    [] [] |  6
-     hello           |    []          []    []       [] [] []    |  6
-     m4              |    []          [] []                   [] |  4
-     make            |                                           |  0
+     grep            |          []    []    [] []    []    [] [] |  7
+     hello           |    []          []    [] []    [] [] [] [] |  8
+     m4              |    []          [] []    []             [] |  5
+     make            |                      [] []                |  2
      mkid            |    []          []                         |  2
      music           |                []                         |  1
-     ptx             |    []          []                      [] |  3
-     recode          |    []    []    []                   [] [] |  5
+     ptx             |    []          []       []    []       [] |  5
+     recode          |    []    []    []       []    []    [] [] |  7
      sh-utils        |    []          []                         |  2
      sharutils       |    []          []       []             [] |  4
-     tar             |    []          []    []    []    [] [] [] |  7
-     textutils       |    []          []    [] []                |  4
-     wdiff           | [] []          []                      [] |  4
+     tar             |    []          []    [] [] []    [] [] [] |  8
+     textutils       |    []          []    [] []    []          |  5
+     wdiff           | [] []          []       []             [] |  5
                      `-------------------------------------------'
                        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
+                        1 18  1  4  1 22  1  7 16  3 10  3  6 12  105
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -217,6 +218,6 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 GNU distribution.
 
-   If May 1996 seems to be old, you may fetch a more recent copy of
+   If August 1996 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.
 

doc/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.0 from Makefile.am
+# Makefile.in generated automatically by automake 1.1e from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -45,15 +45,17 @@ info_TEXINFOS = fileutils.texi
 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]*
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
 
-DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti version.texi
+DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
+version.texi
 
 
 PACKAGE = @PACKAGE@
@@ -81,11 +83,8 @@ stamp-vti: fileutils.texi $(top_srcdir)/configure.in
 	  && $(SHELL) ./mdate-sh fileutils.texi`" > vti.tmp
 	echo "@set EDITION $(VERSION)" >> vti.tmp
 	echo "@set VERSION $(VERSION)" >> vti.tmp
-	if cmp -s vti.tmp $(srcdir)/version.texi; then \
-	  rm vti.tmp;			\
-	else					\
-	  mv vti.tmp $(srcdir)/version.texi; \
-	fi
+	cmp -s vti.tmp $(srcdir)/version.texi || cp vti.tmp $(srcdir)/version.texi
+	rm vti.tmp
 	echo timestamp > $(srcdir)/stamp-vti
 
 mostlyclean-vti:
@@ -99,20 +98,32 @@ maintainer-clean-vti:
 	@MAINT@rm -f stamp-vti version.texi
 
 fileutils.info: fileutils.texi version.texi
+fileutils.dvi: fileutils.texi version.texi
 
 
 .texi.info:
-	$(MAKEINFO) -I$(srcdir) $< -o $(srcdir)/$@
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
 
+.texinfo.info:
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo.dvi:
+	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+
 install-info: $(INFO_DEPS)
+	$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
-	for file in $(INFO_DEPS); do		\
-	  for ifile in `cd $(srcdir) && echo $$file*`; do \
-	    $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
-	  done;					\
+	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:
@@ -136,8 +147,9 @@ tags: TAGS
 TAGS:
 
 
-subdir = doc
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = doc
 distdir: $(DEP_DISTFILES)
 	@for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
 	  test -f $(distdir)/$$file \
@@ -153,8 +165,10 @@ check: all
 installcheck:
 
 install-exec: 
+	$(NORMAL_INSTALL)
 
 install-data: install-info
+	$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
@@ -174,6 +188,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)
@@ -202,7 +217,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 .SUFFIXES:
-.SUFFIXES: .texi .info .dvi
+.SUFFIXES: .texi .texinfo .info .dvi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

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

doc/mdate-sh

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

doc/sh-utils.texi

@@ -140,7 +140,7 @@ utilities.
 * 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
 
@@ -1280,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
@@ -1602,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
 
@@ -1768,8 +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
@@ -1794,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
@@ -2203,7 +2203,7 @@ standard.)
 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).
-Days in a new year preceding the first Sunday are in week zero.
+Days in a new year preceding the first Monday are in week zero.
 @item %x
 locale's date representation (mm/dd/yy)
 @item %y
@@ -2714,7 +2714,7 @@ nohup @var{command} [@var{arg}]@dots{}
 
 @flindex nohup.out
 @code{nohup} increases the scheduling priority of @var{command} by 5, so
-it has a slightly smaller change to run.  If standard output is a tty,
+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

doc/texinfo.tex

@@ -35,7 +35,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 1.10 $
+\deftexinfoversion$Revision: 1.11 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % If in a .fmt file, print the version number
@@ -74,6 +74,7 @@
 }
 \let\~ = \tie                  % And make it available as @~.
 
+
 \message{Basics,}
 \chardef\other=12
 
@@ -579,7 +580,7 @@ where each line of input produces a line of output.}
 % @sp n   outputs n lines of vertical space
 
 \def\sp{\parsearg\spxxx}
-\def\spxxx #1{\par \vskip #1\baselineskip}
+\def\spxxx #1{\vskip #1\baselineskip}
 
 % @comment ...line which is ignored...
 % @c is the same as @comment
@@ -592,6 +593,9 @@ where each line of input produces a line of output.}
 
 \let\c=\comment
 
+% @paragraphindent  is defined for the Info formatting commands only.
+\let\paragraphindent=\comment
+
 % Prevent errors for section commands.
 % Used in @ignore and in failing conditionals.
 \def\ignoresections{%
@@ -626,6 +630,7 @@ where each line of input produces a line of output.}
 % incorrectly.
 %
 \def\ignoremorecommands{%
+  \let\defcodeindex = \relax
   \let\defcv = \relax
   \let\deffn = \relax
   \let\deffnx = \relax
@@ -666,7 +671,6 @@ where each line of input produces a line of output.}
   \let\set = \relax
   \let\clear = \relax
   \let\item = \relax
-  \let\message = \relax
 }
 
 % Ignore @ignore ... @end ignore.
@@ -681,10 +685,15 @@ where each line of input produces a line of output.}
 \def\menu{\doignore{menu}}
 \def\direntry{\doignore{direntry}}
 
+% Also ignore @macro ... @end macro.  The user must run texi2dvi,
+% which runs makeinfo to do macro expansion.  Ignore @unmacro, too.
+\def\macro{\doignore{macro}}
+\let\unmacro = \comment
+
+
 % @dircategory CATEGORY  -- specify a category of the dir file
 % which this file should belong to.  Ignore this in TeX.
-
-\def\dircategory{\comment}
+\let\dircategory = \comment
 
 % Ignore text until a line `@end #1'.
 %
@@ -938,16 +947,13 @@ where each line of input produces a line of output.}
    \comment % Ignore the actual filename.
 }
 
+% @bye.
 \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
 
-\def\inforef #1{\inforefzzz #1,,,,**}
-\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\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{%
@@ -959,6 +965,7 @@ where each line of input produces a line of output.}
 
 %\def\butfirst#1{}
 
+
 \message{fonts,}
 
 % Font-change commands.
@@ -1028,7 +1035,7 @@ where each line of input produces a line of output.}
 \setfont\deftt\ttshape{10}{\magstep1}
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
 
-% Fonts for indices and small examples.
+% Fonts for indices and small examples (9pt).
 % We actually use the slanted font rather than the italic,
 % because texinfo normally uses the slanted fonts for that.
 % Do not make many font distinctions in general in the index, since they
@@ -1045,7 +1052,7 @@ where each line of input produces a line of output.}
 \font\indi=cmmi9
 \font\indsy=cmsy9
 
-% Fonts for headings
+% Chapter (and unnumbered) fonts (17.28pt).
 \setfont\chaprm\rmbshape{12}{\magstep2}
 \setfont\chapit\itbshape{10}{\magstep3}
 \setfont\chapsl\slbshape{10}{\magstep3}
@@ -1057,6 +1064,7 @@ where each line of input produces a line of output.}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3
 
+% Section fonts (14.4pt).
 \setfont\secrm\rmbshape{12}{\magstep1}
 \setfont\secit\itbshape{10}{\magstep2}
 \setfont\secsl\slbshape{10}{\magstep2}
@@ -1082,6 +1090,7 @@ where each line of input produces a line of output.}
 
 %\let\ssecbf=\ssecrm
 
+% Subsection fonts (13.15pt).
 \setfont\ssecrm\rmbshape{12}{\magstephalf}
 \setfont\ssecit\itbshape{10}{1315}
 \setfont\ssecsl\slbshape{10}{1315}
@@ -1127,22 +1136,23 @@ where each line of input produces a line of output.}
   \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\tenttsl=\chapttsl
-  \resetmathfonts}
+  \resetmathfonts \setleading{19pt}}
 \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\tenttsl=\secttsl
-  \resetmathfonts}
+  \resetmathfonts \setleading{16pt}}
 \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\tenttsl=\ssecttsl
-  \resetmathfonts}
+  \resetmathfonts \setleading{15pt}}
+\let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
 \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\tenttsl=\indttsl
-  \resetmathfonts}
+  \resetmathfonts \setleading{12pt}}
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
@@ -1186,11 +1196,21 @@ where each line of input produces a line of output.}
 }
 \let\ttfont=\t
 \def\samp #1{`\tclose{#1}'\null}
-\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
+\setfont\smallrm\rmshape{8}{1000}
+\font\smallsy=cmsy9
+\def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{%
+  \raise0.4pt\hbox{$\langle$}\kern-.08em\vtop{%
+    \vbox{\hrule\kern-0.4pt
+     \hbox{\raise0.4pt\hbox{\vphantom{$\langle$}}#1}}%
+    \kern-0.4pt\hrule}%
+  \kern-.06em\raise0.4pt\hbox{$\rangle$}}}}
+% The old definition, with no lozenge:
+%\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
+\def\email#1{$\langle${\tt #1}$\rangle$}
 
 % @code is a modification of @t,
 % which makes spaces the same size as normal in the surrounding text.
@@ -1222,7 +1242,7 @@ where each line of input produces a line of output.}
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate an a dash.
+% and arrange explicitly to hyphenate at a dash.
 %  -- rms.
 {
 \catcode`\-=\active
@@ -1274,6 +1294,10 @@ where each line of input produces a line of output.}
 \def\sc#1{{\smallcaps#1}}	% smallcaps font
 \def\ii#1{{\it #1}}		% italic font
 
+% @pounds{} is a sterling sign.
+\def\pounds{{\it\$}}
+
+
 \message{page headings,}
 
 \newskip\titlepagetopglue \titlepagetopglue = 1.5in
@@ -1419,7 +1443,8 @@ where each line of input produces a line of output.}
 % @headings after	turns on double-sided headings after this page.
 % @headings doubleafter	turns on double-sided headings after this page.
 % @headings singleafter turns on single-sided headings after this page.
-% By default, they are off.
+% By default, they are off at the start of a document,
+% and turned `on' after @end titlepage.
 
 \def\headings #1 {\csname HEADINGS#1\endcsname}
 
@@ -1433,22 +1458,24 @@ where each line of input produces a line of output.}
 % title on inside top of left hand pages, and page numbers on outside top
 % edge of all pages.
 \def\HEADINGSdouble{
-%\pagealignmacro
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chapoddpage
 }
+\let\contentsalignmacro = \chappager
+
 % For single-sided printing, chapter title goes across top left of page,
 % page number on top right.
 \def\HEADINGSsingle{
-%\pagealignmacro
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\thischapter\hfil\folio}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chappager
 }
 \def\HEADINGSon{\HEADINGSdouble}
 
@@ -1459,6 +1486,7 @@ where each line of input produces a line of output.}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chapoddpage
 }
 
 \def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
@@ -1467,6 +1495,7 @@ where each line of input produces a line of output.}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\thischapter\hfil\folio}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chappager
 }
 
 % Subroutines used in generating headings
@@ -1490,6 +1519,7 @@ July\or August\or September\or October\or November\or December\fi
 \def\settitle{\parsearg\settitlezzz}
 \def\settitlezzz #1{\gdef\thistitle{#1}}
 
+
 \message{tables,}
 
 % @tabs -- simple alignment
@@ -1812,6 +1842,7 @@ July\or August\or September\or October\or November\or December\fi
 %   current hsize to be used for each column. You may use as many
 %   columns as desired.
 
+
 % Or use a template:
 %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
 %   @item ...
@@ -1832,7 +1863,7 @@ July\or August\or September\or October\or November\or December\fi
 % with nothing between them for as many times as empty columns are needed,
 % ie, @tab@tab@tab will produce two empty columns.
 
-% @item, @tab, @multicolumn or @endmulticolumn do not need to be on their
+% @item, @tab, @multitable or @end multitable do not need to be on their
 % own lines, but it will not hurt if they are.
 
 % Sample multitable:
@@ -1856,8 +1887,9 @@ July\or August\or September\or October\or November\or December\fi
 % @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.
+% @multitablelinespace is space to leave between table items, baseline
+%                                                            to baseline.
+%   0pt means it depends on current normal line spacing.
 
 %%%%
 % Dimensions 
@@ -1936,7 +1968,7 @@ July\or August\or September\or October\or November\or December\fi
  % \vtop will set a single line and will also let text wrap and 
  % continue for many paragraphs if desired.
 \halign\bgroup&\global\advance\colcount by 1\relax%
-\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
+\multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
  % In order to keep entries from bumping into each other
  % we will add a \leftskip of \multitablecolspace to all columns after
  % the first one.
@@ -1958,26 +1990,30 @@ July\or August\or September\or October\or November\or December\fi
  % In either case we will make \leftskip=\multitablecolspace:
 \leftskip=\multitablecolspace
 \fi
-\noindent##%\par
-%\vskip\multitablelinespace
-}\cr%
+\noindent##}\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\multitablelinespace 
+\global\everycr{\noalign{%
 \filbreak%% keeps underfull box messages off when table breaks over pages.
-\global\colcount=0\relax}}}
+\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.
+\setbox0=\vbox{Xy}
 \ifdim\multitablelinespace=0pt
-\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
-\global\advance\multitablelinespace by-\ht0\fi
+%% strut to put in table in case some entry doesn't have descenders,
+%% to keep lines equally spaced
+\gdef\multistrut{\vrule height\ht0 depth\dp0 width0pt\relax}
 %% 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.
+\else
+\gdef\multistrut{\vrule height\multitablelinespace depth\dp0
+width0pt\relax} \fi
 \ifdim\multitableparskip>\multitablelinespace
 \global\multitableparskip=\multitablelinespace
 \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
@@ -1988,6 +2024,8 @@ July\or August\or September\or October\or November\or December\fi
 \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
                                       %% than skip between lines in the table.
 \fi}
+
+
 \message{indexing,}
 % Index generation facilities
 
@@ -2276,26 +2314,17 @@ July\or August\or September\or October\or November\or December\fi
 
 \def\printindex{\parsearg\doprintindex}
 
-\def\doprintindex#1{%
-  \tex
-  \dobreak \chapheadingskip {10000}
-  \catcode`\%=\other\catcode`\&=\other\catcode`\#=\other
-  \catcode`\$=\other
-  \catcode`\~=\other
-  \indexbreaks
+\def\doprintindex#1{\begingroup
+  \dobreak \chapheadingskip{10000}%
   %
-  % The following don't help, since the chars were translated
-  % when the raw index was written, and their fonts were discarded
-  % due to \indexnofonts.
-  %\catcode`\"=\active
-  %\catcode`\^=\active
-  %\catcode`\_=\active
-  %\catcode`\|=\active
-  %\catcode`\<=\active
-  %\catcode`\>=\active
-  % %
-  \def\indexbackslash{\rawbackslashxx}
-  \indexfonts\rm \tolerance=9500 \advance\baselineskip -1pt
+  \indexfonts \rm
+  \tolerance = 9500
+  \indexbreaks
+  \def\indexbackslash{\rawbackslashxx}%
+  % Index files are almost Texinfo source, but we use \ as the escape
+  % character.  It would be better to use @, but that's too big a change
+  % to make right now.
+  \catcode`\\ = 0
   \begindoublecolumns
   %
   % See if the index file exists and is nonempty.
@@ -2306,7 +2335,7 @@ July\or August\or September\or October\or November\or December\fi
     % index.  The easiest way to prevent this problem is to make sure
     % there is some text.
     (Index is nonexistent)
-    \else
+  \else
     %
     % If the index file exists but is empty, then \openin leaves \ifeof
     % false.  We have to make TeX try to read something from the file, so
@@ -2320,8 +2349,7 @@ July\or August\or September\or October\or November\or December\fi
   \fi
   \closein 1
   \enddoublecolumns
-  \Etex
-}
+\endgroup}
 
 % These macros are used by the sorted index file itself.
 % Change them to control the appearance of the index.
@@ -2496,8 +2524,9 @@ July\or August\or September\or October\or November\or December\fi
     \fi
   \fi
 }
-
 \catcode `\@=\other
+
+
 \message{sectioning,}
 % Define chapters, sections, etc.
 
@@ -2669,6 +2698,10 @@ July\or August\or September\or October\or November\or December\fi
 \global\let\subsubsection = \appendixsubsubsec
 }}
 
+% @centerchap is like @unnumbered, but the heading is centered.
+\outer\def\centerchap{\parsearg\centerchapyyy}
+\def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}}
+
 \outer\def\top{\parsearg\unnumberedyyy}
 \outer\def\unnumbered{\parsearg\unnumberedyyy}
 \def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
@@ -2771,7 +2804,7 @@ July\or August\or September\or October\or November\or December\fi
 \outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy}
 \def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
 \def\unnumberedsubseczzz #1{\seccheck{unnumberedsubsec}%
-\plainsecheading {#1}\gdef\thissection{#1}%
+\plainsubsecheading {#1}\gdef\thissection{#1}%
 {\chapternofonts%
 \edef\temp{{\realbackslash unnumbsubsecentry{#1}{\noexpand\folio}}}%
 \escapechar=`\\%
@@ -2816,7 +2849,7 @@ July\or August\or September\or October\or November\or December\fi
 \outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy}
 \def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
 \def\unnumberedsubsubseczzz #1{\seccheck{unnumberedsubsubsec}%
-\plainsecheading {#1}\gdef\thissection{#1}%
+\plainsubsubsecheading {#1}\gdef\thissection{#1}%
 {\chapternofonts%
 \edef\temp{{\realbackslash unnumbsubsubsecentry{#1}{\noexpand\folio}}}%
 \escapechar=`\\%
@@ -2875,11 +2908,10 @@ July\or August\or September\or October\or November\or December\fi
                   \parindent=0pt\raggedright
                   \rm #1\hfill}}\bigskip \par\penalty 200}
 
-\def\heading{\parsearg\secheadingi}
-
-\def\subheading{\parsearg\subsecheadingi}
-
-\def\subsubheading{\parsearg\subsubsecheadingi}
+% @heading, @subheading, @subsubheading.
+\def\heading{\parsearg\plainsecheading}
+\def\subheading{\parsearg\plainsubsecheading}
+\def\subsubheading{\parsearg\plainsubsubsecheading}
 
 % These macros generate a chapter, section, etc. heading only
 % (including whitespace, linebreaking, etc. around it),
@@ -2893,7 +2925,7 @@ July\or August\or September\or October\or November\or December\fi
 %%% Define plain chapter starts, and page on/off switching for it
 % Parameter controlling skip before chapter headings (if needed)
 
-\newskip \chapheadingskip \chapheadingskip = 30pt plus 8pt minus 4pt
+\newskip\chapheadingskip
 
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
 \def\chappager{\par\vfill\supereject}
@@ -2902,15 +2934,18 @@ July\or August\or September\or October\or November\or December\fi
 \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
 
 \def\CHAPPAGoff{
+\global\let\contentsalignmacro = \chappager
 \global\let\pchapsepmacro=\chapbreak
 \global\let\pagealignmacro=\chappager}
 
 \def\CHAPPAGon{
+\global\let\contentsalignmacro = \chappager
 \global\let\pchapsepmacro=\chappager
 \global\let\pagealignmacro=\chappager
 \global\def\HEADINGSon{\HEADINGSsingle}}
 
 \def\CHAPPAGodd{
+\global\let\contentsalignmacro = \chapoddpage
 \global\let\pchapsepmacro=\chapoddpage
 \global\let\pagealignmacro=\chapoddpage
 \global\def\HEADINGSon{\HEADINGSdouble}}
@@ -2919,25 +2954,39 @@ July\or August\or September\or October\or November\or December\fi
 
 \def\CHAPFplain{
 \global\let\chapmacro=\chfplain
-\global\let\unnumbchapmacro=\unnchfplain}
+\global\let\unnumbchapmacro=\unnchfplain
+\global\let\centerchapmacro=\centerchfplain}
 
-\def\chfplain #1#2{%
+% Plain chapter opening.
+% #1 is the text, #2 the chapter number or empty if unnumbered.
+\def\chfplain#1#2{%
   \pchapsepmacro
   {%
-    \chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                     \parindent=0pt\raggedright
-                     \rm #2\enspace #1}%
+    \chapfonts \rm
+    \def\chapnum{#2}%
+    \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}%
+    \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
+          \hangindent = \wd0 \centerparametersmaybe
+          \unhbox0 #1\par}%
   }%
-  \bigskip
-  \penalty5000
+  \nobreak\bigskip % no page break after a chapter title
+  \nobreak
 }
 
-\def\unnchfplain #1{%
-\pchapsepmacro %
-{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                  \parindent=0pt\raggedright
-                  \rm #1\hfill}}\bigskip \par\penalty 10000 %
-}
+% Plain opening for unnumbered.
+\def\unnchfplain#1{\chfplain{#1}{}}
+
+% @centerchap -- centered and unnumbered.
+\let\centerparametersmaybe = \relax
+\def\centerchfplain#1{{%
+  \def\centerparametersmaybe{%
+    \advance\rightskip by 3\rightskip
+    \leftskip = \rightskip
+    \parfillskip = 0pt
+  }%
+  \chfplain{#1}{}%
+}}
+
 \CHAPFplain % The default
 
 \def\unnchfopen #1{%
@@ -2951,65 +3000,73 @@ July\or August\or September\or October\or November\or December\fi
 \par\penalty 5000 %
 }
 
+\def\centerchfopen #1{%
+\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+                       \parindent=0pt
+                       \hfill {\rm #1}\hfill}}\bigskip \par\penalty 10000 %
+}
+
 \def\CHAPFopen{
 \global\let\chapmacro=\chfopen
-\global\let\unnumbchapmacro=\unnchfopen}
+\global\let\unnumbchapmacro=\unnchfopen
+\global\let\centerchapmacro=\centerchfopen}
 
-% Parameter controlling skip before section headings.
 
-\newskip \subsecheadingskip  \subsecheadingskip = 17pt plus 8pt minus 4pt
-\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
-
-\newskip \secheadingskip  \secheadingskip = 21pt plus 8pt minus 4pt
+% Section titles.
+\newskip\secheadingskip
 \def\secheadingbreak{\dobreak \secheadingskip {-1000}}
+\def\secheading#1#2#3{\sectionheading{sec}{#2.#3}{#1}}
+\def\plainsecheading#1{\sectionheading{sec}{}{#1}}
 
-% @paragraphindent  is defined for the Info formatting commands only.
-\let\paragraphindent=\comment
+% Subsection titles.
+\newskip \subsecheadingskip
+\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
+\def\subsecheading#1#2#3#4{\sectionheading{subsec}{#2.#3.#4}{#1}}
+\def\plainsubsecheading#1{\sectionheading{subsec}{}{#1}}
 
-% Section fonts are the base font at magstep2, which produces
-% a size a bit more than 14 points in the default situation.
-
-\def\secheading #1#2#3{\secheadingi {#2.#3\enspace #1}}
-\def\plainsecheading #1{\secheadingi {#1}}
-\def\secheadingi #1{{\advance \secheadingskip by \parskip %
-\secheadingbreak}%
-{\secfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                 \parindent=0pt\raggedright
-                 \rm #1\hfill}}%
-\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000 }
+% Subsubsection titles.
+\let\subsubsecheadingskip = \subsecheadingskip
+\let\subsubsecheadingbreak = \subsecheadingbreak
+\def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}}
+\def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}}
 
 
-% Subsection fonts are the base font at magstep1,
-% which produces a size of 12 points.
-
-\def\subsecheading #1#2#3#4{\subsecheadingi {#2.#3.#4\enspace #1}}
-\def\subsecheadingi #1{{\advance \subsecheadingskip by \parskip %
-\subsecheadingbreak}%
-{\subsecfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                     \parindent=0pt\raggedright
-                     \rm #1\hfill}}%
-\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000 }
-
-\def\subsubsecfonts{\subsecfonts} % Maybe this should change:
-				  % Perhaps make sssec fonts scaled
-				  % magstep half
-\def\subsubsecheading #1#2#3#4#5{\subsubsecheadingi {#2.#3.#4.#5\enspace #1}}
-\def\subsubsecheadingi #1{{\advance \subsecheadingskip by \parskip %
-\subsecheadingbreak}%
-{\subsubsecfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt\raggedright
-                       \rm #1\hfill}}%
-\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000}
+% Print any size section title.
+% 
+% #1 is the section type (sec/subsec/subsubsec), #2 is the section
+% number (maybe empty), #3 the text.
+\def\sectionheading#1#2#3{%
+  {%
+    \expandafter\advance\csname #1headingskip\endcsname by \parskip
+    \csname #1headingbreak\endcsname
+  }%
+  {%
+    % Switch to the right set of fonts.
+    \csname #1fonts\endcsname \rm
+    %
+    % Only insert the separating space if we have a section number.
+    \def\secnum{#2}%
+    \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}%
+    %
+    \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
+          \hangindent = \wd0 % zero if no section number
+          \unhbox0 #3}%
+  }%
+  \ifdim\parskip<10pt \nobreak\kern10pt\nobreak\kern-\parskip\fi \nobreak
+}
 
 
 \message{toc printing,}
-
 % Finish up the main text and prepare to read what we've written
 % to \contentsfile.
 
 \newskip\contentsrightmargin \contentsrightmargin=1in
 \def\startcontents#1{%
-   \pagealignmacro
+   % If @setchapternewpage on, and @headings double, the contents should
+   % start on an odd page, unlike chapters.  Thus, we maintain
+   % \contentsalignmacro in parallel with \pagealignmacro.
+   % From: Torbjorn Granlund <tege@matematik.su.se>
+   \contentsalignmacro
    \immediate\closeout \contentsfile
    \ifnum \pageno>0
       \pageno = -1		% Request roman numbered pages.
@@ -3184,12 +3241,11 @@ July\or August\or September\or October\or November\or December\fi
 %                                      depth .1ex\hfil}
 %}
 
+% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 \def\point{$\star$}
-
 \def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
 \def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
 \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
-
 \def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
 
 % Adapted from the TeXbook's \boxit.
@@ -3235,6 +3291,8 @@ July\or August\or September\or October\or November\or December\fi
 \let\.=\ptexdot
 \let\*=\ptexstar
 \let\dots=\ptexdots
+\def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}
+\def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}
 \def\@{@}%
 \let\bullet=\ptexbullet
 \let\b=\ptexb \let\c=\ptexc \let\i=\ptexi \let\t=\ptext \let\l=\ptexl
@@ -3403,8 +3461,7 @@ July\or August\or September\or October\or November\or December\fi
   \let\Esmalllisp = \nonfillfinish
   \let\Esmallexample = \nonfillfinish
   %
-  % Smaller interline space and fonts for small examples.
-  \setleading{10pt}%
+  % Smaller fonts for small examples.
   \indexfonts \tt
   \rawbackslash % make \ output the \ character from the current font (tt)
   \gobble
@@ -3932,6 +3989,7 @@ July\or August\or September\or October\or November\or December\fi
 
 \def\deftpx #1 {\errmessage{@deftpx in invalid context}}
 
+
 \message{cross reference,}
 % Define cross-reference macros
 \newwrite \auxfile
@@ -3939,6 +3997,11 @@ July\or August\or September\or October\or November\or December\fi
 \newif\ifhavexrefs  % True if xref values are known.
 \newif\ifwarnedxrefs  % True if we warned once that they aren't known.
 
+% @inforef is simple.
+\def\inforef #1{\inforefzzz #1,,,,**}
+\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
+  node \samp{\ignorespaces#1{}}}
+
 % \setref{foo} defines a cross-reference point named foo.
 
 \def\setref#1{%
@@ -4174,7 +4237,8 @@ July\or August\or September\or October\or November\or December\fi
 % The trailing space in the following definition for supereject is
 % vital for proper filling; pages come out unaligned when you do a
 % pagealignmacro call if that space before the closing brace is
-% removed.
+% removed. (Generally, numeric constants should always be followed by a
+% space to prevent strange expansion errors.)
 \def\supereject{\par\penalty -20000\footnoteno =0 }
 
 % @footnotestyle is meaningful for info output only..
@@ -4299,13 +4363,18 @@ July\or August\or September\or October\or November\or December\fi
 
 % Set some numeric style parameters, for 8.5 x 11 format.
 
-%\hsize = 6.5in
+\hsize = 6in
+\hoffset = .25in
 \newdimen\defaultparindent \defaultparindent = 15pt
 \parindent = \defaultparindent
-\parskip 18pt plus 1pt
-\setleading{15pt}
+\parskip 3pt plus 2pt minus 1pt
+\setleading{13.2pt}
 \advance\topskip by 1.2cm
 
+\chapheadingskip = 15pt plus 4pt minus 2pt
+\secheadingskip = 12pt plus 3pt minus 2pt
+\subsecheadingskip = 9pt plus 2pt minus 2pt
+
 % Prevent underfull vbox error messages.
 \vbadness=10000
 
@@ -4328,30 +4397,28 @@ July\or August\or September\or October\or November\or December\fi
 
 % Use @smallbook to reset parameters for 7x9.5 format  (or else 7x9.25)
 \def\smallbook{
-
-% These values for secheadingskip and subsecheadingskip are
-% experiments.  RJC 7 Aug 1992
-\global\secheadingskip = 17pt plus 6pt minus 3pt
-\global\subsecheadingskip = 14pt plus 6pt minus 3pt
-
-\global\lispnarrowing = 0.3in
-\setleading{12pt}
-\advance\topskip by -1cm
-\global\parskip 3pt plus 1pt
-\global\hsize = 5in
-\global\vsize=7.5in
-\global\tolerance=700
-\global\hfuzz=1pt
-\global\contentsrightmargin=0pt
-\global\deftypemargin=0pt
-\global\defbodyindent=.5cm
-
-\global\pagewidth=\hsize
-\global\pageheight=\vsize
-
-\global\let\smalllisp=\smalllispx
-\global\let\smallexample=\smalllispx
-\global\def\Esmallexample{\Esmalllisp}
+  \global\chapheadingskip = 15pt plus 4pt minus 2pt
+  \global\secheadingskip = 12pt plus 3pt minus 2pt
+  \global\subsecheadingskip = 9pt plus 2pt minus 2pt
+  %
+  \global\lispnarrowing = 0.3in
+  \setleading{12pt}
+  \advance\topskip by -1cm
+  \global\parskip 2pt plus 1pt
+  \global\hsize = 5in
+  \global\vsize=7.5in
+  \global\tolerance=700
+  \global\hfuzz=1pt
+  \global\contentsrightmargin=0pt
+  \global\deftypemargin=0pt
+  \global\defbodyindent=.5cm
+  %
+  \global\pagewidth=\hsize
+  \global\pageheight=\vsize
+  %
+  \global\let\smalllisp=\smalllispx
+  \global\let\smallexample=\smalllispx
+  \global\def\Esmallexample{\Esmalllisp}
 }
 
 % Use @afourpaper to print on European A4 paper.

doc/textutils.texi

@@ -1572,7 +1572,6 @@ consistent. Synopsis:
 @example
 md5sum [@var{option}]@dots{} [@var{file}]@dots{}
 md5sum [@var{option}]@dots{} --check [@var{file}]
-md5sum [@var{option}]@dots{} --string=@var{string} @dots{}
 @end example
 
 For each @var{file}, @samp{md5sum} outputs the MD5 checksum, a flag
@@ -1629,11 +1628,6 @@ If all listed files are readable and are consistent with the associated
 MD5 checksums, exit successfully.  Otherwise exit with a status code
 indicating there was a failure.
 
-@itemx --string=@var{string}
-@opindex --string
-Compute the message digest for @var{string}, instead of for a file.  The
-result is the same as for a file that contains exactly @var{string}.
-
 @item -t
 @itemx --text
 @opindex -t
@@ -1904,11 +1898,8 @@ appended to it, in which case the global ordering options are not used
 for that particular field.  The @samp{-b} option may be independently
 attached to either or both of the @samp{+@var{pos}} and
 @samp{-@var{pos}} parts of a field specification, and if it is inherited
-from the global options it will be attached to both.  If a @samp{-n} or
-@samp{-M} option is used, thus implying a @samp{-b} option, the
-@samp{-b} option is taken to apply to both the @samp{+@var{pos}} and the
-@samp{-@var{pos}} parts of a key specification.  Keys may span multiple
-fields.
+from the global options it will be attached to both.
+Keys may span multiple fields.
 
 Here are some examples to illustrate various combinations of options.
 In them, the @sc{POSIX} @samp{-k} option is used to specify sort keys rather

lib/.cvsignore

@@ -7,3 +7,4 @@ safe-lstat.c
 safe-lstat.h
 getdate.tab.c
 .deps
+group_member.c

lib/Makefile.am

@@ -1,17 +1,20 @@
 ## Process this file with automake to produce Makefile.in
 noinst_LIBRARIES = fu
 
-EXTRA_DIST = alloca.c basename.c euidaccess.c fnmatch.c fsusage.c \
-ftruncate.c getdate.y getopt.c getopt1.c memcmp.c memcpy.c memset.c \
-mkdir.c mktime.c mountlist.c posixtm.y rename.c rmdir.c \
+EXTRA_DIST = alloca.c basename.c error.c euidaccess.c fnmatch.c fsusage.c \
+ftruncate.c getdate.y group-member.c memcmp.c memcpy.c memset.c \
+mkdir.c mktime.c mountlist.c obstack.c posixtm.y regex.c rx.c \
+rename.c rmdir.c rpmatch.c \
 stpcpy.c strcasecmp.c strdup.c strndup.c strstr.c strtol.c strtoul.c
 
 INCLUDES = -I.. -I$(srcdir)
+INCLUDES = -I.. -I$(srcdir) -I../intl
 
-fu_SOURCES = getdate.c getline.c posixtm.c argmatch.c backupfile.c \
-dirname.c error.c fileblocks.c filemode.c \
-full-write.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 getopt.c getopt1.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
 
@@ -19,7 +22,8 @@ fu_LIBADD = @LIBOBJS@ @ALLOCA@
 
 noinst_HEADERS = argmatch.h backupfile.h error.h fnmatch.h fsusage.h \
 getline.h getopt.h group-member.h long-options.h makepath.h modechange.h \
-mountlist.h obstack.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h
+mountlist.h obstack.h path-concat.h pathmax.h regex.h rx.h \
+save-cwd.h xstrtol.h xstrtoul.h
 
 BUILT_SOURCES = getdate.c posixtm.c
 

lib/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.0 from Makefile.am
+# Makefile.in generated automatically by automake 1.1e from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -40,17 +40,20 @@ transform = @program_transform_name@
 
 noinst_LIBRARIES = fu
 
-EXTRA_DIST = alloca.c basename.c euidaccess.c fnmatch.c fsusage.c \
-ftruncate.c getdate.y getopt.c getopt1.c memcmp.c memcpy.c memset.c \
-mkdir.c mktime.c mountlist.c posixtm.y rename.c rmdir.c \
+EXTRA_DIST = alloca.c basename.c error.c euidaccess.c fnmatch.c fsusage.c \
+ftruncate.c getdate.y group-member.c memcmp.c memcpy.c memset.c \
+mkdir.c mktime.c mountlist.c obstack.c posixtm.y regex.c rx.c \
+rename.c rmdir.c rpmatch.c \
 stpcpy.c strcasecmp.c strdup.c strndup.c strstr.c strtol.c strtoul.c
 
 INCLUDES = -I.. -I$(srcdir)
+INCLUDES = -I.. -I$(srcdir) -I../intl
 
-fu_SOURCES = getdate.c getline.c posixtm.c argmatch.c backupfile.c \
-dirname.c error.c fileblocks.c filemode.c \
-full-write.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 getopt.c getopt1.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
 
@@ -58,39 +61,41 @@ fu_LIBADD = @LIBOBJS@ @ALLOCA@
 
 noinst_HEADERS = argmatch.h backupfile.h error.h fnmatch.h fsusage.h \
 getline.h getopt.h group-member.h long-options.h makepath.h modechange.h \
-mountlist.h obstack.h pathmax.h save-cwd.h xstrtol.h xstrtoul.h
+mountlist.h obstack.h path-concat.h pathmax.h regex.h rx.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 getline.o posixtm.o argmatch.o backupfile.o \
-dirname.o error.o fileblocks.o filemode.o full-write.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 \
+fu_DEPENDENCIES =  @LIBOBJS@ @ALLOCA@
+fu_OBJECTS = getdate.o getline.o getopt.o getopt1.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
+LIBFILES =  $(pkglib_LIBFILES) $(noinst_LIBFILES) $(check_LIBFILES) \
+$(lib_LIBFILES)
 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
+DIST_COMMON = Makefile.am Makefile.in alloca.c error.c fileblocks.c \
+fnmatch.c fsusage.c ftruncate.c getline.c mountlist.c obstack.c regex.c \
+regex.h rx.c rx.h
 
 
 PACKAGE = @PACKAGE@
@@ -102,24 +107,16 @@ 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/group-member.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/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
+DEP_FILES = .deps/alloca.P .deps/argmatch.P .deps/backupfile.P \
+.deps/dirname.P .deps/error.P .deps/fileblocks.P .deps/filemode.P \
+.deps/fnmatch.P .deps/fsusage.P .deps/ftruncate.P .deps/full-write.P \
+.deps/getdate.P .deps/getline.P .deps/getopt.P .deps/getopt1.P \
+.deps/getversion.P .deps/idcache.P .deps/isdir.P .deps/long-options.P \
+.deps/makepath.P .deps/modechange.P .deps/mountlist.P .deps/obstack.P \
+.deps/path-concat.P .deps/posixtm.P .deps/regex.P .deps/rx.P \
+.deps/safe-read.P .deps/save-cwd.P .deps/savedir.P .deps/stripslash.P \
+.deps/userspec.P .deps/xgetcwd.P .deps/xmalloc.P .deps/xstrdup.P \
+.deps/xstrtol.P .deps/xstrtoul.P .deps/yesno.P
 SOURCES = $(fu_SOURCES)
 OBJECTS = $(fu_OBJECTS)
 
@@ -135,14 +132,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
@@ -155,7 +152,7 @@ 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
@@ -177,8 +174,9 @@ distclean-tags:
 
 maintainer-clean-tags:
 
-subdir = lib
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lib
 distdir: $(DEP_DISTFILES)
 	@for file in `cd $(srcdir) && echo $(DISTFILES)`; do \
 	  test -f $(distdir)/$$file \
@@ -186,32 +184,33 @@ distdir: $(DEP_DISTFILES)
 	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \
 	done
 
-# This fragment is probably only useful for maintainers.  It relies on
-# GNU make and gcc.  It is only included in the generated Makefile.in
-# if `automake' is not passed the `--include-deps' flag.
+MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
-MKDEP = gcc -MM $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-
--include $(srcdir)/.deps/.P
-$(srcdir)/.deps/.P: $(BUILT_SOURCES)
-	cd $(srcdir) && test -d .deps || mkdir .deps
+-include .deps/.P
+.deps/.P: $(BUILT_SOURCES)
+	test -d .deps || mkdir .deps
 	echo > $@
 
 -include $(DEP_FILES)
-$(DEP_FILES): $(srcdir)/.deps/.P
+$(DEP_FILES): .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			\
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+
+maintainer-clean-depend:
+	rm -rf .deps
+
+.deps/%.P: $(srcdir)/%.c
+	$(MKDEP) $< > $@-tmp
+	if test -n "$o"; then			\
 	  sed 's/\.o:/$$o:/' $@-tmp > $@;	\
 	  rm $@-tmp;				\
 	else					\
 	  mv $@-tmp $@;				\
 	fi
-
-# End of maintainer-only section
 info:
 
 dvi:
@@ -221,8 +220,10 @@ check: all
 installcheck:
 
 install-exec: 
+	$(NORMAL_INSTALL)
 
 install-data: 
+	$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
@@ -241,6 +242,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)
@@ -250,18 +252,19 @@ maintainer-clean-generic:
 	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
-clean:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean 
+clean:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean 
 
 distclean:  distclean-noinstLIBRARIES distclean-compile distclean-tags \
-		distclean-generic clean 
+		distclean-depend distclean-generic clean 
 	rm -f config.status
 
 maintainer-clean:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean 
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean 
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -269,9 +272,10 @@ maintainer-clean:  maintainer-clean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info dvi check installcheck \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info dvi check \
+installcheck install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 

lib/argmatch.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.  */
 
 /* Written by David MacKenzie <djm@ai.mit.edu> */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <sys/types.h>
 
 #include <stdio.h>
 #ifdef STDC_HEADERS
-#include <string.h>
+# include <string.h>
 #endif
 
 extern char *program_name;

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

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

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.

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

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>

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;

lib/euidaccess.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.  */
 
 /* Written by David MacKenzie and Torbjorn Granlund.
    Adapted for GNU C library by Roland McGrath.  */

lib/fileblocks.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 Brian L. Matthews, blm@6sceng.UUCP. */
 

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>

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>

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

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,6 +37,10 @@ int statfs ();
 #include <sys/vfs.h>
 #endif
 
+#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
@@ -179,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.  */

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

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>

lib/getdate.y

@@ -34,6 +34,17 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#if defined (STDC_HEADERS) || !defined (isascii)
+# define ISASCII(c) 1
+#else
+# define ISASCII(c) isascii(c)
+#endif
+
+#define ISSPACE(c) (ISASCII (c) && isspace (c))
+#define ISALPHA(c) (ISASCII (c) && isalpha (c))
+#define ISUPPER(c) (ISASCII (c) && isupper (c))
+#define ISDIGIT(c) (ISASCII (c) && isdigit (c))
+
 #if	defined (vms)
 #include <types.h>
 #include <time.h>
@@ -710,7 +721,7 @@ LookupWord (buff)
 
   /* Make it lowercase. */
   for (p = buff; *p; p++)
-    if (isupper (*p))
+    if (ISUPPER (*p))
       *p = tolower (*p);
 
   if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0) {
@@ -779,7 +790,7 @@ LookupWord (buff)
     }
 
   /* Military timezones. */
-  if (buff[1] == '\0' && isalpha (*buff)) {
+  if (buff[1] == '\0' && ISALPHA (*buff)) {
     for (tp = MilitaryTable; tp->name; tp++)
       if (strcmp (buff, tp->name) == 0) {
 	yylval.Number = tp->value;
@@ -815,27 +826,27 @@ yylex ()
   int			sign;
 
   for ( ; ; ) {
-    while (isspace (*yyInput))
+    while (ISSPACE (*yyInput))
       yyInput++;
 
-    if (isdigit (c = *yyInput) || c == '-' || c == '+') {
+    if (ISDIGIT (c = *yyInput) || c == '-' || c == '+') {
       if (c == '-' || c == '+') {
 	sign = c == '-' ? -1 : 1;
-	if (!isdigit (*++yyInput))
+	if (!ISDIGIT (*++yyInput))
 	  /* skip the '-' sign */
 	  continue;
       }
       else
 	sign = 0;
-      for (yylval.Number = 0; isdigit (c = *yyInput++); )
+      for (yylval.Number = 0; ISDIGIT (c = *yyInput++); )
 	yylval.Number = 10 * yylval.Number + c - '0';
       yyInput--;
       if (sign < 0)
 	yylval.Number = -yylval.Number;
       return sign ? tSNUMBER : tUNUMBER;
     }
-    if (isalpha (c)) {
-      for (p = buff; isalpha (c = *yyInput++) || c == '.'; )
+    if (ISALPHA (c)) {
+      for (p = buff; ISALPHA (c = *yyInput++) || c == '.'; )
 	if (p < &buff[sizeof buff - 1])
 	  *p++ = c;
       *p = '\0';

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.

lib/getline.c

@@ -18,17 +18,17 @@ 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
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-/* The `getdelim' function is only declared if there following symbol
+/* The `getdelim' function is only declared if the following symbol
    is defined.  */
 #define _GNU_SOURCE	1
 #include <stdio.h>
 #include <sys/types.h>
 
-#if defined __GNU_LIBRARY__ && defined HAVE_GETDELIM
+#if defined __GNU_LIBRARY__ && HAVE_GETDELIM
 
 int
 getline (lineptr, n, stream)
@@ -42,17 +42,17 @@ getline (lineptr, n, stream)
 
 #else /* ! have getdelim */
 
-#define NDEBUG
-#include <assert.h>
+# define NDEBUG
+# include <assert.h>
 
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
+# 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

lib/getline.h

@@ -15,17 +15,17 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef _getline_h_
-#define _getline_h_ 1
+# define _getline_h_ 1
 
-#include <stdio.h>
+# include <stdio.h>
 
-#ifndef PARAMS
-# if defined (__GNUC__) || __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif  /* GCC.  */
-#endif  /* Not PARAMS.  */
+# ifndef PARAMS
+#  if defined (__GNUC__) || __STDC__
+#   define PARAMS(args) args
+#  else
+#   define PARAMS(args) ()
+#  endif  /* GCC.  */
+# endif  /* Not PARAMS.  */
 
 int
 getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));

lib/getloadavg.c

@@ -43,6 +43,7 @@
    DGUX
    eunice			UNIX emulator under VMS.
    hpux
+   MSDOS			No-op for MSDOS.
    NeXT
    sgi
    sequent			Sequent Dynix 3.x.x (BSD)
@@ -51,6 +52,7 @@
    UMAX
    UMAX4_3
    VMS
+   WIN32			No-op for Windows95/NT.
    __linux__			Linux: assumes /proc filesystem mounted.
    				Support from Michael K. Johnson.
    __NetBSD__			NetBSD: assumes /kern filesystem mounted.
@@ -139,7 +141,7 @@ extern int errno;
 #define decstation
 #endif
 
-#if (defined(sun) || defined(__sun)) && defined(SVR4)
+#if (defined(sun) && defined(SVR4)) || defined (SOLARIS2)
 #define SUNOS_5
 #endif
 
@@ -168,7 +170,7 @@ extern int errno;
 #define LOAD_AVE_TYPE long
 #endif
 
-#if defined(sun) || defined(__sun)
+#ifdef sun
 #define LOAD_AVE_TYPE long
 #endif
 
@@ -284,7 +286,7 @@ extern int errno;
 #define NLIST_STRUCT
 #endif
 
-#if defined(sun) || defined(__sun)
+#ifdef sun
 #define NLIST_STRUCT
 #endif
 
@@ -389,6 +391,7 @@ extern int errno;
 #ifdef SUNOS_5
 #include <fcntl.h>
 #include <kvm.h>
+#include <kstat.h>
 #endif
 
 #ifndef KERNEL_FILE
@@ -514,6 +517,50 @@ getloadavg (loadavg, nelem)
   elem = -1;
 #endif
 
+#if !defined (LDAV_DONE) && defined (SUNOS_5)
+/* Use libkstat because we don't have to be root.  */
+#define LDAV_DONE
+  kstat_ctl_t *kc;
+  kstat_t *ksp;
+  kstat_named_t *kn;
+
+  kc = kstat_open ();
+  if (kc == 0) return -1;
+  ksp = kstat_lookup (kc, "unix", 0, "system_misc");
+  if (ksp == 0 ) return -1;
+  if (kstat_read (kc, ksp, 0) == -1) return -1;
+  
+
+  kn = kstat_data_lookup (ksp, "avenrun_1min");
+  if (kn == 0)
+    {
+      /* Return -1 if no load average information is available.  */
+      nelem = 0;
+      elem = -1;
+    }
+
+  if (nelem >= 1)
+    loadavg[elem++] = (double) kn->value.ul/FSCALE;
+
+  if (nelem >= 2)
+    {
+      kn = kstat_data_lookup (ksp, "avenrun_5min");
+      if (kn != 0)
+	{
+	  loadavg[elem++] = (double) kn->value.ul/FSCALE;
+
+	  if (nelem >= 3)
+	    {
+	      kn = kstat_data_lookup (ksp, "avenrun_15min");
+	      if (kn != 0)
+		loadavg[elem++] = (double) kn->value.ul/FSCALE;
+	    }
+	}
+    }
+
+  kstat_close (kc);
+#endif /* SUNOS_5 */
+
 #if !defined (LDAV_DONE) && defined (__linux__)
 #define LDAV_DONE
 #undef LOAD_AVE_TYPE
@@ -733,11 +780,11 @@ getloadavg (loadavg, nelem)
        : (load_ave.tl_avenrun.l[0] / (double) load_ave.tl_lscale));
 #endif	/* OSF_MIPS */
 
-#if !defined (LDAV_DONE) && defined(MSDOS)
+#if !defined (LDAV_DONE) && (defined (MSDOS) || defined (WIN32))
 #define LDAV_DONE
 
   /* A faithful emulation is going to have to be saved for a rainy day.  */
-  for ( ; elem < nelem; elem++) 
+  for ( ; elem < nelem; elem++)
     {
       loadavg[elem] = 0.0;
     }
@@ -866,7 +913,7 @@ getloadavg (loadavg, nelem)
       /* We pass 0 for the kernel, corefile, and swapfile names
 	 to use the currently running kernel.  */
       kd = kvm_open (0, 0, 0, O_RDONLY, 0);
-      if (kd != 0) 
+      if (kd != 0)
 	{
 	  /* nlist the currently running kernel.  */
 	  kvm_nlist (kd, nl);

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] == ':')

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

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>

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

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 ();

lib/getversion.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.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "backupfile.h"
 
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 
 int argmatch ();
@@ -28,12 +32,12 @@ void invalid_arg ();
 
 extern char *program_name;
 
-static char *backup_args[] =
+static const char *const backup_args[] =
 {
   "never", "simple", "nil", "existing", "t", "numbered", 0
 };
 
-static enum backup_type backup_types[] =
+static const enum backup_type backup_types[] =
 {
   simple, simple, numbered_existing, numbered_existing, numbered, numbered
 };

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"

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 ();

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;

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>

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>

lib/makepath.c

@@ -12,58 +12,57 @@
    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>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
-#ifdef __GNUC__
-#define alloca __builtin_alloca
+#if __GNUC__
+# define alloca __builtin_alloca
 #else
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
  #pragma alloca
-#else
+#  else
 char *alloca ();
-#endif
-#endif
+#  endif
+# endif
 #endif
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
 #endif /* STAT_MACROS_BROKEN.  */
 
 #if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if STDC_HEADERS
+# include <stdlib.h>
 #endif
 
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
+#if HAVE_ERRNO_H
+# include <errno.h>
 #endif
 
 #ifndef errno
 extern int errno;
 #endif
 
-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>

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

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

lib/memcasecmp.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.  */
 
 /* Jim Meyering (meyering@na-net.ornl.gov) */
 

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>

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"

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;
 }

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)

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>

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

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> */
 
@@ -24,30 +24,30 @@
    changing the mode of many files, this probably results in a
    performance gain. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "modechange.h"
 
-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if STDC_HEADERS
+# include <stdlib.h>
 #else
 char *malloc ();
 #endif
 
 #ifndef NULL
-#define NULL 0
+# define NULL 0
 #endif
 
-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
 #endif /* STAT_MACROS_BROKEN.  */
 
 #if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
 /* Return newly allocated memory to hold one element of type TYPE. */

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'. */
 
@@ -45,11 +45,11 @@ struct mode_change
 #define MODE_MEMORY_EXHAUSTED (struct mode_change *) 1
 
 #ifndef __P
-#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#define __P(args) args
-#else
-#define __P(args) ()
-#endif  /* GCC.  */
+# 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));

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>

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

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

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:
 

lib/path-concat.c

@@ -0,0 +1,61 @@
+/* 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 (dir, base, base_in_result)
+     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;
+}

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

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

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
 

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

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

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

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

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>

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>

lib/rpmatch.c

@@ -0,0 +1,87 @@
+/* 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 <stddef.h>
+# include <stdlib.h>
+#else
+# ifndef NULL
+#  define NULL 0
+# endif
+#endif
+
+#include <sys/types.h>
+#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]"), 1, 0,
+			 &yesexpr, &yesre))
+	  ? result
+	  : try (response, _("^[nN]"), 0, -1, &noexpr, &nore));
+}

lib/rx.c

@@ -7183,8 +7183,3 @@ regfree (preg)
 }
 
 #endif /* not emacs  */
-
-
-
-
-

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>

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

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

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

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

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>
 

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>

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

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

lib/strftime.c

@@ -1,22 +1,20 @@
 /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
 
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
+The GNU C Library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -25,13 +23,15 @@ USA.  */
 #ifdef _LIBC
 # define HAVE_LIMITS_H 1
 # define HAVE_MBLEN 1
+# define HAVE_MBRLEN 1
+# define HAVE_TM_GMTOFF 1
 # define HAVE_TM_ZONE 1
+# define MULTIBYTE_IS_FORMAT_SAFE 1
 # define STDC_HEADERS 1
 # include <ansidecl.h>
 # include "../locale/localeinfo.h"
 #endif
 
-#include <stdio.h>
 #include <sys/types.h>		/* Some systems define `time_t' here.  */
 
 #ifdef TIME_WITH_SYS_TIME
@@ -45,8 +45,24 @@ USA.  */
 # endif
 #endif
 
-#if HAVE_MBLEN
-# include <ctype.h>
+/* Do multibyte processing if multibytes are supported, unless
+   multibyte sequences are safe in formats.  Multibyte sequences are
+   safe if they cannot contain byte sequences that look like format
+   conversion specifications.  The GNU C Library uses UTF8 multibyte
+   encoding, which is safe for formats, but strftime.c can be used
+   with other C libraries that use unsafe encodings.  */
+#define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE)
+
+#if DO_MULTIBYTE
+# if HAVE_MBRLEN
+#  include <wchar.h>
+# else
+   /* Simulate mbrlen with mblen as best we can.  */
+#  define mbstate_t int
+#  define mbrlen(s, n, ps) mblen (s, n)
+#  define mbsinit(ps) (*(ps) == 0)
+# endif
+  static const mbstate_t mbstate_zero;
 #endif
 
 #if HAVE_LIMITS_H
@@ -77,7 +93,68 @@ USA.  */
 #endif
 #endif
 
-static unsigned int week __P((const struct tm *const, int, int));
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif
+
+#define TYPE_SIGNED(t) ((t) -1 < 0)
+
+/* Bound on length of the string representing an integer value of type t.
+   Subtract one for the sign bit if t is signed;
+   302 / 1000 is log10 (2) rounded up;
+   add one for integer division truncation;
+   add one more for a minus sign if t is signed.  */
+#define INT_STRLEN_BOUND(t) \
+  ((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 100 + 1 + TYPE_SIGNED (t))
+
+#define TM_YEAR_BASE 1900
+
+#ifndef __isleap
+/* Nonzero if YEAR is a leap year (every 4 years,
+   except every 100th isn't, and every 400th is).  */
+#define __isleap(year)	\
+  ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
+#endif
+
+
+#ifdef _LIBC
+# define gmtime_r __gmtime_r
+# define localtime_r __localtime_r
+#else
+# if ! HAVE_LOCALTIME_R
+#  if ! HAVE_TM_GMTOFF
+/* Approximate gmtime_r as best we can in its absence.  */
+#define gmtime_r my_gmtime_r
+static struct tm *gmtime_r __P ((const time_t *, struct tm *));
+static struct tm *
+gmtime_r (t, tp)
+     const time_t *t;
+     struct tm *tp;
+{
+  struct tm *l = gmtime (t);
+  if (! l)
+    return 0;
+  *tp = *l;
+  return tp;
+}
+#  endif /* ! HAVE_TM_GMTOFF */
+
+/* Approximate localtime_r as best we can in its absence.  */
+#define localtime_r my_localtime_r
+static struct tm *localtime_r __P ((const time_t *, struct tm *));
+static struct tm *
+localtime_r (t, tp)
+     const time_t *t;
+     struct tm *tp;
+{
+  struct tm *l = localtime (t);
+  if (! l)
+    return 0;
+  *tp = *l;
+  return tp;
+}
+# endif /* ! HAVE_LOCALTIME_R */
+#endif /* ! defined (_LIBC) */
 
 
 #define	add(n, f)							      \
@@ -93,55 +170,59 @@ static unsigned int week __P((const struct tm *const, int, int));
 	    p += (n);							      \
 	  }								      \
     } while (0)
-#define	cpy(n, s)	add((n), memcpy((PTR) p, (PTR) (s), (n)))
+#define	cpy(n, s)	add ((n), memcpy((PTR) p, (PTR) (s), (n)))
 
-#ifdef _LIBC
-#define	fmt(n, args)	add((n), if (sprintf args != (n)) return 0)
-#else
-#define	fmt(n, args)	add((n), sprintf args; if (strlen (p) != (n)) return 0)
-#endif
+#if ! HAVE_TM_GMTOFF
+/* Yield the difference between *A and *B,
+   measured in seconds, ignoring leap seconds.  */
+static int tm_diff __P ((const struct tm *, const struct tm *));
+static int
+tm_diff (a, b)
+     const struct tm *a;
+     const struct tm *b;
+{
+  int ay = a->tm_year + TM_YEAR_BASE - 1;
+  int by = b->tm_year + TM_YEAR_BASE - 1;
+  /* Divide years by 100, rounding towards minus infinity.  */
+  int ac = ay / 100 - (ay % 100 < 0);
+  int bc = by / 100 - (by % 100 < 0);
+  int intervening_leap_days =
+    ((ay >> 2) - (by >> 2)) - (ac - bc) + ((ac >> 2) - (bc >> 2));
+  int years = ay - by;
+  int days = (365 * years + intervening_leap_days
+	      + (a->tm_yday - b->tm_yday));
+  return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
+		+ (a->tm_min - b->tm_min))
+	  + (a->tm_sec - b->tm_sec));
+}
+#endif /* ! HAVE_TM_GMTOFF */
 
 
 
-/* Return the week in the year specified by TP,
-   with weeks starting on STARTING_DAY.  */
-#ifdef	__GNUC__
+/* The number of days from the first day of the first ISO week of this
+   year to the year day YDAY with week day WDAY.  ISO weeks start on
+   Monday; the first ISO week has the year's first Thursday.  YDAY may
+   be as small as YDAY_MINIMUM.  */
+#define ISO_WEEK_START_WDAY 1 /* Monday */
+#define ISO_WEEK1_WDAY 4 /* Thursday */
+#define YDAY_MINIMUM (-366)
+static int iso_week_days __P ((int, int));
+#ifdef __GNUC__
 inline
 #endif
-static unsigned int
-week (tp, starting_day, max_preceding)
-      const struct tm *const tp;
-      int starting_day;
-      int max_preceding;
+static int
+iso_week_days (yday, wday)
+     int yday;
+     int wday;
 {
-  int wday, dl, base;
-
-  wday = tp->tm_wday - starting_day;
-  if (wday < 0)
-    wday += 7;
-
-  /* Set DL to the day in the year of the first day of the week
-     containing the day specified in TP.  */
-  dl = tp->tm_yday - wday;
-
-  /* For the computation following ISO 8601:1988 we set the number of
-     the week containing January 1st to 1 if this week has more than
-     MAX_PRECEDING days in the new year.  For ISO 8601 this number is
-     3, for the other representation it is 7 (i.e., not to be
-     fulfilled).  */
-  base = ((dl + 7) % 7) > max_preceding ? 1 : 0;
-
-  /* If DL is negative we compute the result as 0 unless we have to
-     compute it according ISO 8601.  In this case we have to return 53
-     or 1 if the week containing January 1st has less than 4 days in
-     the new year or not.  If DL is not negative we calculate the
-     number of complete weeks for our week (DL / 7) plus 1 (because
-     only for DL < 0 we are in week 0/53 and plus the number of the
-     first week computed in the last step.  */
-  return dl < 0 ? (dl < -max_preceding ? 53 : base)
-		: base + 1 + dl / 7;
+  /* Add enough to the first operand of % to make it nonnegative.  */
+  int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7;
+  return (yday
+	  - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7
+	  + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY);
 }
 
+
 #ifndef _NL_CURRENT
 static char const weekday_name[][10] =
   {
@@ -179,6 +260,9 @@ strftime (s, maxsize, format, tp)
   size_t aw_len = strlen(a_wkday);
   size_t am_len = strlen(a_month);
   size_t ap_len = strlen (ampm);
+
+  const char *alt_digits = _NL_CURRENT (LC_TIME, ALT_DIGITS);
+  const char *end_alt_digits = _NL_CURRENT (LC_TIME, ALT_DIGITS + 1);
 #else
   const char *const f_wkday = weekday_name[tp->tm_wday];
   const char *const f_month = month_name[tp->tm_mon];
@@ -189,20 +273,13 @@ strftime (s, maxsize, format, tp)
   size_t am_len = 3;
   size_t ap_len = 2;
 #endif
-  size_t wkday_len = strlen(f_wkday);
-  size_t month_len = strlen(f_month);
-  const unsigned int y_week0 = week (tp, 0, 7);
-  const unsigned int y_week1 = week (tp, 1, 7);
-  const unsigned int y_week2 = week (tp, 1, 3);
+  size_t wkday_len = strlen (f_wkday);
+  size_t month_len = strlen (f_month);
   const char *zone;
   size_t zonelen;
   register size_t i = 0;
   register char *p = s;
   register const char *f;
-  char number_fmt[5];
-
-  /* Initialize the buffer we will use for the sprintf format for numbers.  */
-  number_fmt[0] = '%';
 
   zone = 0;
 #if HAVE_TM_ZONE
@@ -212,8 +289,8 @@ strftime (s, maxsize, format, tp)
   if (!(zone && *zone) && tp->tm_isdst >= 0)
     zone = tzname[tp->tm_isdst];
 #endif
-  if (!(zone && *zone))
-    zone = "???";
+  if (! zone)
+    zone = "";		/* POSIX.2 requires the empty string here.  */
 
   zonelen = strlen (zone);
 
@@ -224,225 +301,557 @@ strftime (s, maxsize, format, tp)
 
   for (f = format; *f != '\0'; ++f)
     {
-      enum { pad_zero, pad_space, pad_none } pad; /* Padding for number.  */
-      unsigned int maxdigits;	/* Max digits for numeric format.  */
-      unsigned int number_value; /* Numeric value to be printed.  */
+      int pad;			/* Padding for number ('-', '_', or 0).  */
+      int modifier;		/* Field modifier ('E', 'O', or 0).  */
+      int digits;		/* Max digits for numeric format.  */
+      int number_value; 	/* Numeric value to be printed.  */
+      int negative_number;	/* 1 if the number is negative.  */
       const char *subfmt;
+      char *bufp;
+      char buf[1 + (sizeof (int) < sizeof (time_t)
+		    ? INT_STRLEN_BOUND (time_t)
+		    : INT_STRLEN_BOUND (int))];
 
-#if HAVE_MBLEN
-      if (!isascii(*f))
+#if DO_MULTIBYTE
+
+       switch (*f)
 	{
-	  /* Non-ASCII, may be a multibyte.  */
-	  int len = mblen(f, strlen(f));
-	  if (len > 0)
-	    {
-	      cpy(len, f);
-	      continue;
-	    }
-	}
-#endif
+	case '%':
+	  break;
 
+	case '\a': case '\b': case '\t': case '\n':
+	case '\v': case '\f': case '\r':
+	case ' ': case '!': case '"': case '#': case '&': case'\'':
+	case '(': case ')': case '*': case '+': case ',': case '-':
+	case '.': case '/': case '0': case '1': case '2': case '3':
+	case '4': case '5': case '6': case '7': case '8': case '9':
+	case ':': case ';': case '<': case '=': case '>': case '?':
+	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+	case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
+	case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
+	case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
+	case 'Y': case 'Z': case '[': case'\\': case ']': case '^':
+	case '_': case 'a': case 'b': case 'c': case 'd': case 'e':
+	case 'f': case 'g': case 'h': case 'i': case 'j': case 'k':
+	case 'l': case 'm': case 'n': case 'o': case 'p': case 'q':
+	case 'r': case 's': case 't': case 'u': case 'v': case 'w':
+	case 'x': case 'y': case 'z': case '{': case '|': case '}':
+	case '~':
+	  /* The C Standard requires these 98 characters (plus '%') to
+	     be in the basic execution character set.  None of these
+	     characters can start a multibyte sequence, so they need
+	     not be analyzed further.  */
+	  add (1, *p = *f);
+	  continue;
+
+	default:
+	  /* Copy this multibyte sequence until we reach its end, find
+	     an error, or come back to the initial shift state.  */
+	  {
+	    mbstate_t mbstate = mbstate_zero;
+	    size_t len = 0;
+
+	    do
+	      {
+		size_t bytes = mbrlen (f + len, (size_t) -1, &mbstate);
+
+		if (bytes == 0)
+		  break;
+
+		if (bytes == (size_t) -2 || bytes == (size_t) -1)
+		  {
+		    len++;
+		    break;
+		  }
+
+		len += bytes;
+	      }
+	    while (! mbsinit (&mbstate));
+
+	    cpy (len, f);
+	    continue;
+	  }
+	}
+
+#else /* ! DO_MULTIBYTE */
+
+      /* Either multibyte encodings are not supported, or they are
+	 safe for formats, so any non-'%' byte can be copied through.  */
       if (*f != '%')
 	{
-	  add(1, *p = *f);
+	  add (1, *p = *f);
 	  continue;
 	}
 
+#endif /* ! DO_MULTIBYTE */
+
       /* Check for flags that can modify a number format.  */
       ++f;
       switch (*f)
 	{
 	case '_':
-	  pad = pad_space;
-	  ++f;
-	  break;
 	case '-':
-	  pad = pad_none;
-	  ++f;
+	  pad = *f++;
 	  break;
+
 	default:
-	  pad = pad_zero;
+	  pad = 0;
+	  break;
+	}
+
+      /* Check for modifiers.  */
+      switch (*f)
+	{
+	case 'E':
+	case 'O':
+	  modifier = *f++;
+	  break;
+
+	default:
+	  modifier = 0;
 	  break;
 	}
 
       /* Now do the specified format.  */
       switch (*f)
 	{
-	case '\0':
+#define DO_NUMBER(d, v) \
+	  digits = d; number_value = v; goto do_number
+#define DO_NUMBER_SPACEPAD(d, v) \
+	  digits = d; number_value = v; goto do_number_spacepad
+
+	case '\0':		/* GNU extension: % at end of format.  */
+	    --f;
+	    /* Fall through.  */
 	case '%':
-	  add(1, *p = *f);
+	  if (modifier != 0)
+	    goto bad_format;
+	  add (1, *p = *f);
 	  break;
 
 	case 'a':
-	  cpy(aw_len, a_wkday);
+	  if (modifier != 0)
+	    goto bad_format;
+	  cpy (aw_len, a_wkday);
 	  break;
 
 	case 'A':
-	  cpy(wkday_len, f_wkday);
+	  if (modifier != 0)
+	    goto bad_format;
+	  cpy (wkday_len, f_wkday);
 	  break;
 
 	case 'b':
-	case 'h':		/* GNU extension.  */
-	  cpy(am_len, a_month);
+	case 'h':		/* POSIX.2 extension.  */
+	  if (modifier != 0)
+	    goto bad_format;
+	  cpy (am_len, a_month);
 	  break;
 
 	case 'B':
-	  cpy(month_len, f_month);
+	  if (modifier != 0)
+	    goto bad_format;
+	  cpy (month_len, f_month);
 	  break;
 
 	case 'c':
+	  if (modifier == 'O')
+	    goto bad_format;
 #ifdef _NL_CURRENT
-	  subfmt = _NL_CURRENT (LC_TIME, D_T_FMT);
+	  if (! (modifier == 'E'
+		 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT)) != '\0'))
+	    subfmt = _NL_CURRENT (LC_TIME, D_T_FMT);
 #else
-	  subfmt = "%a %b %d %H:%M:%S %Z %Y";
+	  subfmt = "%a %b %e %H:%M:%S %Z %Y";
 #endif
+
 	subformat:
 	  {
 	    size_t len = strftime (p, maxsize - i, subfmt, tp);
 	    if (len == 0 && *subfmt)
 	      return 0;
-	    add(len, );
+	    add (len, ;);
 	  }
 	  break;
 
-#define DO_NUMBER(digits, value) \
-	  maxdigits = digits; number_value = value; goto do_number
-#define DO_NUMBER_NOPAD(digits, value) \
-	  maxdigits = digits; number_value = value; goto do_number_nopad
-
-	case 'C':
-	  DO_NUMBER (2, (1900 + tp->tm_year) / 100);
+	case 'C':		/* POSIX.2 extension.  */
+	  if (modifier == 'O')
+	    goto bad_format;
+#ifdef _NL_CURRENT
+	  /* XXX %EC is not implemented yet.  */
+#endif
+	  {
+	    int year = tp->tm_year + TM_YEAR_BASE;
+	    DO_NUMBER (1, year / 100 - (year % 100 < 0));
+	  }
 
 	case 'x':
+	  if (modifier == 'O')
+	    goto bad_format;
 #ifdef _NL_CURRENT
-	  subfmt = _NL_CURRENT (LC_TIME, D_FMT);
+	  if (! (modifier == 'E'
+		 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_FMT)) != '\0'))
+	    subfmt = _NL_CURRENT (LC_TIME, D_FMT);
 	  goto subformat;
 #endif
 	  /* Fall through.  */
-	case 'D':		/* GNU extension.  */
+	case 'D':		/* POSIX.2 extension.  */
+	  if (modifier != 0)
+	    goto bad_format;
 	  subfmt = "%m/%d/%y";
 	  goto subformat;
 
 	case 'd':
+	  if (modifier == 'E')
+	    goto bad_format;
+
 	  DO_NUMBER (2, tp->tm_mday);
 
-	case 'e':		/* GNU extension: %d, but blank-padded.  */
-	  DO_NUMBER_NOPAD (2, tp->tm_mday);
+	case 'e':		/* POSIX.2 extension.  */
+	  if (modifier == 'E')
+	    goto bad_format;
 
-	  /* All numeric formats set MAXDIGITS and NUMBER_VALUE and then
+	  DO_NUMBER_SPACEPAD (2, tp->tm_mday);
+
+	  /* All numeric formats set DIGITS and NUMBER_VALUE and then
 	     jump to one of these two labels.  */
 
-	do_number_nopad:
-	  /* Force `-' flag.  */
-	  pad = pad_none;
+	do_number_spacepad:
+	  /* Force `_' flag.  */
+	  pad = '_';
 
 	do_number:
-	  {
-	    /* Format the number according to the PAD flag.  */
+	  /* Format the number according to the MODIFIER flag.  */
 
-	    register char *nf = &number_fmt[1];
-	    int printed;
+#ifdef _NL_CURRENT
+	  if (modifier == 'O')
+	    {
+	      /* ALT_DIGITS is the first entry in an array with
+		 alternative digit symbols.  We have to find string
+		 number NUMBER_VALUE, but must not look beyond
+		 END_ALT_DIGITS.  */
+	      int run = number_value;
+	      const char *cp = alt_digits;
 
-	    switch (pad)
-	      {
-	      case pad_zero:
-		*nf++ = '0';
-	      case pad_space:
-		*nf++ = '0' + maxdigits;
-	      case pad_none:
-		*nf++ = 'u';
-		*nf = '\0';
-	      }
+	      while (run > 0 && cp < end_alt_digits)
+		cp = strchr (cp, '\0') + 1;
 
-#ifdef _LIBC
-	    add (maxdigits, printed = sprintf (p, number_fmt, number_value));
-#else
-	    add (maxdigits, sprintf (p, number_fmt, number_value);
-		 printed = strlen (p));
+	      if (cp < end_alt_digits)
+		{
+		  size_t digitlen = strlen (cp);
+		  if (digitlen != 0)
+		    {
+		      cpy (digitlen, cp);
+		      break;
+		    }
+		}
+	    }
 #endif
+	  {
+	    unsigned int u = number_value;
 
-	    break;
-	  }
+	    bufp = buf + sizeof (buf);
+	    negative_number = number_value < 0;
+
+	    if (negative_number)
+	      u = -u;
+
+	    do
+	      *--bufp = u % 10 + '0';
+	    while ((u /= 10) != 0);
+  	  }
+
+	do_number_sign_and_padding:
+	  if (negative_number)
+	    *--bufp = '-';
+
+	  if (pad != '-')
+	    {
+	      int padding = digits - (buf + sizeof (buf) - bufp);
+
+	      if (pad == '_')
+		{
+		  while (0 < padding--)
+		    *--bufp = ' ';
+		}
+	      else
+		{
+		  bufp += negative_number;
+		  while (0 < padding--)
+		    *--bufp = '0';
+		  if (negative_number)
+		    *--bufp = '-';
+		}
+	    }
+
+	  cpy (buf + sizeof (buf) - bufp, bufp);
+	  break;
 
 
 	case 'H':
+	  if (modifier == 'E')
+	    goto bad_format;
+
 	  DO_NUMBER (2, tp->tm_hour);
 
 	case 'I':
+	  if (modifier == 'E')
+	    goto bad_format;
+
 	  DO_NUMBER (2, hour12);
 
 	case 'k':		/* GNU extension.  */
-	  DO_NUMBER_NOPAD (2, tp->tm_hour);
+	  if (modifier == 'E')
+	    goto bad_format;
+
+	  DO_NUMBER_SPACEPAD (2, tp->tm_hour);
 
 	case 'l':		/* GNU extension.  */
-	  DO_NUMBER_NOPAD (2, hour12);
+	  if (modifier == 'E')
+	    goto bad_format;
+
+	  DO_NUMBER_SPACEPAD (2, hour12);
 
 	case 'j':
+	  if (modifier == 'E')
+	    goto bad_format;
+
 	  DO_NUMBER (3, 1 + tp->tm_yday);
 
 	case 'M':
+	  if (modifier == 'E')
+	    goto bad_format;
+
 	  DO_NUMBER (2, tp->tm_min);
 
 	case 'm':
+	  if (modifier == 'E')
+	    goto bad_format;
+
 	  DO_NUMBER (2, tp->tm_mon + 1);
 
-	case 'n':		/* GNU extension.  */
+	case 'n':		/* POSIX.2 extension.  */
 	  add (1, *p = '\n');
 	  break;
 
 	case 'p':
-	  cpy(ap_len, ampm);
+	  cpy (ap_len, ampm);
 	  break;
 
 	case 'R':		/* GNU extension.  */
 	  subfmt = "%H:%M";
 	  goto subformat;
 
-	case 'r':		/* GNU extension.  */
+	case 'r':		/* POSIX.2 extension.  */
+#ifdef _NL_CURRENT
+	  subfmt = _NL_CURRENT (LC_TIME, T_FMT_AMPM);
+#else
 	  subfmt = "%I:%M:%S %p";
+#endif
 	  goto subformat;
 
 	case 'S':
+	  if (modifier == 'E')
+	    return 0;
+
 	  DO_NUMBER (2, tp->tm_sec);
 
+	case 's':		/* GNU extension.  */
+  	  {
+	    struct tm ltm = *tp;
+	    time_t t = mktime (&ltm);
+
+	    /* Generate string value for T using time_t arithmetic;
+	       this works even if sizeof (long) < sizeof (time_t).  */
+
+	    bufp = buf + sizeof (buf);
+	    negative_number = t < 0;
+
+	    do
+	      {
+		int d = t % 10;
+		t /= 10;
+
+		if (negative_number)
+		  {
+		    d = -d;
+
+		    /* Adjust if division truncates to minus infinity.  */
+		    if (0 < -1 % 10 && d < 0)
+		      {
+			t++;
+			d += 10;
+		      }
+		  }
+
+		*--bufp = d + '0';
+	      }
+	    while (t != 0);
+
+	    digits = 1;
+	    goto do_number_sign_and_padding;
+	  }
+
 	case 'X':
+	  if (modifier == 'O')
+	    goto bad_format;
 #ifdef _NL_CURRENT
-	  subfmt = _NL_CURRENT (LC_TIME, T_FMT);
+	  if (! (modifier == 'E'
+		 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_T_FMT)) != '\0'))
+	    subfmt = _NL_CURRENT (LC_TIME, T_FMT);
 	  goto subformat;
 #endif
 	  /* Fall through.  */
-	case 'T':		/* GNU extenstion.  */
+	case 'T':		/* POSIX.2 extension.  */
 	  subfmt = "%H:%M:%S";
 	  goto subformat;
 
-	case 't':		/* GNU extenstion.  */
+	case 't':		/* POSIX.2 extension.  */
 	  add (1, *p = '\t');
 	  break;
 
+	case 'u':		/* POSIX.2 extension.  */
+	  DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
+
 	case 'U':
-	  DO_NUMBER (2, y_week0);
+	  if (modifier == 'E')
+	    goto bad_format;
+
+	  DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7);
 
 	case 'V':
-	  DO_NUMBER (2, y_week2);
+	case 'g':		/* GNU extension.  */
+	case 'G':		/* GNU extension.  */
+	  if (modifier == 'E')
+	    goto bad_format;
+	  {
+	    int year = tp->tm_year + TM_YEAR_BASE;
+	    int days = iso_week_days (tp->tm_yday, tp->tm_wday);
+
+	    if (days < 0)
+	      {
+		/* This ISO week belongs to the previous year.  */
+		year--;
+		days = iso_week_days (tp->tm_yday + (365 + __isleap (year)),
+				      tp->tm_wday);
+	      }
+	    else
+	      {
+		int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)),
+				       tp->tm_wday);
+		if (0 <= d)
+		  {
+		    /* This ISO week belongs to the next year.  */
+		    year++;
+		    days = d;
+		  }
+	      }
+
+	    switch (*f)
+	      {
+	      case 'g':
+		DO_NUMBER (2, (year % 100 + 100) % 100);
+
+	      case 'G':
+		DO_NUMBER (1, year);
+
+	      default:
+		DO_NUMBER (2, days / 7 + 1);
+	      }
+	  }
 
 	case 'W':
-	  DO_NUMBER (2, y_week1);
+	  if (modifier == 'E')
+	    goto bad_format;
+
+	  DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7);
 
 	case 'w':
-	  DO_NUMBER (2, tp->tm_wday);
+	  if (modifier == 'E')
+	    goto bad_format;
+
+	  DO_NUMBER (1, tp->tm_wday);
 
 	case 'Y':
-	  DO_NUMBER (4, 1900 + tp->tm_year);
+#ifdef _NL_CURRENT
+	  if (modifier == 'E'
+	      && *(subfmt = _NL_CURRENT (LC_TIME, ERA_YEAR)) != '\0')
+	    goto subformat;
+#endif
+	  if (modifier == 'O')
+	    goto bad_format;
+	  else
+	    DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE);
 
 	case 'y':
-	  DO_NUMBER (2, tp->tm_year % 100);
+#ifdef _NL_CURRENT
+	  /* XXX %Ey is not implemented yet.  */
+#endif
+	  DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100);
 
 	case 'Z':
 	  cpy(zonelen, zone);
 	  break;
 
+	case 'z':		/* GNU extension.  */
+	  if (tp->tm_isdst < 0)
+	    break;
+
+	  {
+	    int diff;
+#if HAVE_TM_GMTOFF
+	    diff = tp->tm_gmtoff;
+#else
+	    struct tm gtm;
+	    struct tm ltm = *tp;
+	    time_t lt = mktime (&ltm);
+
+	    if (lt == (time_t) -1)
+	      {
+		/* mktime returns -1 for errors, but -1 is also a
+		   valid time_t value.  Check whether an error really
+		   occurred.  */
+		struct tm tm;
+		localtime_r (&lt, &tm);
+
+		if ((ltm.tm_sec ^ tm.tm_sec)
+		    | (ltm.tm_min ^ tm.tm_min)
+		    | (ltm.tm_hour ^ tm.tm_hour)
+		    | (ltm.tm_mday ^ tm.tm_mday)
+		    | (ltm.tm_mon ^ tm.tm_mon)
+		    | (ltm.tm_year ^ tm.tm_year))
+		  break;
+	      }
+
+	    if (! gmtime_r (&lt, &gtm))
+	      break;
+
+	    diff = tm_diff (&ltm, &gtm);
+#endif
+
+	    if (diff < 0)
+	      {
+		add (1, *p = '-');
+		diff = -diff;
+	      }
+	    else
+	      add (1, *p = '+');
+
+	    diff /= 60;
+	    DO_NUMBER (4, (diff / 60) * 100 + diff % 60);
+	  }
+
 	default:
-	  /* Bad format.  */
+	  /* Unknown format; output the format, including the '%',
+	     since this is most likely the right thing to do if a
+	     multibyte string has been misparsed.  */
+	bad_format:
+	  {
+	    int flen;
+	    for (flen = 2; f[1 - flen] != '%'; flen++)
+	      continue;
+	    cpy (flen, &f[1 - flen]);
+	  }
 	  break;
 	}
     }

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.

lib/strndup.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"

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>

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;
 }

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>

lib/strtol.c

@@ -108,12 +108,12 @@ extern int errno;
 #else
 # define LONG long
 
-#ifndef ULONG_MAX
-# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
-#endif
-#ifndef LONG_MAX
-# define LONG_MAX ((long int) (ULONG_MAX >> 1))
-#endif
+# ifndef ULONG_MAX
+#  define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
+# endif
+# ifndef LONG_MAX
+#  define LONG_MAX ((long int) (ULONG_MAX >> 1))
+# endif
 #endif
 
 #ifdef USE_WIDE_CHAR
@@ -342,9 +342,9 @@ noconv:
 
 #undef __P
 #if defined (__STDC__) && __STDC__
-#define __P(args) args
+# define __P(args) args
 #else
-#define __P(args) ()
+# define __P(args) ()
 #endif
 
 /* Prototype.  */

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>

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

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

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 *

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.

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>

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

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

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_ */

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;
 }

old/fileutils/ChangeLog

@@ -1,3 +1,374 @@
+Mon Sep 30 20:08:45 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/path-concat.c (path_concat): Use K&R style function definition.
+
+Sun Sep 29 22:00:44 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (ALL_LINGUAS): Add slovenian (sl).
+
+	* src/cp-aux.c (usage): Take only one argument -- like all the other
+	usage functions.
+
+	* src/cp.c (do_copy): Give better error message when copying multiple
+	files and the last one is not a directory.  From Karl Berry.
+	Call error (0, 0, ... then usage (1) -- instead of calling usage
+	with two arguments.
+
+Sat Sep 28 13:16:29 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/getversion.c (backup_types): Declare const.
+	(backup_args): Likewise.
+
+Sat Sep 21 10:22:28 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dircolors.c (xstrndup): Use message that's the same as the one
+	you get from e.g., xmalloc.  Reported by Santiago Vila.
+
+Thu Sep 19 22:13:31 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/Makefile.am (fu_SOURCES): Remove regex.c and rx.c.
+	(EXTRA_DIST): Put them here instead.
+
+	* configure.in ($PACKAGE, $VERSION): Don't AC_DEFINE_UNQUOTED these.
+	AM_INIT_AUTOMAKE now does it (as of automake-1.1e).
+
+	* lib/Makefile.am (fu_SOURCES): Move getopt.c and getopt1.c back to
+	here fro EXTRA_DIST.
+	* configure.in (AC_REPLACE_GNU_GETOPT): Remove it -- it's not
+	necessary.
+
+	* acinclude.m4 (AM_SANITY_CHECK_CC, AC_SYS_POSIX_TERMIOS,
+	AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Remove definitions.
+	Now automake's aclocal includes them.
+
+Sun Sep 15 23:08:48 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* Makefile.am (EXTRA_DIST): Remove acinclude.m4.
+
+Mon Sep  9 21:39:49 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/cp.c (do_copy): Describe in a little more detail the code
+	that makes `cp non-directory file/' (eventually) fail.
+
+Sun Sep  8 12:54:31 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/dircolors.c (usage): Refer to LS_COLORS, not LS_COLOR.
+	From Santiago Vila Doncel.
+
+	* src/cp.c (do_copy): Set backup_type to `none' only *after*
+	calling to find_backup_file_name.  Reported by Eli Zaretskii.
+
+Sat Sep  7 12:25:42 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/regex.c, lib/regex.h: New files.
+	* lib/rx.c, lib/rx.h: New files.
+
+	* lib/Makefile.am (INCLUDES): Add -I../intl so compiler will find
+	libintl.h for rpmatch.c.
+
+	* src/system.h: Add comments justifying IS* versions of ctype.h macros.
+
+Thu Sep  5 18:12:44 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/chmod.c (main): Don't set verbose flag for --changes.
+	(change_file_mode): If chmod succeeds and --changes was given,
+	give a diagnostic describing the new permissions.
+	Reported by Philippe Schnoebelen (phs@fing.edu.uy).
+
+	* src/cp.c (do_copy): When concatenating DEST (with a trailing `/')
+	and the basename part of non-directory SOURCE, don't add a slash
+	between them.
+
+Wed Sep  4 21:42:32 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/rpmatch.c: Make sure NULL is defined by including stddef.h
+	(if STDC_HEADERS || _LIBC) or simply defining it (otherwise).
+	Include sys/types.h for definition of size_t needed by regex.h.
+
+	* lib/Makefile.am (fu_SOURCES): Add regex.c and rx.c.
+	(noinst_HEADERS): Add regex.h and rx.h.
+
+	* configure.in (AM_SANITY_CHECK_CC): Use it.
+	(AM_WITH_REGEX): Use it.
+
+	* acconfig.h (WITH_REGEX): Add it.
+
+Tue Sep  3 08:13:09 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/rpmatch.c (rpmatch): Set yesexpr to "^[yY]" and noexpr to
+	"^[nN]"; this conforms to POSIX.2. From Paul Eggert
+	<eggert@twinsun.com>.
+
+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.

old/fileutils/NEWS

@@ -1,8 +1,16 @@
+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:
+* 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 (documented only in --help message FIXME)
-* new program: dircolors (not yet documented FIXME)
+  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,
@@ -10,16 +18,16 @@ Changes in release 3.13:
 * 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 (like Linux), the system-
-  provided function will be used -- so executables may be a little smaller
+* 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

old/sh-utils/ChangeLog

@@ -1,3 +1,193 @@
+Sun Sep 22 22:41:54 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (AC_CHECK_HEADERS): Alphabetize.
+	Update for automake-1.1e.
+
+Thu Sep 19 07:47:18 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/regex.c: Merge with FSF version.
+	* lib/getloadavg.c: Replace with FSF version.
+
+Mon Sep 16 23:13:04 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/strftime.c (strftime): New version, from GNU libc.
+
+Sun Sep 15 23:08:48 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* Makefile.am (EXTRA_DIST): Remove acinclude.m4.
+
+Mon Sep  9 22:10:45 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in: Improve handling of math library so -lm is used
+	only when it's actually required.  That makes a difference when
+	using dynamic linking.
+	Remove check that added -lm to LIBS.
+	(SQRT_LIBM): Test for and AC_SUBST it.
+	(POW_LIBM): Likewise.
+	(SEQ_LIBM): Likewise.
+	Motivation and suggestions from Ulrich Drepper.
+
+	* src/Makefile.am (factor_LDADD, printf_LDADD, seq_LDADD):
+	Set these using new @SQRT_LIBM@, @POW_LIBM@, and @SEQ_LIBM@ resp.
+	Also set corresponding _DEPENDENCIES variables.
+
+Sat Sep  7 12:41:39 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/system.h: Add comments justifying IS* versions of ctype.h macros.
+
+	* lib/getdate.y: Define and use upper case variants of ctype.h
+	is* macros.  From Bruno Haible.
+
+Thu Sep  5 22:12:20 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/strftime.c: New version from glibc.
+
+Wed Sep  4 23:39:51 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (ALL_LINGUAS): Add dutch (nl).
+
+Mon Sep  2 10:52:55 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/*.c (usage): Tell where to report bugs.
+
+Sun Sep  1 07:56:07 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+        * configure.in (AM_FUNC_MKTIME): Use it.
+        (AC_REPLACE_FUNCS): Remove mktime.
+	(AM_INIT_AUTOMAKE): Use it.
+	(AM_PROG_INSTALL): Remove.  AM_INIT_AUTOMAKE does this.
+        (AC_PROG_MAKE_SET): Likewise.
+	(jm_MAINTAINER_MODE, fp_C_PROTOTYPES): Rename with
+        AM_ prefix for latest automake/aclocal.
+
+	* Makefile.am (EXTRA_DIST): Add acinclude.m4.
+
+        * acinclude.m4: New file -- derived from aclocal.m4.
+        * aclocal.m4: This file is now generated by the aclocal program
+        (which comes with the automake package.)
+
+Sat Aug 17 00:14:55 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/strftime.c: Update from GNU libc -- this adds back %z and %s
+	formats and reverts to old behavior where unrecognized format like
+	%E is treated as eqivalent to `E'.
+
+Sun Aug  4 09:14:28 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* checks/: New directory.
+	* checks/Makefile.am: New file.
+	* checks/nice: New file.  Derived from tests from Eric Backus.
+	* configure.in (AC_OUTPUT): Add new directory: checks.
+	* Makefile.am (SUBDIRS): Likewise.
+
+	* src/nice.c (main): Allow `+' in options like -+8 and -+13.
+
+Fri Aug  2 21:45:06 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/nice.c (main): Set minus_flag to zero in two places.
+	Otherwise, `nice --1 -3' would mistakenly do the equivalent of
+	`nice --3'.  Thanks to Eric Backus <ericb@lsid.hp.com> for the
+	test cases.
+
+	* configure.in (check for /proc/uptime): New check.
+	* acconfig.h (SAVE_PROC_UPTIME): #undef it.  Reorder so symbols
+	are sorted again.
+	*src/who-users.c (print_uptime) [HAVE_PROC_UPTIME]: Read from
+	/proc/uptime.
+	From Ulrich Drepper.
+
+Thu Aug  1 22:38:38 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (AC_REPLACE_GNU_GETOPT): No longer use it.
+	It isn't necessary because the cpp-time checks of getopt.c and
+	getopt1.c are at least as good.
+	* lib/Makefile.am (EXTRA_DIST): Remove getopt.c and getopt1.c.
+	(su_SOURCES): Add getopt.c and getopt1.c
+	This reverts much of the April 23 change.
+
+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.
+
+Sun Jul 21 09:47:55 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (AC_REPLACE_FUNCS): Replace getline.c.
+	Add related check for the getdelim function.
+	From Ulrich Drepper -- as done in gettext.
+
+	* src/stty.c (usage): Correct typo (-iucl -> -iuclc) in usage message.
+	From Thomas Olsson <d95to@efd.lth.se>.
+
+Sat Jul 20 17:01:56 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (PACKAGE_VERSION): Use space instead of hyphen to
+	separate PACKAGE and VERSION.
+
+Wed Jul 17 23:13:19 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/chroot.c: Include <sys/types.h> before system.h.
+	* src/seq.c: Likewise.
+	* src/yes.c: Likewise.
+	From Arne Juul.
+
+Tue Jul 16 00:06:33 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/strftime.c (strftime): Use `(void)0' as second arg to add macro.
+	Omitting that second arg made some HPUX C compiler report an error.
+	From Kaveh R. Ghazi.
+
+Mon Jul 15 23:42:57 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/who-users.c (print_uptime): Reverse `days' and `day' in
+	uptime message.  From Kaveh R. Ghazi.
+
+	* Many files: Update FSF address.
+
+Sun Jul 14 20:05:34 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/who-users.c (print_uptime): Use 0, not undefined errno in
+	couldn't-get-boot-time diagnostic.  From Ulrich Drepper.
+
+Sat Jul 13 14:22:54 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/chroot.c (usage): Add a `\' after `\n' in usage message.
+	Otherwise, SunOS's /bin/cc chokes.
+
+	* src/stty.c [GWINSZ_BROKEN]: Remove thus-guarded `#undef TIOCGWINSZ'.
+	GWINSZ_BROKEN can't be defined anymore.
+
+	* configure.in (boot time test): Use AC_EGREP_CPP instead of
+	AC_EGREP_HEADER; #endif, instead of #fi.
+	(AM_SYS_POSIX_TERMIOS, AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Use
+	these macros instead of the tests from which they were derived.
+	($am_cv_sys_posix_termios): Renamed to have am_ prefix instead of su_.
+
+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.
+
+Sun Jul  7 22:40:08 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* aclocal.m4 (AM_SYS_POSIX_TERMIOS): New macro, derived from test
+	in configure.in.
+	(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Likewise.
+
+Sat Jul  6 12:47:48 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* 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 (su_SOURCES): Remove group-member.c.
+	(EXTRA_DIST): Add group-member.c here.
+
 Thu Jul  4 22:40:06 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* src/expr.c (docolon): Remove space before newline in usage message.

old/textutils/ChangeLog

@@ -1,3 +1,240 @@
+Sun Sep 29 20:04:53 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* tests/sort-test/build-script.pl: Die if close fails.
+	* tests/tr-test/build-script.pl: Likewise.
+
+	* configure.in (AC_OUTPUT): Add tests/cut-test/Makefile.
+	* tests/Makefile.am (SUBDIRS): Add cut-test.
+	* tests/cut-test: New directory.
+
+Fri Sep 27 22:22:09 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (ALL_LINGUAS): Add spanish (es).
+
+Thu Sep 26 21:02:54 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/md5sum.c (usage): Remove references in --help output to
+	the now-deprecated --string option.  Support for it will be
+	removed soon.
+
+	* tests/md5sum-test/md5-rfc: Rewrite to avoid use of --string option.
+
+Wed Sep 25 21:43:10 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* tests/sort-test/Makefile.am (t): Factor out .in suffix.
+	Include new test: t16a.
+	* tests/tr-test/Makefile.am (t): Likewise.
+
+	* src/Makefile.am (EXTRA_DIST): Remove md5-test.rfc.
+
+Mon Sep 23 10:00:50 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* tests/md5sum-test/Makefile.am (EXTRA_DIST): Distribute $(TESTS).
+
+Sun Sep 22 09:24:22 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/sort.c (keycompare): Declare translate to be unsigned char *.
+	Otherwise, sign extension caused misordering when using e.g. -f.
+	Reported by Erick Branderhorst.
+	* tests/sort-test/Test.pm: Add Erick's test for that fix.
+
+	* tests/Makefile.am (SUBDIRS): Add md5sum-test.
+
+Sat Sep 21 13:34:59 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/Makefile.am (check): Remove tests for md5sum.
+	* tests/md5sum-test: New directory.  Put them here instead.
+	* configure.in (AC_OUTPUT): Add tests/md5sum-test/Makefile.
+
+Thu Sep 19 08:54:05 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* tests/: Rename from checks.
+	* Makefile.am (SUBDIRS): Change `checks' to `tests'.
+	* configure.in (AC_OUTPUT): Likewise.
+
+	* configure.in ($PACKAGE, $VERSION): Don't AC_DEFINE_UNQUOTED these.
+	AM_INIT_AUTOMAKE now does it (as of automake-1.1e).
+
+Sun Sep 15 23:08:48 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* Makefile.am (EXTRA_DIST): Remove acinclude.m4.
+
+Thu Sep 12 17:05:23 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* lib/Makefile.am (EXTRA_DIST): Add getline.c.
+	(tu_SOURCES): Remove getline.c
+	From Kaveh Ghazi.
+
+Sun Sep  8 13:55:18 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* checks/sort-test/build-script.pl: Prefix $in with \$srcdir/
+	so make check works with VPATH build.  From Uli Drepper.
+
+Sat Sep  7 12:25:42 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/system.h: Add comments justifying IS* versions of ctype.h macros.
+
+	* src/fmt.c (check_punctuation): Use ISPUNCT instead of ispunct.
+	(get_line): Use ISSPACE instead of isspace.  From Bruno Haible.
+
+Mon Sep  2 10:34:46 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/*.c (usage): Tell where to report bugs.
+
+Sun Aug 25 22:50:47 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* checks/sort-test/Makefile.am (EXTRA_DIST): Add $x-tests.
+	($x-tests): Guard dependencies with @MAINT@.
+	* checks/tr-test/Makefile.am: Likewise.
+
+Sat Aug 24 14:25:41 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/cat.c (cat): Cast first arg to stpcpy to char* to avoid warnings.
+
+Wed Aug 21 22:28:26 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (ALL_LINGUAS): Add polish (pl).
+
+Sun Aug 18 09:34:42 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (AC_OUTPUT): Add checks/sort-test/Makefile.
+	* checks/Makefile.am (SUBDIRS): Add sort-test.
+
+Sat Aug 17 18:57:17 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* Makefile.am (EXTRA_DIST): Add acinclude.m4.
+
+Tue Aug 13 21:47:23 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 11 20:49:21 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in: Rename a few macros for automake-1.1c.
+	(AC_REPLACE_GNU_GETOPT): Remove.
+	(AC_PATH_PROG): Find perl -- needed only for checks if you
+	change or remove things with e.g. make maintainerclean.
+
+
+	* lib/Makefile.am (tu_LIBADD): Remove @REGEXOBJ@.  New AM_WITH_REGEX
+	adds .o files to @LIBOBJ@.
+	(tu_SOURCES): Add getopt.c and getopt1.c.
+	(EXTRA_DIST): Remove getopt.c and getopt1.c.
+
+	* acinclude.m4: New file -- derived from aclocal.m4.
+	* aclocal.m4: This file is now generated by the aclocal program
+	(which comes with the automake package.)
+
+Sun Aug  4 10:50:46 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* checks/: New directory.
+	* checks/Makefile.am: New file.
+	* configure.in (AC_OUTPUT): Add new directories: checks,
+	checks/tr-test.
+	* Makefile.am (SUBDIRS): Likewise.
+
+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 23:06:35 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/unexpand.c (unexpand): Move EOF check to follow code that
+	processes and generates output for pending spaces.  Before
+	`printf '  ' |unexpand -t 1,2' generated no output.
+
+	* src/md5sum.c (md5_check): Remove parameter, BINARY.
+	Rename local TYPE_FLAG to BINARY, so md5_file uses the binary mode
+	from the input stream rather than the one from the command line.
+	(main): Fail with a diagnostic if --binary or --text is specified
+	when verifying checksums.
+	Reported by Eli Zaretskii <eliz@is.elta.co.il>.
+
+Sun Jul 21 11:58:48 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in: Add check for error_at_line so systems with
+	GNU libc don't compile and link with distributed error.c.
+	* lib/Makefile.am (tu_SOURCES): Remove error.c.
+	(EXTRA_DIST): Add error.c.
+
+	* configure.in (AC_REPLACE_FUNCS): Replace getline.c.
+	Add related check for the getdelim function.
+	From Ulrich Drepper -- as done in gettext.
+
+Sat Jul 20 15:59:36 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* configure.in (PACKAGE_VERSION): Use space instead of hyphen to
+	separate PACKAGE and VERSION.
+
+	* aclocal.m4 (AM_SANITY_CHECK_CC): New macro.  Derived from
+	macros from Bruno Haible and from Cygnus.
+	* configure.in (AM_SANITY_CHECK_CC): Use it.
+
+Wed Jul 17 00:30:28 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* install-sh: Get version with MIT copyright.
+
+Tue Jul 16 00:09:37 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* aclocal.m4 (fp_C_PROTOTYPES): Improved version from
+	François Pinard.
+	Update all other macros to reference $fp_cv_prog_cc_stdc, rather
+	than $ac_cv_prog_cc_stdc.
+
+	* src/od.c (OFF_T_MAX): Remove definition.
+	(main): Compare against LONG_MAX rather than OFF_T_MAX.
+
+Mon Jul 15 23:42:57 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* Many files: Update FSF address.
+
+Sun Jul 14 16:53:50 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/unexpand.c (unexpand): Fix bug that contributed to endless loop
+	when invoking `echo '  ' |unexpand -t 1,2': use print_tab_index, not
+	tab_index in inner flush_pend: while loop.  From Keith Owens
+	<kaos@audio.apana.org.au>.
+
+	* src/unexpand.c [HAVE_LIMITS_H]: Include limits.h for INT_MAX.
+	[!INT_MAX]: Define it.
+	(main): Append INT_MAX to command-line-specified tab list to
+	ensure termination in unexpand's inner loop.
+	Derived from a patch from Keith Owens.
+
+Thu Jul 11 22:04:36 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* Version 1.19.
+
+	* configure.in (VERSION): Bump to 1.19.
+
+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 18:07:23 1996  Jim Meyering  <meyering@na-net.ornl.gov>
+
+	* src/fmt.c (MAXCOST): Use `(unsigned long)1' rather than `(COST)1'
+	so the left operand of the << isn't signed.
+	From Kjetil Torgrim Homme.
+
+	* po/Makefile.in.in (install-data): Don't install NLS files when
+	they're not requested.  From Ulrich Drepper.  Reported by
+	Kjetil Torgrim Homme <kjetilho@ifi.uio.no>.
+
 Fri Jul  5 21:55:58 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* po/Makefile.in.in ($(PACKAGE).pot): Merge from gettext-0.10.23.