.

preceding chown call and we're supposed to preserve some special
permission bit(s) that would have been reset by chown.
Reported by Greg Louis.

Makefile.maint

@@ -145,11 +145,13 @@ writable-files:
 WGET = wget
 ftp-gnu = ftp://ftp.gnu.org/gnu
 
+automake_repo=:pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake
 .PHONY: wget-update
 wget-update:
 	$(WGET) $(ftp-gnu)/texinfo/texinfo.tex -O $(srcdir)/doc/texinfo.tex
 	$(WGET) $(ftp-gnu)/config/config.guess -O $(srcdir)/config.guess
 	$(WGET) $(ftp-gnu)/config/config.sub -O $(srcdir)/config.sub
+	cvs -d $(automake_repo) co -p automake/depcomp > depcomp
 
 alpha: writable-files po-check
 	$(MAKE) cvs-dist

THANKS

@@ -84,6 +84,7 @@ Erik Corry                          erik@kroete2.freinet.de
 Felix Lee                           flee@teleport.com
 Fletcher Mattox                     fletcher@cs.utexas.edu
 Florin Iucha                        fiucha@hsys.mic.ro
+Frank Adler                         fadler@allesklar.de
 Frank T Lofaro                      ftlofaro@snooks.Egr.UNLV.EDU
 François Pinard                     pinard@iro.umontreal.ca
 Fred Fish                           fnf@ninemoons.com
@@ -96,6 +97,7 @@ Geoff Odhner                        geoff@franklin.com
 Gerhard Poul                        gpoul@gnu.org
 Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
 GOTO Masanori                       gotom@debian.or.jp
+Greg Louis                          glouis@dynamicro.on.ca
 Greg McGary                         gkm@gnu.org
 Greg Troxel                         gdt@bbn.com
 Greg Wooledge                       gawooledge@sherwin.com
@@ -159,6 +161,7 @@ Lars Hecking                        lhecking@nmrc.ucc.ie
 Lehti Rami                          rammer@cs.tut.fi
 Leonard N. Zubkoff                  lnz@dandelion.com
 Lorne Baker                         lbaker@nitro.avint.net
+Maciej Kwapulinski                  pikpok@univ.gda.pl
 Manas Garg                          manas@cygsoft.com
 Manfred Hollstein                   manfred@s-direktnet.de
 Marc Boucher                        marc@mbsi.ca
@@ -173,6 +176,7 @@ Mark Kettenis                       kettenis@phys.uva.nl
 Mark W. Eichin                      eichin@cygnus.com
 Markus Demleitner                   msdemlei@auriga.ari.uni-heidelberg.de
 Martin                              martin@dresden.nacamar.de
+Martin Gallant                      martyg@goodbit.net
 Martin Hippe                        martin.hippe@schlund.de
 Martin Mitchell                     martin@debian.org
 Martin P.J. Zinser                  zinser@decus.de
@@ -203,6 +207,7 @@ Niklas Edmundsson                   nikke@acc.umu.se
 Noah Friedman                       friedman@splode.com
 Noel Cragg                          noel@red-bean.com
 Olav Morkrid                        olav@funcom.com
+Ørn E. Hansen                       oehansen@daimi.aau.dk
 Paul Eggert                         eggert@twinsun.com
 Paul Nevai                          nevai@ops.mps.ohio-state.edu
 Paul Sauer                          paul@alexa.com
@@ -218,7 +223,7 @@ Philippe De Muyter                  phdm@macqel.be
 Philippe Schnoebelen                Philippe.Schnoebelen@imag.fr
 Piergiorgio Sartor                  sartor@sony.de
 Piotr Kwapulinski                   kwap@univ.gda.pl
-Maciej Kwapulinski                  pikpok@univ.gda.pl
+Prashant TR                         tr@eth.net
 Rainer Orth                         ro@TechFak.Uni-Bielefeld.DE
 Ralf W. Stephan                     stephan@tmt.de
 Ralph Loader                        loader@maths.ox.ac.uk
@@ -242,6 +247,7 @@ Santiago Vila Doncel                sanvila@unex.es
 Savochkin Andrey Vladimirovich      saw@msu.ru
 Scott Lurndal                       slurn@griffin.engr.sgi.com
 Stephen Gildea                      gildea@x.org
+Stephen Smoogen                     ??????????
 Steve McConnel                      steve@acadcomp.sil.org
 Stuart Kemp                         skemp@peter.bmc.com
 Tadayoshi Funaba                    tadf@kt.rim.or.jp
@@ -270,4 +276,3 @@ William Dowling                     will@franklin.com
 William Lewis                       wiml@omnigroup.com
 Wolfram Kleff                       kleff@cs.uni-bonn.de
 Zvi Har'El                          rl@math.technion.ac.il
-Ørn E. Hansen                       oehansen@daimi.aau.dk

doc/Makefile.in

@@ -158,9 +158,11 @@ $(srcdir)/version.texi: stamp-vti
 	@:
 
 $(srcdir)/stamp-vti: fileutils.texi $(top_srcdir)/configure.in
-	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/fileutils.texi`" > vti.tmp
-	@echo "@set EDITION $(VERSION)" >> vti.tmp
-	@echo "@set VERSION $(VERSION)" >> vti.tmp
+	@(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/fileutils.texi`; \
+	echo "@set UPDATED $$1 $$2 $$3"; \
+	echo "@set UPDATED-MONTH $$2 $$3"; \
+	echo "@set EDITION $(VERSION)"; \
+	echo "@set VERSION $(VERSION)") > vti.tmp
 	@cmp -s vti.tmp $(srcdir)/version.texi \
 	  || (echo "Updating $(srcdir)/version.texi"; \
 	      cp vti.tmp $(srcdir)/version.texi)

doc/texinfo.tex

@@ -3,9 +3,9 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2000-05-28.15}
+\def\texinfoversion{2000-09-06.09}
 %
-% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
 % Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software; you can redistribute it and/or
@@ -3155,7 +3155,6 @@ width0pt\relax} \fi
   %
   % Double the \vsize as well.  (We don't need a separate register here,
   % since nobody clobbers \vsize.)
-  \advance\vsize by -\ht\partialpage
   \vsize = 2\vsize
 }
 
@@ -3169,6 +3168,7 @@ width0pt\relax} \fi
   % previous page.
   \dimen@ = \vsize
   \divide\dimen@ by 2
+  \advance\dimen@ by -\ht\partialpage
   %
   % box0 will be the left-hand column, box2 the right.
   \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
@@ -3176,15 +3176,18 @@ width0pt\relax} \fi
   \unvbox255
   \penalty\outputpenalty
 }
+%
+% Re-output the contents of the output page -- any previous material,
+% followed by the two boxes we just split, in box0 and box2.
 \def\pagesofar{%
-  % Re-output the contents of the output page -- any previous material,
-  % followed by the two boxes we just split, in box0 and box2.
   \unvbox\partialpage
   %
   \hsize = \doublecolumnhsize
   \wd0=\hsize \wd2=\hsize
   \hbox to\pagewidth{\box0\hfil\box2}%
 }
+% 
+% All done with double columns.
 \def\enddoublecolumns{%
   \output = {%
     % Split the last of the double-column material.  Leave it on the
@@ -3209,8 +3212,9 @@ width0pt\relax} \fi
   % \endgroup where \vsize got restored).
   \pagegoal = \vsize
 }
