*** empty log message ***

Linux header bug when _XOPEN_SOURCE is defined to 500.

Makefile.maint

@@ -76,14 +76,15 @@ PREV_VERSION := $(shell echo $(VERSION)|tr b-z a-y|sed 's/a$$//')
 PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
 v = Version
 
-a_host=alpha.gnu.org
-b_host=tug.org
+a_host = alpha.gnu.org
+b_host = tug.org
 
-a_url_dir=gnu/fetish
-b_url_dir=gnu/fetish
+alpha_subdir = gnu/fetish
+a_url_dir = $(alpha_subdir)
+b_url_dir = $(alpha_subdir)
 
-a_real_dir=/fs/share/ftp/gnu/fetish
-b_real_dir=/home/ftp/pub/gnu/fetish
+a_real_dir = /fs/share/ftp/$(alpha_subdir)
+b_real_dir = /home/ftp/pub/$(alpha_subdir)
 
 url_dir_list = $(foreach x,a b,ftp://$($(x)_host)/$($(x)_url_dir))
 

THANKS

@@ -35,6 +35,7 @@ Bob McCracken                       kerouac@ravenet.com
 Bob Proulx                          rwp@fc.hp.com
 Brendan O'Dea                       bod@compusol.com.au
 Brian Kimball                       bfk@footbag.org
+Brian Youmans                       3diff@gnu.org
 Bruno Haible                        haible@clisp.cons.org
 Carl Johnson                        carlj@cjlinux.home.org
 Carl Lowenstein                     cdl@mpl.UCSD.EDU
@@ -83,6 +84,7 @@ Gabor Z. Papp                       gzp@gzp.org.hu
 Galen Hazelwood                     galenh@micron.net
 Gary Anderson                       ganderson@clark.net
 Gaël Quéri                          gqueri@mail.dotcom.fr
+Geoff Kuenning                      geoff@cs.hmc.edu
 Geoff Odhner                        geoff@franklin.com
 Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
 GOTO Masanori                       gotom@debian.or.jp
@@ -93,6 +95,8 @@ Gregory Leblanc                     gleblanc@cu-portland.edu
 Göran Uddeborg                      goeran@uddeborg.pp.se
 H. J. Lu                            hjl@valinux.com
 Hans Verkuil                        hans@wyst.hobby.nl
+Harry Liu                           rliu@lek.ugcs.caltech.edu
+Herbert Xu                          herbert@gondor.apana.org.au
 Holger Berger                       hberger@ess.nec.de
 Hugh Daniel                         hugh@xanadu.com
 Ian Jackson                         ijackson@chiark.greenend.org.uk
@@ -192,6 +196,7 @@ Noel Cragg                          noel@red-bean.com
 Olav Morkrid                        olav@funcom.com
 Paul Eggert                         eggert@twinsun.com
 Paul Nevai                          nevai@ops.mps.ohio-state.edu
+Paul Sauer                          paul@alexa.com
 Paul Slootman                       paul@debian.org
 Per Cederqvist                      ceder@lysator.liu.se
 Per Kristian Hove                   perhov@math.ntnu.no
@@ -202,6 +207,7 @@ Peter Seebach                       seebs@taniemarie.solon.com
 Phil Richards                       phil.richards@vf.vodafone.co.uk
 Philippe De Muyter                  phdm@macqel.be
 Philippe Schnoebelen                Philippe.Schnoebelen@imag.fr
+Piergiorgio Sartor                  sartor@sony.de
 Rainer Orth                         ro@TechFak.Uni-Bielefeld.DE
 Ralf W. Stephan                     stephan@tmt.de
 Ralph Loader                        loader@maths.ox.ac.uk
@@ -233,6 +239,7 @@ Thomas Bushnell                     thomas@gnu.ai.mit.edu
 Thomas Quinot                       thomas@Cuivre.FR.EU.ORG
 Tim Smithers                        mouse@dmouse.com.au
 Tim Waugh                           twaugh@redhat
+Todd A. Jacobs                      tjacobs@codegnome.org
 Tom Quinn                           trq@dionysos.thphys.ox.ac.uk
 Ton Hospel                          thospel@mail.dma.be
 Tony Leneis                         tony@plaza.ds.adp.com

doc/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

doc/getdate.texi

@@ -44,11 +44,11 @@ midnight, 1 January 1970 UCT.
 
 @menu
 * General date syntax::            Common rules.
-* Calendar date item::             19 Dec 1994.
-* Time of day item::               9:20pm.
-* Time zone item::                 EST, DST, BST, UTC, ...
-* Day of week item::               Monday and others.
-* Relative item in date strings::  next tuesday, 2 years ago.
+* Calendar date items::             19 Dec 1994.
+* Time of day items::               9:20pm.
+* Time zone items::                 EST, DST, BST, UTC, ...
+* Day of week items::               Monday and others.
+* Relative items in date strings::  next tuesday, 2 years ago.
 * Pure numbers in date strings::   19931219, 1440.
 * Authors of getdate::             Bellovin, Salz, Berets, et al.
 @end menu
@@ -103,8 +103,8 @@ nested.  Hyphens not followed by a digit are currently ignored.  Leading
 zeros on numbers are ignored.
 
 
-@node Calendar date item
-@section Calendar date item
+@node Calendar date items
+@section Calendar date items
 
 @cindex calendar date item
 
@@ -113,13 +113,14 @@ specified differently, depending on whether the month is specified
 numerically or literally.  All these strings specify the same calendar date:
 
 @example
-1972-09-24      # ISO 8601.
-72-9-24         # Assume 19xx for 69 through 99, 20xx for 00 through 68.
-72-09-24        # Leading zeros are ignored.
-9/24/72         # Common U.S. writing.
+1972-09-24     # ISO 8601.
+72-9-24        # Assume 19xx for 69 through 99,
+               # 20xx for 00 through 68.
+72-09-24       # Leading zeros are ignored.
+9/24/72        # Common U.S. writing.
 24 September 1972
-24 Sept 72      # September has a special abbreviation.
-24 Sep 72       # Three-letter abbreviations always allowed.
+24 Sept 72     # September has a special abbreviation.
+24 Sep 72      # Three-letter abbreviations always allowed.
 Sep 24, 1972
 24-sep-72
 24sep72
@@ -173,8 +174,8 @@ Or, omitting the year:
 @end example
 
 
-@node Time of day item
-@section Time of day item
+@node Time of day items
+@section Time of day items
 
 @cindex time of day item
 
@@ -223,8 +224,8 @@ Either @samp{am}/@samp{pm} or a time zone correction may be specified,
 but not both.
 
 
-@node Time zone item
-@section Time zone item
+@node Time zone items
+@section Time zone items
 
 @cindex time zone item
 
@@ -343,8 +344,8 @@ may be specified.
 @end table
 
 
-@node Day of week item
-@section Day of week item
+@node Day of week items
+@section Day of week items
 
 @cindex day of week item
 
@@ -370,8 +371,8 @@ the day that @var{day} by itself would represent.
 A comma following a day of the week item is ignored.
 
 
-@node Relative item in date strings
-@section Relative item in date strings
+@node Relative items in date strings
+@section Relative items in date strings
 
 @cindex relative items in date strings
 @cindex displacement of dates
@@ -423,12 +424,12 @@ one day in the past (equivalent to @samp{day ago}).
 The strings @samp{now} or @samp{today} are relative items corresponding
 to zero-valued time displacement, these strings come from the fact
 a zero-valued time displacement represents the current time when not
-otherwise change by previous items.  They may be used to stress other
+otherwise changed by previous items.  They may be used to stress other
 items, like in @samp{12:00 today}.  The string @samp{this} also has
 the meaning of a zero-valued time displacement, but is preferred in
 date strings like @samp{this thursday}.
 
-When a relative item makes the resulting date to cross the boundary
+When a relative item causes the resulting date to cross the boundary
 between DST and non-DST (or vice-versa), the hour is adjusted according
 to the local time.
 
@@ -438,11 +439,11 @@ to the local time.
 
 @cindex pure numbers in date strings
 
-The precise intepretation of a pure decimal number is dependent of
+The precise intepretation of a pure decimal number depends
 the context in the date string.
 
 If the decimal number is of the form @var{yyyy}@var{mm}@var{dd} and no
-other calendar date item (@pxref{Calendar date item}) appears before it
+other calendar date item (@pxref{Calendar date items}) appears before it
 in the date string, then @var{yyyy} is read as the year, @var{mm} as the
 month number and @var{dd} as the day of the month, for the specified
 calendar date.

doc/perm.texi

@@ -342,7 +342,7 @@ og+rX-w
 gives users other than the owner of the file read permission and, if
 it is a directory or if someone already had execute permission
 to it, gives them execute permission; and it also denies them write
-permission to it file.  It does not affect the permission that the
+permission to the file.  It does not affect the permission that the
 owner of the file has for it.  The above mode is equivalent to
 the two modes:
 

doc/sh-utils.texi

@@ -360,13 +360,14 @@ $ /usr/local/bin/printf '\u4e2d\u6587'
 will be output correctly in all chinese locales (GB2312, BIG5, UTF-8, etc).
 
 Note that in these examples, the full pathname of @code{printf} has been
-given, to distinguish it from the GNU bash builtin function @code{printf}.
+given, to distinguish it from the GNU @code{bash} builtin function
+@code{printf}.
 
 For larger strings, you don't need to look up the hexadecimal code values of
 each character one by one. ASCII characters mixed with \u escape sequences
 is also known as the JAVA source file encoding. You can use GNU recode 3.5c
 (or newer) to convert strings to this encoding. Here is how to convert a
-piece of text into a shell script which will output this text in a locale
+piece of text into a shell script which will output this text in a locale-
 independent way:
 
 @smallexample
@@ -756,7 +757,7 @@ True if either @var{expr1} or @var{expr2} is true.
 @code{expr} evaluates an expression and writes the result on standard
 output.  Each token of the expression must be a separate argument.
 
-Operands are either numbers or strings.  @code{expr} coerces
+Operands are either numbers or strings.  @code{expr} converts
 anything appearing in an operand position to an integer or a string
 depending on the operation being applied to it.
 
@@ -802,7 +803,7 @@ the next sections).
 @cindex pattern matching
 @cindex regular expression matching
 @cindex matching patterns
-Perform pattern matching.  The arguments are coerced to strings and the
+Perform pattern matching.  The arguments are converted to strings and the
 second is considered to be a (basic, a la GNU @code{grep}) regular
 expression, with a @code{^} implicitly prepended.  The first argument is
 then matched against this regular expression.
@@ -883,7 +884,7 @@ the connectives (next section) have higher.
 @kindex -
 @cindex addition
 @cindex subtraction
-Addition and subtraction.  Both arguments are coerced to numbers;
+Addition and subtraction.  Both arguments are converted to numbers;
 an error occurs if this cannot be done.
 
 @item * / %
@@ -893,7 +894,7 @@ an error occurs if this cannot be done.
 @cindex multiplication
 @cindex division
 @cindex remainder
-Multiplication, division, remainder.  Both arguments are coerced to
+Multiplication, division, remainder.  Both arguments are converted to
 numbers; an error occurs if this cannot be done.
 
 @end table
@@ -935,9 +936,9 @@ Return its first argument if neither argument is null or 0, otherwise
 @kindex >=
 @cindex comparison operators
 Compare the arguments and return 1 if the relation is true, 0 otherwise.
-@code{==} is a synonym for @code{=}.  @code{expr} first tries to coerce
+@code{==} is a synonym for @code{=}.  @code{expr} first tries to convert
 both arguments to numbers and do a numeric comparison; if either
-coercion fails, it does a lexicographic comparison.
+conversion fails, it does a lexicographic comparison.
 
 @end table
 
@@ -1619,10 +1620,11 @@ values.
 Same as:
 @c This is too long to write inline.
 @example
-cread -ignbrk brkint -inlcr -igncr icrnl -ixoff -iuclc -ixany
-imaxbel opost -olcuc -ocrnl onlcr -onocr -onlret -ofill -ofdel
-nl0 cr0 tab0 bs0 vt0 ff0 isig icanon iexten echo echoe echok
--echonl -noflsh -xcase -tostop -echoprt echoctl echoke
+cread -ignbrk brkint -inlcr -igncr icrnl -ixoff
+-iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr
+-onocr -onlret -ofill -ofdel nl0 cr0 tab0 bs0 vt0
+ff0 isig icanon iexten echo echoe echok -echonl
+-noflsh -xcase -tostop -echoprt echoctl echoke
 @end example
 @noindent and also sets all special characters to their default values.
 
@@ -1637,9 +1639,9 @@ May be negated.  If negated, same as @code{raw}.
 @opindex raw
 Same as:
 @example
--ignbrk -brkint -ignpar -parmrk -inpck -istrip -inlcr -igncr
--icrnl -ixon -ixoff -iuclc -ixany -imaxbel -opost -isig
--icanon -xcase min 1 time 0
+-ignbrk -brkint -ignpar -parmrk -inpck -istrip
+-inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany
+-imaxbel -opost -isig -icanon -xcase min 1 time 0
 @end example
 @noindent May be negated.  If negated, same as @code{cooked}.
 
@@ -1783,7 +1785,7 @@ the time value has expired, when @code{-icanon} is set.
 
 @item time @var{n}
 @opindex time
-Set the number of tenths of a second before reads time out if the min
+Set the number of tenths of a second before reads time out if the minimum
 number of characters have not been read, when @code{-icanon} is set.
 
 @item ispeed @var{n}
@@ -1809,7 +1811,7 @@ Tell the kernel that the terminal has @var{n} columns.  Non-POSIX.
 @vindex LINES
 @vindex COLUMNS
 Print the number of rows and columns that the kernel thinks the
-terminal has.  (Systems that don't support rows and cols in the kernel
+terminal has.  (Systems that don't support rows and columns in the kernel
 typically use the environment variables @env{LINES} and @env{COLUMNS}
 instead; however, GNU @code{stty} does not know anything about them.)
 Non-POSIX.
@@ -1824,6 +1826,8 @@ Print the terminal speed.
 
 @item @var{n}
 @cindex baud rate, setting
+@c FIXME: Is this still true that the baud rate can't be set
+@c higher than 38400?
 Set the input and output speeds to @var{n}.  @var{n} can be one
 of: 0 50 75 110 134 134.5 150 200 300 600 1200 1800 2400 4800 9600
 19200 38400 @code{exta} @code{extb}.  @code{exta} is the same as
@@ -2596,7 +2600,7 @@ date --date='1970-01-01 00:00:01 UTC +5 hours' +%s
 @end example
 
 Suppose you had @emph{not} specified time zone information in the example above.
-Then, date would have used your computer's idea of the time zone when
+Then, @code{date} would have used your computer's idea of the time zone when
 interpreting the string.  Here's what you would get if you were in
 Greenwich, England:
 
@@ -3245,7 +3249,7 @@ The program accepts the following options.  Also see @ref{Common options}.
 @opindex --format=@var{format}
 @cindex formatting of numbers in @code{seq}
 Print all numbers using @var{format}; default @samp{%g}.
-@var{format} must contain exactly one of the standarding floating point
+@var{format} must contain exactly one of the floating point
 output formats @samp{%e}, @samp{%f}, or @samp{%g}.
 
 @item -s @var{string}

doc/textutils.texi

@@ -317,19 +317,19 @@ Equivalent to @samp{-vET}.
 @opindex -B
 @opindex --binary
 @cindex binary and text I/O in cat
-On MS-DOS and MS-Windows only, read and write the
-files in binary mode.  By default, @code{cat} on MS-DOS/MS-Windows uses
-binary mode only when standard output is redirected to a file or a pipe;
-this option overrides that.  Binary file I/O is used so that the files
-retain their format (Unix text as opposed to DOS text and binary),
-because @code{cat} is frequently used as a file-copying program.  Some
-options (see below) cause @code{cat} read and write files in text mode
-because then the original file contents aren't important (e.g., when
-lines are numbered by @code{cat}, or when line endings should be
-marked).  This is so these options work as DOS/Windows users would
-expect; for example, DOS-style text files have their lines end with
-the CR-LF pair of characters which won't be processed as an empty line
-by @samp{-b} unless the file is read in text mode.
+On MS-DOS and MS-Windows only, read and write the files in binary mode.
+By default, @code{cat} on MS-DOS/MS-Windows uses binary mode only when
+standard output is redirected to a file or a pipe; this option overrides
+that.  Binary file I/O is used so that the files retain their format
+(Unix text as opposed to DOS text and binary), because @code{cat} is
+frequently used as a file-copying program.  Some options (see below)
+cause @code{cat} to read and write files in text mode because in those
+cases the original file contents aren't important (e.g., when lines are
+numbered by @code{cat}, or when line endings should be marked).  This is
+so these options work as DOS/Windows users would expect; for example,
+DOS-style text files have their lines end with the CR-LF pair of
+characters, which won't be processed as an empty line by @samp{-b} unless
+the file is read in text mode.
 
 @item -b
 @itemx --number-nonblank
@@ -813,12 +813,12 @@ Output as hexadecimal shorts.  Equivalent to @samp{-tx2}.
 @item -C
 @itemx --traditional
 @opindex --traditional
-Recognize the pre-POSIX non-option arguments that traditional @code{od}
+Recognize the pre-@sc{posix} non-option arguments that traditional @code{od}
 accepted.  The following syntax:
 
-@example
+@smallexample
 od --traditional [@var{file}] [[+]@var{offset}[.][b] [[+]@var{label}[.][b]]]
-@end example
+@end smallexample
 
 @noindent
 can be used to specify at most one file and optional arguments
@@ -983,24 +983,27 @@ is @samp{space}).  For multicolumn output, lines will always be truncated to
 column output no line truncation occurs by default.  Use @samp{-W} option to
 truncate lines in that case.
 
+@c FIXME:???  Should this be something like "Starting with version 1.22i,..."
    Including version 1.22i:
 