+%
+% Called at the end of the double column material.
 \def\balancecolumns{%
-  % Called at the end of the double column material.
   \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
   \dimen@ = \ht0
   \advance\dimen@ by \topskip

doc/textutils.texi

@@ -1796,32 +1796,34 @@ contents of files.
 
 @pindex wc
 @cindex byte count
+@cindex character count
 @cindex word count
 @cindex line count
 
-@code{wc} counts the number of bytes, whitespace-separated words, and
-newlines in each given @var{file}, or standard input if none are given
-or for a @var{file} of @samp{-}.  Synopsis:
+@code{wc} counts the number of bytes, characters, whitespace-separated
+words, and newlines in each given @var{file}, or standard input if none
+are given or for a @var{file} of @samp{-}.  Synopsis:
 
 @example
 wc [@var{option}]@dots{} [@var{file}]@dots{}
 @end example
 
 @cindex total counts
+@vindex POSIXLY_CORRECT
 @code{wc} prints one line of counts for each file, and if the file was
 given as an argument, it prints the file name following the counts.  If
 more than one @var{file} is given, @code{wc} prints a final line
 containing the cumulative counts, with the file name @file{total}.  The
-counts are printed in this order: newlines, words, bytes.
+counts are printed in this order: newlines, words, characters, bytes.
 By default, each count is output right-justified in a 7-byte field with
 one space between fields so that the numbers and file names line up nicely
 in columns.  However, @sc{posix} requires that there be exactly one space
 separating columns.  You can make @code{wc} use the @sc{posix}-mandated
 output format by setting the @env{POSIXLY_CORRECT} environment variable.
 
-By default, @code{wc} prints all three counts.  Options can specify
-that only certain counts be printed.  Options do not undo others
-previously given, so
+By default, @code{wc} prints three counts: the newline, words, byte counts.
+Options can specify that only certain counts be printed.  Options do not
+undo others previously given, so
 
 @example
 wc --bytes --words
@@ -1840,12 +1842,16 @@ The program accepts the following options.  Also see @ref{Common options}.
 
 @item -c
 @itemx --bytes
-@itemx --chars
 @opindex -c
 @opindex --bytes
-@opindex --chars
 Print only the byte counts.
 
+@item -m
+@itemx --chars
+@opindex -m
+@opindex --chars
+Print only the character counts.
+
 @item -w
 @itemx --words
 @opindex -w
@@ -2137,42 +2143,49 @@ value as the directory for temporary files instead of @file{/tmp}.  The
 @samp{-T @var{tempdir}} option in turn overrides the environment
 variable.
 
-@vindex LC_CTYPE
 The following options affect the ordering of output lines.  They may be
 specified globally or as part of a specific key field.  If no key
 fields are specified, global options apply to comparison of entire
 lines; otherwise the global options are inherited by key fields that do
-not specify any special options of their own.  The @samp{-b}, @samp{-d},
-@samp{-f} and @samp{-i} options classify characters according to
-the @env{LC_CTYPE} locale.
+not specify any special options of their own.  In pre-@sc{posix}
+versions of @command{sort}, global options affect only later key fields,
+so portable shell scripts should specify global options first.
 
 @table @samp
 
 @item -b
 @opindex -b
 @cindex blanks, ignoring leading
+@vindex LC_CTYPE
 Ignore leading blanks when finding sort keys in each line.
+The @env{LC_CTYPE} locale determines character types.
 
 @item -d
 @opindex -d
 @cindex phone directory order
 @cindex telephone directory order
+@vindex LC_CTYPE
 Sort in @dfn{phone directory} order: ignore all characters except
 letters, digits and blanks when sorting.
+The @env{LC_CTYPE} locale determines character types.
 
 @item -f
 @opindex -f
 @cindex case folding
+@vindex LC_CTYPE
 Fold lowercase characters into the equivalent uppercase characters when
 sorting so that, for example, @samp{b} and @samp{B} sort as equal.
+The @env{LC_CTYPE} locale determines character types.
 
 @item -g
 @opindex -g
 @cindex general numeric sort
+@vindex LC_NUMERIC
 Sort numerically, using the standard C function @code{strtod} to convert
 a prefix of each line to a double-precision floating point number.
 This allows floating point numbers to be specified in scientific notation,
 like @code{1.0e-34} and @code{10e100}.
+The @env{LC_NUMERIC} locale determines the decimal-point character.
 Do not report overflow, underflow, or conversion errors.
 Use the following collating sequence:
 
@@ -2196,7 +2209,9 @@ Use this option only if there is no alternative; it is much slower than
 @item -i
 @opindex -i
 @cindex unprintable characters, ignoring
+@vindex LC_CTYPE
 Ignore unprintable characters.
+The @env{LC_CTYPE} locale determines character types.
 
 @item -M
 @opindex -M
@@ -2215,13 +2230,13 @@ determines the month spellings.
 Sort numerically: the number begins each line; specifically, it consists
 of optional whitespace, an optional @samp{-} sign, and zero or more
 digits possibly separated by thousands separators, optionally followed
-by a radix character and zero or more digits.  The @env{LC_NUMERIC}
-locale specifies the radix character and thousands separator.
+by a decimal-point character and zero or more digits.  The @env{LC_NUMERIC}
+locale specifies the decimal-point character and thousands separator.
 
 @code{sort -n} uses what might be considered an unconventional method
 to compare strings representing floating point numbers.  Rather than
 first converting each string to the C @code{double} type and then
-comparing those values, sort aligns the radix characters in the two
+comparing those values, sort aligns the decimal-point characters in the two
 strings and compares the strings a character at a time.  One benefit
 of using this approach is its speed.  In practice this is much more
 efficient than performing the two corresponding string-to-double (or even
@@ -2264,6 +2279,17 @@ into fields @w{@samp{ foo}} and @w{@samp{ bar}}.  The field separator is
 not considered to be part of either the field preceding or the field
 following.
 
+@item -T @var{tempdir}
+@opindex -T
+@cindex temporary directory
+@vindex TMPDIR
+Use directory @var{tempdir} to store temporary files, overriding the
+@env{TMPDIR} environment variable.  If this option is given more than
+once, temporary files are stored in all the directories given.  If you
+have a large sort or merge that is I/O-bound, you can often improve
+performance by using this option to specify directories on different
+disks and controllers.
+
 @item -u
 @opindex -u
 @cindex uniquifying output
@@ -2542,8 +2568,8 @@ comm [@var{option}]@dots{} @var{file1} @var{file2}
 
 @vindex LC_COLLATE
 Before @code{comm} can be used, the input files must be sorted using the
-collating sequence specified by the @env{LC_COLLATE} locale, with
-trailing newlines significant.  If an input file ends in a non-newline
+collating sequence specified by the @env{LC_COLLATE} locale.
+If an input file ends in a non-newline
 character, a newline is silently appended.  The @code{sort} command with
 no options always outputs a file that is suitable input to @code{comm}.
 
@@ -3139,6 +3165,8 @@ take up 1 character.
 @opindex --fields
 Print only the fields listed in @var{field-list}.  Fields are
 separated by a TAB character by default.
+Also print any line that contains no delimiter character, unless
+the @samp{--only-delimited} (@samp{-s}) option is specified
 
 @item -d @var{input_delim_byte}
 @itemx --delimiter=@var{input_delim_byte}
@@ -3410,11 +3438,23 @@ A backslash.
 The notation @samp{@var{m}-@var{n}} expands to all of the characters
 from @var{m} through @var{n}, in ascending order.  @var{m} should
 collate before @var{n}; if it doesn't, an error results.  As an example,
-@samp{0-9} is the same as @samp{0123456789}.  Although GNU @code{tr}
-does not support the System V syntax that uses square brackets to
-enclose ranges, translations specified in that format will still work as
-long as the brackets in @var{string1} correspond to identical brackets
-in @var{string2}.
+@samp{0-9} is the same as @samp{0123456789}.
+
+GNU @code{tr} does not support the System V syntax that uses square
+brackets to enclose ranges.  Translations specified in that format
+sometimes work as expected, since the brackets are often transliterated
+to themselves.  However, they should be avoided because they sometimes
+behave unexpectedly.  For example, @samp{tr -d '[0-9]'} deletes brackets
+as well as digits.
+
+Many historically common and even accepted uses of ranges are not
+portable.  For example, on @sc{ebcdic} hosts using the @samp{A-Z}
+range will not do what most would expect because @samp{A} through @samp{Z}
+are not contiguous as they are in @sc{ascii}.
+If you can rely on a @sc{posix} compliant version of @code{tr}, then
+the best way to work around this is to use character classes (see below).
+Otherwise, it is most portable (and most ugly) to enumerate the members
+of the ranges.
 
 @item Repeated characters
 @cindex repeated characters
@@ -3523,6 +3563,9 @@ tr a-z A-Z
 tr '[:lower:]' '[:upper:]'
 @end example
 
+@noindent
+But note that using ranges like @code{a-z} above is not portable.
+
 When @code{tr} is performing translation, @var{set1} and @var{set2}
 typically have the same length.  If @var{set1} is shorter than
 @var{set2}, the extra characters at the end of @var{set2} are ignored.
@@ -3550,6 +3593,14 @@ because it converts only zero bytes (the first element in the
 complement of @var{set1}), rather than all non-alphanumerics, to
 newlines.
 
+@noindent
+By the way, the above idiom is not portable because it uses ranges.
+Assuming a @sc{posix} compliant @code{tr}, here is a better way to write it:
+
+@example
+tr -cs '[:alnum:]' '[\n*]'
+@end example
+
 
 @node Squeezing
 @subsection Squeezing repeats and deleting
@@ -3589,7 +3640,7 @@ non-alphanumeric characters to newlines, then squeezes each string
 of repeated newlines into a single newline:
 
 @example
-tr -cs 'a-zA-Z0-9' '[\n*]'
+tr -cs '[:alnum:]' '[\n*]'
 @end example
 
 @item
@@ -4075,7 +4126,7 @@ characters. Normally it is used for things like mapping upper case to
 lower case:
 
 @example
-$ echo ThIs ExAmPlE HaS MIXED case! | tr '[A-Z]' '[a-z]'
+$ echo ThIs ExAmPlE HaS MIXED case! | tr '[:upper:]' '[:lower:]'
 this example has mixed case!
 @end example
 
@@ -4134,7 +4185,7 @@ The first step is to change the case of all the letters in our input file
 to one case.  ``The'' and ``the'' are the same word when doing counting.
 
 @example
-$ tr '[A-Z]' '[a-z]' < whats.gnu | ...
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | ...
 @end example
 
 The next step is to get rid of punctuation.  Quoted words and unquoted words
@@ -4142,7 +4193,7 @@ should be treated identically; it's easiest to just get the punctuation out of
 the way.
 
 @smallexample
-$ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' | ...
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \012' | ...
 @end smallexample
 
 The second @code{tr} command operates on the complement of the listed
@@ -4157,8 +4208,8 @@ next step is break the data apart so that we have one word per line. This
 makes the counting operation much easier, as we will see shortly.
 
 @smallexample
-$ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
-> tr -s '[ ]' '\012' | ...
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \012' |
+> tr -s ' ' '\012' | ...
 @end smallexample
 
 This command turns blanks into newlines.  The @samp{-s} option squeezes
@@ -4171,8 +4222,8 @@ We now have data consisting of one word per line, no punctuation, all one
 case.  We're ready to count each word:
 
 @smallexample
-$ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
-> tr -s '[ ]' '\012' | sort | uniq -c | ...
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \012' |
+> tr -s ' ' '\012' | sort | uniq -c | ...
 @end smallexample
 
 At this point, the data might look something like this:
@@ -4203,8 +4254,8 @@ reverse the order of the sort
 The final pipeline looks like this:
 
 @smallexample
-$ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
-> tr -s '[ ]' '\012' | sort | uniq -c | sort -nr
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \012' |
+> tr -s ' ' '\012' | sort | uniq -c | sort -nr
  156 the
   60 a
   58 to
@@ -4230,16 +4281,16 @@ Now, how to compare our file with the dictionary?  As before, we generate
 a sorted list of words, one per line:
 
 @smallexample
-$ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
-> tr -s '[ ]' '\012' | sort -u | ...
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \012' |
+> tr -s ' ' '\012' | sort -u | ...
 @end smallexample
 
 Now, all we need is a list of words that are @emph{not} in the
 dictionary.  Here is where the @code{comm} command comes in.
 
 @smallexample
-$ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
-> tr -s '[ ]' '\012' | sort -u |
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \012' |
+> tr -s ' ' '\012' | sort -u |
 > comm -23 - /usr/lib/ispell/ispell.words
 @end smallexample
 

lib/ChangeLog

@@ -1,3 +1,157 @@
+2000-09-09  Jim Meyering  <meyering@lucent.com>
+
+	Don't use atoi.
+	* userspec.c: Include sys/param.h and limits.h.
+	Include xstrtol.h.
+	(CHAR_BIT, TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Define.
+	(UID_T_MAX, GID_T_MAX, MAXUID, MAXGID): Define.
+	(parse_user_spec): Use xstrtoul, not atoi when converting numeric
+	UID, GID.  Check range.
+
+2000-09-06  Jim Meyering  <meyering@lucent.com>
+
+	* getopt.c (_getopt_internal): Update from glibc.
+
+2000-08-30  Jim Meyering  <meyering@lucent.com>
+
+	* strftime.c: Merge in changes from GNU libc.
+
+2000-08-26  Jim Meyering  <meyering@lucent.com>
+
+	* closeout.c: Include "__fpending.h".
+	(close_stdout_status): Return right away if there's nothing to flush.
+
+	* Makefile.am (noinst_HEADERS): Add __fpending.h.
+	* __fpending.c: New file.
+	* __fpending.h: New file.
+
+2000-08-07  Paul Eggert  <eggert@twinsun.com>
+
+	Standardize on "memory exhausted" instead of "Memory exhausted"
+	or "virtual memory exhausted".
+	* obstack.c (print_and_abort): Use "memory exhausted", not
+	"virtual memory exhausted".
+	* same.c (same_name): Invoke xalloc_die instead of printing
+	our own message.
+	* userspec.c (parse_user_spec): Likewise.
+	* bumpalloc.h: comment fix
+	* same.c, userspec.c: Include xalloc.h.
+
+	* xalloc.h (xalloc_msg_memory_exhausted): Now char const[],
+	not char *const and pointing to a constant array.
+	* xmalloc.c (xalloc_msg_memory_exhausted): Likewise.
+	(xrealloc): Comment fix.
+
+	* userspec.c (parse_user_spec):
+	Don't translate a message until just before returning,
+	to avoid unnecessary translation.
+
+2000-08-07  Jim Meyering  <meyering@lucent.com>
+
+	* addext.c, argmatch.c, argmatch.h, backupfile.h, bumpalloc.h,
+	chown.c, diacrit.h, dirname.h, dup2.c, exclude.h, fileblocks.c,
+	fnmatch.c, fnmatch.h, fsusage.c, fsusage.h, getdate.h,
+	getgroups.c, gethostname.c, getopt.h, group-member.c,
+	hard-locale.c, hash.h, isdir.c, lchown.c, linebuffer.c,
+	linebuffer.h, long-options.h, malloc.c, md5.c, md5.h, memchr.c,
+	memcmp.c, memcoll.c, memset.c, mktime.c, modechange.h, obstack.h,
+	pathmax.h, realloc.c, rmdir.c, safe-read.c, save-cwd.c, stime.c,
+	stpcpy.c, strcasecmp.c, strcspn.c, strdup.c, stripslash.c,
+	strstr.c, strtod.c, strtol.c, strtoul.c, strtoull.c, strtoumax.c,
+	utime.c, version-etc.h, xalloc.h, xstrdup.c, xstrtoumax.c,
+	yesno.c: Back out Copyright date changes for each file with no change
+	this year.  This eases coordination with other programs using the same
+	source code modules.  From Paul Eggert.
+
+2000-08-03  Greg McGary  <greg@mcgary.org>
+
+	* regex.c (SET_HIGH_BOUND, MOVE_BUFFER_POINTER,
+	ELSE_EXTEND_BUFFER_HIGH_BOUND): New macros.
+	(EXTEND_BUFFER): Use them.
+
+2000-08-01  Jim Meyering  <meyering@lucent.com>
+
+	* dirname.c (ISSLASH): Define.
+	(BACKSLASH_IS_PATH_SEPARATOR): Define.
+	(dir_name) [BACKSLASH_IS_PATH_SEPARATOR]: Handle the case in which
+	both `\' and `/' may be use as path separators.
+	Based on a patch from Prashant TR.
+
+2000-07-31  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c (quotearg_n_options): Don't make the initial
+	slot vector a constant, since it might get modified.
+
+2000-07-31  Jim Meyering  <meyering@lucent.com>
+
+	* xmalloc.c: Use `virtual memory exhausted', not `Memory exhausted'.
+	* obstack.c (print_and_abort): Likewise.
+
+2000-07-30  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c (quotearg_n_options): Preallocate a slot 0
+	buffer, so that the caller can always quote one small
+	component of a "memory exhausted" message in slot 0.
+	From a suggestion by Jim Meyering.
+
+2000-07-30  Jim Meyering  <meyering@lucent.com>
+
+	* makepath.c (make_path): Quote the other instance, too.
+
+	* quotearg.c (N_STATIC_SLOTVECS): Define.
+	(STATIC_BUF_SIZE): Define.
+	(quotearg_n_options): Use only statically allocated storage when
+	N < N_STATIC_SLOTVECS and the length of the quoted result is smaller
+	than STATIC_BUF_SIZE.
+
+2000-07-29  Jim Meyering  <meyering@lucent.com>
+
+	* diacrit.c (diacrit_diac): Use __MSDOS__ in favor of MSDOS.
+	* dirname.c (dir_name): Likewise.
+
+	* basename.c (base_name): Use ISSLASH rather than comparing against `/'.
+
+	* dirname.c (dir_name) [MSDOS]: Declare `lim' to be const.
+	(dir_name): Assert that there are no trailing slashes.
+
+2000-07-18  Bruno Haible  <haible@clisp.cons.org>
+
+	* mbswidth.h (mbswidth): Add a flags argument.
+	(mbswidth): New declaration.
+	(MBSW_ACCEPT_INVALID, MBSW_ACCEPT_UNPRINTABLE): New macros.
+	* mbswidth.c (mbswidth): Add a flags argument.
+	(mbsnwidth): New function.
+
+2000-07-24  Jim Meyering  <meyering@lucent.com>
+
+	* mbswidth.c: Remove useless #else.  From Bruno Haible.
+
+2000-07-23  Paul Eggert  <eggert@twinsun.com>
+
+	* mbswidth.c (_XOPEN_SOURCE):
+	Don't define; this causes problems on Solaris 7.
+	(wcwidth) [!HAVE_DECL_WCWIDTH]: Declare.
+
+2000-07-23  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c:
+	Include <wchar.h> even if ! (HAVE_MBRTOWC && 1 < MB_LEN_MAX),
+	so that mbstate_t is always defined.
+
+	Do not inspect MB_LEN_MAX, since it's incorrectly defined to
+	be 1 in at least one GCC installation, and this configuration
+	error is likely to be common.  Ignoring MB_LEN_MAX hurts
+	performance on hosts that have mbrtowc but have only unibyte
+	locales, but I assume these hosts are rare.
+
+2000-07-23  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c: Streamline by invoking multibyte code only if needed.
+	<wchar.h>: Include only if HAVE_MBRTOWC && 1 < MB_LEN_MAX.
+	(MB_CUR_MAX): Redefine to 1 if ! (HAVE_MBRTOWC && 1 < MB_LEN_MAX).
+	(quotearg_buffer_restyled): If a unibyte locale, don't bother to
+	invoke multibyte primitives.
+
 2000-07-23  Jim Meyering  <meyering@lucent.com>
 
 	* basename.c (base_name): Add an assertion.
@@ -12,7 +166,7 @@
 	* mbswidth.h: New file.
 	* mbswidth.c: New file.
 	* Makefile.am (libfetish_a_SOURCES): Add mbswidth.c.
-        (noinst_HEADERS): Add mbswidth.h.
+	(noinst_HEADERS): Add mbswidth.h.
 
 2000-07-17  Bruno Haible  <haible@clisp.cons.org>
 
@@ -109,7 +263,7 @@
 2000-07-03  Paul Eggert  <eggert@twinsun.com>
 	and Bruno Haible  <haible@clisp.cons.org>
 
-	* lib/quotearg.c (mbrtowc):
+	* quotearg.c (mbrtowc):
 	Assign to *pwc, and return 1 only if result is nonzero.
 	(iswprint): Use ISPRINT when substituting our own mbrtowc.
 

lib/Makefile.am

@@ -24,7 +24,8 @@ libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 
 noinst_HEADERS = \
   argmatch.h backupfile.h bumpalloc.h closeout.h diacrit.h dirname.h error.h \
-  exclude.h filemode.h fnmatch.h fsusage.h getdate.h getline.h getopt.h \
+  exclude.h filemode.h fnmatch.h __fpending.h fsusage.h \
+  getdate.h getline.h getopt.h \
   getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
   linebuffer.h long-options.h mbswidth.h md5.h memcasecmp.h memcoll.h \
   makepath.h mbswidth.h modechange.h mountlist.h nanosleep.h obstack.h \

lib/Makefile.in

@@ -140,7 +140,8 @@ libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 
 noinst_HEADERS = \
   argmatch.h backupfile.h bumpalloc.h closeout.h diacrit.h dirname.h error.h \
-  exclude.h filemode.h fnmatch.h fsusage.h getdate.h getline.h getopt.h \
+  exclude.h filemode.h fnmatch.h __fpending.h fsusage.h \
+  getdate.h getline.h getopt.h \
   getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
   linebuffer.h long-options.h mbswidth.h md5.h memcasecmp.h memcoll.h \
   makepath.h mbswidth.h modechange.h mountlist.h nanosleep.h obstack.h \
@@ -193,48 +194,48 @@ DIST_SOURCES =  $(libfetish_a_SOURCES)
 HEADERS =  $(noinst_HEADERS)
 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-DEP_FILES =  @AMDEP@ $(DEPDIR)/addext$U.Po $(DEPDIR)/alloca.Po \
-$(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po $(DEPDIR)/backupfile$U.Po \
-$(DEPDIR)/basename$U.Po $(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po \
-$(DEPDIR)/closeout$U.Po $(DEPDIR)/diacrit$U.Po $(DEPDIR)/dirname$U.Po \
-$(DEPDIR)/dup2.Po $(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \
-$(DEPDIR)/exclude$U.Po $(DEPDIR)/fileblocks.Po $(DEPDIR)/filemode$U.Po \
-$(DEPDIR)/fnmatch.Po $(DEPDIR)/fsusage.Po $(DEPDIR)/ftruncate.Po \
-$(DEPDIR)/full-write$U.Po $(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po \
-$(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po \
-$(DEPDIR)/getopt$U.Po $(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po \
-$(DEPDIR)/getstr$U.Po $(DEPDIR)/getugroups$U.Po \
-$(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \
-$(DEPDIR)/hard-locale$U.Po $(DEPDIR)/hash$U.Po $(DEPDIR)/human$U.Po \
-$(DEPDIR)/idcache$U.Po $(DEPDIR)/isdir$U.Po $(DEPDIR)/lchown.Po \
-$(DEPDIR)/linebuffer$U.Po $(DEPDIR)/localcharset$U.Po \
-$(DEPDIR)/long-options$U.Po $(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po \
-$(DEPDIR)/malloc.Po $(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po \
-$(DEPDIR)/memcasecmp$U.Po $(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po \
-$(DEPDIR)/memcoll$U.Po $(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po \
-$(DEPDIR)/memset.Po $(DEPDIR)/mktime.Po $(DEPDIR)/modechange$U.Po \
-$(DEPDIR)/mountlist.Po $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
-$(DEPDIR)/path-concat$U.Po $(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po \
-$(DEPDIR)/quote$U.Po $(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po \
-$(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
-$(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po $(DEPDIR)/safe-read$U.Po \
-$(DEPDIR)/same$U.Po $(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po \
-$(DEPDIR)/stat.Po $(DEPDIR)/stime.Po $(DEPDIR)/stpcpy.Po \
-$(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po $(DEPDIR)/strdup.Po \
-$(DEPDIR)/strftime.Po $(DEPDIR)/stripslash$U.Po \
-$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
-$(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \
-$(DEPDIR)/strtol.Po $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
-$(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po $(DEPDIR)/unicodeio$U.Po \
-$(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po $(DEPDIR)/version-etc$U.Po \
-$(DEPDIR)/xgetcwd$U.Po $(DEPDIR)/xgethostname$U.Po \
-$(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
-$(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
-$(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
+DEP_FILES =  @AMDEP@ $(DEPDIR)/__fpending.Po $(DEPDIR)/addext$U.Po \
+$(DEPDIR)/alloca.Po $(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po \
+$(DEPDIR)/backupfile$U.Po $(DEPDIR)/basename$U.Po \
+$(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po $(DEPDIR)/closeout$U.Po \
+$(DEPDIR)/diacrit$U.Po $(DEPDIR)/dirname$U.Po $(DEPDIR)/dup2.Po \
+$(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po $(DEPDIR)/exclude$U.Po \
+$(DEPDIR)/fileblocks.Po $(DEPDIR)/filemode$U.Po $(DEPDIR)/fnmatch.Po \
+$(DEPDIR)/fsusage.Po $(DEPDIR)/ftruncate.Po $(DEPDIR)/full-write$U.Po \
+$(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po $(DEPDIR)/gethostname.Po \
+$(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po $(DEPDIR)/getopt$U.Po \
+$(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po $(DEPDIR)/getstr$U.Po \
+$(DEPDIR)/getugroups$U.Po $(DEPDIR)/getusershell.Po \
+$(DEPDIR)/group-member.Po $(DEPDIR)/hard-locale$U.Po \
+$(DEPDIR)/hash$U.Po $(DEPDIR)/human$U.Po $(DEPDIR)/idcache$U.Po \
+$(DEPDIR)/isdir$U.Po $(DEPDIR)/lchown.Po $(DEPDIR)/linebuffer$U.Po \
+$(DEPDIR)/localcharset$U.Po $(DEPDIR)/long-options$U.Po \
+$(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po $(DEPDIR)/malloc.Po \
+$(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po $(DEPDIR)/memcasecmp$U.Po \
+$(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po \
+$(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po $(DEPDIR)/memset.Po \
+$(DEPDIR)/mktime.Po $(DEPDIR)/modechange$U.Po $(DEPDIR)/mountlist.Po \
+$(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po $(DEPDIR)/path-concat$U.Po \
+$(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po $(DEPDIR)/quote$U.Po \
+$(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po $(DEPDIR)/readutmp.Po \
+$(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po $(DEPDIR)/rmdir.Po \
+$(DEPDIR)/rpmatch.Po $(DEPDIR)/safe-read$U.Po $(DEPDIR)/same$U.Po \
+$(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po $(DEPDIR)/stat.Po \
+$(DEPDIR)/stime.Po $(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po \
+$(DEPDIR)/strcspn.Po $(DEPDIR)/strdup.Po $(DEPDIR)/strftime.Po \
+$(DEPDIR)/stripslash$U.Po $(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po \
+$(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po \
+$(DEPDIR)/strtod.Po $(DEPDIR)/strtol.Po $(DEPDIR)/strtoul.Po \
+$(DEPDIR)/strtoull.Po $(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \
+$(DEPDIR)/unicodeio$U.Po $(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po \
+$(DEPDIR)/version-etc$U.Po $(DEPDIR)/xgetcwd$U.Po \
+$(DEPDIR)/xgethostname$U.Po $(DEPDIR)/xmalloc$U.Po \
+$(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po $(DEPDIR)/xstrtol$U.Po \
+$(DEPDIR)/xstrtoul$U.Po $(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
 DIST_COMMON =  README $(noinst_HEADERS) ChangeLog Makefile.am \
-Makefile.in TODO alloca.c atexit.c chown.c dup2.c error.c error.h \
-euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c \
-getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
+Makefile.in TODO __fpending.c alloca.c atexit.c chown.c dup2.c error.c \
+error.h euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c \
+getdate.c getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
 getusershell.c group-member.c lchown.c malloc.c memchr.c memcmp.c \
 memcpy.c memmove.c memset.c mktime.c mountlist.c nanosleep.c obstack.c \
 obstack.h putenv.c readutmp.c realloc.c regex.c rmdir.c rpmatch.c \
@@ -298,6 +299,8 @@ libfetish.a: $(libfetish_a_OBJECTS) $(libfetish_a_DEPENDENCIES)
 	-rm -f libfetish.a
 	$(libfetish_a_AR) libfetish.a $(libfetish_a_OBJECTS) $(libfetish_a_LIBADD)
 	$(RANLIB) libfetish.a
+__fpending_.c: __fpending.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/__fpending.c; then echo $(srcdir)/__fpending.c; else echo __fpending.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > __fpending_.c
 addext_.c: addext.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/addext.c; then echo $(srcdir)/addext.c; else echo addext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > addext_.c
 alloca_.c: alloca.c $(ANSI2KNR)
@@ -510,25 +513,26 @@ xstrtoumax_.c: xstrtoumax.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoumax.c; then echo $(srcdir)/xstrtoumax.c; else echo xstrtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoumax_.c
 yesno_.c: yesno.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/yesno.c; then echo $(srcdir)/yesno.c; else echo yesno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > yesno_.c
-addext_.o alloca_.o argmatch_.o atexit_.o backupfile_.o basename_.o \
-canon-host_.o chown_.o closeout_.o diacrit_.o dirname_.o dup2_.o \
-error_.o euidaccess_.o exclude_.o fileblocks_.o filemode_.o fnmatch_.o \
-fsusage_.o ftruncate_.o full-write_.o getdate_.o getgroups_.o \
-gethostname_.o getline_.o getloadavg_.o getopt_.o getopt1_.o getpass_.o \
-getstr_.o getugroups_.o getusershell_.o group-member_.o hard-locale_.o \
-hash_.o human_.o idcache_.o isdir_.o lchown_.o linebuffer_.o \
-localcharset_.o long-options_.o lstat_.o makepath_.o malloc_.o \
-mbswidth_.o md5_.o memcasecmp_.o memchr_.o memcmp_.o memcoll_.o \
-memcpy_.o memmove_.o memset_.o mktime_.o modechange_.o mountlist_.o \
-nanosleep_.o obstack_.o path-concat_.o posixtm_.o putenv_.o quote_.o \
-quotearg_.o readtokens_.o readutmp_.o realloc_.o regex_.o rmdir_.o \
-rpmatch_.o safe-read_.o same_.o save-cwd_.o savedir_.o stat_.o stime_.o \
-stpcpy_.o strcasecmp_.o strcspn_.o strdup_.o strftime_.o stripslash_.o \
-strncasecmp_.o strndup_.o strnlen_.o strpbrk_.o strstr_.o strtod_.o \
-strtol_.o strtoul_.o strtoull_.o strtoumax_.o strverscmp_.o \
-unicodeio_.o userspec_.o utime_.o version-etc_.o xgetcwd_.o \
-xgethostname_.o xmalloc_.o xstrdup_.o xstrtod_.o xstrtol_.o xstrtoul_.o \
-xstrtoumax_.o yesno_.o : $(ANSI2KNR)
+__fpending_.o addext_.o alloca_.o argmatch_.o atexit_.o backupfile_.o \
+basename_.o canon-host_.o chown_.o closeout_.o diacrit_.o dirname_.o \
+dup2_.o error_.o euidaccess_.o exclude_.o fileblocks_.o filemode_.o \
+fnmatch_.o fsusage_.o ftruncate_.o full-write_.o getdate_.o \
+getgroups_.o gethostname_.o getline_.o getloadavg_.o getopt_.o \
+getopt1_.o getpass_.o getstr_.o getugroups_.o getusershell_.o \
+group-member_.o hard-locale_.o hash_.o human_.o idcache_.o isdir_.o \
+lchown_.o linebuffer_.o localcharset_.o long-options_.o lstat_.o \
+makepath_.o malloc_.o mbswidth_.o md5_.o memcasecmp_.o memchr_.o \
+memcmp_.o memcoll_.o memcpy_.o memmove_.o memset_.o mktime_.o \
+modechange_.o mountlist_.o nanosleep_.o obstack_.o path-concat_.o \
+posixtm_.o putenv_.o quote_.o quotearg_.o readtokens_.o readutmp_.o \
+realloc_.o regex_.o rmdir_.o rpmatch_.o safe-read_.o same_.o \
+save-cwd_.o savedir_.o stat_.o stime_.o stpcpy_.o strcasecmp_.o \
+strcspn_.o strdup_.o strftime_.o stripslash_.o strncasecmp_.o \
+strndup_.o strnlen_.o strpbrk_.o strstr_.o strtod_.o strtol_.o \
+strtoul_.o strtoull_.o strtoumax_.o strverscmp_.o unicodeio_.o \
+userspec_.o utime_.o version-etc_.o xgetcwd_.o xgethostname_.o \
+xmalloc_.o xstrdup_.o xstrtod_.o xstrtol_.o xstrtoul_.o xstrtoumax_.o \
+yesno_.o : $(ANSI2KNR)
 .y.c:
 	$(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c
 	if test -f y.tab.h; then \
@@ -569,6 +573,7 @@ distclean-tags:
 
 maintainer-clean-tags:
 
+@AMDEP@include $(DEPDIR)/__fpending.Po
 @AMDEP@include $(DEPDIR)/addext$U.Po
 @AMDEP@include $(DEPDIR)/alloca.Po
 @AMDEP@include $(DEPDIR)/argmatch$U.Po

lib/__fpending.c

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

lib/__fpending.h

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

lib/addext.c

@@ -1,5 +1,5 @@
 /* addext.c -- add an extension to a file name
-   Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/argmatch.c

@@ -1,5 +1,5 @@
 /* argmatch.c -- find a match for a string in an array
-   Copyright (C) 1990, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/argmatch.h

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

lib/backupfile.h

@@ -1,5 +1,5 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
-   Copyright (C) 1990-1992, 1997-2000 Free Software Foundation, Inc.
+   Copyright (C) 1990-1992, 1997-1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/basename.c

@@ -64,7 +64,7 @@ base_name (char const *name)
     --base;
 
   /* Make sure the last byte is not a slash.  */
-  assert (all_slashes || *(p - 1) != '/');
+  assert (all_slashes || !ISSLASH (*(p - 1)));
 
   return (char *) base;
 }

lib/bumpalloc.h

@@ -25,8 +25,8 @@
 `-------------------------------------------------------------------------*/
 
 /* Routines `xmalloc' and `xrealloc' are called to do the actual memory
-   management.  This implies that the program will abort with an `Memory
-   exhausted!' error if any problem arise.
+   management.  This implies that the program will abort with a "memory
+   exhausted" error if any problem arise.
 
    To work correctly, at least EXPONENT and TYPE should always be the
    same for all uses of this macro for any given TABLE.  A secure way to

lib/chown.c

@@ -1,6 +1,6 @@
 /* provide consistent interface to chown for systems that don't interpret
    an ID of -1 as meaning `don't change the corresponding ID'.
-   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/closeout.c

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

lib/diacrit.c

@@ -38,7 +38,7 @@ const char diacrit_base[256] =
   'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
   'x',    'y',    'z',    0,      0,      0,      0,      0,
 
-#ifdef MSDOS
+#ifdef __MSDOS__
 
   'C',    'u',    'e',    'a',    'a',    'a',    'a',    'c',
   'e',    'e',    'e',    'i',    'i',    'i',    'A',    'A',
@@ -57,7 +57,7 @@ const char diacrit_base[256] =
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      0,      0,
 
-#else /* not MSDOS */
+#else
 
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      0,      0,
@@ -76,7 +76,7 @@ const char diacrit_base[256] =
   0,      'n',    'o',    'o',    'o',    'o',    'o',    0,
   'o',    'u',    'u',    'u',    'u',    'y',    0,      'y',
 
-#endif /* not MSDOS */
+#endif
 };
 
 /*------------------------------------------------------------------------.
@@ -106,7 +106,7 @@ const char diacrit_diac[256] =
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      6,      0,
 
-#ifdef MSDOS
+#ifdef __MSDOS__
 
   7,      5,      2,      4,      5,      3,      8,      7,
   4,      5,      3,      5,      4,      3,      5,      8,
@@ -125,7 +125,7 @@ const char diacrit_diac[256] =
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      0,      0,
 
-#else /* not MSDOS */
+#else
 
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      0,      0,
@@ -144,5 +144,5 @@ const char diacrit_diac[256] =
   0,      6,      3,      2,      4,      6,      5,      0,
   9,      3,      2,      4,      5,      2,      0,      0,
 
-#endif /* not MSDOS */
+#endif
 };

lib/diacrit.h

@@ -1,5 +1,5 @@
 /* Diacritics processing for a few character codes.
-   Copyright (C) 1990, 1991, 1992, 1993, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
    François Pinard <pinard@iro.umontreal.ca>, 1988.
 
    All this file is a temporary hack, waiting for locales in GNU.
@@ -13,4 +13,3 @@ extern const char diacrit_diac[]; /* diacritic code for each character */
 
 /* Returns a diacritic code for CHAR.  CHAR is known to be alphabetic.  */
 #define todiac(Char) (diacrit_diac[(unsigned char) (Char)])
-

lib/dirname.c

@@ -32,9 +32,16 @@ char *malloc ();
 #  define strrchr rindex
 # endif
 #endif
+#include <assert.h>
 
 #include "dirname.h"
 
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == '/')
+#endif
+
+#define BACKSLASH_IS_PATH_SEPARATOR ISSLASH ('\\')
+
 /* Return the leading directories part of PATH,
    allocated with malloc.  If out of memory, return 0.
    Assumes that trailing slashes have already been
@@ -48,6 +55,19 @@ dir_name (const char *path)
   int length;			/* Length of result, not including NUL.  */
 
   slash = strrchr (path, '/');
+  if (BACKSLASH_IS_PATH_SEPARATOR)
+    {
+      char *b = strrchr (path, '\\');
+      if (b && slash < b)
+	slash = b;
+    }
+
+  /* Make sure there are no trailing slashes.  */
+  assert (slash == NULL	   /* There are no slashes in PATH.  */
+	  || slash[1] != 0 /* There is a non-NUL byte after the last slash.  */
+	  || path == slash /* PATH is just `/'.  */
+	  );
+
   if (slash == 0)
     {
       /* File is in the current directory.  */
@@ -57,20 +77,25 @@ dir_name (const char *path)
   else
     {
       /* Remove any trailing slashes from the result.  */
-#ifdef MSDOS
-      char *lim = (path[0] >= 'A' && path[0] <= 'z' && path[1] == ':')
-		  ? path + 2 : path;
+      if (BACKSLASH_IS_PATH_SEPARATOR)
+	{
+	  const char *lim = ((path[0] >= 'A' && path[0] <= 'z'
+			      && path[1] == ':')
+			     ? path + 2 : path);
 
-      /* If canonicalized "d:/path", leave alone the root case "d:/".  */
-      while (slash > lim && *slash == '/')
-	--slash;
-#else
-      while (slash > path && *slash == '/')
-	--slash;
-#endif
+	  /* If canonicalized "d:/path", leave alone the root case "d:/".  */
+	  while (slash > lim && ISSLASH (*slash))
+	    --slash;
+	}
+      else
+	{
+	  while (slash > path && ISSLASH (*slash))
+	    --slash;
+	}
 
       length = slash - path + 1;
     }
+
   newpath = (char *) malloc (length + 1);
   if (newpath == 0)
     return 0;

lib/dirname.h

@@ -1,4 +1,4 @@
-/*  Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/*  Copyright (C) 1998 Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

lib/dup2.c

@@ -1,5 +1,5 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/exclude.h

@@ -1,5 +1,5 @@
 /* exclude.h -- declarations for excluding file names
-   Copyright 1992, 1993, 1994, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 1997, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/fileblocks.c

@@ -1,5 +1,5 @@
 /* Convert file size to number of blocks on System V-like machines.
-   Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/fnmatch.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/fnmatch.h

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
 
 NOTE: The canonical source of this file is maintained with the GNU C Library.
 Bugs can be reported to bug-glibc@prep.ai.mit.edu.

lib/fsusage.c

@@ -1,5 +1,5 @@
 /* fsusage.c -- return space usage of mounted filesystems
-   Copyright (C) 1991, 1992, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1996, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/fsusage.h

@@ -1,5 +1,5 @@
 /* fsusage.h -- declarations for filesystem space usage info
-   Copyright (C) 1991, 1992, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/getdate.h

@@ -1,4 +1,4 @@
-/*  Copyright (C) 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
+/*  Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/getgroups.c

@@ -1,5 +1,5 @@
 /* provide consistent interface to getgroups for systems that don't allow N==0
-   Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/gethostname.c

@@ -1,5 +1,5 @@
 /* gethostname emulation for SysV and POSIX.1.
-   Copyright (C) 1992, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1992 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/getopt.c

@@ -27,13 +27,13 @@
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
-#else
-# if !defined __STDC__ || !__STDC__
+#endif
+
+#if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
-#  ifndef const
-#   define const
-#  endif
+# ifndef const
+#  define const
 # endif
 #endif
 
@@ -671,7 +671,9 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		pfound = p;
 		indfound = option_index;
 	      }
-	    else
+	    else if (pfound->has_arg != p->has_arg
+		     || pfound->flag != p->flag
+		     || pfound->val != p->val)
 	      /* Second or later nonexact match found.  */
 	      ambig = 1;
 	  }

lib/getopt.h

@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97,1998,2000 Free Software Foundation, Inc.
+   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
    This program is free software; you can redistribute it and/or modify it

lib/group-member.c

@@ -1,5 +1,5 @@
 /* group-member.c -- determine whether group id is in calling user's group list
-   Copyright (C) 1994, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/hard-locale.c

@@ -1,5 +1,5 @@
 /* hard-locale.c -- Determine whether a locale is hard.
-   Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/hash.h

@@ -1,5 +1,5 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    Written by Jim Meyering <meyering@ascend.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify

lib/isdir.c

@@ -1,5 +1,5 @@
 /* isdir.c -- determine whether a directory exists
-   Copyright (C) 1990, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/lchown.c

@@ -1,5 +1,5 @@
 /* Provide a stub lchown function for systems that lack it.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/linebuffer.c

@@ -1,5 +1,5 @@
 /* linebuffer.c -- read arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/linebuffer.h

@@ -1,5 +1,5 @@
 /* linebuffer.h -- declarations for reading arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/long-options.h

@@ -1,5 +1,5 @@
 /* long-options.h -- declaration for --help- and --version-handling function.
-   Copyright (C) 1993, 1994, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/makepath.c

@@ -370,7 +370,7 @@ make_path (const char *argpath,
       umask (oldmask);
 
       if (verbose_fmt_string != NULL)
-	error (0, 0, verbose_fmt_string, dirpath);
+	error (0, 0, verbose_fmt_string, quote (dirpath));
 
       if (owner != (uid_t) -1 || group != (gid_t) -1)
 	{

lib/malloc.c

@@ -1,5 +1,5 @@
 /* Work around bug on some systems where malloc (0) fails.
-   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/mbswidth.c

@@ -21,11 +21,6 @@
 # include <config.h>
 #endif
 
-/* Tell GNU libc to declare wcwidth().  */
-#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE 500
-#endif
-
 /* Get MB_LEN_MAX.  */
 #if HAVE_LIMITS_H
 # include <limits.h>
@@ -62,10 +57,19 @@
 # define mbsinit(ps) 1
 #endif
 
-/* If wcwidth() doesn't exist, assume all printable characters have
+#ifndef HAVE_DECL_WCWIDTH
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_WCWIDTH
+int wcwidth ();
+#endif
+
+#ifndef wcwidth
+# if !HAVE_WCWIDTH
+/* wcwidth doesn't exist, so assume all printable characters have
    width 1.  */
-#if !defined wcwidth && !HAVE_WCWIDTH
-# define wcwidth(wc) ((wc) == 0 ? 0 : iswprint (wc) ? 1 : -1)
+#  define wcwidth(wc) ((wc) == 0 ? 0 : iswprint (wc) ? 1 : -1)
+# endif
 #endif
 
 /* Get ISPRINT.  */
@@ -80,15 +84,27 @@
 #undef ISPRINT
 #define ISPRINT(c) (ISASCII (c) && isprint (c))
 
+#include "mbswidth.h"
+
 /* Returns the number of columns needed to represent the multibyte
    character string pointed to by STRING.  If a non-printable character
-   occurs, -1 is returned.
-   This is the multibyte analogon of the wcswidth function.  */
+   occurs, -1 is returned, unless MBSW_ACCEPT_UNPRINTABLE is specified.
+   With flags = 0, this is the multibyte analogon of the wcswidth function.  */
 int
-mbswidth (const char *string)
+mbswidth (const char *string, int flags)
+{
+  return mbsnwidth (string, strlen (string), flags);
+}
+
+/* Returns the number of columns needed to represent the multibyte
+   character string pointed to by STRING of length NBYTES.  If a
+   non-printable character occurs, -1 is returned, unless
+   MBSW_ACCEPT_UNPRINTABLE is specified.  */
+int
+mbsnwidth (const char *string, size_t nbytes, int flags)
 {
   const char *p = string;
-  const char *plimit = p + strlen (p);
+  const char *plimit = p + nbytes;
   int width;
 
   width = 0;
@@ -122,8 +138,6 @@ mbswidth (const char *string)
 	      p++;
 	      width++;
 	      break;
-	    case '\0':
-	      break;
 	    default:
 	      /* If we have a multibyte sequence, scan it up to its end.  */
 	      {
@@ -132,20 +146,32 @@ mbswidth (const char *string)
 		do
 		  {
 		    wchar_t wc;
-		    size_t bytes = mbrtowc (&wc, p, plimit - p, &mbstate);
+		    size_t bytes;
 		    int w;
 
-		    if (bytes == 0)
-		      /* A null wide character was encountered.  */
-		      break;
+		    bytes = mbrtowc (&wc, p, plimit - p, &mbstate);
 
 		    if (bytes == (size_t) -1)
 		      /* An invalid multibyte sequence was encountered.  */
-		      return -1;
+		      {
+			if (flags & MBSW_ACCEPT_INVALID)
+			  break;
+			else
+			  return -1;
+		      }
 
 		    if (bytes == (size_t) -2)
 		      /* An incomplete multibyte character at the end.  */
-		      return -1;
+		      {
+			if (flags & MBSW_ACCEPT_INVALID)
+			  break;
+			else
+			  return -1;
+		      }
+
+		    if (bytes == 0)
+		      /* A null wide character was encountered.  */
+		      bytes = 1;
 
 		    w = wcwidth (wc);
 		    if (w >= 0)
@@ -153,7 +179,10 @@ mbswidth (const char *string)
 		      width += w;
 		    else
 		      /* An unprintable multibyte character.  */
-		      return -1;
+		      if (flags & MBSW_ACCEPT_UNPRINTABLE)
+			width += 1;
+		      else
+			return -1;
 
 		    p += bytes;
 		  }
@@ -169,10 +198,7 @@ mbswidth (const char *string)
     {
       unsigned char c = (unsigned char) *p++;
 
-      if (c == '\0')
-	break;
-
-      if (ISPRINT (c))
+      if ((flags & MBSW_ACCEPT_UNPRINTABLE) || ISPRINT (c))
 	width++;
       else
 	return -1;

lib/mbswidth.h

@@ -23,4 +23,19 @@
 # endif
 #endif
 
-extern int mbswidth PARAMS ((const char *string));
+/* Optional flags to influence mbswidth/mbsnwidth behavior.  */
+
+/* If this bit is set, assume invalid characters have width 0.
+   Otherwise, return -1 upon finding an invalid or incomplete character.  */
+#define MBSW_ACCEPT_INVALID 1
+
+/* If this bit is set, assume unprintable characters have width 1.
+   Otherwise, return -1 upon finding a non-printable character.  */
+#define MBSW_ACCEPT_UNPRINTABLE	2
+
+/* Returns the number of screen columns needed for STRING.  */
+extern int mbswidth PARAMS ((const char *string, int flags));
+
+/* Returns the number of screen columns needed for the NBYTES bytes
+   starting at BUF.  */
+extern int mbsnwidth PARAMS ((const char *buf, size_t nbytes, int flags));

lib/md5.c

@@ -1,6 +1,6 @@
 /* md5.c - Functions to compute MD5 message digest of files or memory blocks
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 

lib/md5.h

@@ -1,6 +1,6 @@
 /* md5.h - Declaration of functions and data types used for MD5 sum
    computing library functions.
-   Copyright (C) 1995, 1996, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1999 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 

lib/memchr.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1997, 1999 Free Software Foundation, Inc.
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
    with help from Dan Sahlin (dan@sics.se) and
    commentary by Jim Blandy (jimb@ai.mit.edu);

lib/memcmp.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1995, 1997, 1998 Free Software Foundation, Inc.
    Contributed by Torbjorn Granlund (tege@sics.se).
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.

lib/memcoll.c

@@ -1,5 +1,5 @@
 /* Locale-specific memory comparison.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/memset.c

@@ -1,5 +1,5 @@
 /* memset.c -- set an area of memory to a given value
-   Copyright (C) 1991, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/mktime.c

@@ -1,5 +1,5 @@
 /* Convert a `struct tm' to a time_t value.
-   Copyright (C) 1993, 94, 95, 96, 97, 98, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert (eggert@twinsun.com).
 

lib/modechange.h

@@ -1,5 +1,5 @@
 /* modechange.h -- definitions for file mode manipulation
-   Copyright (C) 1989, 1990, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/obstack.h

@@ -1,5 +1,5 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988,89,90,91,92,93,94,96,97,98,1999,2000 Free Software Foundation, Inc.
+   Copyright (C) 1988,89,90,91,92,93,94,96,97,98,99 Free Software Foundation, Inc.
 
    the C library, however.  The master source lives in /gd/gnu/lib.
 

lib/pathmax.h

@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/quotearg.c

@@ -70,6 +70,11 @@ size_t mbrtowc ();
 #  define mbsinit(ps) 1
 # endif
 #else
+/* Disable multibyte processing entirely.  Since MB_CUR_MAX is 1, the
+   other macros are defined only for documentation and to satisfy C
+   syntax.  */
+# undef MB_CUR_MAX
+# define MB_CUR_MAX 1
 # define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0)
 # define mbsinit(ps) 1
 # define iswprint(wc) ISPRINT ((unsigned char) (wc))
@@ -213,6 +218,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
   char const *quote_string = 0;
   size_t quote_string_len = 0;
   int backslash_escapes = 0;
+  int unibyte_locale = MB_CUR_MAX == 1;
 
 #define STORE(c) \
     do \
@@ -398,57 +404,59 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
 	     we can't easily escape single characters within it.  */
 	  {
 	    /* Length of multibyte sequence found so far.  */
-	    size_t m = 0;
+	    size_t m;
 
-	    int printable = 1;
-	    mbstate_t mbstate;
-	    memset (&mbstate, 0, sizeof mbstate);
+	    int printable;
 
-	    if (argsize == (size_t) -1)
-	      argsize = strlen (arg);
-
-	    do
+	    if (unibyte_locale)
 	      {
-		wchar_t w;
-		size_t bytes = mbrtowc (&w, &arg[i + m],
-					argsize - (i + m), &mbstate);
-		if (bytes == 0)
-		  break;
-		else if (bytes == (size_t) -1)
-		  {
-		    printable = 0;
-		    break;
-		  }
-		else if (bytes == (size_t) -2)
-		  {
-		    printable = 0;
-		    while (i + m < argsize && arg[i + m])
-		      m++;
-		    break;
-		  }
-		else
-		  {
-		    if (! iswprint (w))
-		      printable = 0;
-		    m += bytes;
-		  }
+		m = 1;
+		printable = ISPRINT (c);
 	      }
-	    while (! mbsinit (&mbstate));
-
-	    if (m <= 1)
+	    else
 	      {
-		/* Escape a unibyte character like a multibyte
-		   sequence if using backslash escapes, and if the
-		   character is not printable.  */
-		m = backslash_escapes && ! ISPRINT (c);
-		printable = 0;
+		mbstate_t mbstate;
+		memset (&mbstate, 0, sizeof mbstate);
+
+		m = 0;
+		printable = 1;
+		if (argsize == (size_t) -1)
+		  argsize = strlen (arg);
+
+		do
+		  {
+		    wchar_t w;
+		    size_t bytes = mbrtowc (&w, &arg[i + m],
+					    argsize - (i + m), &mbstate);
+		    if (bytes == 0)
+		      break;
+		    else if (bytes == (size_t) -1)
+		      {
+			printable = 0;
+			break;
+		      }
+		    else if (bytes == (size_t) -2)
+		      {
+			printable = 0;
+			while (i + m < argsize && arg[i + m])
+			  m++;
+			break;
+		      }
+		    else
+		      {
+			if (! iswprint (w))
+			  printable = 0;
+			m += bytes;
+		      }
+		  }
+		while (! mbsinit (&mbstate));
 	      }
 
-	    if (m)
+	    if (1 < m || (backslash_escapes && ! printable))
 	      {
 		/* Output a multibyte sequence, or an escaped
 		   unprintable unibyte character.  */
-		size_t imax = i + m - 1;
+		size_t ilim = i + m;
 
 		for (;;)
 		  {
@@ -459,7 +467,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
 			STORE ('0' + ((c >> 3) & 7));
 			c = '0' + (c & 7);
 		      }
-		    if (i == imax)
+		    if (ilim <= i + 1)
 		      break;
 		    STORE (c);
 		    c = arg[++i];
@@ -522,12 +530,17 @@ static char *
 quotearg_n_options (int n, char const *arg,
 		    struct quoting_options const *options)
 {
-  static unsigned int nslots;
-  static struct slotvec
+  /* Preallocate a slot 0 buffer, so that the caller can always quote
+     one small component of a "memory exhausted" message in slot 0.  */
+  static char slot0[256];
+  static unsigned int nslots = 1;
+  struct slotvec
     {
       size_t size;
       char *val;
-    } *slotvec;
+    };
+  static struct slotvec slotvec0 = {sizeof slot0, slot0};
+  static struct slotvec *slotvec = &slotvec0;
 
   if (nslots <= n)
     {
@@ -535,6 +548,11 @@ quotearg_n_options (int n, char const *arg,
       size_t s = n1 * sizeof (struct slotvec);
       if (! (0 < n1 && n1 == s / sizeof (struct slotvec)))
 	abort ();
+      if (slotvec == &slotvec0)
+	{
+	  slotvec = (struct slotvec *) xmalloc (sizeof (struct slotvec));
+	  *slotvec = slotvec0;
+	}
       slotvec = (struct slotvec *) xrealloc (slotvec, s);
       memset (slotvec + nslots, 0, (n1 - nslots) * sizeof (struct slotvec));
       nslots = n;
@@ -548,7 +566,7 @@ quotearg_n_options (int n, char const *arg,
     if (size <= qsize)
       {
 	slotvec[n].size = size = qsize + 1;
-	slotvec[n].val = val = xrealloc (val, size);
+	slotvec[n].val = val = xrealloc (val == slot0 ? 0 : val, size);
 	quotearg_buffer (val, size, arg, (size_t) -1, options);
       }
 

lib/realloc.c

@@ -1,5 +1,5 @@
 /* Work around bug on some systems where realloc (NULL, 0) fails.
-   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/regex.c

@@ -1747,29 +1747,51 @@ static reg_errcode_t compile_range _RE_ARGS ((unsigned int range_start,
    reset the pointers that pointed into the old block to point to the
    correct places in the new one.  If extending the buffer results in it
    being larger than MAX_BUF_SIZE, then flag memory exhausted.  */
+#if __BOUNDED_POINTERS__
+# define SET_HIGH_BOUND(P) (__ptrhigh (P) = __ptrlow (P) + bufp->allocated)
+# define MOVE_BUFFER_POINTER(P) \
+  (__ptrlow (P) += incr, SET_HIGH_BOUND (P), __ptrvalue (P) += incr)
+# define ELSE_EXTEND_BUFFER_HIGH_BOUND		\
+  else						\
+    {						\
+      SET_HIGH_BOUND (b);			\
+      SET_HIGH_BOUND (begalt);			\
+      if (fixup_alt_jump)			\
+	SET_HIGH_BOUND (fixup_alt_jump);	\
+      if (laststart)				\
+	SET_HIGH_BOUND (laststart);		\
+      if (pending_exact)			\
+	SET_HIGH_BOUND (pending_exact);		\
+    }
+#else
+# define MOVE_BUFFER_POINTER(P) (P) += incr
+# define ELSE_EXTEND_BUFFER_HIGH_BOUND
+#endif
 #define EXTEND_BUFFER()							\
-  do { 									\
+  do {									\
     unsigned char *old_buffer = bufp->buffer;				\
-    if (bufp->allocated == MAX_BUF_SIZE) 				\
+    if (bufp->allocated == MAX_BUF_SIZE)				\
       return REG_ESIZE;							\
     bufp->allocated <<= 1;						\
     if (bufp->allocated > MAX_BUF_SIZE)					\
-      bufp->allocated = MAX_BUF_SIZE; 					\
+      bufp->allocated = MAX_BUF_SIZE;					\
     bufp->buffer = (unsigned char *) REALLOC (bufp->buffer, bufp->allocated);\
     if (bufp->buffer == NULL)						\
       return REG_ESPACE;						\
     /* If the buffer moved, move all the pointers into it.  */		\
     if (old_buffer != bufp->buffer)					\
       {									\
-        b = (b - old_buffer) + bufp->buffer;				\
-        begalt = (begalt - old_buffer) + bufp->buffer;			\
-        if (fixup_alt_jump)						\
-          fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer;\
-        if (laststart)							\
-          laststart = (laststart - old_buffer) + bufp->buffer;		\
-        if (pending_exact)						\
-          pending_exact = (pending_exact - old_buffer) + bufp->buffer;	\
+	int incr = bufp->buffer - old_buffer;				\
+	MOVE_BUFFER_POINTER (b);					\
+	MOVE_BUFFER_POINTER (begalt);					\
+	if (fixup_alt_jump)						\
+	  MOVE_BUFFER_POINTER (fixup_alt_jump);				\
+	if (laststart)							\
+	  MOVE_BUFFER_POINTER (laststart);				\
+	if (pending_exact)						\
+	  MOVE_BUFFER_POINTER (pending_exact);				\
       }									\
+    ELSE_EXTEND_BUFFER_HIGH_BOUND					\
   } while (0)
 
 

lib/rmdir.c

@@ -1,5 +1,5 @@
 /* BSD compatible remove directory function for System V
-   Copyright (C) 1988, 1990, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1990 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/safe-read.c

@@ -1,5 +1,5 @@
 /* safe-read.c -- an interface to read that retries after interrupts
-   Copyright (C) 1993, 1994, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/same.c

@@ -45,6 +45,7 @@ extern int errno;
 #include "same.h"
 #include "dirname.h"
 #include "error.h"
+#include "xalloc.h"
 
 #if ENABLE_NLS
 # include <libintl.h>
@@ -81,7 +82,7 @@ same_name (const char *source, const char *dest)
   source_dirname = dir_name (source);
   dest_dirname = dir_name (dest);
   if (source_dirname == NULL || dest_dirname == NULL)
-    error (1, 0, _("virtual memory exhausted"));
+    xalloc_die ();
 
   if (stat (source_dirname, &source_dir_stats))
     {

lib/save-cwd.c

@@ -1,5 +1,5 @@
 /* save-cwd.c -- Save and restore current working directory.
-   Copyright (C) 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/stime.c

@@ -1,5 +1,5 @@
 /* stime -- set the system clock
-   Copyright (C) 1989, 1991, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/stpcpy.c

@@ -1,5 +1,5 @@
 /* stpcpy.c -- copy a string and return pointer to end of new string
-   Copyright (C) 1992, 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1995, 1997, 1998 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.

lib/strcasecmp.c

@@ -1,5 +1,5 @@
 /* strcasecmp.c -- case insensitive string comparator
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/strcspn.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1996, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996, 1997 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.

lib/strdup.c

@@ -1,5 +1,5 @@
 /* strdup.c -- return a newly allocated copy of a string
-   Copyright (C) 1990, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/strftime.c

@@ -98,8 +98,8 @@ extern char *tzname[];
 # define L_(Str) L##Str
 # define NLW(Sym) _NL_W##Sym
 
-# define MEMCPY(d, s, n) wmemcpy (d, s, n)
-# define STRLEN(s) wcslen (s)
+# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
+# define STRLEN(s) __wcslen (s)
 
 #else
 # define CHAR_T char
@@ -752,6 +752,11 @@ my_strftime (s, maxsize, format, tp ut_argument)
 
 	case L_('b'):
 	case L_('h'):		/* POSIX.2 extension.  */
+	  if (change_case)
+	    {
+	      to_uppcase = 1;
+	      to_lowcase = 0;
+	    }
 	  if (modifier != 0)
 	    goto bad_format;
 #if defined _NL_CURRENT || !HAVE_STRFTIME
@@ -848,7 +853,7 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	      if (era)
 		{
 # ifdef COMPILE_WIDE
-		  size_t len = wcslen (era->era_wname);
+		  size_t len = __wcslen (era->era_wname);
 		  cpy (len, era->era_wname);
 # else
 		  size_t len = strlen (era->era_name);

lib/stripslash.c

@@ -1,5 +1,5 @@
 /* stripslash.c -- remove trailing slashes from a string
-   Copyright (C) 1990, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/strstr.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1999 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

lib/strtod.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1997, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/strtol.c

@@ -1,5 +1,5 @@
 /* Convert string representation of a number into an integer value.
-   Copyright (C) 1991, 92, 94, 95, 96, 97, 98, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
 

lib/strtoul.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 
 NOTE: The canonical source of this file is maintained with the GNU C Library.
 Bugs can be reported to bug-glibc@prep.ai.mit.edu.

lib/strtoull.c

@@ -1,5 +1,5 @@
 /* Function to parse an `unsigned long long int' from text.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
 

lib/strtoumax.c

@@ -1,5 +1,5 @@
 /* Convert string representation of a number into an uintmax_t value.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/userspec.c

@@ -40,6 +40,14 @@ char *alloca ();
 #include <pwd.h>
 #include <grp.h>
 
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
 #if HAVE_STRING_H
 # include <string.h>
 #else
@@ -57,6 +65,9 @@ char *alloca ();
 # include <unistd.h>
 #endif
 
+#include "xalloc.h"
+#include "xstrtol.h"
+
 #if ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
@@ -79,6 +90,34 @@ struct group *getgrgid ();
 # define endpwent() ((void) 0)
 #endif
 
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
+
+/* The extra casts work around common compiler bugs.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
+   It is necessary at least when t == time_t.  */
+#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
+			      ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
+#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))
+
+#ifndef UID_T_MAX
+# define UID_T_MAX TYPE_MAXIMUM (uid_t)
+#endif
+
+#ifndef GID_T_MAX
+# define GID_T_MAX TYPE_MAXIMUM (gid_t)
+#endif
+
+/* MAXUID may come from limits.h or sys/params.h.  */
+#ifndef MAXUID
+# define MAXUID UID_T_MAX
+#endif
+#ifndef MAXGID
+# define MAXGID GID_T_MAX
+#endif
+
 /* Perform the equivalent of the statement `dest = strdup (src);',
    but obtaining storage via alloca instead of from the heap.  */
 
@@ -137,7 +176,6 @@ const char *
 parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 		 char **username_arg, char **groupname_arg)
 {
-  static const char *E_no_memory = N_("virtual memory exhausted");
   static const char *E_invalid_user = N_("invalid user");
   static const char *E_invalid_group = N_("invalid group");
   static const char *E_bad_spec =
@@ -210,17 +248,21 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 	{
 
 	  if (!is_number (u))
-	    error_msg = _(E_invalid_user);
+	    error_msg = E_invalid_user;
 	  else
 	    {
 	      int use_login_group;
 	      use_login_group = (separator != NULL && g == NULL);
 	      if (use_login_group)
-		error_msg = _(E_bad_spec);
+		error_msg = E_bad_spec;
 	      else
 		{
-		  /* FIXME: don't use atoi!  */
-		  *uid = atoi (u);
+		  unsigned long int tmp_long;
+		  if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+		      || tmp_long > MAXUID)
+		    return _(E_invalid_user);
+		  printf ("MAXUID: %u\n", (uid_t) MAXUID);
+		  *uid = tmp_long;
 		}
 	    }
 	}
@@ -259,11 +301,14 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
       if (grp == NULL)
 	{
 	  if (!is_number (g))
-	    error_msg = _(E_invalid_group);
+	    error_msg = E_invalid_group;
 	  else
 	    {
-	      /* FIXME: don't use atoi!  */
-	      *gid = atoi (g);
+	      unsigned long int tmp_long;
+	      if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+		  || tmp_long > MAXGID)
+		return _(E_invalid_group);
+	      *gid = tmp_long;
 	    }
 	}
       else
@@ -280,7 +325,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 	{
 	  *username_arg = strdup (u);
 	  if (*username_arg == NULL)
-	    error_msg = _(E_no_memory);
+	    error_msg = xalloc_msg_memory_exhausted;
 	}
 
       if (groupname != NULL && error_msg == NULL)
@@ -293,7 +338,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 		  free (*username_arg);
 		  *username_arg = NULL;
 		}
-	      error_msg = _(E_no_memory);
+	      error_msg = xalloc_msg_memory_exhausted;
 	    }
 	}
     }
@@ -306,7 +351,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
       goto retry;
     }
 
-  return error_msg;
+  return _(error_msg);
 }
 
 #ifdef TEST

lib/utime.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

lib/version-etc.h

@@ -1,5 +1,5 @@
 /* Utility to help print --version output in a consistent format.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/xalloc.h

@@ -1,5 +1,5 @@
 /* xalloc.h -- malloc with out-of-memory checking
-   Copyright (C) 1990-1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,9 +46,9 @@ extern int xalloc_exit_failure;
 extern void (*xalloc_fail_func) PARAMS ((void));
 
 /* If XALLOC_FAIL_FUNC is undefined or a function that returns, this
-   message must be non-NULL.  It is translated via gettext.
-   The default value is "Memory exhausted".  */
-extern char *const xalloc_msg_memory_exhausted;
+   message is output.  It is translated via gettext.
+   Its value is "memory exhausted".  */
+extern char const xalloc_msg_memory_exhausted[];
 
 /* This function is always triggered when memory is exhausted.  It is
    in charge of honoring the three previous items.  This is the

lib/xmalloc.c

@@ -1,5 +1,5 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1997, 98, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990-1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ void (*xalloc_fail_func) PARAMS ((void)) = 0;
 
 /* If XALLOC_FAIL_FUNC is NULL, or does return, display this message
    before exiting when memory is exhausted.  Goes through gettext. */
-char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
+char const xalloc_msg_memory_exhausted[] = N_("memory exhausted");
 
 void
 xalloc_die (void)
@@ -91,8 +91,7 @@ xmalloc (size_t n)
 }
 
 /* Change the size of an allocated block of memory P to N bytes,
-   with error checking.
-   If P is NULL, run xmalloc.  */
+   with error checking.  */
 
 void *
 xrealloc (void *p, size_t n)

lib/xstrdup.c

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

lib/xstrtoumax.c

@@ -1,5 +1,5 @@
 /* xstrtoumax.c -- A more useful interface to strtoumax.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

lib/yesno.c

@@ -1,5 +1,5 @@
 /* yesno.c -- read a yes/no response from stdin
-   Copyright (C) 1990, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

m4/ChangeLog

@@ -1,3 +1,30 @@
+2000-08-26  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4: Use jm_FUNC_FPENDING.
+	* fpending.m4: New file.
+
+2000-08-20  Jim Meyering  <meyering@lucent.com>
+
+	* check-decl.m4: Include utmp.h `#if HAVE_UTMP_H', rather than
+	`#if !HAVE_UTMPX_H'.  The latter would lose on systems with neither
+	utmp.h nor utmpx.h.  Reported by Eli Zaretskii.
+
+2000-08-11  J. David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	Improve fileutils installation on systems where running
+	programs (like install) can't be unlinked.
+	* unlink-busy.m4 (jm_FUNC_UNLINK_BUSY_TEXT): New file/macro.
+	* jm-macros.m4: Use jm_FUNC_UNLINK_BUSY_TEXT.
+
+2000-08-06  Paul Eggert  <eggert@twinsun.com>
+
+	* m4/mbstate_t.m4 (AC_MBSTATE_T): Define mbstate_t to be int,
+	not char, for compatibility with glibc 2.1.3 strftime.c.
+
+2000-07-23  Paul Eggert  <eggert@twinsun.com>
+
+	* mbswidth.m4 (jm_PREREQ_MBSWIDTH): Check for wcwidth declaration.
+
 2000-07-23  Jim Meyering  <meyering@lucent.com>
 
 	* check-decl.m4 (jm_CHECK_DECLS): Check for declarations of these, too:

m4/Makefile.am

@@ -13,6 +13,7 @@ d-ino.m4 \
 d-type.m4 \
 error.m4 \
 fnmatch.m4 \
+fpending.m4 \
 fstypename.m4 \
 fsusage.m4 \
 ftruncate.m4 \
@@ -60,6 +61,7 @@ strftime.m4 \
 timespec.m4 \
 uintmax_t.m4 \
 ulonglong.m4 \
+unlink-busy.m4 \
 uptime.m4 \
 utimbuf.m4 \
 utime.m4 \

m4/Makefile.in

@@ -127,6 +127,7 @@ d-ino.m4 \
 d-type.m4 \
 error.m4 \
 fnmatch.m4 \
+fpending.m4 \
 fstypename.m4 \
 fsusage.m4 \
 ftruncate.m4 \
@@ -174,6 +175,7 @@ strftime.m4 \
 timespec.m4 \
 uintmax_t.m4 \
 ulonglong.m4 \
+unlink-busy.m4 \
 uptime.m4 \
 utimbuf.m4 \
 utime.m4 \

m4/check-decl.m4

@@ -38,7 +38,7 @@ AC_DEFUN(jm_CHECK_DECLS,
 # endif
 #endif
 
-#if !HAVE_UTMPX_H
+#if HAVE_UTMP_H
 # include <utmp.h>
 #endif
 '

m4/fpending.m4

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

m4/jm-macros.m4

@@ -1,4 +1,4 @@
-#serial 24
+#serial 25
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -92,6 +92,7 @@ AC_DEFUN(jm_MACROS,
   AC_REQUIRE([AM_FUNC_ERROR_AT_LINE])
   AC_REQUIRE([jm_FUNC_GNU_STRFTIME])
   AC_REQUIRE([jm_FUNC_MKTIME])
+  AC_REQUIRE([jm_FUNC_FPENDING])
 
   AC_REQUIRE([jm_FUNC_GETGROUPS])
   test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
@@ -209,6 +210,7 @@ AC_DEFUN(jm_MACROS,
   jm_LANGINFO_CODESET
   jm_GLIBC21
   jm_ICONV
+  jm_FUNC_UNLINK_BUSY_TEXT
 
   # These tests are for df.
   jm_LIST_MOUNTED_FILESYSTEMS([list_mounted_fs=yes], [list_mounted_fs=no])

m4/mbstate_t.m4

@@ -1,4 +1,4 @@
-# serial 7
+# serial 8
 
 # From Paul Eggert.
 
@@ -24,6 +24,6 @@ AC_DEFUN(AC_MBSTATE_T,
       ac_cv_type_mbstate_t=yes,
       ac_cv_type_mbstate_t=no)])
    if test $ac_cv_type_mbstate_t = no; then
-     AC_DEFINE(mbstate_t, char,
+     AC_DEFINE(mbstate_t, int,
 	       [Define to a type if <wchar.h> does not define.])
    fi])

m4/mbswidth.m4

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

m4/unlink-busy.m4

@@ -0,0 +1,32 @@
+#serial 5
+
+dnl From J. David Anglin.
+
+dnl HPUX and other systems can't unlink shared text that is being executed.
+
+AC_DEFUN(jm_FUNC_UNLINK_BUSY_TEXT,
+[dnl
+  AC_CACHE_CHECK([whether a running program can be unlinked],
+    jm_cv_func_unlink_busy_text,
+    [
+      AC_TRY_RUN([
+        main (argc, argv)
+          int argc;
+          char **argv;
+        {
+          if (!argc)
+            exit (-1);
+          exit (unlink (argv[0]));
+        }
+	],
+      jm_cv_func_unlink_busy_text=yes,
+      jm_cv_func_unlink_busy_text=no,
+      jm_cv_func_unlink_busy_text=no
+      )
+    ]
+  )
+
+  if test $jm_cv_func_unlink_busy_text = no; then
+    INSTALL=$ac_install_sh
+  fi
+])

old/fileutils/ChangeLog

@@ -1,3 +1,385 @@
+2000-09-09  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0z.
+
+	* tests/cp/special-bits: New file.
+	* tests/cp/Makefile.am (TESTS): Add special-bits.
+	(TESTS_ENVIRONMENT): Propagate $MAKE into environment, for special-bits.
+
+	* src/copy.c (SAME_OWNER, SAME_GROUP, SAME_OWNER_AND_GROUP): Define.
+	(copy_internal): Avoid calling chown if we know it's not necessary.
+
+	* src/copy.c (copy_internal): Call chmod also if we've made the
+	preceding chown call and we're supposed to preserve some special
+	permission bit(s) that would have been reset by chown.
+	Reported by Greg Louis.
+
+2000-09-08  Jim Meyering  <meyering@lucent.com>
+
+	* src/mkdir.c (S_IRWXUGO): Remove definition.
+	* src/sys2.h (S_IRWXUGO): Define here, instead.
+
+2000-09-07  Jim Meyering  <meyering@lucent.com>
+
+	* doc/texinfo.tex: Update from master repository.
+	* config.sub: Likewise.
+	* config.guess: Likewise.
+
+2000-09-05  Jim Meyering  <meyering@lucent.com>
+
+	* tests/mv/part-symlink: Redirect stdout to stderr before trying to
+	remove the temp directory.  Otherwise, the `rm -rf' would get an
+	error because the output file wouldn't be closed and the directory
+	wouldn't be `empty'.
+	* tests/cp/same-file: Likewise.
+
+	* tests/cp/same-file: Remove the `cp -dl sl1 sl2' case,
+	since it's no longer portable (hard link to a symlink).
+	Likewise for the `cp -bdl symlink foo' case.
+
+	* config.guess: Update from master repository.
+
+2000-09-04  Jim Meyering  <meyering@lucent.com>
+
+	* src/cp.c: Move declaractions of lstat, stat, and rpl_lstat
+	as well as the definition of lstat from here...
+	* src/copy.h: ...to here.
+	* src/copy.c: Remove declaration of lstat, now that it's in copy.h.
+
+	* tests/mv/force: mv's --force (-f) option is no longer needed for
+	this test, now that all it does is cancel --interactive (-i).
+
+	* tests/cp/same-file: Add new tests using cp's --rem option.
+	Reflect the fact that cp's -f option no longer causes cp to remove the
+	destination file before trying to open it.
+	Reflect the fact that `cp -bdl' now makes a backup when copying a
+	symlink onto the file it points to (FIXME: look into this, and why
+	cp -bl does *not* do so).
+
+	* src/ln.c (do_link): Tweak diagnostics.
+
+2000-09-03  Jim Meyering  <meyering@lucent.com>
+
+	* src/install.c (cp_option_init): Initialize new members.
+
+	* src/cp.c (enum): Add UNLINK_DEST_BEFORE_OPENING.
+	[long_options]: Add an entry for --remove-destination.
+	(usage): Describe --remove-destination.
+	(do_copy): Use unlink_dest_after_failed_open member, not `force.'
+	(cp_option_init): Initialize new members.
+	(main): Handle UNLINK_DEST_BEFORE_OPENING (aka --remove-destination).
+
+	* src/mv.c: Remove obsolete comment block.
+	(cp_option_init): Initialize new members.
+	(usage): Reflect the fact that --force (-f) relates only to whether
+	mv prompts.
+	(main): Remove uses of old `force' option member.
+
+	* src/install.c (cp_option_init): Reflect
+
+	`force' no longer means unlink-dest-before-opening
+	* src/copy.h (struct cp_options) [force]: Remove member.
+	[unlink_dest_before_opening]: Add member.  `cp -f' and `mv -f' used to
+	do this.  Now, you must use `cp --remove-destination' to get this
+	behavior.  Now, `cp -f' and `mv -f' work as required by POSIX.
+	[unlink_dest_after_failed_open]: Add member.
+
+	* src/copy.c (same_file_ok): New function, extracted from copy_internal,
+	and rewritten.
+	(copy_internal): Unlink destination file when unlink_dest_before_opening
+	option is set, and when the source is neither a regular file nor a
+	directory.
+
+	* tests/mv/Makefile.am (TESTS): Add part-symlink.
+
+	* src/ls.c: Use strcoll (not strcmp) when comparing file names.
+	Suggestion from Ulrich Drepper.
+
+2000-08-27  Jim Meyering  <meyering@lucent.com>
+
+	* src/copy.c (copy_reg): New parameters: X and NEW_DST.
+	Remove the SPARSE_MODE parameter.  Update caller.
+	Perform POSIX-mandated (for cp) open-with-O_WRONLY|O_TRUNC when copying
+	a regular source file and the destination file exists;  upon failure,
+	unlink that existing file, then open again, but with O_WRONLY|O_CREAT.
+	(copy_internal): `force' in not related to interactive; remove
+	the conjunct.
+	Remove the entire `else if (x->force)' block;  justifying
+	removal of the non-directory part is easy:  POSIX requires we try
+	to open an existing regular file, so we can't unlink it beforehand.
+	The part that changes the mode on a directory to allow overwriting
+	isn't necessary.
+
+	* src/copy.c (copy_reg): Rename two goto labels.
+	(copy_internal): Set `new_dst' when the move_mode rename fails,
+	since we then unlink the destination file.
+
+	* src/cp.c (usage): --force is independent of --interactive.
+
+2000-08-24  Jim Meyering  <meyering@lucent.com>
+
+	Put back the kluge.  It's necessary after all.
+	* src/dd.c (buggy_lseek_support): New function.
+	(skip): Use it.
+	Frank Adler reported that although _llseek returns 0, lseek
+	erroneously returns an offset suggesting the operation succeeded
+	even though it fails.
+
+	* install-sh: Double quote as needed, to protect against arguments
+	containing spaces or shell metacharacters.  Reported by Bruno Haible.
+
+2000-08-23  Jim Meyering  <meyering@lucent.com>
+
+	* tests/dd/not-rewound: New test, for the SEEK_CUR vs. SEEK_SET part
+	of the last change.  Based on Paul's example.
+	* tests/dd/Makefile.am (TESTS): Add not-rewound.
+
+2000-08-22  Paul Eggert  <eggert@twinsun.com>
+
+	* src/dd.c (skip):
+	Assume lseek failed if it returned zero, since a zero return is
+	impossible and some buggy drivers return zero.
+
+	Use SEEK_CUR rather than SEEK_SET; this fixes a bug when the
+	file descriptor is not currently rewound.
+
+2000-08-23  Jim Meyering  <meyering@lucent.com>
+
+	* src/dd.c: Back out my last change.  Paul's (above) is better.
+
+2000-08-22  Jim Meyering  <meyering@lucent.com>
+
+	Don't even try to use lseek on character devices.
+	* src/dd.c (buggy_lseek_support): New function.
+	(skip): Use it.
+	Reported by Martin Gallant via Michael Stone.
+
+2000-08-21  Jim Meyering  <meyering@lucent.com>
+
+	* tests/cp/same-file: Clean up traps.  Create files in a subdir.
+
+	* install-sh (oIFS): Remove unmatched double quote, left over from
+	my 2000-08-12 change.  From J. David Anglin.
+
+	* Makefile.maint (wget-update): Get the latest version of depcomp.
+
+	* depcomp: Update from automake.
+
+2000-08-20  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0y.
+
+	Add support for cp's new POSIX-mandated -H and -L options.
+	* src/copy.h (enum Dereference_symlink): Define.
+	(struct cp_options) [dereference]: Change type to Dereference_symlink.
+	* src/copy.c: Declare lstat.
+	(copy_dir): Set `xstat' member to lstat so that with `-H' we don't
+	follow symlinks found via recursive traversal.
+	Update uses of `dereference' to compare against new enum member names.
+	* src/cp.c (long_opts): Add --dereference, -L.
+	(usage): Describe -L and -H.
+	(cp_option_init): Initialize to DEREF_UNDEFINED, not `1'.
+	(main): Add `H' and `-L' to getopt spec string.
+	[case 'a']: Initialize `dereference' to DEREF_NEVER, not 0.
+	[case 'd']: Likewise.
+	[case 'H']: New case.
+	[case 'L']: New case.
+	[case 'R']: Don't set dereference to `0' here.
+	If it's not yet defined, set x.dereference to DEREF_NEVER
+	if -R was specified, else set it to DEREF_ALWAYS.
+	Set x.xstat accordingly for -H.
+	* doc/fileutils.texi (cp invocation): Describe -H and -L.
+	* src/mv.c (cp_option_init): Initialize to DEREF_NEVER, not `0'.
+	* src/install.c (cp_option_init): Initialize to DEREF_ALWAYS, not `1'.
+
+	* tests/cp/Makefile.am (TESTS): Add cp-HL.
+	* tests/cp/cp-HL: New test.
+
+	* src/du.c (print_totals): Rename global from opt_combined_arguments.
+
+2000-08-17  Paul Eggert  <eggert@twinsun.com>
+
+	* src/copy.c (DO_CHOWN): Do not make a special case for non-root.
+	POSIX.2 requires that cp -p and mv attempt to set the uid of the
+	destination file, even if you're not root.  This affects behavior
+	only on hosts that let you give files away via chmod.
+	* NEWS: Describe the above change.
+
+2000-08-15  Jim Meyering  <meyering@lucent.com>
+
+	* src/du.c (count_entry): Remember the current directory also for `.'
+	and `..'.  Reported by Stephen Smoogen, based on a patch from H.J. Lu.
+	* tests/du/two-args: Add tests for this.
+
+2000-08-14  Jim Meyering  <meyering@lucent.com>
+
+	* src/copy.c (copy_reg): Move declaration of local, `n_read', into
+	the scope where it's used.
+	(copy_internal): In calling copy_reg, pass not the raw `src_mode',
+	but the possibly-umask-relative mode, `get_dest_mode (x, src_mode)'.
+
+2000-08-13  Jim Meyering  <meyering@lucent.com>
+
+	* src/copy.c (get_dest_mode): Rename from new_nondir_mode.
+	Honor the umask for `cp', but not for `mv' or `cp -p'.
+	(copy_reg): New 4th parameter, dst_mode.  Pass it as 3rd arg. to open.
+	(copy_internal): Change type of locals `src_mode' and `src_type' from
+	int to mode_t.
+	Remove unnecessary local, `fix_mode'.
+	Combine two if-stmts into one.
+	Pass `src_mode' as 4th arg to copy_reg.
+	If we've just created a new regular file, return early, skipping the
+	chmod step.  copy_reg now sets permissions of such files upon creation.
+	Use get_dest_mode, so there's just one chmod call here.
+
+	* tests/cp/Makefile.am (TESTS): Add perm.
+	* tests/cp/perm: New tests, to help ensure the above didn't
+	change anything.
+
+2000-08-12  Jim Meyering  <meyering@lucent.com>
+
+	* tests/mv/into-self-2: Remove test for the VERSION_CONTROL and/or
+	SIMPLE_BACKUP_SUFFIX envvars.  Source ../envvar-check instead.
+	* tests/mv/i-2: Likewise.
+	* tests/mv/to-symlink: Likewise.
+	* tests/cp/slink-2-slink: Likewise.
+	* tests/mv/partition-perm: Likewise.
+	* tests/cp/cp-mv-backup: Likewise.
+
+	* tests/Makefile.am (EXTRA_DIST): Add envvar-check.
+	* tests/envvar-check: New file.
+
+	* install-sh: Remove trailing blanks.
+	Output diagnostics to stderr, not stdout.
+	Remove many useless curly braces and double quotes.
+
+2000-08-11  J. David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* install-sh: Improve error handling.
+	Do the job even when the target file is `busy' on systems
+	that don't allow such files to be unlinked.
+
+2000-08-12  Jim Meyering  <meyering@lucent.com>
+
+	* README: Remove note about how installation can fail and the
+	work-around, now that it's all automated.
+
+2000-08-07  Paul Eggert  <eggert@twinsun.com>
+
+	* src/cp.c (usage, main): For cp -P messages, mention the new
+	behavior as well as the old.
+
+2000-08-07  Paul Eggert  <eggert@twinsun.com>
+
+	Standardize on "memory exhausted" instead of "Memory exhausted"
+	or "virtual memory exhausted".
+	Invoke xalloc_die instead of printing our own message.
+	* src/chmod.c (main): Likewise.
+	* src/copy.c (copy_dir, copy_internal): Likewise.
+	* src/cp.c (do_copy): Likewise.
+	* src/dircolors.c (xstrndup): Likewise.
+	* src/install.c (main): Likewise.
+	* src/ln.c (do_link): Likewise.
+	* src/mkdir.c (main): Likewise.
+	* src/mkfifo.c (main): Likewise.
+	* src/mknod.c (main): Likewise.
+	* src/mv.c (movefile): Likewise.
+	* src/remove.c (remove_cwd_entries, rm): Likewise.
+	* src/shred.c (quotearg_colon, xmalloc):
+	"virtual memory exhausted" -> "memory exhausted"
+
+2000-08-07  Jim Meyering  <meyering@lucent.com>
+
+	* src/cp.c (enum) [PARENTS_OPTION]: New member.
+	(long_opts): Update "parents" and deprecated "path" entries to use
+	`PARENTS_OPTION', not `P'.
+	(usage): Update --help output.
+	(main): Warn that the meaning of `-P' will soon change.
+
+2000-08-06  Jim Meyering  <meyering@lucent.com>
+
+	* doc/fileutils.texi (cp invocation) [-r]: Remove inaccurate mention of
+	`non-symbolic links'.
+
+2000-08-05  Jim Meyering  <meyering@lucent.com>
+
+	* config.guess: Update from master repository.
+	* config.sub: Likewise.
+
+	* Regenerate build/config framework to use the latest CVS versions
+	of automake and autoconf.
+
+2000-07-31  Jim Meyering  <meyering@lucent.com>
+
+	* src/shred.c [!HAVE_CONFIG_H]: Use `virtual memory exhausted', not
+	`Memory exhausted'.
+
+2000-07-30  Jim Meyering  <meyering@lucent.com>
+
+	* src/sys2.h (ISPRINT): Undef before defining to avoid warning.
+
+	* src/copy.c (copy_internal): Quote the file names that are displayed
+	with --verbose and --backup.
+	* src/remove.c (remove_file): Quote the file names that are displayed
+	with --verbose.
+	(remove_dir): Likewise.
+	* tests/mv/mv-special-1: Add quote marks to match new behavior.
+	* tests/rm/r-1: Likewise.
+	* tests/rm/r-2: Likewise.
+
+	* src/df.c: Convert "`%s'" in format strings to "%s", and wrap each
+	corresponding argument in a `quote (...)' call.
+	* src/dircolors.c: Likewise.
+	* src/du.c: Likewise.
+	* src/mkdir.c: Likewise.
+	* src/mkfifo.c: Likewise.
+	* src/mknod.c: Likewise.
+	* src/shred.c: Likewise.
+	* src/rmdir.c: Likewise.
+	* src/cp-hash.c: Likewise.
+
+	* src/chgrp.c: Convert "`%s'" in format strings to "%s", and wrap each
+	corresponding argument in a `quote (...)' call.
+	Add more precise diagnostics.
+	* src/chmod.c: Likewise.
+	* src/chown.c: Likewise.
+
+	* src/remove.c (remove_cwd_entries): Quote one more file name.
+
+	* src/help-version: Remove file.  Move it to ...
+	* tests/help-version: ...here
+	* tests/Makefile.am (TESTS): Set to help-version.
+	(TESTS_ENVIRONMENT): Define.
+	(EXTRA_DIST): Add $(TESTS).
+	* src/Makefile.am (EXTRA_DIST): Remove help-version.
+	(TESTS): Remove definition.
+	(TESTS_ENVIRONMENT): Remove definition.
+
+2000-07-24  Bruno Haible  <haible@clisp.cons.org>
+
+	* src/ls.c: Include <limits.h>, <stdlib.h>, <wchar.h>, <wctype.h>.
+	(quote_name): Use mbrtowc to step through the filename string while
+	replacing nonprintables with question marks. Return the screen width,
+	not the strlen length. Do no output if the out stream is NULL.
+	(length_of_file_name_and_frills): Use the quote_name return value.
+
+2000-07-25  Jim Meyering  <meyering@lucent.com>
+
+	* src/chgrp.c (change_file_group): Save errno from a possibly failed
+	chown, and use that later.  Otherwise, errno itself could be clobbered
+	before used.
+	* src/chmod.c (change_file_mode): Likewise.
+	* src/chown.c (change_file_owner): Likewise.
+
+	* src/mv.c (main): Remove unnecessary "%s" argument.
+
+	* src/ln.c: Convert "`%s'" in format strings to "%s", and wrap each
+	corresponding argument in a `quote (...)' call.
+	Add more precise diagnostics.
+	* src/mv.c: Likewise.
+	* src/cp.c: Likewise.
+	* src/touch.c: Likewise.
+
 2000-07-23  Jim Meyering  <meyering@lucent.com>
 
 	* Version 4.0x.

old/fileutils/NEWS

@@ -1,4 +1,26 @@
-Changes in release 4.1:
+Changes in release 4.01:
+[4.0z]
+* `cp -p' once again preserves `special' permission bits (this bug was
+    introduced in 4.0y)
+* mv's --force (-f) option now controls solely whether mv prompts (per POSIX)
+* `cp -f' now first attempts to open an existing destination file, and only
+    if that fails does it resort to unlinking the file and retrying the open.
+    Before, it would unlink the file before trying to open it.
+* cp accepts a new option, --remove-destination, that provides the old behavior
+* cp's -f option no longer cancels the effect of --interactive (-i) (per POSIX)
+* when ls sorts directory entries, it now honors the current locale settings
+* dd's `skip=BLOCKS' operator once again works on systems with a buggy lseek
+  function (Linux, at least on SCSI tape devices)
+* fix a typo in install-sh
+[4.0y]
+* cp now accepts the POSIX-mandated -H and -L options.
+* cp -p and mv now try to preserve uid even if you're not root, as per POSIX.2.
+  This affects behavior only on hosts that let you give files away via chmod.
+* du would fail when given `.' or `..' followed by other command line arguments
+* Using cp's short-named `-P' option evokes the warning that that the
+   meaning of `-P' will soon change.  Use `--parents' instead.
+* chgrp, chmod, and chown: when used with the --verbose option, might give an
+  invalid diagnostic (due to clobbered errno) when failing.
 [4.0x]
 * Fix cp so that `cp -r DIR1/ DIR2' works properly once again.
 * New ls option --quoting-style=clocale acts like --quoting-style=locale,

old/sh-utils/ChangeLog

@@ -1,5 +1,29 @@
+2000-08-14  Jim Meyering  <meyering@lucent.com>
+
+	* src/tee.c (main): Remove incorrect `FIXME' comment.
+
+2000-08-07  Paul Eggert  <eggert@twinsun.com>
+
+	* src/su.c (xputenv): Invoke xalloc_die instead of printing
+	our own message.
+
+2000-07-30  Jim Meyering  <meyering@lucent.com>
+
+	* src/tee.c (tee): Use SET_BINARY and SET_BINARY2.
+	From Prashant TR.
+
+	* src/help-version: Remove file.  Move it to ...
+	* tests/help-version: ...here
+	* tests/Makefile.am (TESTS): Add help-version.
+	(TESTS_ENVIRONMENT): Define.
+	* src/Makefile.am (EXTRA_DIST): Remove help-version.
+	(TESTS): Remove definition.
+	(TESTS_ENVIRONMENT): Remove definition.
+
 2000-07-23  Jim Meyering  <meyering@lucent.com>
 
+	* src/help-version (su_args): Punt, so we don't try to start a shell.
+
 	* src/su.c: Include <sys/param.h> if HAVE_SYS_PARAM_H is defined,
 	rather than if _POSIX_VERSION is defined.  Remove declarations of
 	getpwuid, getgrgid, and getuid, now that they're in sys2.h.

old/textutils/ChangeLog

@@ -1,3 +1,173 @@
+2000-09-07  Jim Meyering  <meyering@lucent.com>
+
+	* src/cut.c: Remove obsolete comment block.
+	(usage): Note that when using -f, lines with no delimiters are
+	also printed.
+	* doc/textutils.texi (cut invocation): Likewise.
+
+2000-08-23  Jim Meyering  <meyering@lucent.com>
+
+	* src/md5sum.c: Include <config.h> unconditionally, to be consistent
+	with all the other programs in this directory.
+	* src/tsort.c: Likewise.
+
+2000-08-19  Jim Meyering  <meyering@lucent.com>
+
+	* src/comm.c (writeline): Correct comments.  From Bruno Haible.
+
+2000-08-11  Paul Eggert  <eggert@twinsun.com>
+
+	* doc/textutils.texi:
+
+	Portable shell scripts should specify global options before
+	key fields.
+
+	Move global LC_CTYPE remark to each sort option that depends
+	on LC_CTYPE.
+
+	sort -g depends on LC_NUMERIC.
+
+	Add @vindex where it's missing.
+
+	"radix character" -> "decimal-point character", to match Standard C
+	terminology, which is easier for most people to follow.
+
+	"comm" does not consider trailing newlines to be significant.
+
+2000-08-10  Paul Eggert  <eggert@twinsun.com>
+
+	* doc/textutils.texi: Recommend against the System V syntax
+	for tr ranges, and don't use it in examples.  Use POSIX
+	classes rather than ranges, for portability.
+	* src/tr.c (usage): Don't describe System V syntax, as it
+	doesn't always work.
+
+	* src/sort.c (usage): Describe -d and -i in a locale-independent way.
+
+	* doc/Makefile.am (constants.texi): Use the C locale so that
+	[A-Z] works as expected.
+
+2000-08-07  Paul Eggert  <eggert@twinsun.com>
+
+	* src/cut.c (cut_fields): Invoke xalloc_die instead of printing
+	our own message.
+	(cut_fields): Check for I/O error as well as end-of-file
+
+2000-08-06  Bruno Haible  <haible@clisp.cons.org>
+
+	* src/wc.c: Add support for multi-byte locales.
+	(iswprint, mbrtowc, wcwidth): Provide default definitions.
+	(total_bytes): New variable.
+	(print_bytes): New variable.
+	(longopts): Change abbreviation for --chars from 'c' to 'm'.
+	(usage): Update.
+	(write_counts): Add `bytes' argument.
+	(wc): New variables `bytes', `count_bytes', `count_chars',
+	`count_complicated'. The old code determines `bytes', not `chars'.
+	New case for MB_CUR_MAX > 1. A non-printable non-space character does
+	not increment the line position or start a word. Update `total_bytes'.
+	(main): Initialize `print_bytes' and `total_bytes' to 0. Accept 'm'
+	option. Pass `total_bytes' to write_counts.
+	* doc/textutils.texi (wc invocation): Update accordingly.
+
+2000-08-06  Bruno Haible  <haible@clisp.cons.org>
+
+	* src/head.c (head): Call write_header here.
+	(head_file): ... not here.
+
+	* src/cat.c (closeout_func): Remove variable.
+	(close_stdout_wrapper): Remove unused function.
+	(main): Remove assignment to closeout_func.
+
+	* src/fold.c (fold_file): Remove ferror(stdout) check, already done
+	in close_stdout.
+
+2000-08-06  Paul Eggert  <eggert@twinsun.com>
+
+	* src/sort.c (usage): Warn more succintly about the effects of
+	the locale on sort order.
+
+2000-08-06  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0g.
+
+	* src/tail.c (pipe_lines): Declare local `cp' to be const.
+
+2000-08-04  Greg McGary  <greg@mcgary.org>
+
+	* src/tail.c (pipe_lines): Add variable `nbytes' so we can free
+	`tmp' immediately after read loop.  Don't process an empty file.
+	[This fixes a buffer-underrun error -- detected thanks to
+	bounded pointers -jmm]
+
+2000-08-05  Jim Meyering  <meyering@lucent.com>
+
+	Fix buffer-overrun error.
+	* src/pr.c (init_header): Allocated buffer was sometimes too small.
+	Reported by Greg McGary (who found this bug using his
+	bounded-pointers-enabled gcc).
+	(init_header): Move declarations of several variables into the
+	inner scope where they are used.
+	* tests/pr/Test.pm (narrow-1): New test, for the above.
+
+	* src/csplit.c (MAX): Remove definition (It's in sys2.h).
+
+2000-08-04  Jim Meyering  <meyering@lucent.com>
+
+	* src/sort.c (main): Rename local `t' to `tmp_dir' to avoid shadowing
+	a previous local by that name.
+	(usage): Warn that GNU sort is now locale-aware, and suggest
+	people put LC_ALL=POSIX in their environment.
+
+	* src/pr.c (store_columns): Remove conjunct that would dereference
+	an out-of-bounds pointer.  Reported by Greg McGary (who found this
+	bug using his bounded-pointers-enabled gcc).
+
+2000-08-03  Jim Meyering  <meyering@lucent.com>
+
+	* tests/Makefile.am.in ($(srcdir)/$x-tests): Use -I$(srcdir), not `-I.'.
+	(Makefile.am): Likewise.  Reported by Greg McGary.
+
+2000-08-01  Jim Meyering  <meyering@lucent.com>
+
+	* doc/textutils.texi (tr invocation): Note that ranges are not portable.
+	Update examples not to use ranges.
+
+2000-07-31  Jim Meyering  <meyering@lucent.com>
+
+	* src/cut.c (cut_fields): Use `virtual memory exhausted',
+	not `Memory exhausted'.
+
+2000-07-30  Jim Meyering  <meyering@lucent.com>
+
+	* src/help-version: Remove file.  Move it to ...
+	* tests/help-version: ...here
+	* tests/Makefile.am (TESTS): Set to help-version.
+	(TESTS_ENVIRONMENT): Define.
+	(EXTRA_DIST): Add $(TESTS).
+	* src/Makefile.am (EXTRA_DIST): Remove help-version.
+	(TESTS): Remove definition.
+	(TESTS_ENVIRONMENT): Remove definition.
+
+2000-07-28  Paul Eggert  <eggert@twinsun.com>
+
+	sort's -T option can now appear multiple times.
+	Thanks to Charles Randall for suggesting this idea.
+
+	* doc/textutils.texi, NEWS: Document this.
+
+	* src/sort.c (temp_dir): Remove.
+	(temp_dirs, temp_dir_count, temp_dir_alloc): New vars.
+	(process_id): New var.
+	(usage): Describe new use of -T.
+	(add_temp_dir): New function.
+	(tempname): Use new temp_dirs array.
+	Do not discard information from the process-id or sequence
+	number, unless we have short file names.
+	(sighandle): Use process_id instead of getpid.
+	(main): Initialize process_id.
+	Add support for the new use of -T.
+
 2000-07-23  Jim Meyering  <meyering@lucent.com>
 
 	* tests/head/Test.pm: Rename tests (and hence files) to have a short

old/textutils/NEWS

@@ -1,4 +1,14 @@
 Changes in release 2.1
+[2.0h]
+[2.0g]
+* sort's --help output now warns that it is locale-aware
+* tail: fix a buffer underrun error that occurred on an empty pipe,
+  also thanks to bounded pointers
+* pr: fix a bounds violation found by Greg McGary's bounded-pointers-enabled gcc
+  It could have caused (with low probability) the columns on the last page of
+  output *not* to be `balanced' when they should have been.
+* sort: if the -T tmpdir option is given multiple times, all the given
+  directories are used; this can improve performance for huge sort/merges.
 [2.0f]
 * all programs fail when printing --help or --version output to a full device
 * cut no longer gets a segfault under some circumstances

src/cat.c

@@ -462,17 +462,6 @@ cat (
     }
 }
 
-/* This is gross, but necessary, because of the way close_stdout
-   works and because this program closes STDOUT_FILENO directly.  */
-static void (*closeout_func) (void) = close_stdout;
-
-static void
-close_stdout_wrapper (void)
-{
-  if (closeout_func)
-    (*closeout_func) ();
-}
-
 int
 main (int argc, char **argv)
 {
@@ -632,8 +621,6 @@ main (int argc, char **argv)
 	}
     }
 
-  closeout_func = NULL;
-
   /* Get device, i-node number, and optimal blocksize of output.  */
 
   if (fstat (STDOUT_FILENO, &stat_buf) < 0)

src/chgrp.c

@@ -27,6 +27,7 @@
 #include "error.h"
 #include "lchown.h"
 #include "group-member.h"
+#include "quote.h"
 #include "savedir.h"
 #include "xstrtol.h"
 
@@ -137,7 +138,7 @@ describe_change (const char *file, enum Change_status changed)
   if (changed == CH_NOT_APPLIED)
     {
       printf (_("neither symbolic link %s nor referent has been changed\n"),
-	      file);
+	      quote (file));
       return;
     }
 
@@ -155,7 +156,7 @@ describe_change (const char *file, enum Change_status changed)
     default:
       abort ();
     }
-  printf (fmt, file, groupname);
+  printf (fmt, quote (file), groupname);
 }
 
 /* Set *G according to NAME. */
@@ -176,14 +177,14 @@ parse_group (const char *name, gid_t *g)
       unsigned long int tmp_long;
 
       if (!ISDIGIT (*name))
-	error (1, 0, _("invalid group name `%s'"), name);
+	error (1, 0, _("invalid group name %s"), quote (name));
 
       s_err = xstrtoul (name, NULL, 0, &tmp_long, NULL);
       if (s_err != LONGINT_OK)
 	STRTOL_FATAL_ERROR (name, _("group number"), s_err);
 
       if (tmp_long > MAXGID)
-	error (1, 0, _("invalid group number `%s'"), name);
+	error (1, 0, _("invalid group number %s"), quote (name));
 
       *g = tmp_long;
     }
@@ -205,7 +206,7 @@ change_file_group (int cmdline_arg, const char *file, gid_t group)
   if ((*xstat) (file, &file_stats))
     {
       if (force_silent == 0)
-	error (0, errno, "%s", file);
+	error (0, errno, _("getting attributes of %s"), quote (file));
       return 1;
     }
 
@@ -213,6 +214,7 @@ change_file_group (int cmdline_arg, const char *file, gid_t group)
     {
       int fail;
       int symlink_changed = 1;
+      int saved_errno;
 
       if (S_ISLNK (file_stats.st_mode) && change_symlinks)
 	{
@@ -231,6 +233,9 @@ change_file_group (int cmdline_arg, const char *file, gid_t group)
 	  fail = chown (file, (uid_t) -1, group);
 	}
 
+      /* Save errno, since in verbose mode, describe_change might change it.  */
+      saved_errno = errno;
+
       if (verbosity == V_high || (verbosity == V_changes_only && !fail))
 	{
 	  enum Change_status ch_status = (! symlink_changed ? CH_NOT_APPLIED
@@ -246,18 +251,20 @@ change_file_group (int cmdline_arg, const char *file, gid_t group)
 	      /* Give a more specific message.  Some systems set errno
 		 to EPERM for both `inaccessible file' and `user not a member
 		 of the specified group' errors.  */
-	      if (errno == EPERM && !group_member (group))
+	      if (saved_errno == EPERM && !group_member (group))
 		{
-		  error (0, errno, _("you are not a member of group `%s'"),
-			 groupname);
+		  error (0, saved_errno, _("you are not a member of group %s"),
+			 quote (groupname));
 		}
-	      else if (errno == EINVAL && group > MAXUID)
+	      else if (saved_errno == EINVAL && group > MAXUID)
 		{
-		  error (0, 0, _("%s: invalid group number"), groupname);
+		  error (0, 0, _("%s: invalid group number"),
+			 quote (groupname));
 		}
 	      else
 		{
-		  error (0, errno, "%s", file);
+		  error (0, saved_errno, _("changing group of %s"),
+			 quote (file));
 		}
 	    }
 	}
@@ -292,7 +299,7 @@ change_dir_group (const char *dir, gid_t group, const struct stat *statp)
   if (name_space == NULL)
     {
       if (force_silent == 0)
-	error (0, errno, "%s", dir);
+	error (0, errno, "%s", quote (dir));
       return 1;
     }
 
@@ -419,7 +426,7 @@ main (int argc, char **argv)
     {
       struct stat ref_stats;
       if (stat (reference_file, &ref_stats))
-        error (1, errno, "%s", reference_file);
+	error (1, errno, _("getting attributes of %s"), quote (reference_file));
 
       group = ref_stats.st_gid;
     }