-Some small @var{letter options} (@samp{-s}, @samp{-w}) has been redefined
-with the object of a better @var{posix} compliance.  The output of some
-further cases has been adapted to other @var{unix}es.  A violation of
-downward compatibility has to be accepted.
+@c FIXME: this whole section here sounds very awkward to me. I
+@c made a few small changes, but really it all needs to be redone. - Brian
+Some small @var{letter options} (@samp{-s}, @samp{-w}) have been redefined
+with the object of a better @sc{posix} compliance.  The output of some
+further cases has been adapted to other Unix systems.  These changes are
+not compatible with earlier versions of the program.
 
 Some @var{new capital letter} options (@samp{-J}, @samp{-S}, @samp{-W})
-has been introduced to turn off unexpected interferences of small letter
+have been introduced to turn off unexpected interferences of small letter
 options.  The @samp{-N} option and the second argument @var{last_page}
 of @samp{+FIRST_PAGE} offer more flexibility.  The detailed handling of
-form feeds set in the input files requires @samp{-T} option.
+form feeds set in the input files requires the @samp{-T} option.
 
-Capital letter options dominate small letter ones.
+Capital letter options override small letter ones.
 
 Some of the option-arguments (compare @samp{-s}, @samp{-S}, @samp{-e},
 @samp{-i}, @samp{-n}) cannot be specified as separate arguments from the
-preceding option letter (already stated in the @var{posix} specification).
+preceding option letter (already stated in the @sc{posix} specification).
 
 The program accepts the following options.  Also see @ref{Common options}.
 
@@ -1110,7 +1113,7 @@ Merge lines of full length.  Used together with the column options
 @samp{-W/-w} line truncation;
 no column alignment used; may be used with @samp{-S[@var{string}]}.
 @samp{-J} has been introduced (together with @samp{-W} and @samp{-S})
-to disentangle the old (@var{posix} compliant) options @samp{-w} and
+to disentangle the old (@sc{posix}-compliant) options @samp{-w} and
 @samp{-s} along with the three column options.
 
 
@@ -1120,7 +1123,7 @@ to disentangle the old (@var{posix} compliant) options @samp{-w} and
 @opindex --length
 Set the page length to @var{page_length} (default 66) lines, including
 the lines of the header [and the footer].  If @var{page_length} is less
-than or equal 10 (and <= 3 with @samp{-F}), the header and footer are
+than or equal to 10 (or <= 3 with @samp{-F}), the header and footer are
 omitted, and all form feeds set in input files are eliminated, as if
 the @samp{-T} option had been given.
 
@@ -1129,7 +1132,7 @@ the @samp{-T} option had been given.
 @opindex -m
 @opindex --merge
 Merge and print all @var{file}s in parallel, one in each column.  If a
-line is too long to fit in a column, it is truncated, unless @samp{-J}
+line is too long to fit in a column, it is truncated, unless the @samp{-J}
 option is used.  @samp{-S[@var{string}]} may be used.  Empty pages in
 some @var{file}s (form feeds set) produce empty columns, still marked
 by @var{string}.  The result is a continuous line numbering and column
@@ -1146,8 +1149,8 @@ Provide @var{digits} digit line numbering (default for @var{digits} is
 5).  With multicolumn output the number occupies the first @var{digits}
 column positions of each text column or only each line of @samp{-m}
 output.  With single column output the number precedes each line just as
-@samp{-m} does.  Default counting of the line numbers starts with 1st
-line of the input file (not the 1st line printed, compare the
+@samp{-m} does.  Default counting of the line numbers starts with the
+first line of the input file (not the first line printed, compare the
 @samp{--page} option and @samp{-N} option).
 Optional argument @var{number-separator} is the character appended to
 the line number to separate it from the text followed.  The default
@@ -1155,8 +1158,8 @@ separator is the TAB character.  In a strict sense a TAB is always
 printed with single column output only.  The @var{TAB}-width varies
 with the @var{TAB}-position, e.g. with the left @var{margin} specified
 by @samp{-o} option.  With multicolumn output priority is given to
-@samp{equal width of output columns} (a @var{posix} specification).
-The @var{TAB}-width is fixed to the value of the 1st column and does
+@samp{equal width of output columns} (a @sc{posix} specification).
+The @var{TAB}-width is fixed to the value of the first column and does
 not change with different values of left @var{margin}.  That means a
 fixed number of spaces is always printed in the place of the
 @var{number-separator tab}.  The tabification depends upon the output
@@ -1196,7 +1199,7 @@ is the TAB character without @samp{-w} and @samp{no character} with
 @samp{-w}.  Without @samp{-s} default separator @samp{space} is set.
 @samp{-s[char]} turns off line truncation of all three column options
 (@samp{-COLUMN}|@samp{-a -COLUMN}|@samp{-m}) except @samp{-w} is set.
-That is a @var{posix} compliant formulation.
+That is a @sc{posix}-compliant formulation.
 
 
 @item -S[@var{string}]
@@ -1251,7 +1254,7 @@ output only (default for @var{page_width} is 72).  @samp{-s[CHAR]} turns
 off the default page width and any line truncation and column alignment.
 Lines of full length are merged, regardless of the column options
 set.  No @var{page_width} setting is possible with single column output.
-A @var{posix} compliant formulation.
+A @sc{posix}-compliant formulation.
 
 @item -W @var{page_width}
 @itemx --page_width=@var{page_width}
@@ -1812,8 +1815,8 @@ containing the cumulative counts, with the file name @file{total}.  The
 counts are printed in this order: newlines, words, 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, POSIX requires that there be exactly one space
-separating columns.  You can make @code{wc} use the POSIX-mandated
+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
@@ -2388,13 +2391,13 @@ sort -t : -n -k 5b,5 -k 3,3 /etc/passwd
 @end example
 
 @item
-Generate a tags file in case insensitive sorted order.
+Generate a tags file in case-insensitive sorted order.
 
-@example
+@smallexample
 find src -type f -print0 | sort -t / -z -f | xargs -0 etags --append
-@end example
+@end smallexample
 
-The use of @samp{-print0}, @samp{-z}, and @samp{-0} in this case mean
+The use of @samp{-print0}, @samp{-z}, and @samp{-0} in this case means
 that pathnames that contain Line Feed characters will not get broken up
 by the sort operation.
 
@@ -2463,7 +2466,7 @@ The program accepts the following options.  Also see @ref{Common options}.
 @opindex --skip-fields
 Skip @var{n} fields on each line before checking for uniqueness.  Fields
 are sequences of non-space non-tab characters that are separated from
-each other by at least one spaces or tabs.
+each other by at least one space or tab.
 
 @item +@var{n}
 @itemx -s @var{n}
@@ -2630,35 +2633,35 @@ ptx -G [@var{option} @dots{}] [@var{input} [@var{output}]]
 @end example
 
 The @samp{-G} (or its equivalent: @samp{--traditional}) option disables
-all GNU extensions and revert to traditional mode, thus introducing some
-limitations, and changes several of the program's default option values.
+all GNU extensions and reverts to traditional mode, thus introducing some
+limitations and changing several of the program's default option values.
 When @samp{-G} is not specified, GNU extensions are always enabled.  GNU
 extensions to @code{ptx} are documented wherever appropriate in this
 document.  For the full list, see @xref{Compatibility in ptx}.
 
-Individual options are explained in incoming sections.
+Individual options are explained in the following sections.
 
 When GNU extensions are enabled, there may be zero, one or several
-@var{file} after the options.  If there is no @var{file}, the program
-reads the standard input.  If there is one or several @var{file}, they
+@var{file}s after the options.  If there is no @var{file}, the program
+reads the standard input.  If there is one or several @var{file}s, they
 give the name of input files which are all read in turn, as if all the
 input files were concatenated.  However, there is a full contextual
 break between each file and, when automatic referencing is requested,
 file names and line numbers refer to individual text input files.  In
-all cases, the program produces the permuted index onto the standard
+all cases, the program outputs the permuted index to the standard
 output.
 
 When GNU extensions are @emph{not} enabled, that is, when the program
 operates in traditional mode, there may be zero, one or two parameters
-besides the options.  If there is no parameters, the program reads the
-standard input and produces the permuted index onto the standard output.
+besides the options.  If there are no parameters, the program reads the
+standard input and outputs the permuted index to the standard output.
 If there is only one parameter, it names the text @var{input} to be read
 instead of the standard input.  If two parameters are given, they give
 respectively the name of the @var{input} file to read and the name of
 the @var{output} file to produce.  @emph{Be very careful} to note that,
 in this case, the contents of file given by the second parameter is
-destroyed.  This behaviour is dictated only by System V @code{ptx}
-compatibility, because GNU Standards discourage output parameters not
+destroyed.  This behavior is dictated by System V @code{ptx}
+compatibility; GNU Standards normally discourage output parameters not
 introduced by an option.
 
 Note that for @emph{any} file named as the value of an option or as an
@@ -2667,7 +2670,7 @@ standard input is assumed.  However, it would not make sense to use this
 convention more than once per program invocation.
 
 @menu
-* General options in ptx::      Options which affect general program behaviour.
+* General options in ptx::      Options which affect general program behavior.
 * Charset selection in ptx::    Underlying character set considerations.
 * Input processing in ptx::     Input fields, contexts, and keyword selection.
 * Output formatting in ptx::    Types of output format, and sizing the fields.
@@ -2682,20 +2685,20 @@ convention more than once per program invocation.
 
 @item -C
 @itemx --copyright
-Prints a short note about the Copyright and copying conditions, then
+Print a short note about the copyright and copying conditions, then
 exit without further processing.
 
 @item -G
 @itemx --traditional
 As already explained, this option disables all GNU extensions to
-@code{ptx} and switch to traditional mode.
+@code{ptx} and switches to traditional mode.
 
 @item --help
-Prints a short help on standard output, then exit without further
+Print a short help on standard output, then exit without further
 processing.
 
 @item --version
-Prints the program verison on standard output, then exit without further
+Print the program version on standard output, then exit without further
 processing.
 
 @end table
@@ -2704,16 +2707,17 @@ processing.
 @node Charset selection in ptx
 @subsection Charset selection
 
-As it is setup now, the program assumes that the input file is coded
+@c FIXME:  People don't necessarily know what an IBM-PC was these days.
+As it is set up now, the program assumes that the input file is coded
 using 8-bit ISO 8859-1 code, also known as Latin-1 character set,
-@emph{unless} if it is compiled for MS-DOS, in which case it uses the
+@emph{unless} it is compiled for MS-DOS, in which case it uses the
 character set of the IBM-PC.  (GNU @code{ptx} is not known to work on
-smaller MS-DOS machines anymore.)  Compared to 7-bit @sc{ascii}, the set of
-characters which are letters is then different, this fact alters the
-behaviour of regular expression matching.  Thus, the default regular
-expression for a keyword allows foreign or diacriticized letters.
-Keyword sorting, however, is still crude; it obeys the underlying
-character set ordering quite blindly.
+smaller MS-DOS machines anymore.)  Compared to 7-bit @sc{ascii}, the set
+of characters which are letters is different; this alters the behavior
+of regular expression matching.  Thus, the default regular expression
+for a keyword allows foreign or diacriticized letters.  Keyword sorting,
+however, is still crude; it obeys the underlying character set ordering
+quite blindly.
 
 @table @samp
 
@@ -2735,7 +2739,7 @@ Fold lower case letters to upper case for sorting.
 This option provides an alternative (to @samp{-W}) method of describing
 which characters make up words.  It introduces the name of a
 file which contains a list of characters which can@emph{not} be part of
-one word, this file is called the @dfn{Break file}.  Any character which
+one word; this file is called the @dfn{Break file}.  Any character which
 is not part of the Break file is a word constituent.  If both options
 @samp{-b} and @samp{-W} are specified, then @samp{-W} has precedence and
 @samp{-b} is ignored.
@@ -2764,21 +2768,21 @@ default Ignore file, specify @code{/dev/null} instead.
 @itemx --only-file=@var{file}
 
 The file associated with this option contains a list of words which will
-be retained in concordance output, any word not mentioned in this file
+be retained in concordance output; any word not mentioned in this file
 is ignored.  The file is called the @dfn{Only file}.  The file contains
 exactly one word in each line; the end of line separation of words is
 not subject to the value of the @samp{-S} option.
 
 There is no default for the Only file.  In the case there are both an
-Only file and an Ignore file, a word will be subject to be a keyword
-only if it is given in the Only file and not given in the Ignore file.
+Only file and an Ignore file, a word can be a keyword only if it is
+given in the Only file and not given in the Ignore file.
 
 @item -r
 @itemx --references
 
-On each input line, the leading sequence of non white characters will be
+On each input line, the leading sequence of non-white space characters will be
 taken to be a reference that has the purpose of identifying this input
-line on the produced permuted index.  For more information about reference
+line in the resulting permuted index.  For more information about reference
 production, see @xref{Output formatting in ptx}.
 Using this option changes the default value for option @samp{-S}.
 
@@ -2793,12 +2797,12 @@ excluded from the output contexts.
 @itemx --sentence-regexp=@var{regexp}
 
 This option selects which regular expression will describe the end of a
-line or the end of a sentence.  In fact, there is other distinction
-between end of lines or end of sentences than the effect of this regular
-expression, and input line boundaries have no special significance
-outside this option.  By default, when GNU extensions are enabled and if
-@samp{-r} option is not used, end of sentences are used.  In this
-case, the precise @var{regex} is imported from GNU emacs:
+line or the end of a sentence.  In fact, this regular expression is not
+the only distinction between end of lines or end of sentences, and input
+line boundaries have no special significance outside this option.  By
+default, when GNU extensions are enabled and if @samp{-r} option is not
+used, end of sentences are used.  In this case, this @var{regex} is
+imported from GNU Emacs:
 
 @example
 [.?!][]\"')@}]*\\($\\|\t\\|  \\)[ \t\n]*
@@ -2829,8 +2833,8 @@ the head of the input line or sentence is used to fill the unused area
 on the right of the output line.
 
 As a matter of convenience to the user, many usual backslashed escape
-sequences, as found in the C language, are recognized and converted to
-the corresponding characters by @code{ptx} itself.
+sequences from the C language are recognized and converted to the
+corresponding characters by @code{ptx} itself.
 
 @item -W @var{regexp}
 @itemx --word-regexp=@var{regexp}
@@ -2841,9 +2845,9 @@ letters; the @var{regexp} used is @samp{\w+}.  When GNU extensions are
 disabled, a word is by default anything which ends with a space, a tab
 or a newline; the @var{regexp} used is @samp{[^ \t\n]+}.
 
-An empty @var{regexp} is equivalent to not using this option, letting the
-default dive in.  @xref{Regexps, , Syntax of Regular Expressions, emacs,
-The GNU Emacs Manual}.
+An empty @var{regexp} is equivalent to not using this option.
+@xref{Regexps, , Syntax of Regular Expressions, emacs, The GNU Emacs
+Manual}.
 
 As a matter of convenience to the user, many usual backslashed escape
 sequences, as found in the C language, are recognized and converted to
@@ -2855,13 +2859,13 @@ the corresponding characters by @code{ptx} itself.
 @node Output formatting in ptx
 @subsection Output formatting
 
-Output format is mainly controlled by @samp{-O} and @samp{-T} options,
-described in the table below.  When neither @samp{-O} nor @samp{-T} is
-selected, and if GNU extensions are enabled, the program choose an
-output format suited for a dumb terminal.  Each keyword occurrence is
+Output format is mainly controlled by the @samp{-O} and @samp{-T} options
+described in the table below.  When neither @samp{-O} nor @samp{-T} are
+selected, and if GNU extensions are enabled, the program chooses an
+output format suitable for a dumb terminal.  Each keyword occurrence is
 output to the center of one line, surrounded by its left and right
 contexts.  Each field is properly justified, so the concordance output
-could readily be observed.  As a special feature, if automatic
+can be readily observed.  As a special feature, if automatic
 references are selected by option @samp{-A} and are output before the
 left context, that is, if option @samp{-R} is @emph{not} selected, then
 a colon is added after the reference; this nicely interfaces with GNU
@@ -2879,8 +2883,8 @@ Output format is further controlled by the following options.
 @item -g @var{number}
 @itemx --gap-size=@var{number}
 
-Select the size of the minimum white gap between the fields on the output
-line.
+Select the size of the minimum white space gap between the fields on the
+output line.
 
 @item -w @var{number}
 @itemx --width=@var{number}
@@ -2890,7 +2894,7 @@ used, they are included or excluded from the output maximum width
 depending on the value of option @samp{-R}.  If this option is not
 selected, that is, when references are output before the left context,
 the output maximum width takes into account the maximum length of all
-references.  If this options is selected, that is, when references are
+references.  If this option is selected, that is, when references are
 output after the right context, the output maximum width does not take
 into account the space taken by references, nor the gap that precedes
 them.
@@ -2930,12 +2934,12 @@ towards the beginning or the end of the current line, or current
 sentence, as selected with option @samp{-S}.  But there is a maximum
 allowed output line width, changeable through option @samp{-w}, which is
 further divided into space for various output fields.  When a field has
-to be truncated because cannot extend until the beginning or the end of
-the current line to fit in the, then a truncation occurs.  By default,
+to be truncated because it cannot extend beyond the beginning or the end of
+the current line to fit in, then a truncation occurs.  By default,
 the string used is a single slash, as in @samp{-F /}.
 
 @var{string} may have more than one character, as in @samp{-F ...}.
-Also, in the particular case @var{string} is empty (@samp{-F ""}),
+Also, in the particular case when @var{string} is empty (@samp{-F ""}),
 truncation flagging is disabled, and no truncation marks are appended in
 this case.
 
@@ -2955,11 +2959,11 @@ generating output suitable for @code{nroff}, @code{troff} or @TeX{}.
 Choose an output format suitable for @code{nroff} or @code{troff}
 processing.  Each output line will look like:
 
-@example
+@smallexample
 .xx "@var{tail}" "@var{before}" "@var{keyword_and_after}" "@var{head}" "@var{ref}"
-@end example
+@end smallexample
 
-so it will be possible to write an @samp{.xx} roff macro to take care of
+so it will be possible to write a @samp{.xx} roff macro to take care of
 the output typesetting.  This is the default output format when GNU
 extensions are disabled.  Option @samp{-M} might be used to change
 @samp{xx} to another macro name.
@@ -2975,9 +2979,9 @@ so it will be correctly processed by @code{nroff} or @code{troff}.
 Choose an output format suitable for @TeX{} processing.  Each output
 line will look like:
 
-@example
+@smallexample
 \xx @{@var{tail}@}@{@var{before}@}@{@var{keyword}@}@{@var{after}@}@{@var{head}@}@{@var{ref}@}
-@end example
+@end smallexample
 
 @noindent
 so it will be possible to write a @code{\xx} definition to take care of
@@ -3025,11 +3029,11 @@ or, if a second @var{file} parameter is given on the command, to that
 
 Having output parameters not introduced by options is a quite dangerous
 practice which GNU avoids as far as possible.  So, for using @code{ptx}
-portably between GNU and System V, you should pay attention to always
-use it with a single input file, and always expect the result on
-standard output.  You might also want to automatically configure in a
-@samp{-G} option to @code{ptx} calls in products using @code{ptx}, if
-the configurator finds that the installed @code{ptx} accepts @samp{-G}.
+portably between GNU and System V, you should always use it with a
+single input file, and always expect the result on standard output.  You
+might also want to automatically configure in a @samp{-G} option to
+@code{ptx} calls in products using @code{ptx}, if the configurator finds
+that the installed @code{ptx} accepts @samp{-G}.
 
 @item
 The only options available in System V @code{ptx} are options @samp{-b},
@@ -3053,7 +3057,7 @@ line width computations.
 All 256 characters, even @kbd{NUL}s, are always read and processed from
 input file with no adverse effect, even if GNU extensions are disabled.
 However, System V @code{ptx} does not accept 8-bit characters, a few
-control characters are rejected, and the tilde @kbd{~} is condemned.
+control characters are rejected, and the tilde @kbd{~} is also rejected.
 
 @item
 Input line length is only limited by available memory, even if GNU
@@ -3156,7 +3160,7 @@ character.
 
 @itemx --output-delimiter=@var{output_delim_string}
 @opindex --output-delimiter
-For @samp{-f}, output fields are separated by @var{output_delim_string}
+For @samp{-f}, output fields are separated by @var{output_delim_string}.
 The default is to use the input delimiter.
 
 
@@ -3871,9 +3875,9 @@ water pipeline.
 
 With the Unix shell, it's very easy to set up data pipelines:
 
-@example
+@smallexample
 program_to_create_data | filter1 | .... | filterN > final.pretty.data
-@end example
+@end smallexample
 
 We start out by creating the raw data; each filter applies some successive
 transformation to the data, until by the time it comes out of the pipeline,
@@ -4137,9 +4141,9 @@ The next step is to get rid of punctuation.  Quoted words and unquoted words
 should be treated identically; it's easiest to just get the punctuation out of
 the way.
 
-@example
+@smallexample
 $ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' | ...
-@end example
+@end smallexample
 
 The second @code{tr} command operates on the complement of the listed
 characters, which are all the letters, the digits, the underscore, and
@@ -4152,10 +4156,10 @@ The words only contain alphanumeric characters (and the underscore).  The
 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.
 
-@example
+@smallexample
 $ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
 > tr -s '[ ]' '\012' | ...
-@end example
+@end smallexample
 
 This command turns blanks into newlines.  The @samp{-s} option squeezes
 multiple newline characters in the output into just one.  This helps us
@@ -4166,10 +4170,10 @@ typing in all of a command.)
 We now have data consisting of one word per line, no punctuation, all one
 case.  We're ready to count each word:
 
-@example
+@smallexample
 $ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
 > tr -s '[ ]' '\012' | sort | uniq -c | ...
-@end example
+@end smallexample
 
 At this point, the data might look something like this:
 
@@ -4198,7 +4202,7 @@ reverse the order of the sort
 
 The final pipeline looks like this:
 
-@example
+@smallexample
 $ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
 > tr -s '[ ]' '\012' | sort | uniq -c | sort -nr
  156 the
@@ -4207,7 +4211,7 @@ $ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
   51 of
   51 and
  ...
-@end example
+@end smallexample
 
 Whew!  That's a lot to digest.  Yet, the same principles apply. With six
 commands, on two lines (really one long one split for convenience), we've
@@ -4225,19 +4229,19 @@ dictionary.
 Now, how to compare our file with the dictionary?  As before, we generate
 a sorted list of words, one per line:
 
-@example
+@smallexample
 $ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
 > tr -s '[ ]' '\012' | sort -u | ...
-@end example
+@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.
 
-@example
+@smallexample
 $ tr '[A-Z]' '[a-z]' < whats.gnu | tr -cd '[A-Za-z0-9_ \012]' |
 > tr -s '[ ]' '\012' | sort -u |
 > comm -23 - /usr/lib/ispell/ispell.words
-@end example
+@end smallexample
 
 The @samp{-2} and @samp{-3} options eliminate lines that are only in the
 dictionary (the second file), and lines that are in both files.  Lines

lib/.gdb-history

@@ -198,3 +198,22 @@ n
 r -r .aa > k
 pwd
 q
+b main
+r
+b get_date
+c
+n
+p tm
+n
+p tm
+n
+p pc
+n
+p tm
+n
+p tm
+n
+p delta
+n
+p Start
+q

lib/ChangeLog

@@ -1,3 +1,96 @@
+2000-06-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* unicodeio.c (print_unicode_char): Work around ansi2knr deficiency.
+
+2000-06-24  Jim Meyering  <meyering@lucent.com>
+
+	* error.c [!HAVE_DECL_STRERROR_R]: Declare strerror_r.
+
+2000-06-21  Jim Meyering  <meyering@lucent.com>
+
+	* getpass.c: New file, from Bruno Haible.  Required for BeOS.
+
+2000-06-19  Paul Eggert  <eggert@twinsun.com>
+
+	* quotearg.c: Include <wctype.h> after <wchar.h>, for Solaris 2.5.
+	(mbrtowc, mbstate_t): Define substitutes if
+	HAVE_MBRTOWC && HAVE_WCHAR_H && !HAVE_MBSTATE_T_OBJECT.
+	(iswprint): Define to 1 if !defined iswprint && !HAVE_ISWPRINT,
+	not if ! (HAVE_MBRTOWC && HAVE_WCHAR_H).
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* xgetcwd.c (xgetcwd): If the required pathname length is smaller
+	than 1024, return a memory chunk of least possible size, instead
+	of size PATH_MAX + 2. In the loop, increment the size proportionally.
+	Use free/xmalloc instead of xrealloc to avoid copying for very long
+	paths.
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* canon-host.c (canon_host): Use malloc and memcpy to copy an
+	address, not strdup.  Include <stdlib.h> and don't declare free().
+
+2000-06-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* path-concat.c (path_concat): Don't access dir[-1] if dir is
+	the empty string.
+
+2000-06-21  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (libfetish_a_SOURCES): Add getstr.c.
+	(noinst_HEADERS): Add getstr.h.
+
+	* getline.c (getstr): Move into a separate file.
+	* getstr.c (getstr): New file, extracted from getline.c, with
+	the following changes: new parameter, delim2; both delim[12]
+	parameters have type `int', not `char'.  The latter would lose
+	with 8-bit delimiters.
+	* getstr.h: New file.
+
+2000-06-19  Jim Meyering  <meyering@lucent.com>
+
+	* getloadavg.c [HAVE_NLIST_H] (NLIST_STRUCT): Define.
+
+2000-06-18  Jim Meyering  <meyering@lucent.com>
+
+	* mkdir.c: Remove file, due mainly to copyright incompatibility.
+	Besides, these days every porting target provides a mkdir function.
+
+	* strnlen.c: Include memory.h, string.h, and/or strings.h as needed.
+	(this snippet comes from src/system.h).
+
+2000-06-15  Paul Eggert  <eggert@twinsun.com>
+
+	* human.c (adjust_value): New function.
+	(human_readable_inexact): Apply rounding style even when
+	printing approximate values.
+
+2000-06-14  Paul Eggert  <eggert@twinsun.com>
+
+	* human.c (human_readable_inexact): Allow an input block
+	size that is not a multiple of the output block size, and vice versa.
+	Reported by Piergiorgio Sartor.
+
+2000-06-14  Paul Eggert  <eggert@twinsun.com>
+
+	* getdate.y (get_date): Apply relative times after time
+	zone indicator, not before.  Reported by Todd A. Jacobs.
+
+2000-06-13  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.am (all-local): Depend on lstat.c and stat.c.
+
+	* xstat.in [!HAVE_DECL_FREE]: Declare free in lstat.c.
+
+2000-06-12  Paul Eggert  <eggert@twinsun.com>
+
+	* xstat.in: Include <stdlib.h> in lstat, to declare "free".
+
+2000-06-04  Paul Eggert  <eggert@twinsun.com>
+
+	* strnlen.c: Include <config.h> if HAVE_CONFIG_H.
+
 2000-06-04  Jim Meyering  <meyering@lucent.com>
 
 	* getugroups.c (getugroups): Cast -1 to gid_t, for systems like
@@ -41,7 +134,7 @@
 
 2000-05-15  Paul Eggert  <eggert@twinsun.com>
 
-	* lib/closeout.c:
+	* closeout.c:
 	<sys/stat.h>, <sys/types.h>, <unistd.h>, (STDOUT_FILENO):
 	Remove; no longer needed.
 	"quotearg.h": Add include.
@@ -228,7 +321,7 @@
 
 2000-03-07  Paul Eggert  <eggert@twinsun.com>
 
-	* lib/savedir.c (savedir): Work even if directory size is
+	* savedir.c (savedir): Work even if directory size is
 	negative; this can happen with some screwy NFS configurations.
 
 2000-03-06  Jim Meyering  <meyering@lucent.com>
@@ -281,7 +374,7 @@
 
 2000-02-28  Paul Eggert  <eggert@twinsun.com>
 
-	* lib/quotearg.c (ALERT_CHAR): New macro.
+	* quotearg.c (ALERT_CHAR): New macro.
 	(quotearg_buffer_restyled): Use it.
 
 2000-02-27  Jim Meyering  <meyering@lucent.com>
@@ -311,7 +404,7 @@
 
 2000-02-18  Paul Eggert  <eggert@twinsun.com>
 
-	* lib/getdate.y: Handle two-digit years with leading zeros correctly.
+	* getdate.y: Handle two-digit years with leading zeros correctly.
 	(textint): New typedef.
 	(parser_control): Member year changed from int to textint.
 	All uses changed.
@@ -333,7 +426,7 @@
 
 2000-02-14  Paul Eggert  <eggert@twinsun.com>
 
-	* lib/getpagesize.h (getpagesize): Port to VMS for Alpha;
+	* getpagesize.h (getpagesize): Port to VMS for Alpha;
 	adapted from changes to grep getpagesize.h by Martin P.J. Zinser.
 
 2000-02-12  Jim Meyering  <meyering@lucent.com>
@@ -421,7 +514,7 @@
 
 2000-01-16  Paul Eggert  <eggert@twinsun.com>
 
-	* lib/quotearg.c (quotearg_buffer_restyled): Do not quote
+	* quotearg.c (quotearg_buffer_restyled): Do not quote
 	alert, backslash, formfeed, and vertical tab unnecessarily in
 	shell quoting style.
 

lib/Makefile.am

@@ -10,7 +10,7 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 libfetish_a_SOURCES = \
   getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
   canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
-  full-write.c getopt.c getopt1.c getugroups.c hard-locale.c hash.c \
+  full-write.c getopt.c getopt1.c getstr.c getugroups.c hard-locale.c hash.c \
   human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
   makepath.c md5.c memcasecmp.c memcoll.c modechange.c path-concat.c \
   quotearg.c readtokens.c readutmp.c safe-read.c same.c save-cwd.c \
@@ -24,7 +24,7 @@ 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 \
-  getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
+  getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
   linebuffer.h long-options.h md5.h memcasecmp.h memcoll.h \
   makepath.h modechange.h mountlist.h nanosleep.h obstack.h \
   path-concat.h pathmax.h posixtm.h quotearg.h readtokens.h \
@@ -62,7 +62,7 @@ stat.c: xstat.in
 # On systems with glibc-2.1 or newer, the file is redundant, therefore we
 # avoid installing it.
 
-all-local: charset.alias ref-add.sed ref-del.sed
+all-local: charset.alias ref-add.sed ref-del.sed lstat.c stat.c
 
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp

lib/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
@@ -124,7 +124,7 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 libfetish_a_SOURCES = \
   getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
   canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
-  full-write.c getopt.c getopt1.c getugroups.c hard-locale.c hash.c \
+  full-write.c getopt.c getopt1.c getstr.c getugroups.c hard-locale.c hash.c \
   human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
   makepath.c md5.c memcasecmp.c memcoll.c modechange.c path-concat.c \
   quotearg.c readtokens.c readutmp.c safe-read.c same.c save-cwd.c \
@@ -139,7 +139,7 @@ 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 \
-  getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
+  getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
   linebuffer.h long-options.h md5.h memcasecmp.h memcoll.h \
   makepath.h modechange.h mountlist.h nanosleep.h obstack.h \
   path-concat.h pathmax.h posixtm.h quotearg.h readtokens.h \
@@ -173,14 +173,14 @@ libfetish_a_AR = $(AR) cru
 am_libfetish_a_OBJECTS =  getdate$U.o posixtm$U.o addext$U.o \
 argmatch$U.o backupfile$U.o basename$U.o canon-host$U.o closeout$U.o \
 diacrit$U.o dirname$U.o exclude$U.o filemode$U.o full-write$U.o \
-getopt$U.o getopt1$U.o getugroups$U.o hard-locale$U.o hash$U.o \
-human$U.o idcache$U.o isdir$U.o linebuffer$U.o localcharset$U.o \
-long-options$U.o makepath$U.o md5$U.o memcasecmp$U.o memcoll$U.o \
-modechange$U.o path-concat$U.o quotearg$U.o readtokens$U.o readutmp$U.o \
-safe-read$U.o same$U.o save-cwd$U.o savedir$U.o stripslash$U.o \
-unicodeio$U.o userspec$U.o version-etc$U.o xgetcwd$U.o xgethostname$U.o \
-xmalloc$U.o xstrdup$U.o xstrtod$U.o xstrtol$U.o xstrtoul$U.o \
-xstrtoumax$U.o yesno$U.o
+getopt$U.o getopt1$U.o getstr$U.o getugroups$U.o hard-locale$U.o \
+hash$U.o human$U.o idcache$U.o isdir$U.o linebuffer$U.o \
+localcharset$U.o long-options$U.o makepath$U.o md5$U.o memcasecmp$U.o \
+memcoll$U.o modechange$U.o path-concat$U.o quotearg$U.o readtokens$U.o \
+readutmp$U.o safe-read$U.o same$U.o save-cwd$U.o savedir$U.o \
+stripslash$U.o unicodeio$U.o userspec$U.o version-etc$U.o xgetcwd$U.o \
+xgethostname$U.o xmalloc$U.o xstrdup$U.o xstrtod$U.o xstrtol$U.o \
+xstrtoul$U.o xstrtoumax$U.o yesno$U.o
 libfetish_a_OBJECTS =  $(am_libfetish_a_OBJECTS)
 AR = ar
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -200,7 +200,8 @@ $(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)/getugroups$U.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 \
@@ -209,16 +210,15 @@ $(DEPDIR)/long-options$U.Po $(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po \
 $(DEPDIR)/malloc.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)/mkdir.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)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po \
-$(DEPDIR)/readutmp$U.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)/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)/quotearg$U.Po \
+$(DEPDIR)/readtokens$U.Po $(DEPDIR)/readutmp$U.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 \
@@ -231,10 +231,10 @@ $(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 getusershell.c \
-group-member.c lchown.c malloc.c memchr.c memcmp.c memcpy.c memmove.c \
-memset.c mkdir.c mktime.c mountlist.c nanosleep.c obstack.c obstack.h \
-putenv.c realloc.c regex.c rmdir.c rpmatch.c stime.c stpcpy.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 realloc.c regex.c rmdir.c rpmatch.c stime.c stpcpy.c \
 strcasecmp.c strcspn.c strdup.c strftime.c strncasecmp.c strndup.c \
 strnlen.c strpbrk.c strstr.c strtod.c strtol.c strtoul.c strtoull.c \
 strtoumax.c strverscmp.c utime.c
@@ -351,6 +351,10 @@ getopt_.c: getopt.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c
 getopt1_.c: getopt1.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c
+getpass_.c: getpass.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getpass.c; then echo $(srcdir)/getpass.c; else echo getpass.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getpass_.c
+getstr_.c: getstr.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getstr.c; then echo $(srcdir)/getstr.c; else echo getstr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getstr_.c
 getugroups_.c: getugroups.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getugroups.c; then echo $(srcdir)/getugroups.c; else echo getugroups.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getugroups_.c
 getusershell_.c: getusershell.c $(ANSI2KNR)
@@ -397,8 +401,6 @@ memmove_.c: memmove.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memmove_.c
 memset_.c: memset.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memset.c; then echo $(srcdir)/memset.c; else echo memset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memset_.c
-mkdir_.c: mkdir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkdir.c; then echo $(srcdir)/mkdir.c; else echo mkdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkdir_.c
 mktime_.c: mktime.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c
 modechange_.c: modechange.c $(ANSI2KNR)
@@ -505,12 +507,12 @@ 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 \
-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 md5_.o memcasecmp_.o \
-memchr_.o memcmp_.o memcoll_.o memcpy_.o memmove_.o memset_.o mkdir_.o \
-mktime_.o modechange_.o mountlist_.o nanosleep_.o obstack_.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 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 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 \
@@ -588,6 +590,8 @@ maintainer-clean-tags:
 @AMDEP@include $(DEPDIR)/getloadavg.Po
 @AMDEP@include $(DEPDIR)/getopt$U.Po
 @AMDEP@include $(DEPDIR)/getopt1$U.Po
+@AMDEP@include $(DEPDIR)/getpass.Po
+@AMDEP@include $(DEPDIR)/getstr$U.Po
 @AMDEP@include $(DEPDIR)/getugroups$U.Po
 @AMDEP@include $(DEPDIR)/getusershell.Po
 @AMDEP@include $(DEPDIR)/group-member.Po
@@ -611,7 +615,6 @@ maintainer-clean-tags:
 @AMDEP@include $(DEPDIR)/memcpy.Po
 @AMDEP@include $(DEPDIR)/memmove.Po
 @AMDEP@include $(DEPDIR)/memset.Po
-@AMDEP@include $(DEPDIR)/mkdir.Po
 @AMDEP@include $(DEPDIR)/mktime.Po
 @AMDEP@include $(DEPDIR)/modechange$U.Po
 @AMDEP@include $(DEPDIR)/mountlist.Po
@@ -800,7 +803,7 @@ stat.c: xstat.in
 # On systems with glibc-2.1 or newer, the file is redundant, therefore we
 # avoid installing it.
 
-all-local: charset.alias ref-add.sed ref-del.sed
+all-local: charset.alias ref-add.sed ref-del.sed lstat.c stat.c
 install-exec-local: all-local
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	if test -f $(charset_alias); then \

lib/canon-host.c

@@ -26,6 +26,9 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -46,7 +49,6 @@
 #ifndef strdup
 char *strdup ();
 #endif
-void free ();
 
 /* Returns the canonical hostname associated with HOST (allocated in a static
    buffer), or 0 if it can't be determined.  */
@@ -80,11 +82,12 @@ canon_host (const char *host)
 	     directly to gethostbyaddr because on some systems he->h_addr
 	     is located in a static library buffer that is reused in the
 	     gethostbyaddr call.  Make a copy and use that instead.  */
-	  char *h_addr_copy = strdup (he->h_addr);
+	  char *h_addr_copy = (char *) malloc (he->h_length);
 	  if (h_addr_copy == NULL)
 	    he = NULL;
 	  else
 	    {
+	      memcpy (h_addr_copy, he->h_addr, he->h_length);
 	      he = gethostbyaddr (h_addr_copy, he->h_length, he->h_addrtype);
 	      free (h_addr_copy);
 	    }

lib/error.c

@@ -49,6 +49,13 @@ void exit ();
 
 #include "error.h"
 
+#ifndef HAVE_DECL_STRERROR_R
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_STRERROR_R
+char *strerror_r ();
+#endif
+
 #ifndef _
 # define _(String) String
 #endif

lib/getdate.y

@@ -85,7 +85,7 @@
 #define TM_YEAR_BASE 1900
 
 #define HOUR(x) ((x) * 60)
- 
+
 /* An integer value, and the number of digits in its textual
    representation.  */
 typedef struct
@@ -168,7 +168,7 @@ static int yylex ();
 
 /* This grammar has 13 shift/reduce conflicts. */
 %expect 13
- 
+
 %union
 {
   int intval;
@@ -987,9 +987,6 @@ get_date (const char *p, const time_t *now)
     {
       tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
     }
-  tm.tm_hour += pc.rel_hour;
-  tm.tm_min += pc.rel_minutes;
-  tm.tm_sec += pc.rel_seconds;
 
   /* Let mktime deduce tm_isdst if we have an absolute time stamp,
      or if the relative time stamp mentions days, months, or years.  */
@@ -1061,6 +1058,29 @@ get_date (const char *p, const time_t *now)
       Start -= delta;
     }
 
+  /* Add relative hours, minutes, and seconds.  Ignore leap seconds;
+     i.e. "+ 10 minutes" means 600 seconds, even if one of them is a
+     leap second.  Typically this is not what the user wants, but it's
+     too hard to do it the other way, because the time zone indicator
+     must be applied before relative times, and if mktime is applied
+     again the time zone will be lost.  */
+  {
+    time_t t0 = Start;
+    long d1 = 60 * 60 * (long) pc.rel_hour;
+    time_t t1 = t0 + d1;
+    long d2 = 60 * (long) pc.rel_minutes;
+    time_t t2 = t1 + d2;
+    int d3 = pc.rel_seconds;
+    time_t t3 = t2 + d3;
+    if ((d1 / (60 * 60) ^ pc.rel_hour)
+	| (d2 / 60 ^ pc.rel_minutes)
+	| ((t0 + d1 < t0) ^ (d1 < 0))
+	| ((t1 + d2 < t1) ^ (d2 < 0))
+	| ((t2 + d3 < t2) ^ (d3 < 0)))
+      return -1;
+    Start = t3;
+  }
+
   return Start;
 }
 

lib/getline.c

@@ -1,6 +1,6 @@
 /* getline.c -- Replacement for GNU C library function getline
 
-Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 1997, 1998, 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
@@ -39,105 +39,19 @@ getline (char **lineptr, size_t *n, FILE *stream)
   return getdelim (lineptr, n, '\n', stream);
 }
 
-
 #else /* ! have getdelim */
 
-# define NDEBUG
-# include <assert.h>
-
-# if STDC_HEADERS
-#  include <stdlib.h>
-# else
-char *malloc (), *realloc ();
-# endif
-
-/* Always add at least this many bytes when extending the buffer.  */
-# define MIN_CHUNK 64
-
-/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
-   + OFFSET (and null-terminate it). *LINEPTR is a pointer returned from
-   malloc (or NULL), pointing to *N characters of space.  It is realloc'd
-   as necessary.  Return the number of characters read (not including the
-   null terminator), or -1 on error or EOF.  */
-
-int
-getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset)
-{
-  int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
-  char *read_pos;		/* Where we're reading into *LINEPTR. */
-  int ret;
-
-  if (!lineptr || !n || !stream)
-    return -1;
-
-  if (!*lineptr)
-    {
-      *n = MIN_CHUNK;
-      *lineptr = malloc (*n);
-      if (!*lineptr)
-	return -1;
-    }
-
-  nchars_avail = *n - offset;
-  read_pos = *lineptr + offset;
-
-  for (;;)
-    {
-      register int c = getc (stream);
-
-      /* We always want at least one char left in the buffer, since we
-	 always (unless we get an error while reading the first char)
-	 NUL-terminate the line buffer.  */
-
-      assert(*n - nchars_avail == read_pos - *lineptr);
-      if (nchars_avail < 2)
-	{
-	  if (*n > MIN_CHUNK)
-	    *n *= 2;
-	  else
-	    *n += MIN_CHUNK;
-
-	  nchars_avail = *n + *lineptr - read_pos;
-	  *lineptr = realloc (*lineptr, *n);
-	  if (!*lineptr)
-	    return -1;
-	  read_pos = *n - nchars_avail + *lineptr;
-	  assert(*n - nchars_avail == read_pos - *lineptr);
-	}
-
-      if (c == EOF || ferror (stream))
-	{
-	  /* Return partial line, if any.  */
-	  if (read_pos == *lineptr)
-	    return -1;
-	  else
-	    break;
-	}
-
-      *read_pos++ = c;
-      nchars_avail--;
-
-      if (c == terminator)
-	/* Return the line.  */
-	break;
-    }
-
-  /* Done - NUL terminate and return the number of chars read.  */
-  *read_pos = '\0';
-
-  ret = read_pos - (*lineptr + offset);
-  return ret;
-}
+# include "getstr.h"
 
 int
 getline (char **lineptr, size_t *n, FILE *stream)
 {
-  return getstr (lineptr, n, stream, '\n', 0);
+  return getstr (lineptr, n, stream, '\n', 0, 0);
 }
 
 int
 getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream)
 {
-  return getstr (lineptr, n, stream, delimiter, 0);
+  return getstr (lineptr, n, stream, delimiter, 0, 0);
 }
 #endif

lib/getline.h

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

lib/getloadavg.c

@@ -308,6 +308,12 @@ extern int errno;
 #  define LDAV_CVT(n) (((double) (n)) / FSCALE)
 # endif
 
+# ifndef NLIST_STRUCT
+#  if HAVE_NLIST_H
+#   define NLIST_STRUCT
+#  endif
+# endif
+
 /* VAX C can't handle multi-line #ifs, or lines longer that 256 characters.  */
 # ifndef NLIST_STRUCT
 

lib/getpass.c

@@ -0,0 +1,101 @@
+/* Copyright (C) 1992,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <termios.h>
+#include <unistd.h>
+#include "getline.h"
+
+/* It is desirable to use this bit on systems that have it.
+   The only bit of terminal state we want to twiddle is echoing, which is
+   done in software; there is no need to change the state of the terminal
+   hardware.  */
+
+#ifndef TCSASOFT
+# define TCSASOFT 0
+#endif
+
+char *
+getpass (const char *prompt)
+{
+  FILE *in, *out;
+  struct termios s, t;
+  int tty_changed;
+  static char *buf;
+  static size_t bufsize;
+  ssize_t nread;
+
+  /* Try to write to and read from the terminal if we can.
+     If we can't open the terminal, use stderr and stdin.  */
+
+  in = fopen ("/dev/tty", "w+");
+  if (in == NULL)
+    {
+      in = stdin;
+      out = stderr;
+    }
+  else
+    out = in;
+
+  /* Turn echoing off if it is on now.  */
+
+  if (tcgetattr (fileno (in), &t) == 0)
+    {
+      /* Save the old one. */
+      s = t;
+      /* Tricky, tricky. */
+      t.c_lflag &= ~(ECHO|ISIG);
+      tty_changed = (tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t) == 0);
+    }
+  else
+    tty_changed = 0;
+
+  /* Write the prompt.  */
+  fputs (prompt, out);
+  fflush (out);
+
+  /* Read the password.  */
+  nread = getline (&buf, &bufsize, in);
+  if (buf != NULL)
+    {
+      if (nread < 0)
+	buf[0] = '\0';
+      else if (buf[nread - 1] == '\n')
+	{
+	  /* Remove the newline.  */
+	  buf[nread - 1] = '\0';
+	  if (tty_changed)
+	    /* Write the newline that was not echoed.  */
+	    putc ('\n', out);
+	}
+    }
+
+  /* Restore the original setting.  */
+  if (tty_changed)
+    (void) tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &s);
+
+  if (in != stdin)
+    /* We opened the terminal; now close it.  */
+    fclose (in);
+
+  return buf;
+}

lib/getstr.c

@@ -0,0 +1,114 @@
+/* getstr.c -- core function for GNU C library getline replacement function
+
+   Copyright (C) 1993, 1996-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 of the
+   License, 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 Jan Brittenson, bson@gnu.ai.mit.edu.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#include <assert.h>
+
+#if STDC_HEADERS
+# include <stdlib.h>
+#else
+char *malloc (), *realloc ();
+#endif
+
+/* Always add at least this many bytes when extending the buffer.  */
+#define MIN_CHUNK 64
+
+/* Read up to (and including) a delimiter DELIM1 from STREAM into *LINEPTR
+   + OFFSET (and NUL-terminate it).  If DELIM2 is non-zero, then read up
+   and including the first occurrence of DELIM1 or DELIM2.  *LINEPTR is
+   a pointer returned from malloc (or NULL), pointing to *N characters of
+   space.  It is realloc'd as necessary.  Return the number of characters
+   read (not including the NUL terminator), or -1 on error or EOF.  */
+
+int
+getstr (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
+	size_t offset)
+{
+  int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
+  char *read_pos;		/* Where we're reading into *LINEPTR. */
+  int ret;
+
+  if (!lineptr || !n || !stream)
+    return -1;
+
+  if (!*lineptr)
+    {
+      *n = MIN_CHUNK;
+      *lineptr = malloc (*n);
+      if (!*lineptr)
+	return -1;
+    }
+
+  nchars_avail = *n - offset;
+  read_pos = *lineptr + offset;
+
+  for (;;)
+    {
+      register int c = getc (stream);
+
+      /* We always want at least one char left in the buffer, since we
+	 always (unless we get an error while reading the first char)
+	 NUL-terminate the line buffer.  */
+
+      assert(*n - nchars_avail == read_pos - *lineptr);
+      if (nchars_avail < 2)
+	{
+	  if (*n > MIN_CHUNK)
+	    *n *= 2;
+	  else
+	    *n += MIN_CHUNK;
+
+	  nchars_avail = *n + *lineptr - read_pos;
+	  *lineptr = realloc (*lineptr, *n);
+	  if (!*lineptr)
+	    return -1;
+	  read_pos = *n - nchars_avail + *lineptr;
+	  assert(*n - nchars_avail == read_pos - *lineptr);
+	}
+
+      if (c == EOF || ferror (stream))
+	{
+	  /* Return partial line, if any.  */
+	  if (read_pos == *lineptr)
+	    return -1;
+	  else
+	    break;
+	}
+
+      *read_pos++ = c;
+      nchars_avail--;
+
+      if (c == delim1 || (delim2 && c == delim2))
+	/* Return the line.  */
+	break;
+    }
+
+  /* Done - NUL terminate and return the number of chars read.  */
+  *read_pos = '\0';
+
+  ret = read_pos - (*lineptr + offset);
+  return ret;
+}

lib/getstr.h

@@ -0,0 +1,19 @@
+#ifndef GETSTR_H_
+# define GETSTR_H_ 1
+
+# include <stdio.h>
+
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+int
+getstr PARAMS ((char **lineptr, size_t *n, FILE *stream,
+		int delim1, int delim2,
+		size_t offset));
+
+#endif

lib/human.c

@@ -76,6 +76,23 @@ static const char suffixes[] =
   'Y'	/* Yotta */
 };
 
+/* If INEXACT_STYLE is not human_round_to_even, and if easily
+   possible, adjust VALUE according to the style.  */
+static double
+adjust_value (enum human_inexact_style inexact_style, double value)
+{
+  /* Do not use the floor or ceil functions, as that would mean
+     linking with the standard math library, which is a porting pain.
+     So leave the value alone if it is too large to easily round.  */
+  if (inexact_style != human_round_to_even && value < (uintmax_t) -1)
+    {
+      uintmax_t u = value;
+      value = u + (inexact_style == human_ceiling && u != value);
+    }
+
+  return value;
+}
+
 /* Like human_readable_inexact, except always round to even.  */
 char *
 human_readable (uintmax_t n, char *buf,
@@ -90,9 +107,8 @@ human_readable (uintmax_t n, char *buf,
    N is expressed in units of FROM_BLOCK_SIZE.  FROM_BLOCK_SIZE must
    be nonnegative.
 
-   If OUTPUT_BLOCK_SIZE is positive, use units of OUTPUT_BLOCK_SIZE in
-   the output number.  OUTPUT_BLOCK_SIZE must be a multiple of
-   FROM_BLOCK_SIZE or vice versa.
+   OUTPUT_BLOCK_SIZE must be nonzero.  If it is positive, use units of
+   OUTPUT_BLOCK_SIZE in the output number.
 
    Use INEXACT_STYLE to determine whether to take the ceiling or floor
    of any result that cannot be expressed exactly.
@@ -148,57 +164,58 @@ human_readable_inexact (uintmax_t n, char *buf,
 
   /* Adjust AMT out of FROM_BLOCK_SIZE units and into TO_BLOCK_SIZE units.  */
 
-  if (to_block_size <= from_block_size)
-    {
-      int multiplier = from_block_size / to_block_size;
-      amt = n * multiplier;
+  {
+    int multiplier;
+    int divisor;
+    int r2;
+    int r10;
+    if (to_block_size <= from_block_size
+	? (from_block_size % to_block_size != 0
+	   || (multiplier = from_block_size / to_block_size,
+	       (amt = n * multiplier) / multiplier != n))
+	: (from_block_size == 0
+	   || to_block_size % from_block_size != 0
+	   || (divisor = to_block_size / from_block_size,
+	       r10 = (n % divisor) * 10,
+	       r2 = (r10 % divisor) * 2,
+	       amt = n / divisor,
+	       tenths = r10 / divisor,
+	       rounding = r2 < divisor ? 0 < r2 : 2 + (divisor < r2),
+	       0)))
+      {
+	/* Either the result cannot be computed easily using uintmax_t,
+	   or from_block_size is zero.  Fall back on floating point.
+	   FIXME: This can yield answers that are slightly off.  */
 
-      if (amt / multiplier != n)
-	{
-	  /* Overflow occurred during multiplication.  We should use
-	     multiple precision arithmetic here, but we'll be lazy and
-	     resort to floating point.  This can yield answers that
-	     are slightly off.  In practice it is quite rare to
-	     overflow uintmax_t, so this is good enough for now.  */
+	double damt = n * (from_block_size / (double) to_block_size);
 
-	  double damt = n * (double) multiplier;
+	if (! base)
+	  sprintf (buf, "%.0f", adjust_value (inexact_style, damt));
+	else
+	  {
+	    double e = 1;
+	    power = 0;
 
-	  if (! base)
-	    sprintf (buf, "%.0f", damt);
-	  else
-	    {
-	      double e = 1;
-	      power = 0;
+	    do
+	      {
+		e *= base;
+		power++;
+	      }
+	    while (e * base <= damt && power < sizeof suffixes - 1);
 
-	      do
-		{
-		  e *= base;
-		  power++;
-		}
-	      while (e * base <= damt && power < sizeof suffixes - 1);
+	    damt /= e;
 
-	      damt /= e;
-
-	      sprintf (buf, "%.1f%c", damt, suffixes[power]);
-	      if (4 < strlen (buf))
-		sprintf (buf, "%.0f%c", damt, suffixes[power]);
-	    }
-
-	  return buf;
-	}
-    }
-  else if (from_block_size == 0)
-    amt = 0;
-  else
-    {
-      int divisor = to_block_size / from_block_size;
-      int r10 = (n % divisor) * 10;
-      int r2 = (r10 % divisor) * 2;
-      amt = n / divisor;
-      tenths = r10 / divisor;
-      rounding = r2 < divisor ? 0 < r2 : 2 + (divisor < r2);
-    }
+	    sprintf (buf, "%.1f%c", adjust_value (inexact_style, damt),
+		     suffixes[power]);
+	    if (4 < strlen (buf))
+	      sprintf (buf, "%.0f%c",
+		       adjust_value (inexact_style, damt * 10) / 10,
+		       suffixes[power]);
+	  }
 
+	return buf;
+      }
+  }
 
   /* Use power of BASE notation if adjusted AMT is large enough.  */
 

lib/mkdir.c

@@ -1,108 +0,0 @@
-/* BSD compatible make directory function for System V
-   Copyright (C) 1988, 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
-   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.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
-
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
-#ifndef S_IRWXU
-# define S_IRWXU 0700
-#endif
-#ifndef S_IRWXG
-# define S_IRWXG 0070
-#endif
-#ifndef S_IRWXO
-# define S_IRWXO 0007
-#endif
-
-/* mkdir adapted from GNU tar.  */
-
-/* Make directory DPATH, with permission mode DMODE.
-
-   Written by Robert Rother, Mariah Corporation, August 1985
-   (sdcsvax!rmr or rmr@uscd).  If you want it, it's yours.
-
-   Severely hacked over by John Gilmore to make a 4.2BSD compatible
-   subroutine.	11Mar86; hoptoad!gnu
-
-   Modified by rmtodd@uokmax 6-28-87 -- when making an already existing dir,
-   subroutine didn't return EEXIST.  It does now.  */
-
-int
-mkdir (const char *dpath, mode_t dmode)
-{
-  pid_t cpid;
-  mode_t mode;
-  int status;
-  struct stat statbuf;
-
-  if (stat (dpath, &statbuf) == 0)
-    {
-      errno = EEXIST;		/* stat worked, so it already exists.  */
-      return -1;
-    }
-
-  /* If stat fails for a reason other than non-existence, return error.  */
-  if (errno != ENOENT)
-    return -1;
-
-  cpid = fork ();
-  switch (cpid)
-    {
-    case -1:			/* Cannot fork.  */
-      return -1;		/* errno is already set.  */
-
-    case 0:			/* Child process.  */
-      /* Cheap hack to set mode of new directory.  Since this child
-	 process is going away anyway, we zap its umask.
-	 This won't suffice to set SUID, SGID, etc. on this
-	 directory, so the parent process calls chmod afterward.  */
-      mode = umask (0);	/* Get current umask.  */
-      /* Set for mkdir.  */
-      umask (mode | ((S_IRWXU | S_IRWXG | S_IRWXO) & ~dmode));
-      execl ("/bin/mkdir", "mkdir", dpath, (char *) 0);
-      _exit (1);
-
-    default:			/* Parent process.  */
-      /* Wait for kid to finish.  */
-      while (wait (&status) != cpid)
-	/* Do nothing.  */ ;
-
-      if (status)
-	{
-	  /* /bin/mkdir failed.  */
-	  errno = EIO;
-	  return -1;
-	}
-      return chmod (dpath, dmode);
-    }
-}

lib/path-concat.c

@@ -86,10 +86,13 @@ path_concat (const char *dir, const char *base, char **base_in_result)
 
   p = mempcpy (p_concat, dir, dir_len);
 
-  if (ISSLASH (*(p - 1)) && ISSLASH(*base))
-    --p;
-  else if (!ISSLASH (*(p - 1)) && !ISSLASH(*base))
-    *p++ = DIRECTORY_SEPARATOR;
+  if (dir_len > 0)
+    {
+      if (ISSLASH (*(p - 1)) && ISSLASH(*base))
+	--p;
+      else if (!ISSLASH (*(p - 1)) && !ISSLASH(*base))
+	*p++ = DIRECTORY_SEPARATOR;
+    }
 
   if (base_in_result)
     *base_in_result = p;

lib/quotearg.c

@@ -58,19 +58,25 @@
 # include <string.h>
 #endif
 
-#if HAVE_WCTYPE_H
-# include <wctype.h>
-#endif
-
 #if HAVE_MBRTOWC && HAVE_WCHAR_H
 # include <wchar.h>
+# if !HAVE_MBSTATE_T_OBJECT
+#  define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
+#  define mbstate_t int
+# endif
 #else
-# define iswprint(wc) 1
 # define mbrtowc(pwc, s, n, ps) 1
 # define mbsinit(ps) 1
 # define mbstate_t int
 #endif
 
+#if HAVE_WCTYPE_H
+# include <wctype.h>
+#endif
+#if !defined iswprint && !HAVE_ISWPRINT
+# define iswprint(wc) 1
+#endif
+
 #define INT_BITS (sizeof (int) * CHAR_BIT)
 
 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))

lib/strnlen.c

@@ -17,7 +17,18 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <string.h>
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 
 #ifndef HAVE_DECL_MEMCHR
 "this configure-time declaration test was not run"

lib/unicodeio.c

@@ -121,7 +121,7 @@ print_unicode_char (FILE *stream, unsigned int code)
 
   if (!initialized)
     {
-      extern const char *locale_charset (void);
+      extern const char *locale_charset PARAMS ((void));
       const char *charset = locale_charset ();
 
       is_utf8 = (charset != NULL && !strcmp (charset, UTF8_NAME));

lib/xgetcwd.c

@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 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
@@ -37,12 +37,9 @@ char *getwd ();
 # define getcwd(Buf, Max) getwd (Buf)
 #endif
 
-/* Amount to increase buffer size by in each try. */
-#define PATH_INCR 32
-
-char *xmalloc ();
-char *xrealloc ();
-void free ();
+extern void *xmalloc ();
+extern char *xstrdup ();
+extern void free ();
 
 /* Return the current directory, newly allocated, arbitrarily long.
    Return NULL and set errno on error. */
@@ -50,30 +47,39 @@ void free ();
 char *
 xgetcwd ()
 {
-  char *cwd;
   char *ret;
   unsigned path_max;
+  char buf[1024];
 
   errno = 0;
+  ret = getcwd (buf, sizeof (buf));
+  if (ret != NULL)
+    return xstrdup (buf);
+  if (errno != ERANGE)
+    return NULL;
+
   path_max = (unsigned) PATH_MAX;
   path_max += 2;		/* The getcwd docs say to do this. */
 
-  cwd = xmalloc (path_max);
-
-  errno = 0;
-  while ((ret = getcwd (cwd, path_max)) == NULL && errno == ERANGE)
+  for (;;)
     {
-      path_max += PATH_INCR;
-      cwd = xrealloc (cwd, path_max);
+      char *cwd = (char *) xmalloc (path_max);
+
       errno = 0;
-    }
+      ret = getcwd (cwd, path_max);
+      if (ret != NULL)
+	return ret;
+      if (errno != ERANGE)
+	{
+	  int save_errno = errno;
+	  free (cwd);
+	  errno = save_errno;
+	  return NULL;
+	}
 
-  if (ret == NULL)
-    {
-      int save_errno = errno;
       free (cwd);
-      errno = save_errno;
-      return NULL;
+
+      path_max += path_max / 16;
+      path_max += 32;
     }
-  return cwd;
 }

lib/xstat.in

@@ -32,6 +32,10 @@ extern int errno;
 #endif
 @BEGIN_LSTAT_ONLY@
 
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
 #ifdef STAT_MACROS_BROKEN
 # undef S_ISLNK
 #endif
@@ -39,6 +43,13 @@ extern int errno;
 # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 #endif
 
+#ifndef HAVE_DECL_FREE
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_FREE
+void free ();
+#endif
+
 char *xmalloc ();
 
 /* lstat works different on Linux and Solaris systems.  POSIX (see

m4/ChangeLog

@@ -1,3 +1,75 @@
+2000-06-25  Jim Meyering  <meyering@lucent.com>
+
+	* mbstate_t.m4: Include stdio.h before wchar.h to work around
+	Linux header bug when _XOPEN_SOURCE is defined to 500.
+
+2000-06-24  Jim Meyering  <meyering@lucent.com>
+
+	* strerror_r.m4: Revive this file -- to try out an experimental
+	version of AC_FUNC_STRERROR_R that may work even on BeOS, a system
+	for which strerror does return char*, but which lacks a conveniently
+	accessible declaration of the function.  If the compile-test says
+	strerror_r doesn't work, then resort to a `run'-test that works on
+	BeOS and segfaults on DEC Unix.
+
+2000-06-19  Paul Eggert  <eggert@twinsun.com>
+
+	* mbstate_t.m4: New file, defining AC_MBSTATE_T_OBJECT.
+	* prereq.m4 (jm_PREREQ_QUOTEARG): Use it.  Add check for iswprint.
+
+2000-06-23  Jim Meyering  <meyering@lucent.com>
+
+	* afs.m4: Add missing AC_MSG_RESULT.
+	Reported by Bruno Haible.
+
+	* fsusage.m4: s/AC_MSG_CHECKING/AC_CHECKING/.
+	Suggestion from Bruno Haible.
+
+2000-06-21  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4 (AC_REPLACE_FUNCS): Add getpass.
+
+2000-06-18  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4 (AC_REPLACE_FUNCS): Remove mkdir.
+
+	* link-follow.m4 (jm_AC_FUNC_LINK_FOLLOWS_SYMLINK): Change the
+	`checking whether...' message to be consistent with that of the
+	lstat test.
+
+2000-06-16  Bruno Haible  <haible@clisp.cons.org>
+
+	* glibc21.m4 (jm_GLIBC21): Define GLIBC21 for Makefiles, not for C.
+
+2000-06-12  Jim Meyering  <meyering@lucent.com>
+
+	* getloadavg.m4 (AM_FUNC_GETLOADAVG): Replace with AC_FUNC_GETLOADAVG
+	from autoconf, and tweak the latter to accept an optional argument.
+	* jm-macros.m4: s/AM_FUNC_GETLOADAVG/AC_FUNC_GETLOADAVG/, and supply
+	the optional argument, `lib'.
+
+2000-06-08  Jim Meyering  <meyering@lucent.com>
+
+	* largefile.m4: Remove file (now that it's part of autoconf).
+
+2000-06-04  Paul Eggert  <eggert@twinsun.com>
+
+	Rewrite largefile configuration so that we don't need to run
+	getconf and don't need AC_CANONICAL_HOST.  [I'm leaving the use of
+	AC_CANONICAL_HOST in configure.in -- jmm]
+
+	* largefile.m4 (AC_SYS_LARGEFILE_FLAGS,
+	AC_SYS_LARGEFILE_SPACE_APPEND): Remove.
+	(AC_SYS_LARGEFILE_TEST_INCLUDES): New macro.
+	(AC_SYS_LARGEFILE_MACRO_VALUE): Change arguments from
+	CODE-TO-SET-DEFAULT to VALUE, INCLUDES, FUNCTION-BODY.
+	All uses changed.
+	Instead of inspecting the output of getconf, try to compile the
+	test program without and with the macro definition.
+	(AC_SYS_LARGEFILE): Do not require AC_CANONICAL_HOST or check
+	for getconf.  Instead, check for the needed flags by compiling
+	test programs.
+
 2000-06-03  Jim Meyering  <meyering@lucent.com>
 
 	* prereq.m4 (jm_PREREQ_HUMAN): Use []-quoted list in AC_CHECK_DECLS,

m4/Makefile.am

@@ -30,7 +30,6 @@ jm-macros.m4 \
 jm-mktime.m4 \
 jm-winsz1.m4 \
 jm-winsz2.m4 \
-largefile.m4 \
 lchown.m4 \
 lcmessage.m4 \
 lib-check.m4 \
@@ -39,6 +38,7 @@ link-follow.m4 \
 ls-mntd-fs.m4 \
 lstat.m4 \
 malloc.m4 \
+mbstate_t.m4 \
 memcmp.m4 \
 nanosleep.m4 \
 perl.m4 \
@@ -53,6 +53,7 @@ search-libs.m4 \
 st_dm_mode.m4 \
 st_mtim.m4 \
 stat.m4 \
+strerror_r.m4 \
 strftime.m4 \
 timespec.m4 \
 uintmax_t.m4 \

m4/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
@@ -143,7 +143,6 @@ jm-macros.m4 \
 jm-mktime.m4 \
 jm-winsz1.m4 \
 jm-winsz2.m4 \
-largefile.m4 \
 lchown.m4 \
 lcmessage.m4 \
 lib-check.m4 \
@@ -152,6 +151,7 @@ link-follow.m4 \
 ls-mntd-fs.m4 \
 lstat.m4 \
 malloc.m4 \
+mbstate_t.m4 \
 memcmp.m4 \
 nanosleep.m4 \
 perl.m4 \
@@ -166,6 +166,7 @@ search-libs.m4 \
 st_dm_mode.m4 \
 st_mtim.m4 \
 stat.m4 \
+strerror_r.m4 \
 strftime.m4 \
 timespec.m4 \
 uintmax_t.m4 \

m4/afs.m4

@@ -1,7 +1,12 @@
-#serial 2
+#serial 3
 
 AC_DEFUN(jm_AFS,
   AC_MSG_CHECKING(for AFS)
-  test -d /afs \
-    && AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
+  if test -d /afs; then
+    AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  AC_MSG_RESULT($ac_result)
 )

m4/fsusage.m4

@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
 
 # From fileutils/configure.in
 
@@ -11,7 +11,7 @@
 AC_DEFUN(jm_FILE_SYSTEM_USAGE,
 [
 
-AC_MSG_CHECKING(how to get filesystem space usage)
+AC_CHECKING(how to get filesystem space usage)
 ac_fsusage_space=no
 
 # Perform only the link test since it seems there are no variants of the

m4/getloadavg.m4

@@ -1,22 +1,45 @@
-#serial 6
+#serial 7
 
-AC_DEFUN(AM_FUNC_GETLOADAVG,
+# A replacement for autoconf's macro by the same name.  This version
+# accepts an optional argument specifying the name of the $srcdir-relative
+# directory in which the file getloadavg.c may be found.  It is unusual
+# (but justified, imho) that this file is required at ./configure time.
+
+undefine([AC_FUNC_GETLOADAVG])
+
+# AC_FUNC_GETLOADAVG
+# ------------------
+AC_DEFUN([AC_FUNC_GETLOADAVG],
 [ac_have_func=no # yes means we've found a way to get the load average.
 
-am_cv_saved_LIBS="$LIBS"
+# By default, expect to find getloadavg.c in $srcdir/.
+ac_lib_dir_getloadavg=$srcdir
+# But if there's an argument, DIR, expect to find getloadavg.c in $srcdir/DIR.
+ifval([$1], [ac_lib_dir_getloadavg=$srcdir/$1])
+# Make sure getloadavg.c is where it belongs, at ./configure-time.
+test -f $ac_lib_dir_getloadavg/getloadavg.c \
+  || AC_MSG_ERROR([getloadavg.c is not in $ac_lib_dir_getloadavg])
+# FIXME: Add an autoconf-time test, too?
+
+ac_save_LIBS=$LIBS
+
+# Check for getloadavg, but be sure not to touch the cache variable.
+(AC_CHECK_FUNC(getloadavg, exit 0, exit 1)) && ac_have_func=yes
 
 # On HPUX9, an unprivileged user can get load averages through this function.
 AC_CHECK_FUNCS(pstat_getdynamic)
 
 # Solaris has libkstat which does not require root.
 AC_CHECK_LIB(kstat, kstat_open)
-if test $ac_cv_lib_kstat_kstat_open = yes ; then ac_have_func=yes ; fi
+test $ac_cv_lib_kstat_kstat_open = yes && ac_have_func=yes
 
 # Some systems with -lutil have (and need) -lkvm as well, some do not.
 # On Solaris, -lkvm requires nlist from -lelf, so check that first
 # to get the right answer into the cache.
 # For kstat on solaris, we need libelf to force the definition of SVR4 below.
-AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS")
+if test $ac_have_func = no; then
+  AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS")
+fi
 if test $ac_have_func = no; then
   AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")
   # Check for the 4.4BSD definition of getloadavg.
@@ -27,75 +50,32 @@ fi
 if test $ac_have_func = no; then
   # There is a commonly available library for RS/6000 AIX.
   # Since it is not a standard part of AIX, it might be installed locally.
-  ac_save_LIBS="$LIBS"
+  ac_getloadavg_LIBS=$LIBS
   LIBS="-L/usr/local/lib $LIBS"
   AC_CHECK_LIB(getloadavg, getloadavg,
-    LIBS="-lgetloadavg $LIBS", LIBS="$ac_save_LIBS")
+               [LIBS="-lgetloadavg $LIBS"], [LIBS=$ac_getloadavg_LIBS])
 fi
 
-# Make sure it is really in the library, if we think we found it.
-AC_REPLACE_FUNCS(getloadavg)
-
-if test $ac_cv_func_getloadavg = yes; then
-  AC_DEFINE(HAVE_GETLOADAVG, 1, [FIXME])
-  ac_have_func=yes
-else
-  AC_DEFINE(C_GETLOADAVG, 1, [Define if using getloadavg.c.])
-  # Figure out what our getloadavg.c needs.
-  ac_have_func=no
-  AC_CHECK_HEADER(sys/dg_sys_info.h,
-  [ac_have_func=yes; AC_DEFINE(DGUX, 1, [FIXME])
-  AC_CHECK_LIB(dgc, dg_sys_info)])
-
-  AC_CHECK_HEADERS(locale.h)
-  AC_CHECK_FUNCS(setlocale)
-
-  # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
-  # uses stabs), but it is still SVR4.  We cannot check for <elf.h> because
-  # Irix 4.0.5F has the header but not the library.
-  if test $ac_have_func = no && test $ac_cv_lib_elf_elf_begin = yes; then
-    ac_have_func=yes; AC_DEFINE(SVR4, 1, [FIXME])
-  fi
-
-  if test $ac_have_func = no; then
-    AC_CHECK_HEADER(inq_stats/cpustats.h,
-    [ac_have_func=yes; AC_DEFINE(UMAX, 1, [FIXME])
-    AC_DEFINE(UMAX4_3, 1, [FIXME])])
-  fi
-
-  if test $ac_have_func = no; then
-    AC_CHECK_HEADER(sys/cpustats.h,
-    [ac_have_func=yes; AC_DEFINE(UMAX, 1, [FIXME])])
-  fi
-
-  if test $ac_have_func = no; then
-    AC_CHECK_HEADERS(mach/mach.h)
-  fi
-
-  AC_CHECK_HEADER(nlist.h,
-  [AC_DEFINE(NLIST_STRUCT, 1, [FIXME])
-  AC_CACHE_CHECK([for n_un in struct nlist], ac_cv_struct_nlist_n_un,
-  [AC_TRY_COMPILE([#include <nlist.h>],
-  [struct nlist n; n.n_un.n_name = 0;],
-  ac_cv_struct_nlist_n_un=yes, ac_cv_struct_nlist_n_un=no)])
-  if test $ac_cv_struct_nlist_n_un = yes; then
-    AC_DEFINE(NLIST_NAME_UNION, 1, [FIXME])
-  fi
-  ])dnl
-fi # Do not have getloadavg in system libraries.
+# Make sure it is really in the library, if we think we found it,
+# otherwise set up the replacement function.
+AC_CHECK_FUNCS(getloadavg, [],
+               [_AC_LIBOBJ_GETLOADAVG])
 
 # Some definitions of getloadavg require that the program be installed setgid.
-dnl FIXME Don't hardwire the path of getloadavg.c in the top-level directory.
 AC_CACHE_CHECK(whether getloadavg requires setgid,
-  ac_cv_func_getloadavg_setgid,
+               ac_cv_func_getloadavg_setgid,
 [AC_EGREP_CPP([Yowza Am I SETGID yet],
-[#include "$srcdir/lib/getloadavg.c"
+[#include "$ac_lib_dir_getloadavg/getloadavg.c"
 #ifdef LDAV_PRIVILEGED
 Yowza Am I SETGID yet
-#endif],
-  ac_cv_func_getloadavg_setgid=yes, ac_cv_func_getloadavg_setgid=no)])
+@%:@endif],
+              ac_cv_func_getloadavg_setgid=yes,
+              ac_cv_func_getloadavg_setgid=no)])
 if test $ac_cv_func_getloadavg_setgid = yes; then
-  NEED_SETGID=true; AC_DEFINE(GETLOADAVG_PRIVILEGED, 1, [FIXME])
+  NEED_SETGID=true
+  AC_DEFINE(GETLOADAVG_PRIVILEGED, 1,
+            [Define if the `getloadavg' function needs to be run setuid
+             or setgid.])
 else
   NEED_SETGID=false
 fi
@@ -103,25 +83,21 @@ AC_SUBST(NEED_SETGID)dnl
 
 if test $ac_cv_func_getloadavg_setgid = yes; then
   AC_CACHE_CHECK(group of /dev/kmem, ac_cv_group_kmem,
-[  # On Solaris, /dev/kmem is a symlink.  Get info on the real file.
+[ # On Solaris, /dev/kmem is a symlink.  Get info on the real file.
   ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null`
   # If we got an error (system does not support symlinks), try without -L.
   test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem`
   ac_cv_group_kmem=`echo $ac_ls_output \
-    | sed -ne 's/[ 	][ 	]*/ /g;
+    | sed -ne ['s/[ 	][ 	]*/ /g;
 	       s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\)  *.*/\1/;
-	       / /s/.* //;p;'`
-]
-)
-  KMEM_GROUP=$ac_cv_group_kmem
+	       / /s/.* //;p;']`
+])
+  AC_SUBST(KMEM_GROUP, $ac_cv_group_kmem)dnl
 fi
-AC_SUBST(KMEM_GROUP)dnl
-
-if test x = "x$am_cv_saved_LIBS"; then
-  GETLOADAVG_LIBS="$LIBS"
+if test "x$ac_save_LIBS" = x; then
+  GETLOADAVG_LIBS=$LIBS
 else
-  GETLOADAVG_LIBS=`echo "$LIBS"|sed "s!$am_cv_saved_LIBS!!"`
+  GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$ac_save_LIBS!!"`
 fi
 AC_SUBST(GETLOADAVG_LIBS)dnl
-LIBS="$am_cv_saved_LIBS"
-])
+])# AC_FUNC_GETLOADAVG

m4/glibc21.m4

@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 # Test for the GNU C Library, version 2.1 or newer.
 # From Bruno Haible.
@@ -20,7 +20,7 @@ AC_DEFUN(jm_GLIBC21,
 	ac_cv_gnu_library_2_1=no)
       ]
     )
-    AC_DEFINE_UNQUOTED(GLIBC21, $ac_cv_gnu_library_2_1,
-                       [we use GNU C Library 2.1 or newer])
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
   ]
 )

m4/jm-macros.m4

@@ -1,4 +1,4 @@
-#serial 19
+#serial 22
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -98,7 +98,7 @@ AC_DEFUN(jm_MACROS,
 
   AC_REQUIRE([AC_FUNC_VPRINTF])
   AC_REQUIRE([AC_FUNC_ALLOCA])
-  AC_REQUIRE([AM_FUNC_GETLOADAVG])
+  AC_FUNC_GETLOADAVG([lib])
   AC_REQUIRE([jm_SYS_PROC_UPTIME])
   AC_REQUIRE([jm_FUNC_FTRUNCATE])
 
@@ -107,9 +107,10 @@ AC_DEFUN(jm_MACROS,
   AC_REPLACE_FUNCS(gethostname getusershell)
   AC_REPLACE_FUNCS(stime strcspn stpcpy strstr strtol strtoul)
   AC_REPLACE_FUNCS(strpbrk)
-  AC_REPLACE_FUNCS(euidaccess memcmp mkdir rmdir rpmatch strndup strverscmp)
+  AC_REPLACE_FUNCS(euidaccess memcmp rmdir rpmatch strndup strverscmp)
   AC_REPLACE_FUNCS(atexit)
   AC_REPLACE_FUNCS(strnlen)
+  AC_REPLACE_FUNCS(getpass)
 
   dnl used by e.g. intl/*domain.c and lib/canon-host.c
   AC_REPLACE_FUNCS(strdup)

m4/largefile.m4

@@ -1,134 +0,0 @@
-#serial 11
-
-dnl By default, many hosts won't let programs access large files;
-dnl one must use special compiler options to get large-file access to work.
-dnl For more details about this brain damage please see:
-dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
-
-dnl Written by Paul Eggert <eggert@twinsun.com>.
-
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
-AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
-  [AC_CACHE_CHECK([for $1 value to request large file support],
-     ac_cv_sys_largefile_$1,
-     [if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2
-      then
-        ac_cv_sys_largefile_$1=`cat conftest.1`
-      else
-	ac_cv_sys_largefile_$1=no
-	ifelse($1, CFLAGS,
-	  [case "$host_os" in
-	   # HP-UX 10.20 requires -D__STDC_EXT__ with gcc 2.95.1.
-[	   hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)]
-	     if test "$GCC" = yes; then
-	       ac_cv_sys_largefile_CFLAGS=-D__STDC_EXT__
-	     fi
-	     ;;
-	   # IRIX 6.2 and later do not support large files by default,
-	   # so use the -n32 ABI unless the installer said otherwise.
-[	   irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)]
-	     if test "$GCC" != yes; then
-	       case "$CC $CFLAGS " in
-	       *' -o32 '*|*' -n32 '*|*' -64 '*) ;;
-	       *) ac_cv_sys_largefile_CFLAGS=-n32 ;;
-	       esac
-	     fi
-	   esac
-	   if test "$ac_cv_sys_largefile_CFLAGS" != no; then
-	     ac_save_CC="$CC"
-	     CC="$CC $ac_cv_sys_largefile_CFLAGS"
-	     AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)
-	     CC="$ac_save_CC"
-	   fi])
-      fi
-      rm -f conftest*])])
-
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)
-AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
-  [case $2 in
-   no) ;;
-   ?*)
-     case "[$]$1" in
-     '') $1=$2 ;;
-     *) $1=[$]$1' '$2 ;;
-     esac ;;
-   esac])
-
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
-  [AC_CACHE_CHECK([for $1], $2,
-     [$2=no
-      $4
-      for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
-	case "$ac_flag" in
-	-D$1)
-	  $2=1 ;;
-	-D$1=*)
-	  $2=`expr " $ac_flag" : '[[^=]]*=\(.*\)'` ;;
-	esac
-      done
-      ])
-   if test "[$]$2" != no; then
-     AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
-   fi])
-
-AC_DEFUN(AC_SYS_LARGEFILE,
-  [AC_REQUIRE([AC_CANONICAL_HOST])
-   AC_ARG_ENABLE(largefile,
-     [  --disable-largefile     omit support for large files])
-   if test "$enable_largefile" != no; then
-     AC_CHECK_TOOL(GETCONF, getconf)
-     AC_SYS_LARGEFILE_FLAGS(CFLAGS)
-     AC_SYS_LARGEFILE_FLAGS(LDFLAGS)
-     AC_SYS_LARGEFILE_FLAGS(LIBS)
-
-     for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
-       case "$ac_flag" in
-       no) ;;
-       -D_FILE_OFFSET_BITS=*) ;;
-       -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;;
-       -D_LARGE_FILES | -D_LARGE_FILES=*) ;;
-       -D?* | -I?*)
-	 AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;;
-       *)
-	 AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;;
-       esac
-     done
-     AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS")
-     AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS")
-     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,
-       ac_cv_sys_file_offset_bits,
-       [Number of bits in a file offset, on hosts where this is settable.],
-       [case "$host_os" in
-	# HP-UX 10.20 and later
-[	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)]
-	  ac_cv_sys_file_offset_bits=64 ;;
-	esac])
-     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
-       ac_cv_sys_largefile_source,
-       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
-       [AC_TRY_COMPILE([#include <stdio.h>], [return !ftello;], ,
-	  [AC_TRY_COMPILE([#define _LARGEFILE_SOURCE 1
-#include <stdio.h>], [return !ftello;],
-	     ac_cv_sys_largefile_source=1)])])
-     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
-       ac_cv_sys_large_files,
-       [Define for large files, on AIX-style hosts.],
-       [case "$host_os" in
-	# AIX 4.2 and later
-[	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)]
-	  ac_cv_sys_large_files=1 ;;
-	esac])
-     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE,
-       ac_cv_sys_xopen_source,
-       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
-       [AC_TRY_COMPILE([#include <stdio.h>], [return !ftello;], ,
-	  [AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
-#include <stdio.h>],
-	     [return !ftello;],
-	     ac_cv_sys_xopen_source=500)])])
-   fi
-  ])

m4/link-follow.m4

@@ -1,10 +1,11 @@
-#serial 1
+#serial 2
 dnl Run a program to determine whether whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
 AC_DEFUN(jm_AC_FUNC_LINK_FOLLOWS_SYMLINK,
 [dnl
-  AC_CACHE_CHECK([whether link(2) follows symlinks],
+  AC_CACHE_CHECK(
+    [whether link(2) dereferences a symlink specified with a trailing slash],
 		 jm_ac_cv_func_link_follows_symlink,
   [
     dnl poor-man's AC_REQUIRE: FIXME: repair this once autoconf-3 provides

m4/mbstate_t.m4

@@ -0,0 +1,23 @@
+# serial 2
+
+# From Paul Eggert.
+
+# Some versions of BeOS define mbstate_t to be an incomplete type,
+# so you can't declare an object of that type.
+# Check for this incompatibility with Standard C.
+
+# Include stdio.h first, because otherwise this test would fail on Linux
+# (at least 2.2.16) because the `_XOPEN_SOURCE 500' definition elicits
+# a syntax error in wchar.h due to the use of undefined __int32_t.
+
+AC_DEFUN(AC_MBSTATE_T_OBJECT,
+  [AC_CACHE_CHECK([for mbstate_t object type], ac_cv_type_mbstate_t_object,
+    [AC_TRY_COMPILE([#include <stdio.h>
+#include <wchar.h>],
+      [mbstate_t x; return sizeof x;],
+      ac_cv_type_mbstate_t_object=yes,
+      ac_cv_type_mbstate_t_object=no)])
+   if test $ac_cv_type_mbstate_t_object = yes; then
+     AC_DEFINE(HAVE_MBSTATE_T_OBJECT, 1,
+	       [Define if mbstate_t is an object type.])
+   fi])

m4/prereq.m4

@@ -56,10 +56,11 @@ AC_DEFUN(jm_PREREQ_GETPAGESIZE,
 
 AC_DEFUN(jm_PREREQ_QUOTEARG,
 [
-  AC_CHECK_FUNCS(isascii mbrtowc)
+  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
   AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
+  AC_MBSTATE_T_OBJECT
   AM_C_PROTOTYPES
 ])
 

m4/strerror_r.m4

@@ -0,0 +1,67 @@
+#serial 1000
+# Experimental replacement for the function in the latest CVS autoconf.
+# If the compile-test says strerror_r doesn't work, then resort to a
+# `run'-test that works on BeOS and segfaults on DEC Unix.
+# Use with the error.c file in ../lib.
+
+undefine([AC_FUNC_STRERROR_R])
+
+# AC_FUNC_STRERROR_R
+# ------------------
+AC_DEFUN([AC_FUNC_STRERROR_R],
+[# Check strerror_r
+AC_CHECK_DECLS([strerror_r])
+AC_CHECK_FUNCS([strerror_r])
+if test $ac_cv_func_strerror_r = yes; then
+  AC_CHECK_HEADERS(string.h)
+  AC_CACHE_CHECK([for working strerror_r],
+                 ac_cv_func_strerror_r_works,
+   [
+    AC_TRY_COMPILE(
+     [
+#       include <stdio.h>
+#       if HAVE_STRING_H
+#        include <string.h>
+#       endif
+     ],
+     [
+       char buf;
+       char x = *strerror_r (0, &buf, sizeof buf);
+     ],
+     ac_cv_func_strerror_r_works=yes,
+     ac_cv_func_strerror_r_works=no
+    )
+    if test $ac_cv_func_strerror_r_works = no; then
+      # strerror_r seems not to work, but now we have to choose between
+      # systems that have relatively inaccessible declarations for the
+      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
+      # former has a strerror_r that returns char*, while the latter
+      # has a strerror_r that returns `int'.
+      # This test should segfault on the DEC system.
+      AC_TRY_RUN(
+       [
+#       include <stdio.h>
+#       include <string.h>
+
+	extern char *strerror_r ();
+
+	int
+	main ()
+	{
+	  char buf[2];
+	  char x = *strerror_r (0, buf, sizeof buf);
+	  exit (x && !isalpha (x));
+	}
+       ],
+       ac_cv_func_strerror_r_works=yes,
+       ac_cv_func_strerror_r_works=no,
+       ac_cv_func_strerror_r_works=no)
+    fi
+
+    if test $ac_cv_func_strerror_r_works = yes; then
+      AC_DEFINE_UNQUOTED(HAVE_WORKING_STRERROR_R, 1,
+        [Define to 1 if `strerror_r' returns a string.])
+    fi
+  ])
+fi
+])# AC_FUNC_STRERROR_R

old/fileutils/ChangeLog

@@ -1,3 +1,63 @@
+2000-06-25  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0v.
+
+2000-06-18  Jim Meyering  <meyering@lucent.com>
+
+	* README-alpha: Update.
+
+2000-06-17  Jim Meyering  <meyering@lucent.com>
+
+	* tests/install/basic-1: Don't fail (just exit 77) if strip doesn't
+	work.  Suggestion from Ulrich Drepper.
+	Add canonical trap/mkdir/cd, plus exit portability cruft.
+
+2000-06-16  Jim Meyering  <meyering@lucent.com>
+
+	* src/copy.c (copy_reg): Give a slightly better diagnostic upon
+	open failure.
+
+2000-06-15  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, doc/fileutils.texi: df, du, and ls now round disk
+	usage up and disk free space down.
+
+	* src/df.c (df_readable): New arg for rounding style.
+	Round negative numbers correctly.
+	(show_dev): Round disk usage up and disk free space down.
+
+	* src/ls.c: (print_dir, gobble_file, print_long_format,
+	print_file_name_and_frills): Round disk usage up.
+	* src/du.c (print_size): Likewise.
+
+2000-06-14  Andreas Schwab  <schwab@suse.de>
+
+	* tests/rm/r-1 (framework_failure): Initialize this instead of
+	test_failure.
+
+2000-06-12  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0u.
+
+	* tests/rm/r-1: Clean up.
+	Be careful to remove temp directory upon interrupt.
+
+	* src/mv.c (main): Give the correct diagnostic when using the
+	--target-dir=DIR option, but no arguments.
+	Patch from Michael Stone.  Reported by Herbert Xu.
+	* tests/mv/diag: New test for this.
+	* tests/mv/Makefile.am (TESTS): Add diag.
+
+2000-06-08  Brian Youmans  <3diff@gnu.org>
+
+	* doc/perm.texi (Multiple Changes): Fix typo.
+	* doc/fileutils.texi: A few typos and minor formatting fixes.
+	* doc/getdate.texi: Likewise.
+
+2000-06-06  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.maint (alpha_subdir): Factor out `gnu/fetish'.
+
 2000-06-04  Jim Meyering  <meyering@lucent.com>
 
 	* Version 4.0t.

old/fileutils/NEWS

@@ -1,5 +1,13 @@
 Changes in release 4.1:
+[4.0v]
+* df, du, and ls now round disk usage up and disk free space down
+* df, du, ls: --block-size=N now works for values of N that are e.g.,
+    not a multiple of the file's block size
+[4.0u]
+* give proper diagnostic for mv usage error
+* fix compile problem with lib/strnlen.c
 [4.0t]
+* `cp -d -u' no longer fails with certain existing destination symlinks
 * rmdir and mkdir accept -v as synonym for --verbose
 [4.0s]
 * rm no longer segfaults on certain very deep hierarchies

old/sh-utils/ChangeLog

@@ -1,3 +1,21 @@
+2000-06-21  Jim Meyering  <meyering@lucent.com>
+
+	* tests/stty/basic-1: New test for that.
+	* src/stty.c (valid_options): Don't segfault on `stty erase -'.
+	Patch from Harry Liu.
+
+2000-06-15  Jim Meyering  <meyering@lucent.com>
+
+	* tests/date/Test.pm: Add tests for getdate.y fix.
+
+2000-06-14  Jim Meyering  <meyering@lucent.com>
+
+	* src/help-version: Punt on nohup; give it --version.
+
+2000-06-10  Jim Meyering  <meyering@lucent.com>
+
+	* doc/sh-utils.texi: Typo-fixes and some clean-up from Brian Youmans.
+
 2000-05-29  Jim Meyering  <meyering@lucent.com>
 
 	* tests/nice: Remove now-unused reference to srcdir.

old/sh-utils/NEWS

@@ -1,5 +1,6 @@
 Changes in release 2.1
  [2.0j]
+* `date -d DATE' now parses certain relative DATEs correctly
  [2.0i]
 * fixed a bug introduced in 2.0h that made many programs fail with a
  `write error' when invoked with the --version option

old/textutils/ChangeLog

@@ -1,3 +1,32 @@
+2000-06-24  Jim Meyering  <meyering@lucent.com>
+
+	* tests/sum/basic-1: New file.
+	* tests/sum/Makefile.am: New file.
+	* configure.in (AC_OUTPUT): Add tests/md5sum/Makefile.
+	* tests/Makefile.am (SUBDIRS): Add sum.
+
+2000-06-22  Bruno Haible  <haible@clisp.cons.org>
+
+	* src/sum.c (sysv_sum_file): Avoid overflowing 32-bit accumulator
+	on files larger than 256 MB.
+
+2000-06-22  Bruno Haible  <haible@clisp.cons.org>
+
+	* src/cat.c (main): Correct a comment.
+
+2000-06-21  Jim Meyering  <meyering@lucent.com>
+
+	* src/cut.c (getstr): Remove private (and out of date) version of
+	this function.
+	(cut_fields): Adjust caller to use the just-extended one in ../lib.
+	Reported by Paul Sauer.
+
+2000-06-20  Jim Meyering  <meyering@lucent.com>
+
+	* src/uniq.c (main): Fix off-by-argc test, so +N-style options are
+	recognized once again.  Reported by Geoff Keunning.
+	Fix typo in diagnostic: s/compare/skip/.
+
 2000-05-27  Jim Meyering  <meyering@lucent.com>
 
 	* src/tail.c: Arrange to call close_stdout upon exit.
@@ -17,8 +46,6 @@
 	Don't close stdout explicitly.  Replace uses of global constant,
 	output_desc, with uses of STDOUT_FILENO.
 
-	* src/tail.c: FIXME
-
 	Arrange to call close_stdout upon exit.  Don't close stdout explicitly.
 	* src/cksum.c: Likewise.
 	* src/comm.c: Likewise.

old/textutils/NEWS

@@ -1,5 +1,6 @@
 Changes in release 2.1
 [2.0f]
+* cut no longer gets a segfault under some circumstances
 * unexpand accepts new option: --first-only
 [2.0e]
 * `tail -f directory' no longer gets a failed assertion

src/cat.c

@@ -788,7 +788,7 @@ main (int argc, char **argv)
 	{
 	  inbuf = (unsigned char *) xmalloc (insize + 1);
 
-	  /* Why are (OUTSIZE  - 1 + INSIZE * 4 + 13) bytes allocated for
+	  /* Why are (OUTSIZE - 1 + INSIZE * 4 + 13) bytes allocated for
 	     the output buffer?
 
 	     A test whether output needs to be written is done when the input
@@ -797,8 +797,8 @@ main (int argc, char **argv)
 	     buffer.  Now INSIZE bytes of input is read.  Each input character
 	     may grow by a factor of 4 (by the prepending of M-^).  If all
 	     characters do, and no newlines appear in this block of input, we
-	     will have at most (OUTSIZE - 1 + INSIZE) bytes in the buffer.  If
-	     the last character in the preceding block of input was a
+	     will have at most (OUTSIZE - 1 + INSIZE * 4) bytes in the buffer.
+	     If the last character in the preceding block of input was a
 	     newline, a line number may be written (according to the given
 	     options) as the first thing in the output buffer. (Done after the
 	     new input is read, but before processing of the input begins.)  A

src/copy.c

@@ -188,7 +188,7 @@ copy_reg (const char *src_path, const char *dst_path,
 	error (0, 0, _("`%s' and `%s' are the same file"),
 	       src_path, dst_path);
       else
-	error (0, errno, "%s", src_path);
+	error (0, errno, _("cannot open `%s' for reading"), src_path);
 
       return -1;
     }

src/cut.c

@@ -64,6 +64,7 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
+#include "getstr.h"
 #include "closeout.h"
 #include "error.h"
 
@@ -231,89 +232,6 @@ With no FILE, or when FILE is -, read standard input.\n\
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
-/* The following function was copied from getline.c, but with these changes:
-   - Read up to and including a newline or TERMINATOR, whichever comes first.
-   The original does not treat newline specially.
-   - Remove unused argument, OFFSET.
-   - Use xmalloc and xrealloc instead of malloc and realloc.
-   - Declare this function static.  */
-
-/* Always add at least this many bytes when extending the buffer.  */
-#define MIN_CHUNK 64
-
-/* Read up to (and including) a newline or TERMINATOR from STREAM into
-   *LINEPTR (and null-terminate it). *LINEPTR is a pointer returned from
-   xmalloc (or NULL), pointing to *N characters of space.  It is
-   xrealloc'd as necessary.  Return the number of characters read (not
-   including the null terminator), or -1 on error or EOF.  */
-
-static int
-getstr (char **lineptr, int *n, FILE *stream, int terminator)
-{
-  int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
-  char *read_pos;		/* Where we're reading into *LINEPTR. */
-
-  if (!lineptr || !n || !stream)
-    return -1;
-
-  if (!*lineptr)
-    {
-      *n = MIN_CHUNK;
-      *lineptr = (char *) xmalloc (*n);
-      if (!*lineptr)
-	return -1;
-    }
-
-  nchars_avail = *n;
-  read_pos = *lineptr;
-
-  for (;;)
-    {
-      register int c = getc (stream);
-
-      /* We always want at least one char left in the buffer, since we
-	 always (unless we get an error while reading the first char)
-	 NUL-terminate the line buffer.  */
-
-      assert (*n - nchars_avail == read_pos - *lineptr);
-      if (nchars_avail < 1)
-	{
-	  if (*n > MIN_CHUNK)
-	    *n *= 2;
-	  else
-	    *n += MIN_CHUNK;
-
-	  nchars_avail = *n + *lineptr - read_pos;
-	  *lineptr = xrealloc (*lineptr, *n);
-	  if (!*lineptr)
-	    return -1;
-	  read_pos = *n - nchars_avail + *lineptr;
-	  assert (*n - nchars_avail == read_pos - *lineptr);
-	}
-
-      if (feof (stream) || ferror (stream))
-	{
-	  /* Return partial line, if any.  */
-	  if (read_pos == *lineptr)
-	    return -1;
-	  else
-	    break;
-	}
-
-      *read_pos++ = c;
-      nchars_avail--;
-
-      if (c == terminator || c == '\n')
-	/* Return the line.  */
-	break;
-    }
-
-  /* Done - NUL terminate and return the number of chars read.  */
-  *read_pos = '\0';
-
-  return read_pos - *lineptr;
-}
-
 static int
 print_kth (unsigned int k)
 {
@@ -556,9 +474,14 @@ cut_fields (FILE *stream)
 	{
 	  int len;
 
-	  len = getstr (&field_1_buffer, &field_1_bufsize, stream, delim);
+	  len = getstr (&field_1_buffer, &field_1_bufsize, stream,
+			delim, '\n', 0);
 	  if (len < 0)
-	    break;
+	    {
+	      if (feof (stream))
+		break;
+	      FATAL_ERROR (_("Memory exhausted"));
+	    }
 
 	  assert (len != 0);
 

src/df.c

@@ -209,12 +209,12 @@ excluded_fstype (const char *fstype)
   return 0;
 }
 
-/* Like human_readable, except return "-" if the argument is -1,
-   return the negative of N if NEGATIVE is 1,
-   and take ceiling of fractions if posix_format.  */
+/* Like human_readable_inexact, except return "-" if the argument is -1,
+   and return the negative of N if NEGATIVE is 1.  */
 static char const *
 df_readable (int negative, uintmax_t n, char *buf,
-	     int from_block_size, int t_output_block_size)
+	     int from_block_size, int t_output_block_size,
+	     enum human_inexact_style s)
 {
   if (n == -1)
     return "-";
@@ -223,9 +223,7 @@ df_readable (int negative, uintmax_t n, char *buf,
       char *p = human_readable_inexact (negative ? - n : n,
 					buf + negative, from_block_size,
 					t_output_block_size,
-					(posix_format
-					 ? human_ceiling
-					 : human_round_to_even));
+					negative ? - s : s);
       if (negative)
 	*--p = '-';
       return p;
@@ -347,11 +345,16 @@ show_dev (const char *disk, const char *mount_point, const char *fstype,
 
   printf (" %*s %*s %*s ",
 	  width, df_readable (0, total,
-			      buf[0], input_units, output_units),
+			      buf[0], input_units, output_units,
+			      (posix_format
+			       ? human_ceiling
+			       : human_round_to_even)),
 	  width, df_readable (negate_used, used,
-			      buf[1], input_units, output_units),
+			      buf[1], input_units, output_units,
+			      human_ceiling),
 	  width, df_readable (negate_available, available,
-			      buf[2], input_units, output_units));
+			      buf[2], input_units, output_units,
+			      posix_format ? human_ceiling : human_floor));
 
   if (used != -1 && available != -1)
     {

src/du.c

@@ -300,7 +300,8 @@ print_size (uintmax_t n_blocks, const char *string)
 {
   char buf[LONGEST_HUMAN_READABLE + 1];
   printf ("%s\t%s\n",
-	  human_readable (n_blocks, buf, ST_NBLOCKSIZE, output_block_size),
+	  human_readable_inexact (n_blocks, buf, ST_NBLOCKSIZE,
+				  output_block_size, human_ceiling),
 	  string);
   fflush (stdout);
 }

src/ls.c

@@ -1693,7 +1693,8 @@ print_dir (const char *name, const char *realname)
       p = _("total");
       DIRED_FPUTS (p, stdout, strlen (p));
       DIRED_PUTCHAR (' ');
-      p = human_readable (total_blocks, buf, ST_NBLOCKSIZE, output_block_size);
+      p = human_readable_inexact (total_blocks, buf, ST_NBLOCKSIZE,
+				  output_block_size, human_ceiling);
       DIRED_FPUTS (p, stdout, strlen (p));
       DIRED_PUTCHAR ('\n');
     }
@@ -1883,8 +1884,9 @@ gobble_file (const char *name, int explicit_arg, const char *dirname)
       blocks = ST_NBLOCKS (files[files_index].stat);
       {
 	char buf[LONGEST_HUMAN_READABLE + 1];
-	int len = strlen (human_readable (blocks, buf, ST_NBLOCKSIZE,
-					  output_block_size));
+	int len = strlen (human_readable_inexact (blocks, buf, ST_NBLOCKSIZE,
+						  output_block_size,
+						  human_ceiling));
 	if (block_size_size < len)
 	  block_size_size = len < 7 ? len : 7;
       }
@@ -2320,8 +2322,9 @@ print_long_format (const struct fileinfo *f)
     {
       char hbuf[LONGEST_HUMAN_READABLE + 1];
       sprintf (p, "%*s ", block_size_size,
-	       human_readable ((uintmax_t) ST_NBLOCKS (f->stat), hbuf,
-			       ST_NBLOCKSIZE, output_block_size));
+	       human_readable_inexact ((uintmax_t) ST_NBLOCKS (f->stat), hbuf,
+				       ST_NBLOCKSIZE, output_block_size,
+				       human_ceiling));
       p += strlen (p);
     }
 
@@ -2497,8 +2500,9 @@ print_file_name_and_frills (const struct fileinfo *f)
 
   if (print_block_size)
     printf ("%*s ", block_size_size,
-	    human_readable ((uintmax_t) ST_NBLOCKS (f->stat), buf,
-			    ST_NBLOCKSIZE, output_block_size));
+	    human_readable_inexact ((uintmax_t) ST_NBLOCKS (f->stat), buf,
+				    ST_NBLOCKSIZE, output_block_size,
+				    human_ceiling));
 
   print_name_with_quoting (f->name, FILE_OR_LINK_MODE (f), f->linkok, NULL);
 

src/mv.c

@@ -472,6 +472,12 @@ main (int argc, char **argv)
 
   dest_is_dir = (n_files > 0 && isdir (target_directory));
 
+  if (n_files == 0 || (n_files == 1 && !target_directory_specified))
+    {
+      error (0, 0, "%s", _("missing file argument"));
+      usage (1);
+    }
+
   if (target_directory_specified)
     {
       if (!dest_is_dir)
@@ -480,29 +486,12 @@ main (int argc, char **argv)
 		 target_directory);
 	  usage (1);
 	}
-
-      if (n_files == 0)
-	{
-	  error (0, 0, "%s", _("missing file argument"));
-	  usage (1);
-	}
     }
-  else
+  else if (n_files > 2 && !dest_is_dir)
     {
-      if (n_files < 2)
-	{
-	  error (0, 0, "%s", (n_files == 0
-			      ? _("missing file arguments")
-			      : _("missing file argument")));
-	  usage (1);
-	}
-
-      if (n_files > 2 && !dest_is_dir)
-	{
-	  error (0, 0,
-	   _("when moving multiple files, last argument must be a directory"));
-	  usage (1);
-	}
+      error (0, 0,
+	    _("when moving multiple files, last argument must be a directory"));
+      usage (1);
     }
 
   if (backup_suffix_string)

src/stty.c

@@ -680,7 +680,7 @@ valid_options (char *opt, const char *valid_opts,
 {
   char ch;
 
-  if (*opt++ != '-')
+  if (*opt++ != '-' || *opt == 0)
     return 0;
 
   while ((ch = *opt))

src/sum.c

@@ -12,8 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Like BSD sum or SysV sum -r, except like SysV sum if -s option is given. */
 
@@ -176,6 +176,9 @@ sysv_sum_file (const char *file, int print_name)
 
       for (i = 0; i < bytes_read; i++)
 	checksum += buf[i];
+      /* Reduce checksum mod 0xffff, to avoid overflow.  */
+      checksum = (checksum & 0xffff) + (checksum >> 16);
+
       total_bytes += bytes_read;
     }
 

src/uniq.c

@@ -428,7 +428,7 @@ main (int argc, char **argv)
 	}
     }
 
-  if (optind >= 2 && !STREQ (argv[optind - 1], "--"))
+  if (argc - optind >= 2 && !STREQ (argv[optind - 1], "--"))
     {
       /* Interpret non-option arguments with leading `+' only
 	 if we haven't seen `--'.  */
@@ -439,7 +439,7 @@ main (int argc, char **argv)
 	  if (xstrtol (opt_str, NULL, 10, &tmp_long, "") != LONGINT_OK
 	      || tmp_long <= 0 || tmp_long > INT_MAX)
 	    error (EXIT_FAILURE, 0,
-		   _("invalid number of bytes to compare: `%s'"),
+		   _("invalid number of bytes to skip: `%s'"),
 		   opt_str);
 	  skip_chars = (int) tmp_long;
 	}

tests/basename/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/chmod/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/cp/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/cut/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/date/Makefile.am

@@ -10,7 +10,7 @@ rel-2d.X rel-2e.X rel-2f.X rel-2g.X rel-3a.X next-s.X next-m.X next-h.X \
 next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-0a.X utc-1.I utc-1.X \
 utc-1a.I utc-1a.X date2sec-0.X date2sec-0a.X date2sec-1.X sec2date-0.X \
 this-m.X this-h.X this-w.X this-mo.X this-y.X risks-1.X regress-1.X \
-datevtime-1.X rfc822-1.X
+datevtime-1.X rfc822-1.X relative-1.X relative-2.X
 run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
 9.E leap-1.O leap-1.E U95-1.O U95-1.E U95-2.O U95-2.E U95-3.O U95-3.E U92-1.O \
 U92-1.E U92-2.O U92-2.E U92-3.O U92-3.E V92-1.O V92-1.E V92-2.O V92-2.E \
@@ -24,7 +24,8 @@ utc-0a.E utc-1.O utc-1.E utc-1a.O utc-1a.E date2sec-0.O date2sec-0.E \
 date2sec-0a.O date2sec-0a.E date2sec-1.O date2sec-1.E sec2date-0.O \
 sec2date-0.E this-m.O this-m.E this-h.O this-h.E this-w.O this-w.E this-mo.O \
 this-mo.E this-y.O this-y.E risks-1.O risks-1.E regress-1.O regress-1.E \
-datevtime-1.O datevtime-1.E rfc822-1.O rfc822-1.E
+datevtime-1.O datevtime-1.E rfc822-1.O rfc822-1.E relative-1.O relative-1.E \
+relative-2.O relative-2.E
 ##test-files-end
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)

tests/date/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
@@ -123,7 +123,7 @@ rel-2d.X rel-2e.X rel-2f.X rel-2g.X rel-3a.X next-s.X next-m.X next-h.X \
 next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-0a.X utc-1.I utc-1.X \
 utc-1a.I utc-1a.X date2sec-0.X date2sec-0a.X date2sec-1.X sec2date-0.X \
 this-m.X this-h.X this-w.X this-mo.X this-y.X risks-1.X regress-1.X \
-datevtime-1.X rfc822-1.X
+datevtime-1.X rfc822-1.X relative-1.X relative-2.X
 
 run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
 9.E leap-1.O leap-1.E U95-1.O U95-1.E U95-2.O U95-2.E U95-3.O U95-3.E U92-1.O \
@@ -138,7 +138,8 @@ utc-0a.E utc-1.O utc-1.E utc-1a.O utc-1a.E date2sec-0.O date2sec-0.E \
 date2sec-0a.O date2sec-0a.E date2sec-1.O date2sec-1.E sec2date-0.O \
 sec2date-0.E this-m.O this-m.E this-h.O this-h.E this-w.O this-w.E this-mo.O \
 this-mo.E this-y.O this-y.E risks-1.O risks-1.E regress-1.O regress-1.E \
-datevtime-1.O datevtime-1.E rfc822-1.O rfc822-1.E
+datevtime-1.O datevtime-1.E rfc822-1.O rfc822-1.E relative-1.O relative-1.E \
+relative-2.O relative-2.E
 
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)

tests/date/Test.pm

@@ -123,6 +123,15 @@ sub test_vector
      # test for RFC-822 conformance
      ['rfc822-1', "-R -d '$d1'", {}, "Sun, 19 Jan 1997 08:17:48 +0000", 0],
 
+     # Relative seconds, with time.  fixed in 2.0j
+     ['relative-1', "--utc -d '1970-01-01 00:00:00 UTC +961062237 sec' $fmt",
+      {}, "2000-06-15 09:43:57", 0],
+
+     # Relative seconds, no time.
+     # This test is fragile!  It works only if TZ is set to UTC+1 (as below).
+     ['relative-2', "--utc -d '1970-01-01 UTC +961062237 sec' $fmt", {},
+      "2000-06-15 10:43:57", 0],
+
      # FIXME: add a lot more...
      );
 
@@ -158,6 +167,7 @@ sub test_vector
   $Test::env{'date2sec-0'} = ['TZ=UTC+2'];
 
   $Test::env{'rfc822-1'} = ['LC_ALL=de_DE TZ=UTC0'];
+  $Test::env{'relative-2'} = ['TZ=UTC+1'];
 
   return @tv;
 }

tests/date/date-tests

@@ -1062,8 +1062,44 @@ else
   esac
 fi
 test -s rfc822-1.E || rm -f rfc822-1.E
+LANG=C TZ=UTC0 $xx --utc -d '1970-01-01 00:00:00 UTC +961062237 sec' '+%Y-%m-%d %T'  > relative-1.O 2> relative-1.E
+code=$?
+if test $code != 0; then
+  $echo "Test relative-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp relative-1.O $srcdir/relative-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed relative-1(LANG=C TZ=UTC0)"; fi;;
+    1) $echo "Test relative-1(LANG=C TZ=UTC0) failed: files relative-1.O and $srcdir/relative-1.X differ" 1>&2
+       (diff -c relative-1.O $srcdir/relative-1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test relative-1(LANG=C TZ=UTC0) may have failed." 1>&2
+       $echo The command "cmp relative-1.O $srcdir/relative-1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s relative-1.E || rm -f relative-1.E
+TZ=UTC+1 $xx --utc -d '1970-01-01 UTC +961062237 sec' '+%Y-%m-%d %T'  > relative-2.O 2> relative-2.E
+code=$?
+if test $code != 0; then
+  $echo "Test relative-2(TZ=UTC+1) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp relative-2.O $srcdir/relative-2.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed relative-2(TZ=UTC+1)"; fi;;
+    1) $echo "Test relative-2(TZ=UTC+1) failed: files relative-2.O and $srcdir/relative-2.X differ" 1>&2
+       (diff -c relative-2.O $srcdir/relative-2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test relative-2(TZ=UTC+1) may have failed." 1>&2
+       $echo The command "cmp relative-2.O $srcdir/relative-2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s relative-2.E || rm -f relative-2.E
 if test $errors = 0; then
-  $echo Passed all 58 tests. 1>&2
+  $echo Passed all 60 tests. 1>&2
 else
   $echo Failed $errors tests. 1>&2
 fi

tests/dd/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/dircolors/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/du/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/factor/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/head/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/install/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/install/basic-1

@@ -3,7 +3,14 @@
 dir=dir
 file=file
 
+pwd=`pwd`
+tmp=inst-basic.$$
+trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'exit $?' 1 2 13 15
+
 framework_failure=0
+mkdir $tmp || framework_failure=1
+cd $tmp || framework_failure=1
 
 rm -rf $dir $file || framework_failure=1
 mkdir -p $dir || framework_failure=1
@@ -21,17 +28,29 @@ test -f $file || fail=1
 # Make sure the dest file has been created.
 test -f $dir/$file || fail=1
 
+# Make sure strip works.
+cp ../../../src/dd .
+cp dd dd2
+
+strip dd2 || \
+  {
+    cat 1>&2 <<EOF
+$0: WARNING!!!
+Your strip command doesn't seem to work, so skipping
+the test of install's --strip option.
+EOF
+    exit 77
+  }
+
 # This test would fail with 3.16s when using versions of strip that
 # don't work on read-only files (the one from binutils works fine).
-ginstall -s -c -m 555 ../../src/dd $dir || fail=1
+ginstall -s -c -m 555 dd $dir || fail=1
 # Make sure the dest file has been created.
-test -f $dir/dd || fail=1
+test -f dd || fail=1
 
 # ...and that the permissions are as requested.
 set X `ls -l $dir/dd`
 shift
 test "$1" = -r-xr-xr-x || fail=1
 
-rm -rf $dir $file
-
-exit $fail
+(exit $fail); exit

tests/join/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/ln/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/ls-2/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/ls/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/md5sum/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/mkdir/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/mv/Makefile.am

@@ -2,7 +2,7 @@
 AUTOMAKE_OPTIONS = 1.3 gnits
 
 TESTS = i-2 mv-special-1 into-self into-self-2 into-self-3 backup-is-src \
-  i-1 hard-link-1 force partition-perm to-symlink dir-file
+  i-1 hard-link-1 force partition-perm to-symlink dir-file diag
 
 EXTRA_DIST = $(TESTS) setup
 TESTS_ENVIRONMENT = \

tests/mv/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
@@ -117,7 +117,7 @@ l = @l@
 AUTOMAKE_OPTIONS = 1.3 gnits
 
 TESTS = i-2 mv-special-1 into-self into-self-2 into-self-3 backup-is-src \
-  i-1 hard-link-1 force partition-perm to-symlink dir-file
+  i-1 hard-link-1 force partition-perm to-symlink dir-file diag
 
 
 EXTRA_DIST = $(TESTS) setup

tests/mv/diag

@@ -0,0 +1,60 @@
+#!/bin/sh
+# make sure we get proper diagnostics: e.g., with --target-dir=d but no args
+
+if test "$VERBOSE" = yes; then
+  set -x
+  mv --version
+fi
+
+pwd=`pwd`
+tmp=diag-$$
+trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'exit $?' 1 2 13 15
+
+framework_failure=0
+mkdir $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+
+touch f1 || framework_failure=1
+touch f2 || framework_failure=1
+touch d || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo 'failure in testing framework'
+  exit 1
+fi
+
+# Make sure we get English translations.
+LANGUAGE=C
+export LANGUAGE
+LC_ALL=C
+export LC_ALL
+LANG=C
+export LANG
+
+# These mv commands should all exit nonzero.
+
+# Too few args.  This first one did fail, but with an incorrect diagnostic
+# until fileutils-4.0u.
+mv --target=d >> out 2>&1 && fail=1
+mv no-file >> out 2>&1 && fail=1
+
+# Target is not a directory.
+mv f1 f2 f1 >> out 2>&1 && fail=1
+mv --target=f2 f1 >> out 2>&1 && fail=1
+
+cat > exp <<\EOF
+mv: missing file argument
+Try `mv --help' for more information.
+mv: missing file argument
+Try `mv --help' for more information.
+mv: when moving multiple files, last argument must be a directory
+Try `mv --help' for more information.
+mv: specified target, `f2' is not a directory
+Try `mv --help' for more information.
+EOF
+
+cmp out exp || fail=1
+
+(exit $fail)
+exit $fail

tests/mv/i-2

@@ -30,7 +30,7 @@ trap 'exit $?' 1 2 13 15
 
 framework_failure=0
 mkdir $tmp || framework_failure=1
-cd $tmp
+cd $tmp || framework_failure=1
 
 touch file || framework_failure=1
 chmod u-w file || framework_failure=1

tests/pr/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/rm/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/rm/r-1

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-: ${RM=rm}
 test=r-1
 
 # TMPDIR should be an absolute dir for this test.
@@ -9,18 +8,21 @@ test=r-1
 
 if test "$VERBOSE" = yes; then
   set -x
-  $RM --version
+  rm --version
 fi
 
+pwd=`pwd`
 tmp=$TMPDIR/t-rm.$$
+trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'exit $?' 1 2 13 15
 
-test_failure=0
+framework_failure=0
 
-mkdir $tmp || test_failure=1
-mkdir $tmp/a $tmp/a/a || test_failure=1
-> $tmp/b || test_failure=1
+mkdir $tmp || framework_failure=1
+mkdir $tmp/a $tmp/a/a || framework_failure=1
+> $tmp/b || framework_failure=1
 
-cat <<EOF > $tmp/$test.E || test_failure=1
+cat <<EOF > $tmp/$test.E || framework_failure=1
 removing all entries of directory $tmp/a
 removing all entries of directory $tmp/a/a
 removing the directory itself: $tmp/a/a
@@ -28,7 +30,7 @@ removing the directory itself: $tmp/a
 removing $tmp/b
 EOF
 
-if test $test_failure = 1; then
+if test $framework_failure = 1; then
   echo 'failure in testing framework'
   exit 1
 fi
@@ -39,7 +41,7 @@ LANG=C
 export LANG
 
 fail=0
-$RM --verbose -r $tmp/a $tmp/b > $tmp/$test.O || fail=1
+rm --verbose -r $tmp/a $tmp/b > $tmp/$test.O || fail=1
 
 for d in $dirs; do
   if test -d $d; then
@@ -52,4 +54,5 @@ cmp $tmp/$test.E $tmp/$test.O || fail=1
 
 rm -rf $tmp
 
+(exit $fail)
 exit $fail

tests/rmdir/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/seq/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/shred/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/sort/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/stty/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/stty/basic-1

@@ -24,10 +24,14 @@ REV_oddp=1 REV_nl=1 REV_cooked=1 REV_raw=1 REV_pass8=1 REV_litout=1
 REV_cbreak=1 REV_decctlq=1 REV_tabs=1 REV_lcase=1 REV_LCASE=1
 
 fail=0
+
 saved_state=.saved-state
 stty --save > $saved_state || fail=1
 stty `cat $saved_state` || fail=1
 
+# This would segfault prior to sh-utils-2.0j.
+stty erase -
+
 # Build a list of all boolean options stty accepts on this system.
 options=`stty -a|tail +2|tr ';' '\012'|sed '/ = /d;s/^ //;s/-//g'`
 

tests/sum/.cvsignore

@@ -0,0 +1 @@
+Makefile

tests/sum/Makefile.am

@@ -0,0 +1,12 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-.
+
+EXTRA_DIST = $(TESTS)
+
+TESTS_ENVIRONMENT = \
+  top_srcdir=$(top_srcdir) \
+  srcdir=$(srcdir) \
+  PERL="@PERL@" \
+  PATH=`pwd`/../../src:$$PATH \
+  PROG=sum
+
+TESTS = basic-1

tests/sum/Makefile.in

@@ -0,0 +1,282 @@
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
+
+# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+@SET_MAKE@
+host_alias = @host_alias@
+host_triplet = @host@
+AMDEP = @AMDEP@
+AMTAR = @AMTAR@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+DATADIRNAME = @DATADIRNAME@
+DEPDIR = @DEPDIR@
+DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
+GENCAT = @GENCAT@
+GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNU_PACKAGE = @GNU_PACKAGE@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+KMEM_GROUP = @KMEM_GROUP@
+LIBICONV = @LIBICONV@
+LIBOBJS = @LIBOBJS@
+LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
+LIB_CRYPT = @LIB_CRYPT@
+LIB_NANOSLEEP = @LIB_NANOSLEEP@
+MAKEINFO = @MAKEINFO@
+MAN = @MAN@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+NEED_SETGID = @NEED_SETGID@
+OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
+OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
+PACKAGE = @PACKAGE@
+PERL = @PERL@
+POFILES = @POFILES@
+POSUB = @POSUB@
+POW_LIBM = @POW_LIBM@
+RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
+U = @U@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+YACC = @YACC@
+install_sh = @install_sh@
+l = @l@
+
+
+EXTRA_DIST = $(TESTS)
+
+TESTS_ENVIRONMENT = \
+  top_srcdir=$(top_srcdir) \
+  srcdir=$(srcdir) \
+  PERL="@PERL@" \
+  PATH=`pwd`/../../src:$$PATH \
+  PROG=sum
+
+
+TESTS = basic-1
+subdir = tests/sum
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../config.h
+CONFIG_CLEAN_FILES = 
+DIST_SOURCES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/sum/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; \
+	srcdir=$(srcdir); export srcdir; \
+	for tst in $(TESTS); do \
+	  if test -f ./$$tst; then dir=./; \
+	  elif test -f $$tst; then dir=; \
+	  else dir="$(srcdir)/"; fi; \
+	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	    all=`expr $$all + 1`; \
+	    case " $(XFAIL_TESTS) " in \
+	    *" $$tst "*) \
+	      xpass=`expr $$xpass + 1`; \
+	      failed=`expr $$failed + 1`; \
+	      echo "XPASS: $$tst"; \
+	    ;; \
+	    *) \
+	      echo "PASS: $$tst"; \
+	    ;; \
+	    esac; \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
+	    case " $(XFAIL_TESTS) " in \
+	    *" $$tst "*) \
+	      xfail=`expr $$xfail + 1`; \
+	      echo "XFAIL: $$tst"; \
+	    ;; \
+	    *) \
+	      failed=`expr $$failed + 1`; \
+	      echo "FAIL: $$tst"; \
+	    ;; \
+	    esac; \
+	  fi; \
+	done; \
+	if test "$$failed" -eq 0; then \
+	  if test "$$xfail" -eq 0; then \
+	    banner="All $$all tests passed"; \
+	  else \
+	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	  fi; \
+	else \
+	  if test "$$xpass" -eq 0; then \
+	    banner="$$failed of $$all tests failed"; \
+	  else \
+	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	  fi; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	-rm -f Makefile.in
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all install-strip installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

tests/sum/basic-1

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+: ${PERL=perl}
+: ${srcdir=.}
+
+case "$PERL" in
+  *'missing perl')
+  echo 1>&2 "$0: configure didn't find a usable version of Perl, so can't run this test"
+  exit 77
+  ;;
+esac
+
+exec $PERL -w -I$srcdir/.. -MFetish -- - <<\EOF
+require 5.003;
+use strict;
+
+(my $program_name = $0) =~ s|.*/||;
+
+# Turn off localisation of executable's ouput.
+@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+
+my $in_1k = 'a' x 1024;
+my $in_2k = 'b' x 2048;
+
+my @Tests =
+    (
+     ['1', {IN=> {f=> ''}},	{OUT=>"00000     0\n"}],
+     ['2', {IN=> {f=> 'a'}},	{OUT=>"00097     1\n"}],
+     ['3', {IN=> {f=> 'abc'}},	{OUT=>"16556     1\n"}],
+     ['4', {IN=> {f=> 'message digest'}}, {OUT=>"26423     1\n"}],
+     ['5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, {OUT=>"53553     1\n"}],
+     ['6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}},
+				{OUT=>"25587     1\n"}],
+     ['7', {IN=> {f=> '1234567890' x 8}}, {OUT=>"21845     1\n"}],
+
+     ['a-r-1k', '-r', {IN=> {f=> $in_1k}}, {OUT=>"65409     1\n"}],
+     ['a-s-1k', '-s', {IN=> {f=> $in_1k}}, {OUT=>"33793 2 f\n"}],
+     ['b-r-2k', '-r', {IN=> {f=> $in_2k}}, {OUT=>"65223     2\n"}],
+     ['b-s-2k', '-s', {IN=> {f=> $in_2k}}, {OUT=>"4099 4 f\n"}],
+
+     ['1s', '-s', {IN=> {f=> ''}},	{OUT=>"0 0 f\n"}],
+     ['2s', '-s', {IN=> {f=> 'a'}},	{OUT=>"97 1 f\n"}],
+     ['3s', '-s', {IN=> {f=> 'abc'}},	{OUT=>"294 1 f\n"}],
+     ['4s', '-s', {IN=> {f=> 'message digest'}}, {OUT=>"1413 1 f\n"}],
+     ['5s', '-s', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}},
+                                        {OUT=>"2847 1 f\n"}],
+     ['6s', '-s', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}},
+				        {OUT=>"5387 1 f\n"}],
+     ['7s', '-s', {IN=> {f=> '1234567890' x 8}}, {OUT=>"4200 1 f\n"}],
+    );
+
+my $save_temps = $ENV{DEBUG};
+my $verbose = $ENV{VERBOSE};
+
+my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
+exit $fail;
+EOF

tests/tac/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/tail-2/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/tail/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/test/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@

tests/touch/Makefile.in

@@ -73,8 +73,8 @@ DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
-GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@