*** empty log message ***

2025-09-10 07:59:52 +02:00 · 2004-02-19 18:04:33 +00:00 · 2004-02-18 18:00:17 +00:00 · 2004-02-18 17:57:42 +00:00 · 2004-02-18 17:49:59 +00:00 · 2004-02-18 13:50:42 +00:00
682 changed files with 128673 additions and 93780 deletions
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-5.0
+5.1.3
--- a/.vg-suppressions
+++ b/.vg-suppressions
@@ -0,0 +1,8 @@
+{
+   libc_dl_open
+   Memcheck:Cond
+   fun:_dl_relocate_object
+   obj:/lib/libc-2.3.2.so
+   fun:_dl_catch_error
+   fun:_dl_open
+}
--- a/.x-sc_space_tab
+++ b/.x-sc_space_tab
@@ -0,0 +1,9 @@
+config(ure|\.(guess|sub))
+tests/pr
+lib/regex.c
+config-log
+tests/misc/nl
+po/de.po
+m4/lib-ld.m4
+m4/po.m4
+aclocal.m4
--- a/.x-sc_sun_os_names
+++ b/.x-sc_sun_os_names
@@ -0,0 +1,2 @@
+config-log
+config/config.guess
--- a/788
+++ b/788
@@ -1,8 +1,8 @@
 Notes on the Free Translation Project
 *************************************

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

@@ -25,7 +25,7 @@ related to internationalization, you should tell about the version of
 Quick configuration advice
 ==========================

-   If you want to exploit the full power of internationalization, you
+If you want to exploit the full power of internationalization, you
 should configure it using

     ./configure --with-included-gettext
@@ -48,10 +48,10 @@ included `libintl'.
 INSTALL Matters
 ===============

-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.

   By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
@@ -98,7 +98,7 @@ codes, stating which languages are allowed.
 Using This Package
 ==================

-   As a user, if your language has been installed for this package, you
+As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
 `LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
 and `CC' is an ISO 3166 two-letter country code.  For example, let's
@@ -140,7 +140,7 @@ to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 Translating Teams
 =================

-   For the Free Translation Project to be a success, we need interested
+For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
@@ -170,275 +170,515 @@ programming skill, here.
 Available Packages
 ==================

-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of February
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of December
 2003.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.

-     Ready PO files    az be bg ca cs da de el en en_GB eo es et fa fi
-                     +-------------------------------------------------+
-     a2ps            |                [] [] []                []    [] |
-     aegis           |                   ()                            |
-     anubis          |                                                 |
-     ap-utils        |                                                 |
-     bash            |                   []             [] []          |
-     batchelor       |                                                 |
-     bfd             |                []                   []          |
-     binutils        |                []                   []          |
-     bison           |                [] []                [] []       |
-     clisp           |                   []    []          []          |
-     clisp           |                                                 |
-     coreutils       |                [] []                [] []       |
-     cpio            |                [] []                []          |
-     darkstat        |                ()                   []          |
-     diffutils       |          [] [] [] []             [] []       [] |
-     enscript        |          []    [] []                            |
-     error           |                   []        []      []       [] |
-     fetchmail       |          [] () [] []                []          |
-     fileutils       |                [] []                [] []       |
-     findutils       |          []    [] []             [] [] []    [] |
-     flex            |          []    [] []                []          |
-     gas             |                                     []          |
-     gawk            |                [] []                []          |
-     gcal            |          []                                     |
-     gcc             |                []                   []          |
-     gettext         |    []    []    [] []                []          |
-     gimp-print      |                                                 |
-     gliv            |                                                 |
-     gnucash         |                [] ()                            |
-     gnucash-glossary|                [] ()                []          |
-     gnupg           |          []       [] []          [] [] []    [] |
-     gpe-todo        |                                                 |
-     gphoto2         |                   []                []          |
-     gprof           |                []                   []          |
-     gpsdrive        |                () ()    ()          ()          |
-     grep            |       [] []       [] []             [] []    [] |
-     gretl           |                                     []          |
-     hello           |          []    [] [] []          [] [] [] [] [] |
-     id-utils        |                [] []                            |
-     indent          |          []       []             [] [] []    [] |
-     jpilot          |             () [] []                []          |
-     jwhois          |                                     []          |
-     kbd             |                [] []                []          |
-     ld              |                []                   []          |
-     libc            |          [] [] [] [] []             []       [] |
-     libgpewidget    |                                                 |
-     libiconv        |          []    [] []             [] []       [] |
-     lifelines       |                [] ()                            |
-     lilypond        |                []                               |
-     lingoteach      |                []                               |
-     lingoteach_lessons|                   ()                ()          |
-     lynx            |          [] [] [] []                   []       |
-     m4              |             [] [] [] []                         |
-     mailutils       |          []                         []          |
-     make            |                [] []                []          |
-     man-db          |          [] ()    []                ()          |
-     mysecretdiary   |                [] []                []          |
-     nano            |          [] () [] []                []          |
-     nano_1_0        |          [] () [] []                []          |
-     opcodes         |                []                   []          |
-     parted          |          []    [] []                []          |
-     ptx             |          []    [] []             [] [] []    [] |
-     python          |                                                 |
-     radius          |                                                 |
-     recode          |                [] [] []          [] []          |
-     sed             |          []    [] []             [] [] []       |
-     sh-utils        |                   []                [] []    [] |
-     sharutils       |          [] [] [] [] []             [] []       |
-     sketch          |                [] ()                []          |
-     soundtracker    |                [] []                []          |
-     sp              |                   []                            |
-     tar             |             [] [] []                [] []    [] |
-     texinfo         |             [] [] []             []             |
-     textutils       |          []    [] []                []          |
-     tin             |                   ()        ()         []       |
-     util-linux      |          [] [] [] []                [] []    [] |
-     vorbis-tools    |                []                   []          |
-     wastesedge      |                   ()                            |
-     wdiff           |          []    [] []                [] []       |
-     wget            |       [] [] [] [] [] []             [] []    [] |
-     xchat           |                                                 |
-     xpad            |                                                 |
-                     +-------------------------------------------------+
-                       az be bg ca cs da de el en en_GB eo es et fa fi
-                        0  1  2 26  9 49 46  9  1   1   11 52 19  1 15
+     Ready PO files       am az be bg ca cs da de el en en_GB eo es
+                        +-------------------------------------------+
+     a2ps               |       []          [] [] []                |
+     aegis              |                      ()                   |
+     ant-phone          |                      ()                   |
+     anubis             |                                           |
+     ap-utils           |                                           |
+     bash               |             []       []             [] [] |
+     batchelor          |                                           |
+     bfd                |                   []                   [] |
+     binutils           |                   []                   [] |
+     bison              |                   [] []                [] |
+     bluez-pin          |                []                   []    |
+     clisp              |                                           |
+     clisp              |                      []    []          [] |
+     coreutils          |             []    [] []                [] |
+     cpio               |                   [] []                [] |
+     darkstat           |          []       ()                   [] |
+     diffutils          |             [] [] [] [] []          [] [] |
+     e2fsprogs          |                []    []                   |
+     enscript           |             []    [] []        []         |
+     error              |             []    [] []        []      [] |
+     fetchmail          |             [] () [] [] []             [] |
+     fileutils          |                   [] []                [] |
+     findutils          |       []    []    [] [] []          [] [] |
+     flex               |             []    [] []                [] |
+     fslint             |                                           |
+     gas                |                                        [] |
+     gawk               |             []    [] []                [] |
+     gbiff              |                      []                   |
+     gcal               |             []                            |
+     gcc                |                   []                   [] |
+     gettext            |       []    []    [] []                [] |
+     gettext-examples   |             []       []                [] |
+     gettext-runtime    |       []    []    [] []                [] |
+     gettext-tools      |             []       []                [] |
+     gimp-print         |                [] [] []        []      [] |
+     gliv               |                                           |
+     glunarclock        |                   [] []                   |
+     gnubiff            |                      []                   |
+     gnucash            |                []    ()        []      [] |
+     gnucash-glossary   |                   [] ()                [] |
+     gnupg              |             [] ()    [] []          [] [] |
+     gpe-aerial         |                []                         |
+     gpe-beam           |                []    []                   |
+     gpe-calendar       |                []    []                   |
+     gpe-clock          |                []    []                   |
+     gpe-conf           |                []    []                   |
+     gpe-contacts       |                []    []                   |
+     gpe-edit           |                []                         |
+     gpe-go             |                []                         |
+     gpe-login          |                []    []                   |
+     gpe-ownerinfo      |                []    []                   |
+     gpe-sketchbook     |                []    []                   |
+     gpe-su             |                []    []                   |
+     gpe-taskmanager    |                []    []                   |
+     gpe-timesheet      |                []                         |
+     gpe-today          |                []    []                   |
+     gpe-todo           |                []    []                   |
+     gphoto2            |                [] [] []                [] |
+     gprof              |                   [] []                [] |
+     gpsdrive           |                      ()    ()          () |
+     gramadoir          |                      []                   |
+     grep               |       [] [] []       [] []             [] |
+     gretl              |                                        [] |
+     gtick              |                      ()                   |
+     hello              |             []    [] [] []          [] [] |
+     id-utils           |                   [] []                   |
+     indent             |             []       []             [] [] |
+     jpilot             |                [] []                   [] |
+     jtag               |                                           |
+     jwhois             |                                        [] |
+     kbd                |                [] [] [] []             [] |
+     latrine            |                      ()                   |
+     ld                 |                   []                   [] |
+     libc               |             [] [] [] [] []             [] |
+     libgpewidget       |                []    []                   |
+     libiconv           |             []    [] []             [] [] |
+     lifelines          |                   [] ()                   |
+     lilypond           |                      []                   |
+     lingoteach         |                                           |
+     lingoteach_lessons |                      ()                () |
+     lynx               |             [] [] [] []                   |
+     m4                 |                [] [] [] []                |
+     mailutils          |             []                         [] |
+     make               |                   [] []                [] |
+     man-db             |             [] () [] []                () |
+     minicom            |                []    []                [] |
+     mysecretdiary      |                   [] []                [] |
+     nano               |             [] () [] []                [] |
+     nano_1_0           |             [] () [] []                [] |
+     opcodes            |                                        [] |
+     parted             |             [] [] [] []                [] |
+     ptx                |             []    [] []             [] [] |
+     python             |                                           |
+     radius             |                                        [] |
+     recode             |       []    []    [] [] []          [] [] |
+     rpm                |                [] []                      |
+     screem             |                                           |
+     scrollkeeper       |       []    [] [] [] []                [] |
+     sed                |             []    [] []             [] [] |
+     sh-utils           |                   [] []                [] |
+     shared-mime-info   |                                           |
+     sharutils          |             [] [] [] [] []             [] |
+     silky              |                      ()                   |
+     skencil            |                   [] ()                [] |
+     sketch             |                   [] ()                [] |
+     soundtracker       |                   [] []                [] |
+     sp                 |                      []                   |
+     tar                |                [] [] []                [] |
+     texinfo            |                   [] []             []    |
+     textutils          |             []    [] []                [] |
+     tin                |                      ()        ()         |
+     tuxpaint           |             [] [] [] [] []     []      [] |
+     util-linux         |             [] [] [] []                [] |
+     vorbis-tools       |       []       [] []                   [] |
+     wastesedge         |                      ()                   |
+     wdiff              |             []    [] []                [] |
+     wget               |          [] []    [] [] []             [] |
+     xchat              |             []       [] []             [] |
+     xfree86_xkb_xml    |                []                         |
+     xpad               |                                        [] |
+                        +-------------------------------------------+
+                          am az be bg ca cs da de el en en_GB eo es
+                           0  0  8  3 37 38 56 73 15  1   5   12 64
     
-                       fr gl he hr hu id it ja ko lg lv ms nb nl
-                     +-------------------------------------------+
-     a2ps            | []                ()    ()       []    [] |
-     aegis           |                                        () |
-     anubis          | []                               []       |
-     ap-utils        | []                                        |
-     bash            | []          []                            |
-     batchelor       |                                           |
-     bfd             | []                   []                   |
-     binutils        | []                   []                   |
-     bison           | []             [] []                   [] |
-     clisp           | []                                     [] |
-     clisp           |                                           |
-     coreutils       | []                [] []                   |
-     cpio            | [] []       []          []             [] |
-     darkstat        | ()          []                   []    [] |
-     diffutils       | [] [] []    [] []    []                   |
-     enscript        | []       []                            [] |
-     error           | []          []                         [] |
-     fetchmail       |                      []                   |
-     fileutils       | []          []    [] []                   |
-     findutils       | [] []    [] [] [] [] [] []             [] |
-     flex            | []                      []                |
-     gas             | []                                        |
-     gawk            | []    []                                  |
-     gcal            | []                                        |
-     gcc             | []                                        |
-     gettext         | []                   [] []                |
-     gimp-print      |                                           |
-     gliv            | ()                                        |
-     gnucash         | []          []    []                      |
-     gnucash-glossary|                   []                   [] |
-     gnupg           | [] []          [] [] []                   |
-     gpe-todo        |                                           |
-     gphoto2         | []          []       []                   |
-     gprof           | []             []                         |
-     gpsdrive        | ()          []    ()                   () |
-     grep            | [] [] [] [] [] [] [] []                   |
-     gretl           | []                                        |
-     hello           | [] [] [] [] [] [] [] [] []    [] [] [] [] |
-     id-utils        | []          []                         [] |
-     indent          | [] []       []    [] []                [] |
-     jpilot          | []                   ()                () |
-     jwhois          | []          [] []                      [] |
-     kbd             | []                                        |
-     ld              | []                                        |
-     libc            | [] []       []       [] []          []    |
-     libgpewidget    |                                           |
-     libiconv        | [] []    [] [] [] []                      |
-     lifelines       | ()                                        |
-     lilypond        | []                                     [] |
-     lingoteach      |                []                         |
-     lingoteach_lessons|                                           |
-     lynx            |             []    [] []                [] |
-     m4              | [] []          []    []                [] |
-     mailutils       |                                           |
-     make            | [] [] [] []          [] []             [] |
-     man-db          | []                () ()                   |
-     mysecretdiary   | []             []                         |
-     nano            | [] []          [] []             []    [] |
-     nano_1_0        | [] []          [] []             [] []    |
-     opcodes         | []             []                      [] |
-     parted          | [] []                []                   |
-     ptx             | [] []       [] []                   [] [] |
-     python          |                                           |
-     radius          |                                           |
-     recode          | [] [] []       [] []                      |
-     sed             | [] []          [] [] []                   |
-     sh-utils        | []          []    [] []             []    |
-     sharutils       | [] []       []       []                [] |
-     sketch          | []                                        |
-     soundtracker    | [] []    []                               |
-     sp              | []                   ()                   |
-     tar             | [] []    [] [] [] [] []          [] []    |
-     texinfo         | []    [] []          []                   |
-     textutils       | [] []       []       [] []          []    |
-     tin             |                                           |
-     util-linux      | []          []    () []                [] |
-     vorbis-tools    |                                        [] |
-     wastesedge      | ()                                        |
-     wdiff           | [] []       [] []                []       |
-     wget            | [] [] [] [] []       []                [] |
-     xchat           |                                           |
-     xpad            |                                           |
-                     +-------------------------------------------+
-                       fr gl he hr hu id it ja ko lg lv ms nb nl
-                       59 23  8 10 26 20 18 26  8  0  1  8  7 24
+                          et fa fi fr ga gl he hr hu id is it ja
+                        +----------------------------------------+
+     a2ps               | []    [] []                      ()    |
+     aegis              |                                        |
+     ant-phone          |                                        |
+     anubis             |          []                            |
+     ap-utils           |          []                            |
+     bash               |          []             []             |
+     batchelor          |             []                         |
+     bfd                |          []                            |
+     binutils           |          []                         [] |
+     bison              | []       []                []    []    |
+     bluez-pin          |       [] [] []          [] []          |
+     clisp              |                                        |
+     clisp              |          []                            |
+     coreutils          | []    [] [] []                   [] [] |
+     cpio               |          []    []       []             |
+     darkstat           |          () []          [] []          |
+     diffutils          |       [] []    [] []    [] []       [] |
+     e2fsprogs          |                                        |
+     enscript           |          []          []                |
+     error              |       [] [] []          []             |
+     fetchmail          |                                     [] |
+     fileutils          | []       [] []          []       [] [] |
+     findutils          | []    [] [] [] []    [] [] []    [] [] |
+     flex               |          [] []                         |
+     fslint             |                                        |
+     gas                |          []                            |
+     gawk               |          []       []                [] |
+     gbiff              |                                        |
+     gcal               |          []                            |
+     gcc                |          []                            |
+     gettext            |          []                         [] |
+     gettext-examples   |          []                         [] |
+     gettext-runtime    |       [] []                []       [] |
+     gettext-tools      |          []                         [] |
+     gimp-print         |          []                         [] |
+     gliv               |          ()                            |
+     glunarclock        |       []    [] []       []             |
+     gnubiff            |                                        |
+     gnucash            |          ()                      []    |
+     gnucash-glossary   |                                  []    |
+     gnupg              | []    [] []    []          []    [] [] |
+     gpe-aerial         |          []                            |
+     gpe-beam           |          []                            |
+     gpe-calendar       |          []             [] []          |
+     gpe-clock          |          []                            |
+     gpe-conf           |          []                            |
+     gpe-contacts       |          []             []             |
+     gpe-edit           |          []                []          |
+     gpe-go             |          []                            |
+     gpe-login          |          []             []             |
+     gpe-ownerinfo      |          []             [] []          |
+     gpe-sketchbook     |          []                            |
+     gpe-su             |          []                            |
+     gpe-taskmanager    |          []                            |
+     gpe-timesheet      |          [] []             []          |
+     gpe-today          |          [] []                         |
+     gpe-todo           |          []                []          |
+     gphoto2            |          []             []          [] |
+     gprof              |          []                []          |
+     gpsdrive           |          ()             []       () () |
+     gramadoir          |             []                         |
+     grep               | []    [] [] [] [] [] [] [] []    [] [] |
+     gretl              |          []                            |
+     gtick              |       []    []                         |
+     hello              | [] [] [] [] [] [] [] [] [] []    [] [] |
+     id-utils           |          []             [] []    []    |
+     indent             | []    [] [] [] []       [] []    [] [] |
+     jpilot             |          []                         () |
+     jtag               |                                        |
+     jwhois             |          []             [] []    []    |
+     kbd                |          []                            |
+     latrine            |                                        |
+     ld                 |          []                            |
+     libc               |       [] []    []       []          [] |
+     libgpewidget       |          [] []          [] []          |
+     libiconv           | []    [] [] [] []    [] [] []    []    |
+     lifelines          |          ()                            |
+     lilypond           |          []                            |
+     lingoteach         |          []                []          |
+     lingoteach_lessons |                                        |
+     lynx               | []                      []       [] [] |
+     m4                 |          []    []          []       [] |
+     mailutils          |                                        |
+     make               |          []    [] [] []             [] |
+     man-db             |                                  () () |
+     minicom            |       [] []             []          [] |
+     mysecretdiary      |          []                []          |
+     nano               |          []    []          []    []    |
+     nano_1_0           |          []    []          []    []    |
+     opcodes            |          []                            |
+     parted             |          []    []                   [] |
+     ptx                | []    [] [] [] []       [] []          |
+     python             |                                        |
+     radius             |          []                            |
+     recode             |          []    [] []    [] []    []    |
+     rpm                |                                        |
+     screem             |                                        |
+     scrollkeeper       |                         []             |
+     sed                | []    [] [] [] []       [] []    [] [] |
+     sh-utils           | []    [] [] []          []       [] [] |
+     shared-mime-info   |                         []             |
+     sharutils          | []       []    []       []          [] |
+     silky              |       []                         ()    |
+     skencil            |          []                            |
+     sketch             |          []                            |
+     soundtracker       |          []    []    []          []    |
+     sp                 |          []                         () |
+     tar                | []    [] []    []    [] [] []    [] [] |
+     texinfo            |          []       [] []             [] |
+     textutils          |          [] [] []       []          [] |
+     tin                | []       ()                            |
+     tuxpaint           |       [] []       []    [] [] [] [] [] |
+     util-linux         | []    [] []             []       () [] |
+     vorbis-tools       |          []                            |
+     wastesedge         |          ()                            |
+     wdiff              | []       [] [] []       [] []          |
+     wget               | []    [] []    []    [] []          [] |
+     xchat              | []    [] []                            |
+     xfree86_xkb_xml    |                                        |
+     xpad               |             []                         |
+                        +----------------------------------------+
+                          et fa fi fr ga gl he hr hu id is it ja
+                          21  1 25 86 24 24  8 10 38 31  1 23 32
     
-                       nn no pl pt pt_BR ro ru sk sl sv tr uk zh_CN zh_TW
-                     +----------------------------------------------------+
-     a2ps            |    () () ()  []      []    [] [] [] []             | 14
-     aegis           |                      ()                            |  0
-     anubis          |                                  [] []             |  4
-     ap-utils        |       ()                            ()             |  1
-     bash            |              []      []                            |  7
-     batchelor       |                                                    |  0
-     bfd             |                               [] []                |  6
-     binutils        |                               [] []                |  6
-     bison           |              []      []       []                   | 11
-     clisp           |                                                    |  5
-     clisp           |                                                    |  0
-     coreutils       |                      []    [] [] []           []   | 12
-     cpio            |       []     []      []       []        []         | 13
-     darkstat        |              []               []        ()    ()   |  6
-     diffutils       |       []     []      []       [] []           []   | 19
-     enscript        |              []      []       [] []                | 10
-     error           |              []         []       []           []   | 11
-     fetchmail       |       ()     ()                  []                |  6
-     fileutils       |                      []    [] [] []     []    []   | 14
-     findutils       |       []     []      [] [] [] [] []     []         | 24
-     flex            |              []      []       [] []                | 10
-     gas             |                                  []                |  3
-     gawk            |                               [] []                |  7
-     gcal            |                               [] []                |  4
-     gcc             |                                  []                |  4
-     gettext         |                      [] [] [] [] []           []   | 14
-     gimp-print      |                                                    |  0
-     gliv            |              []                                    |  1
-     gnucash         |          []  []         []    []              []   |  9
-     gnucash-glossary|          []             []    []              []   |  8
-     gnupg           |       []                      [] []           []   | 16
-     gpe-todo        |                                                    |  0
-     gphoto2         |                               []        []         |  7
-     gprof           |              []               [] []                |  7
-     gpsdrive        |                         []    []                   |  3
-     grep            |       []     []      []    []    []                | 20
-     gretl           |                                                    |  2
-     hello           | [] [] []     []      [] []    [] [] []             | 31
-     id-utils        |              []      []       [] []                |  9
-     indent          |              []      [] []    [] []                | 17
-     jpilot          |    ()                         [] []     []    []   |  8
-     jwhois          |              []      ()       () []           []   |  8
-     kbd             |                               [] []                |  6
-     ld              |                               [] []                |  5
-     libc            |    [] []     []         []    [] []     []         | 20
-     libgpewidget    |                                                    |  0
-     libiconv        |              []      [] [] [] [] []                | 18
-     lifelines       |                               []                   |  2
-     lilypond        |                               []                   |  4
-     lingoteach      |              []               []                   |  4
-     lingoteach_lessons|                                         ()         |  0
-     lynx            |              []      []       [] []                | 13
-     m4              |       []     []      []       []                   | 13
-     mailutils       |                                                    |  2
-     make            |              []      []       [] []     []         | 15
-     man-db          |                               []                   |  4
-     mysecretdiary   |              []               [] []                |  8
-     nano            |       []                      []    []             | 13
-     nano_1_0        | []    []             []       []    []             | 15
-     opcodes         |              []               [] []                |  8
-     parted          | []       []  []               [] []                | 12
-     ptx             |    [] [] []  []      []       [] []                | 20
-     python          |                                                    |  0
-     radius          |                                                    |  0
-     recode          |       []     []      []    [] [] []                | 16
-     sed             |              []         [] [] [] []                | 16
-     sh-utils        |                      []    []    []                | 12
-     sharutils       |                      []       [] []           []   | 16
-     sketch          |              []               []                   |  5
-     soundtracker    |                               []                   |  7
-     sp              |                                  []                |  3
-     tar             |    [] []     []   []    [] [] [] []     []         | 24
-     texinfo         |                      []       [] []     []         | 12
-     textutils       |                      []    [] [] []           []   | 15
-     tin             |                                                    |  1
-     util-linux      |              []               [] []                | 14
-     vorbis-tools    |                      []                            |  4
-     wastesedge      |                                                    |  0
-     wdiff           |              []      [] []    [] []                | 15
-     wget            |       []             [] [] [] [] [] []        []   | 24
-     xchat           |                                                    |  0
-     xpad            |                                                    |  0
-                     +----------------------------------------------------+
-       43 teams        nn no pl pt pt_BR ro ru sk sl sv tr uk zh_CN zh_TW
-       82 domains       3  4 14  4  34    1 29 14 13 53 46  6   9    13    723
+                          ko lg lt lv ms nb nl nn no pl pt pt_BR ro
+                        +-------------------------------------------+
+     a2ps               | ()          []    []    () ()     []   [] |
+     aegis              |                   ()                   () |
+     ant-phone          |                   []                   [] |
+     anubis             |             [] [] []       []          [] |
+     ap-utils           |                   []       ()          [] |
+     bash               |                                   []   [] |
+     batchelor          |                                        [] |
+     bfd                |                                        [] |
+     binutils           |                                           |
+     bison              |             []    []              []   [] |
+     bluez-pin          |                   []       []          [] |
+     clisp              |                                           |
+     clisp              |                   []                      |
+     coreutils          |                            []             |
+     cpio               | []                []       []     []   [] |
+     darkstat           |             []    []              []   [] |
+     diffutils          |             []             []     []   [] |
+     e2fsprogs          |                            []             |
+     enscript           |                   []              []   [] |
+     error              |                   []              []   [] |
+     fetchmail          |                   []       []     ()      |
+     fileutils          |                            []          [] |
+     findutils          | []                []       []     []   [] |
+     flex               | []                         []     []   [] |
+     fslint             |                   []                   [] |
+     gas                |                                           |
+     gawk               |                            []     []   [] |
+     gbiff              |                   []                   [] |
+     gcal               |                                           |
+     gcc                |                                           |
+     gettext            | []                         []          [] |
+     gettext-examples   |                            []          [] |
+     gettext-runtime    | []                         []          [] |
+     gettext-tools      | []                         []          [] |
+     gimp-print         |                   []                      |
+     gliv               |                   []              []   [] |
+     glunarclock        |             []    []                   [] |
+     gnubiff            |                                           |
+     gnucash            |                   []          []  ()      |
+     gnucash-glossary   |                   []          []          |
+     gnupg              |                                        [] |
+     gpe-aerial         |                   []          []       [] |
+     gpe-beam           |                   []          []       [] |
+     gpe-calendar       |                   []          []       [] |
+     gpe-clock          |                   []          []       [] |
+     gpe-conf           |                   []          []       [] |
+     gpe-contacts       |                   []          []       [] |
+     gpe-edit           |                   []          []       [] |
+     gpe-go             |                   []                   [] |
+     gpe-login          |                   []          []       [] |
+     gpe-ownerinfo      |                   []          []       [] |
+     gpe-sketchbook     |                   []          []       [] |
+     gpe-su             |                   []          []       [] |
+     gpe-taskmanager    |                   []          []       [] |
+     gpe-timesheet      |                   []          []       [] |
+     gpe-today          |                   []          []       [] |
+     gpe-todo           |                   []          []       [] |
+     gphoto2            |                                        [] |
+     gprof              |                                   []   [] |
+     gpsdrive           |                   ()    ()        ()   [] |
+     gramadoir          |                                        [] |
+     grep               |                            [] []  []   [] |
+     gretl              |                                           |
+     gtick              |                   []                   [] |
+     hello              | []       [] [] [] [] [] [] []     []   [] |
+     id-utils           |                   []              []   [] |
+     indent             |                   []              []   [] |
+     jpilot             |                   ()    ()                |
+     jtag               |                                           |
+     jwhois             |                   []       []     []   [] |
+     kbd                |                   []       []          [] |
+     latrine            |                                        [] |
+     ld                 |                                           |
+     libc               | []             []       [] []     []      |
+     libgpewidget       |                   []          []       [] |
+     libiconv           |                   []       []     []   [] |
+     lifelines          |                                           |
+     lilypond           |                                           |
+     lingoteach         |                                           |
+     lingoteach_lessons |                                           |
+     lynx               |                   []              []      |
+     m4                 |                   []       []     []   [] |
+     mailutils          |                            []          [] |
+     make               | []                []       []     []      |
+     man-db             |                                        [] |
+     minicom            |                            []     []   [] |
+     mysecretdiary      |                   []              []   [] |
+     nano               |             []    []       []          [] |
+     nano_1_0           |             [] []    []    []          [] |
+     opcodes            |                   []                   [] |
+     parted             |                      []    [] []  []      |
+     ptx                |                [] []    [] [] []  []   [] |
+     python             |                                           |
+     radius             |                            []             |
+     recode             |                            []     []   [] |
+     rpm                | []                            []          |
+     screem             |                                           |
+     scrollkeeper       |                [] []       []          [] |
+     sed                |                            []     []   [] |
+     sh-utils           |                []                         |
+     shared-mime-info   |                   []                      |
+     sharutils          |                   []                      |
+     silky              |                                           |
+     skencil            |                               []  []      |
+     sketch             |                               []  []      |
+     soundtracker       |                                           |
+     sp                 |                                           |
+     tar                |             [] []       [] []     []   [] |
+     texinfo            |                []          []          [] |
+     textutils          | []             []                         |
+     tin                |                                           |
+     tuxpaint           | []    []    []    [] []    [] []  []   [] |
+     util-linux         |                   []              []      |
+     vorbis-tools       |                   []                   [] |
+     wastesedge         |                                           |
+     wdiff              |             []             []     []   [] |
+     wget               |                            []          [] |
+     xchat              |          []       []                      |
+     xfree86_xkb_xml    |                   []                      |
+     xpad               |                   []                   [] |
+                        +-------------------------------------------+
+                          ko lg lt lv ms nb nl nn no pl pt pt_BR ro
+                          12  0  1  2 12 10 60  4  4 38 25  35   76
+     
+                          ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
+                        +-------------------------------------------+
+     a2ps               | []    []    []    [] []                   | 16
+     aegis              | ()                                        |  0
+     ant-phone          |                                           |  2
+     anubis             | []                [] []                   |  9
+     ap-utils           |                      ()                   |  3
+     bash               | []                                        |  9
+     batchelor          |                                           |  2
+     bfd                |             []    []                      |  6
+     binutils           |             []    []           []         |  7
+     bison              | []          []    []                      | 14
+     bluez-pin          |    []       []             []             | 13
+     clisp              |                                           |  0
+     clisp              |                                           |  5
+     coreutils          | []    []    []    []                 []   | 16
+     cpio               | []          []                 []         | 14
+     darkstat           |    []    [] []                 ()    ()   | 12
+     diffutils          | []          []    []                 []   | 22
+     e2fsprogs          |             []    []                      |  5
+     enscript           | []          []    []                      | 12
+     error              |    []             []                 []   | 15
+     fetchmail          | [] []             []                      | 11
+     fileutils          | []    []    []    []           []    []   | 17
+     findutils          | [] [] [] [] []    []           []         | 29
+     flex               | []          []    []                      | 13
+     fslint             |                                           |  2
+     gas                |                   []                      |  3
+     gawk               |             []    []                      | 12
+     gbiff              |                                           |  3
+     gcal               |             []    []                      |  4
+     gcc                |                   []                      |  4
+     gettext            | [] [] []    []    []                 []   | 16
+     gettext-examples   |          [] []    []           []         | 11
+     gettext-runtime    | [] [] [] [] []    [] []        []    []   | 21
+     gettext-tools      |    [] [] [] []    []           []         | 14
+     gimp-print         |    []       []                            | 10
+     gliv               |                                           |  3
+     glunarclock        | []       [] []             []             | 13
+     gnubiff            |                                           |  1
+     gnucash            | [] []                                []   |  9
+     gnucash-glossary   |    []       []                       []   |  8
+     gnupg              |    []       []    []                 []   | 17
+     gpe-aerial         | []          []                            |  7
+     gpe-beam           | []          []                            |  8
+     gpe-calendar       | [] []       []             []        []   | 13
+     gpe-clock          | [] []    [] []                            | 10
+     gpe-conf           | [] []       []                            |  9
+     gpe-contacts       | [] []       []                       []   | 11
+     gpe-edit           | [] []    [] []             []        []   | 12
+     gpe-go             | []                                        |  5
+     gpe-login          | [] []    [] []             []        []   | 13
+     gpe-ownerinfo      | [] []    [] []                       []   | 13
+     gpe-sketchbook     | [] []       []                            |  9
+     gpe-su             | [] []    [] []                            | 10
+     gpe-taskmanager    | [] []    [] []                            | 10
+     gpe-timesheet      | [] []    [] []                       []   | 12
+     gpe-today          | [] []    [] []             []        []   | 13
+     gpe-todo           | [] []       []             []        []   | 12
+     gphoto2            |    []       []                 []         | 11
+     gprof              |             []    []                      |  9
+     gpsdrive           |    []       []                            |  4
+     gramadoir          |                                           |  3
+     grep               | []    [] []       [] []                   | 26
+     gretl              |                                           |  2
+     gtick              | []                                        |  5
+     hello              | [] []       []    [] []                   | 33
+     id-utils           | []          []    []                      | 12
+     indent             | [] []    [] []    []                      | 21
+     jpilot             |             []    []    []     []    []   |  9
+     jtag               |    []                                     |  1
+     jwhois             | ()          ()    []                 []   | 11
+     kbd                |             []    []                      | 11
+     latrine            |                                           |  1
+     ld                 |             []    []                      |  5
+     libc               |    []       []    []           []         | 20
+     libgpewidget       |    []    [] []             []             | 13
+     libiconv           | [] [] [] [] []    [] []    []  []         | 27
+     lifelines          |             []                            |  2
+     lilypond           |             []                            |  3
+     lingoteach         |                                           |  2
+     lingoteach_lessons |                                ()         |  0
+     lynx               | []          []    [] []                   | 14
+     m4                 | []          []                 []         | 15
+     mailutils          | []                                        |  5
+     make               | []          []    []           []         | 16
+     man-db             |             []                            |  5
+     minicom            | []                                        | 11
+     mysecretdiary      |             []    []                      | 10
+     nano               | []       [] []    [] []                   | 17
+     nano_1_0           | []          []    [] []                   | 17
+     opcodes            |             []    []                      |  6
+     parted             |             []    []           []         | 15
+     ptx                | []          []    []                      | 22
+     python             |                                           |  0
+     radius             | []                                        |  4
+     recode             | []    []    []    []                      | 20
+     rpm                | []          []    []                      |  7
+     screem             |             []                 []         |  2
+     scrollkeeper       | [] []    [] []                            | 15
+     sed                |    [] [] [] []    [] []                   | 23
+     sh-utils           | []    []          []                      | 14
+     shared-mime-info   |          [] []                            |  4
+     sharutils          | []       [] []    []                 []   | 17
+     silky              |    ()                                     |  2
+     skencil            |             []                            |  6
+     sketch             |             []                            |  6
+     soundtracker       |    []       []                            |  9
+     sp                 |                   []                      |  3
+     tar                |    [] []    []    []           []         | 24
+     texinfo            | []          []    []           []         | 14
+     textutils          | []    []    []    []                 []   | 16
+     tin                |                                           |  1
+     tuxpaint           |    []       []    []       []  []         | 29
+     util-linux         | []          []    []                      | 15
+     vorbis-tools       | []                                        |  8
+     wastesedge         |                                           |  0
+     wdiff              | [] []       []    []                      | 18
+     wget               | [] [] []    []    [] []        []    []   | 23
+     xchat              |    [] [] [] []                 []         | 14
+     xfree86_xkb_xml    | [] []    []       [] []        []         |  8
+     xpad               |                                           |  4
+                        +-------------------------------------------+
+       51 teams           ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
+      120 domains         59 42 16 25 81  0 56 12  1 10  21    22    1260

   Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -451,7 +691,7 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.

-   If February 2003 seems to be old, you may fetch a more recent copy
+   If December 2003 seems to be old, you may fetch a more recent copy
 of this `ABOUT-NLS' file on most GNU archive sites.  The most
 up-to-date matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
@@ -459,7 +699,7 @@ up-to-date matrix with full percentage details can be found at
 Using `gettext' in new packages
 ===============================

-   If you are writing a freely available program and want to
+If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
 package.  Of course you have to respect the GNU Library General Public
 License which covers the use of the GNU `gettext' library.  This means
--- a/2253
+++ b/2253
--- a/22
+++ b/22
@@ -4,9 +4,31 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.

+# Copyright (C) 2001, 2003 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.
+
 # Systems where /bin/sh is not the default shell need this.  The $(shell)
 # command below won't work with e.g. stock DOS/Windows shells.
+ifeq ($(wildcard /bin/s[h]),/bin/sh)
 SHELL = /bin/sh
+else
+# will be used only with the next shell-test line, then overwritten
+# by a configured-in value
+SHELL = sh
+endif

 have-Makefile := $(shell test -f Makefile && echo yes)

--- a/28
+++ b/28
@@ -1,5 +1,5 @@
-Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation,
-Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.

   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -71,8 +71,9 @@ Compilers and Options
 the `configure' script does not know about.  Run `./configure --help'
 for details on some of the pertinent environment variables.

-   You can give `configure' initial values for variables by setting
-them in the environment.  You can do that on the command line like this:
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:

     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix

@@ -137,9 +138,10 @@ Specifying the System Type
 ==========================

   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it cannot guess the host type, give it the
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:

@@ -151,20 +153,16 @@ where SYSTEM can have one of these forms:

   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.

   If you are _building_ compiler tools for cross-compiling, you should
 use the `--target=TYPE' option to select the type of system they will
 produce code for.

   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the host
-platform (i.e., that on which the generated programs will eventually be
-run) with `--host=TYPE'.  In this case, you should also specify the
-build platform with `--build=TYPE', because, in this case, it may not
-be possible to guess the build platform (it sometimes involves
-compiling and running simple test programs, and this can't be done if
-the compiler is a cross compiler).
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.

 Sharing Defaults
 ================
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@
 SUBDIRS = lib src doc man m4 po tests
 EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
  .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
+  .x-sc_space_tab .x-sc_sun_os_names \
  announce-gen \
  old/fileutils/ChangeLog \
  old/fileutils/ChangeLog-1997 \
@@ -22,6 +23,9 @@ ACLOCAL_AMFLAGS = -I m4
 check-root:
 	cd tests && $(MAKE) $@

+dist-hook:
+	test -x $(srcdir)/config/install-sh
+
 distcheck-hook:
 	$(MAKE) my-distcheck

--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -1,15 +1,30 @@
-# -*- makefile -*-
-## Customize Makefile.maint.
+# Customize Makefile.maint.                           -*- makefile -*-
+# Copyright (C) 2003, 2004 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.

 # Use alpha.gnu.org for alpha and beta releases.
 # Use ftp.gnu.org for major releases.
-gnu_ftp_host-alpha = alpha
-gnu_ftp_host-beta = alpha
-gnu_ftp_host-major = ftp
+gnu_ftp_host-alpha = alpha.gnu.org
+gnu_ftp_host-beta = alpha.gnu.org
+gnu_ftp_host-major = ftp.gnu.org
 gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))

 url_dir_list = \
-  ftp://$(gnu_rel_host).gnu.org/gnu/coreutils \
+  ftp://$(gnu_rel_host)/gnu/coreutils \
  http://fetish.sf.net

 # Files to update automatically.
@@ -17,6 +32,9 @@ wget_files = \
  $(srcdir)/config/config.guess \
  $(srcdir)/config/config.sub \
  $(srcdir)/config/texinfo.tex
+# Of the above, texinfo.tex is out of date,
+# and the other two are not available.
+wget_files =

 cvs_files = \
  $(srcdir)/config/elisp-comp \
@@ -29,3 +47,6 @@ cvs_files = \
 #  $(srcdir)/src/ansi2knr.c

 local_updates = wget-update cvs-update
+
+# Tests not to run.
+local-checks-to-skip =
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  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.
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.

@SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -36,6 +34,139 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.hin \
+	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
+	INSTALL NEWS THANKS TODO config/ChangeLog config/config.guess \
+	config/config.rpath config/config.sub config/depcomp \
+	config/install-sh config/mdate-sh config/missing \
+	config/mkinstalldirs config/texinfo.tex
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
+	$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/assert.m4 \
+	$(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/backupfile.m4 \
+	$(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/boottime.m4 \
+	$(top_srcdir)/m4/canon-host.m4 \
+	$(top_srcdir)/m4/canonicalize.m4 \
+	$(top_srcdir)/m4/check-decl.m4 $(top_srcdir)/m4/chown.m4 \
+	$(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/closeout.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \
+	$(top_srcdir)/m4/d-type.m4 $(top_srcdir)/m4/dirfd.m4 \
+	$(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \
+	$(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/error.m4 \
+	$(top_srcdir)/m4/euidaccess.m4 $(top_srcdir)/m4/exclude.m4 \
+	$(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/file-type.m4 $(top_srcdir)/m4/fileblocks.m4 \
+	$(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/fnmatch.m4 \
+	$(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/free.m4 \
+	$(top_srcdir)/m4/fstypename.m4 $(top_srcdir)/m4/fsusage.m4 \
+	$(top_srcdir)/m4/ftruncate.m4 \
+	$(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \
+	$(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getgroups.m4 \
+	$(top_srcdir)/m4/gethostname.m4 $(top_srcdir)/m4/getline.m4 \
+	$(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \
+	$(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/getpass.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/getugroups.m4 \
+	$(top_srcdir)/m4/getusershell.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/group-member.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hash.m4 \
+	$(top_srcdir)/m4/host-os.m4 $(top_srcdir)/m4/human.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/idcache.m4 \
+	$(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/jm-macros.m4 $(top_srcdir)/m4/jm-winsz1.m4 \
+	$(top_srcdir)/m4/jm-winsz2.m4 $(top_srcdir)/m4/lchown.m4 \
+	$(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/link-follow.m4 \
+	$(top_srcdir)/m4/long-options.m4 \
+	$(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/ls-mntd-fs.m4 $(top_srcdir)/m4/lstat.m4 \
+	$(top_srcdir)/m4/makepath.m4 $(top_srcdir)/m4/malloc.m4 \
+	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbswidth.m4 \
+	$(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \
+	$(top_srcdir)/m4/memcmp.m4 $(top_srcdir)/m4/memcoll.m4 \
+	$(top_srcdir)/m4/memcpy.m4 $(top_srcdir)/m4/memmove.m4 \
+	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/memset.m4 \
+	$(top_srcdir)/m4/mkdir-slash.m4 $(top_srcdir)/m4/mkstemp.m4 \
+	$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \
+	$(top_srcdir)/m4/mountlist.m4 $(top_srcdir)/m4/nanosleep.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/obstack.m4 \
+	$(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/path-concat.m4 \
+	$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perl.m4 \
+	$(top_srcdir)/m4/physmem.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/posixtm.m4 $(top_srcdir)/m4/posixver.m4 \
+	$(top_srcdir)/m4/prereq.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/putenv.m4 $(top_srcdir)/m4/quote.m4 \
+	$(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readdir.m4 \
+	$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readtokens.m4 \
+	$(top_srcdir)/m4/readutmp.m4 $(top_srcdir)/m4/realloc.m4 \
+	$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \
+	$(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/rmdir-errno.m4 \
+	$(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rpmatch.m4 \
+	$(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \
+	$(top_srcdir)/m4/same.m4 $(top_srcdir)/m4/save-cwd.m4 \
+	$(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/settime.m4 \
+	$(top_srcdir)/m4/sha.m4 $(top_srcdir)/m4/sig2str.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/st_mtim.m4 \
+	$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio-safer.m4 \
+	$(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
+	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
+	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/strndup.m4 \
+	$(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tzset.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/unlink-busy.m4 \
+	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
+	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
+	$(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \
+	$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
+	$(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+	$(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xstrtod.m4 \
+	$(top_srcdir)/m4/xstrtoimax.m4 $(top_srcdir)/m4/xstrtol.m4 \
+	$(top_srcdir)/m4/xstrtoumax.m4 $(top_srcdir)/m4/yesno.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -52,6 +183,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
+DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -61,6 +193,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
+FNMATCH_H = @FNMATCH_H@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
@@ -143,6 +276,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -150,10 +284,10 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 SUBDIRS = lib src doc man m4 po tests
 EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
  .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
+  .x-sc_space_tab .x-sc_sun_os_names \
  announce-gen \
  old/fileutils/ChangeLog \
  old/fileutils/ChangeLog-1997 \
@@ -164,10 +298,8 @@ EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
  old/sh-utils/NEWS \
  old/textutils/NEWS

-
 ACLOCAL_AMFLAGS = -I m4

-
 # Just prior to distribution, ...
 # transform the automake-generated rule that runs `rm -f rm'.
 # On some systems, that command would fail with a diagnostic like
@@ -178,44 +310,42 @@ ACLOCAL_AMFLAGS = -I m4
 rm_subst = \
  s!(rm -f (rm|\$$\(bin_PROGRAMS\)))$$!$$1 > /dev/null 2>&1 || /bin/$$1!

-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
-	Makefile.am Makefile.in NEWS THANKS TODO aclocal.m4 config.hin \
-	config/ChangeLog config/config.guess config/config.rpath \
-	config/config.sub config/depcomp config/install-sh \
-	config/mdate-sh config/missing config/mkinstalldirs \
-	config/texinfo.tex configure configure.ac
-DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

 .SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnits '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnits  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits  Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;

-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)

-$(ACLOCAL_M4):  configure.ac m4/acl.m4 m4/afs.m4 m4/alloca.m4 m4/assert.m4 m4/bison.m4 m4/boottime.m4 m4/c-stack.m4 m4/canonicalize.m4 m4/check-decl.m4 m4/chown.m4 m4/codeset.m4 m4/d-ino.m4 m4/d-type.m4 m4/dirfd.m4 m4/dos.m4 m4/error.m4 m4/fpending.m4 m4/fstypename.m4 m4/fsusage.m4 m4/ftruncate.m4 m4/ftw.m4 m4/getcwd-path-max.m4 m4/getcwd.m4 m4/getgroups.m4 m4/getline.m4 m4/gettext.m4 m4/gettimeofday.m4 m4/glibc.m4 m4/glibc21.m4 m4/group-member.m4 m4/host-os.m4 m4/human.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intmax_t.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/jm-glibc-io.m4 m4/jm-macros.m4 m4/jm-mktime.m4 m4/jm-winsz1.m4 m4/jm-winsz2.m4 m4/lchown.m4 m4/lcmessage.m4 m4/lib-check.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/link-follow.m4 m4/longdouble.m4 m4/longlong.m4 m4/ls-mntd-fs.m4 m4/lstat.m4 m4/mbrtowc.m4 m4/mbswidth.m4 m4/memcmp.m4 m4/mkdir-slash.m4 m4/mkstemp.m4 m4/mktime.m4 m4/nanosleep.m4 m4/onceonly.m4 m4/open-max.m4 m4/perl.m4 m4/prereq.m4 m4/progtest.m4 m4/putenv.m4 m4/readdir.m4 m4/regex.m4 m4/rename.m4 m4/restrict.m4 m4/rmdir-errno.m4 m4/search-libs.m4 m4/signed.m4 m4/st_dm_mode.m4 m4/st_mtim.m4 m4/stat.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/strftime.m4 m4/timespec.m4 m4/tm_gmtoff.m4 m4/tzset.m4 m4/uintmax_t.m4 m4/unlink-busy.m4 m4/uptime.m4 m4/utimbuf.m4 m4/utime.m4 m4/utimes.m4 m4/vasnprintf.m4 m4/vasprintf.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xstrtoimax.m4 m4/xstrtoumax.m4
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

 config.h: stamp-h1
@@ -227,10 +357,10 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.hin $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-
-$(srcdir)/config.hin:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/config.hin:  $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.hin
+	rm -f stamp-h1
+	touch $@

 distclean-hdr:
 	-rm -f config.h stamp-h1
@@ -295,14 +425,6 @@ ctags-recursive:
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done

-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -311,6 +433,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS

 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -336,7 +459,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \
 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
-
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -359,19 +481,6 @@ GTAGS:

 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print

 distdir: $(DISTFILES)
 	@case `sed 15q $(srcdir)/NEWS` in \
@@ -382,7 +491,7 @@ distdir: $(DISTFILES)
 	esac
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/config $(distdir)/old/fileutils $(distdir)/old/sh-utils $(distdir)/old/textutils $(distdir)/po
+	$(mkdir_p) $(distdir)/config $(distdir)/m4 $(distdir)/old/fileutils $(distdir)/old/sh-utils $(distdir)/old/textutils $(distdir)/po
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -394,7 +503,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -411,17 +520,20 @@ distdir: $(DISTFILES)
 	done
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -430,11 +542,23 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
-
 dist-bzip2: distdir
 	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)

+dist-tarZ: distdir
+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
 dist dist-all: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
@@ -444,8 +568,18 @@ dist dist-all: distdir
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	$(am__remove_distdir)
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
 	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
@@ -466,19 +600,20 @@ distcheck: dist
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
 	  && ({ \
-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       (cd ../.. && $(mkdir_p) "$$dc_destdir") \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-	  && rm -f $(distdir).tar.gz \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
 	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;p;x'
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -502,7 +637,6 @@ check: check-recursive
 all-am: Makefile config.h
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -514,7 +648,7 @@ install-am: all-am
 installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -522,7 +656,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -533,12 +667,15 @@ clean-am: clean-generic mostlyclean-am

 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags

 dvi: dvi-recursive

 dvi-am:

+html: html-recursive
+
 info: info-recursive

 info-am:
@@ -556,6 +693,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-recursive
@@ -574,22 +712,20 @@ uninstall-am: uninstall-info-am

 uninstall-info: uninstall-info-recursive

-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-recursive ctags ctags-recursive dist \
-	dist-all dist-bzip2 dist-gzip distcheck distclean \
-	distclean-generic distclean-hdr distclean-recursive \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
-	ps-recursive tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-recursive ctags \
+	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+	dist-tarZ dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-recursive distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am


 install-root:
@@ -599,6 +735,9 @@ install-root:
 check-root:
 	cd tests && $(MAKE) $@

+dist-hook:
+	test -x $(srcdir)/config/install-sh
+
 distcheck-hook:
 	$(MAKE) my-distcheck
 .kludge-stamp: $(srcdir)/src/Makefile.in
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -2,7 +2,7 @@
 # This Makefile fragment is shared between the coreutils,
 # CPPI, Bison, and Autoconf.

-## Copyright (C) 2001-2003 Free Software Foundation, Inc.
+## Copyright (C) 2001-2004 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,7 +19,9 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.

-ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+# This is reported not to work with make-3.79.1
+# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+ME := Makefile.maint

 # Do not save the original name or timestamp in the .tar.gz file.
 GZIP_ENV = '--no-name --best'
@@ -41,6 +43,10 @@ my_distdir = $(PACKAGE)-$(VERSION)
 # Used for diffs and xdeltas.
 release_archive_dir ?= ../release

+# Prevent programs like 'sort' from considering distinct strings to be equal.
+# Doing it here saves us from having to set LC_ALL elsewhere in this file.
+export LC_ALL = C
+


 ## --------------- ##
@@ -50,23 +56,28 @@ release_archive_dir ?= ../release
 # Checks that don't require cvs.
 # Run `changelog-check' last, as previous test may reveal problems requiring
 # new ChangeLog entries.
-local-check = \
+local-checks-available = \
  po-check copyright-check writable-files m4-check author_mark_check \
  changelog-check strftime-check syntax-check makefile_path_separator_check \
  makefile-check
-.PHONY: $(local-check)
+.PHONY: $(local-checks-available)
+
+local-check = $(filter-out $(local-checks-to-skip), $(local-checks-available))

 # Make sure C source files in src/ don't include xalloc.h directly,
 # since they all already include it via sys2.h.
 # It's not a big deal -- just aesthetics.
 .PHONY: $(syntax-check-rules)
 syntax-check-rules = \
-  sc_unmarked_diagnostics \
  sc_cast_of_argument_to_free \
  sc_cast_of_x_alloc_return_value \
-  sc_space_tab \
+  sc_cast_of_alloca_return_value \
+  sc_changelog \
  sc_error_exit_success \
-  sc_xalloc_h_in_src
+  sc_space_tab \
+  sc_sun_os_names \
+  sc_system_h_headers \
+  sc_unmarked_diagnostics

 syntax-check: $(syntax-check-rules)
 #	@grep -E '#  *include <(limits|std(def|arg|bool))\.h>'		\
@@ -96,18 +107,24 @@ sc_cast_of_argument_to_free:

 sc_cast_of_x_alloc_return_value:
 	@grep -E --exclude=$(srcdir)/lib/regex.c			\
-	    '\*\) *x(m|c|re)alloc\>' $(srcdir)/{lib,src}/*.[chy] &&	\
+	    '\*\) *x(m|c|re)alloc\>'				\
+	    $(srcdir)/{lib,src}/*.[chy] &&				\
 	  { echo '$(ME): don'\''t cast x*alloc return value' 1>&2;	\
 	    exit 1; } || :

-sc_space_tab:
-	@grep -E '[ ]	' --exclude=$(srcdir)/lib/regex.c		\
-		$(srcdir)/{lib,src}/*.[chly]				\
-		$(find -name Makefile.am) &&				\
-	  { echo '$(ME): found SPACE-TAB sequence; remove the SPACE'	\
-		1>&2; \
+sc_cast_of_alloca_return_value:
+	@grep -E '\*\) *alloca\>'					\
+	    $(srcdir)/src/*.[chy] &&					\
+	  { echo '$(ME): don'\''t cast alloca return value' 1>&2;	\
 	    exit 1; } || :

+sc_space_tab:
+	@( cvsu --list ) > /dev/null 2>&1 || : &&			\
+	  grep '[ ]	'						\
+	     $$(cvsu --list | grep -vEf .x-$@ ) &&			\
+	  { echo '$(ME): found SPACE-TAB sequence; remove the SPACE'	\
+		1>&2; exit 1; } || :
+
 # Using EXIT_SUCCESS as the first argument to error is misleading,
 # since when that parameter is 0, error does not exit.  Use `0' instead.
 sc_error_exit_success:
@@ -116,15 +133,57 @@ sc_error_exit_success:
 	  { echo '$(ME): found error (EXIT_SUCCESS' 1>&2;		\
 	    exit 1; } || :

-# xalloc.h is included via system.h, so should not be included
-# directly by any file in src/.
-sc_xalloc_h_in_src:
+# FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ
+
+# Each nonempty line must start with a year number, or a TAB.
+sc_changelog:
+	@grep '^[^12	]' $$(find . -name ChangeLog -maxdepth 2) &&	\
+	  { echo '$(ME): found unexpected prefix in a ChangeLog' 1>&2;	\
+	    exit 1; } || :
+
+header_regexp = \
+  alloca\
+  |closeout\
+  |ctype\
+  |dirent\
+  |errno\
+  |exitfail\
+  |fcntl\
+  |inttypes\
+  |limits\
+  |locale\
+  |pathmax\
+  |std(lib|bool)\
+  |string\
+  |sys/(stat|dir|time)\
+  |time\
+  |unistd\
+  |utime\
+  |version-etc\
+  |xalloc
+h_re := $(shell echo '$(header_regexp)'|tr -d ' ')
+
+# Files in src/ should not include directly any of
+# the headers already included via system.h.
+# Get list of candidates with this:
+# grep -h include src/sys*.h|sed 's/.*include //'|sort -
+sc_system_h_headers:
 	@if test -f $(srcdir)/src/sys2.h; then				\
-	  if grep 'xalloc\.h' $(srcdir)/src/*.c; then			\
-	    exit 1;							\
-	  fi;								\
+	  ( cvsu --list ) > /dev/null 2>&1 || : &&			\
+	  grep -E '^# *include ["<]($(h_re))\.h[">]'			\
+	      $$(cvsu --list src | grep -Ev 'sys(2|tem)\.h$$')		\
+	    && { echo '$(ME): the above are already included via system.h'\
+		  1>&2; exit 1; } || :; \
 	fi

+sc_sun_os_names:
+	@( cvsu --list ) > /dev/null 2>&1 || : && \
+	grep -Ei \
+	    'solaris[^[:alnum:]]*2\.(7|8|9|[1-9][0-9])|sunos[^[:alnum:]][6-9]' \
+	  $$(cvsu --list | grep -vEf .x-$@ ) &&			\
+	  { echo '$(ME): found misuse of Sun OS version numbers' 1>&2;	\
+	    exit 1; } || :
+
 # Ensure that date's --help output stays in sync with the info
 # documentation for GNU strftime.  The only exception is %N,
 # which date accepts but GNU strftime does not.
@@ -144,9 +203,18 @@ strftime-check:
 # not @...@ in Makefile.am, now that we can rely on automake
 # to emit a definition for each substituted variable.
 makefile-check:
-	grep -E '@[A-Z_]+@' `find . -name Makefile.am` \
+	grep -E '@[A-Z_0-9]+@' `find . -name Makefile.am` \
 	  && { echo 'Makefile.maint: use $(...), not @...@' 1>&2; exit 1; } || :

+news-date-check: NEWS
+	today=`date +%Y-%m-%d`;	\
+	if head NEWS | grep '^\*.*'$$today >/dev/null; then \
+	  :; \
+	else \
+	  echo "today's date is not in NEWS" 1>&2; \
+	  exit 1; \
+	fi
+
 changelog-check:
 	if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
 	  :; \
@@ -161,21 +229,24 @@ m4-check:
 	       exit 1; } || :

 # Verify that all source files using _() are listed in po/POTFILES.in.
+# FIXME: don't hard-code src/false.c below; use a more general mechanism.
 po-check:
-	if test -f po/POTFILES.in; then \
-	  grep -E -v '^(#|$$)' po/POTFILES.in | sort > $@-1; \
-	  files=; \
-	  for file in lib/*.[chly] src/*.[chly]; do \
-	    case $$file in \
-	    *.[ch]) \
-	      base=`expr " $$file" : ' \(.*\)\..'`; \
-	      { test -f $$base.l || test -f $$base.y; } && continue;; \
-	    esac; \
-	    files="$$files $$file"; \
-	  done; \
-	  grep -E -l '\bN?_\([^)"]*("|$$)' $$files | sort > $@-2; \
-	  diff -u $@-1 $@-2 || exit 1; \
-	  rm -f $@-1 $@-2; \
+	( cvsu --list ) > /dev/null 2>&1 || : &&			\
+	if test -f po/POTFILES.in; then					\
+	  grep -E -v '^(#|$$)' po/POTFILES.in				\
+	    | grep -v '^src/false\.c$$' | sort > $@-1;			\
+	  files=;							\
+	  for file in $$(cvsu --list lib src | grep '\.[chly]$$'); do	\
+	    case $$file in						\
+	    *.[ch])							\
+	      base=`expr " $$file" : ' \(.*\)\..'`;			\
+	      { test -f $$base.l || test -f $$base.y; } && continue;;	\
+	    esac;							\
+	    files="$$files $$file";					\
+	  done;								\
+	  grep -E -l '\bN?_\([^)"]*("|$$)' $$files | sort > $@-2;	\
+	  diff -u $@-1 $@-2 || exit 1;					\
+	  rm -f $@-1 $@-2;						\
 	fi

 # In a definition of #define AUTHORS "... and ..." where the RHS contains
@@ -288,6 +359,9 @@ my-distcheck: $(local-check)
 	echo "$(distdir).tar.gz is ready for distribution"; \
 	echo "========================"

+WGET = wget
+WGETFLAGS = -C off
+
 tgz-md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/  -//')
 tgz-sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/  -//')
 bz2-md5 = $(shell md5sum < $(my_distdir).tar.bz2|sed 's/  -//')
@@ -303,20 +377,15 @@ rel-check:
 	md5_tmp=/tmp/rel-check-md5-$$$$; \
 	set -e; \
 	trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \
-	wget -q --output-document=$$tarz $(url); \
+	$(WGET) $(WGETFLAGS) -q --output-document=$$tarz $(url); \
 	echo "$(md5)  -" > $$md5_tmp; \
 	md5sum -c $$md5_tmp < $$tarz

 prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
 xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta

-signatures ?= $(distdir).tar.bz2.asc $(distdir).tar.gz.asc
-%.asc: %
-	rm -f $@
-	gpg --armor --detach-sign -o $@ $<
-
-rel-files = $(xd-delta) $(distdir).tar.bz2 $(distdir).tar.gz $(signatures)
-announcement: NEWS ChangeLog $(rel-files) $(signatures)
+rel-files = $(xd-delta) $(DIST_ARCHIVES)
+announcement: NEWS ChangeLog $(rel-files)
 	@./announce-gen							\
 	    --release-type=$(RELEASE_TYPE)				\
 	    --package=$(PACKAGE)					\
@@ -331,7 +400,6 @@ announcement: NEWS ChangeLog $(rel-files) $(signatures)
 ## Updating files.  ##
 ## ---------------- ##

-WGET = wget
 ftp-gnu = ftp://ftp.gnu.org/gnu
 www-gnu = http://www.gnu.org

@@ -358,7 +426,8 @@ do-po-update:
 	tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\
 	rm -rf $$tmppo && \
 	mkdir $$tmppo && \
-	(cd $$tmppo && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
+	(cd $$tmppo && \
+	  $(WGET) $(WGETFLAGS) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
 	cp $$tmppo/*.po po
 	cd po && $(MAKE) update-po
 	$(MAKE) po-check
@@ -375,10 +444,12 @@ po-update:
 # The following pseudo table associates a local directory and a URL
 # with each of the files that belongs to some other package and is
 # regularly updated from the specified URL.
-wget_files ?= $(srcdir)/config/config.guess \
-              $(srcdir)/config/config.sub \
-              $(srcdir)/src/ansi2knr.c \
-	      $(srcdir)/config/texinfo.tex
+wget_files ?= \
+  $(srcdir)/config/config.guess \
+  $(srcdir)/config/config.sub \
+  $(srcdir)/config/texinfo.tex \
+  $(srcdir)/src/ansi2knr.c
+
 get-targets = $(patsubst %, get-%, $(wget_files))

 config.guess-url_prefix = $(ftp-gnu)/config/
@@ -396,12 +467,15 @@ url = $($(notdir $(target))-url_prefix)$(notdir $(target))

 .PHONY: $(get-targets)
 $(get-targets):
-	$(WGET) $(url) -O $(target).t \
+	$(WGET) $(WGETFLAGS) $(url) -O $(target).t \
 	  && $(move_if_change) $(target).t $(target)

-cvs_files ?= $(srcdir)/config/depcomp $(srcdir)/config/missing \
-	     $(srcdir)/config/mkinstalldirs \
-             $(srcdir)/config/install-sh $(srcdir)/src/ansi2knr.c
+cvs_files ?= \
+  $(srcdir)/config/depcomp \
+  $(srcdir)/config/install-sh \
+  $(srcdir)/config/missing \
+  $(srcdir)/config/mkinstalldirs \
+  $(srcdir)/src/ansi2knr.c
 automake_repo=:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/automake
 .PHONY: wget-update
 wget-update: $(get-targets)
@@ -421,20 +495,22 @@ cvs-update:
 	done;								\
 	test "$$fail" && exit 1

-define emit-upload-commands
-	echo =====================================
-	echo =====================================
-	echo upload $(PACKAGE) $(PREV_VERSION) $(VERSION)
-	echo '# send the /tmp/announcement e-mail'
-	echo =====================================
-	echo =====================================
-endef
+emit_upload_commands:
+	@echo =====================================
+	@echo =====================================
+	@echo "$(srcdir)/gnupload $(GNUPLOADFLAGS) \\"
+	@echo "    --to fetish.sf.net:fetish-ftp \\"
+	@echo "    --to $(gnu_rel_host):coreutils \\"
+	@echo "  $(rel-files)"
+	@echo '# send the /tmp/announcement e-mail'
+	@echo =====================================
+	@echo =====================================

 $(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
 	xdelta delta -9 $^ $@ || :

 .PHONY: alpha beta major
-alpha beta major: $(local-check)
+alpha beta major: news-date-check $(local-check)
 	$(MAKE) cvs-dist
 	$(MAKE) $(xd-delta)
 	$(MAKE) -s announcement RELEASE_TYPE=$@ > /tmp/announce-$(my_distdir)
@@ -442,4 +518,4 @@ alpha beta major: $(local-check)
 	chmod a-w $(rel-files)
 	echo $(VERSION) > $(prev_version_file)
 	$(CVS) ci -m. $(prev_version_file)
-	@$(emit-upload-commands)
+	$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
--- a/255
+++ b/255
@@ -1,5 +1,256 @@
 GNU coreutils NEWS                                    -*- outline -*-
-* Major changes in release 5.0.1:
+* Major changes in release 5.2.0 (2004-02-19) [stable]
+
+** Bug fixes
+
+  none
+
+
+* Major changes in release 5.1.3 (2004-02-08): candidate to become stable 5.2.0
+
+** Bug fixes
+
+  `cp -d' now works as required even on systems like OSF V5.1 that
+  declare stat and lstat as `static inline' functions.
+
+  time stamps output by stat now include actual fractional seconds,
+  when available -- or .0000000 for files without that information.
+
+  seq no longer infloops when printing 2^31 or more numbers.
+  For reference, seq `echo 2^31|bc` > /dev/null takes about one hour
+  on a 1.6 GHz Athlon 2000 XP.  Now it can output 2^53-1 numbers before
+  misbehaving.
+
+* Major changes in release 5.1.2 (2004-01-25):
+
+** Bug fixes
+
+  rmdir -p exits with status 1 on error; formerly it sometimes exited
+  with status 0 when given more than one argument.
+
+  nohup now always exits with status 127 when it finds an error,
+  as POSIX requires; formerly it sometimes exited with status 1.
+
+  Several programs (including cut, date, dd, env, hostname, nl, pr,
+  stty, and tr) now always exit with status 1 when they find an error;
+  formerly they sometimes exited with status 2.
+
+  factor no longer reports a usage error if stdin has the wrong format.
+
+  paste no longer infloops on ppc systems (bug introduced in 5.1.1)
+
+
+* Major changes in release 5.1.1 (2004-01-17):
+
+** Configuration option
+
+  You can select the default level of POSIX conformance at configure-time,
+  e.g., by ./configure DEFAULT_POSIX2_VERSION=199209
+
+** Bug fixes
+
+  fold -s works once again on systems with differing sizes for int
+  and size_t (bug introduced in 5.1.0)
+
+** New features
+
+  touch -r now specifies the origin for any relative times in the -d
+  operand, if both options are given.  For example, "touch -r FOO -d
+  '-5 seconds' BAR" sets BAR's modification time to be five seconds
+  before FOO's.
+
+  join: The obsolete options "-j1 FIELD", "-j2 FIELD", and
+  "-o LIST1 LIST2..." are no longer supported on POSIX 1003.1-2001 systems.
+  Portable scripts should use "-1 FIELD", "-2 FIELD", and
+  "-o LIST1,LIST2..." respectively.  If join was compiled on a
+  POSIX 1003.1-2001 system, you may enable the old behavior
+  by setting _POSIX2_VERSION=199209 in your environment.
+
+
+* Major changes in release 5.1.0 (2003-12-21):
+
+** New features
+
+  chgrp, chmod, and chown can now process (with -R) hierarchies of virtually
+  unlimited depth.  Before, they would fail to operate on any file they
+  encountered with a relative name of length PATH_MAX (often 4096) or longer.
+
+  chgrp, chmod, chown, and rm accept the new options:
+  --preserve-root, --no-preserve-root (default)
+
+  chgrp and chown now accept POSIX-mandated -L, -H, and -P options
+
+  du can now process hierarchies of virtually unlimited depth.
+  Before, du was limited by the user's stack size and it would get a
+  stack overflow error (often a segmentation fault) when applied to
+  a hierarchy of depth around 30,000 or larger.
+
+  du works even when run from an inaccessible directory
+
+  du -D now dereferences all symlinks specified on the command line,
+  not just the ones that reference directories
+
+  du now accepts -P (--no-dereference), for compatibility with du
+  of NetBSD and for consistency with e.g., chown and chgrp
+
+  du's -H option will soon have the meaning required by POSIX
+  (--dereference-args, aka -D) rather then the current meaning of --si.
+  Now, using -H elicits a warning to that effect.
+
+  When given -l and similar options, ls now adjusts the output column
+  widths to fit the data, so that output lines are shorter and have
+  columns that line up better.  This may adversely affect shell
+  scripts that expect fixed-width columns, but such shell scripts were
+  not portable anyway, even with old GNU ls where the columns became
+  ragged when a datum was too wide.
+
+  du accepts a new option, -0/--null, to make it produce NUL-terminated
+  output lines
+
+** Bug fixes
+
+  printf, seq, tail, and sleep now parse floating-point operands
+  and options in the C locale.  POSIX requires this for printf.
+
+  od -c -w9999999 no longer segfaults
+
+  csplit no longer reads from freed memory (dumping core on some systems)
+
+  csplit would mistakenly exhaust virtual memory in some cases
+
+  ls --width=N (for very large N) is no longer subject to an address
+  arithmetic bug that could result in bounds violations.
+
+  ls --width=N (with -x or -C) no longer allocates more space
+  (potentially much more) than necessary for a given directory.
+
+  dd `unblock' and `sync' may now be combined (e.g., dd conv=unblock,sync)
+
+* Major changes in release 5.0.91 (2003-09-08):
+
+** New features
+
+  date accepts a new option --rfc-2822, an alias for --rfc-822.
+
+  split accepts a new option -d or --numeric-suffixes.
+
+  cp, install, mv, and touch now preserve microsecond resolution on
+  file timestamps, on platforms that have the 'utimes' system call.
+  Unfortunately there is no system call yet to preserve file
+  timestamps to their full nanosecond resolution; microsecond
+  resolution is the best we can do right now.
+
+  sort now supports the zero byte (NUL) as a field separator; use -t '\0'.
+  The -t '' option, which formerly had no effect, is now an error.
+
+  sort option order no longer matters for the options -S, -d, -i, -o, and -t.
+  Stronger options override weaker, and incompatible options are diagnosed.
+
+  `sha1sum --check' now accepts the BSD format for SHA1 message digests
+  in addition to the BSD format for MD5 ones.
+
+  who -l now means `who --login', not `who --lookup', per POSIX.
+  who's -l option has been eliciting an unconditional warning about
+  this impending change since sh-utils-2.0.12 (April 2002).
+
+** Bug fixes
+
+  Mistakenly renaming a file onto itself, e.g., via `mv B b' when `B' is
+  the same directory entry as `b' no longer destroys the directory entry
+  referenced by both `b' and `B'.  Note that this would happen only on
+  file systems like VFAT where two different names may refer to the same
+  directory entry, usually due to lower->upper case mapping of file names.
+  Now, the above can happen only on file systems that perform name mapping and
+  that support hard links (stat.st_nlink > 1).  This mitigates the problem
+  in two ways: few file systems appear to be affected (hpfs and ntfs are),
+  when the bug is triggered, mv no longer removes the last hard link to a file.
+  *** ATTENTION ***: if you know how to distinguish the following two cases
+  without writing to the file system in question, please let me know:
+  1) B and b refer to the same directory entry on a file system like NTFS
+       (B may well have a link count larger than 1)
+  2) B and b are hard links to the same file
+
+  stat no longer overruns a buffer for format strings ending in `%'
+
+  fold -s -wN would infloop for N < 8 with TABs in the input.
+  E.g., this would not terminate: printf 'a\t' | fold -w2 -s
+
+  `split -a0', although of questionable utility, is accepted once again.
+
+  `df DIR' used to hang under some conditions on OSF/1 5.1.  Now it doesn't.
+
+  seq's --width (-w) option now works properly even when the endpoint
+  requiring the larger width is negative and smaller than the other endpoint.
+
+  seq's default step is 1, even if LAST < FIRST.
+
+  paste no longer mistakenly outputs 0xFF bytes for a nonempty input file
+  without a trailing newline.
+
+  `tail -n0 -f FILE' and `tail -c0 -f FILE' no longer perform what amounted
+  to a busy wait, rather than sleeping between iterations.
+
+  tail's long-undocumented --allow-missing option now elicits a warning
+
+
+* Major changes in release 5.0.90 (2003-07-29):
+
+** New features
+
+  sort is now up to 30% more CPU-efficient in some cases
+
+  `test' is now more compatible with Bash and POSIX:
+
+    `test -t', `test --help', and `test --version' now silently exit
+    with status 0.  To test whether standard output is a terminal, use
+    `test -t 1'.  To get help and version info for `test', use
+    `[ --help' and `[ --version'.
+
+    `test' now exits with status 2 (not 1) if there is an error.
+
+  wc count field widths now are heuristically adjusted depending on the input
+  size, if known.  If only one count is printed, it is guaranteed to
+  be printed without leading spaces.
+
+  Previously, wc did not align the count fields if POSIXLY_CORRECT was set,
+  but POSIX did not actually require this undesirable behavior, so it
+  has been removed.
+
+** Bug fixes
+
+  kill no longer tries to operate on argv[0] (introduced in 5.0.1)
+  Why wasn't this noticed?  Although many tests use kill, none of
+  them made an effort to avoid using the shell's built-in kill.
+
+  `[' invoked with no arguments no longer evokes a segfault
+
+  rm without --recursive (aka -r or -R) no longer prompts regarding
+  unwritable directories, as required by POSIX.
+
+  uniq -c now uses a SPACE, not a TAB between the count and the
+  corresponding line, as required by POSIX.
+
+  expr now exits with status 2 if the expression is syntactically valid,
+  and with status 3 if an error occurred.  POSIX requires this.
+
+  expr now reports trouble if string comparison fails due to a collation error.
+
+  split now generates suffixes properly on EBCDIC hosts.
+
+  split -a0 now works, as POSIX requires.
+
+  `sort --version' and `sort --help' fail, as they should
+  when their output is redirected to /dev/full.
+
+  `su --version > /dev/full' now fails, as it should.
+
+** Fewer arbitrary limitations
+
+  cut requires 97% less memory when very large field numbers or
+  byte offsets are specified.
+
+
+* Major changes in release 5.0.1 (2003-07-15):

 ** New programs
 - new program: `[' (much like `test')
@@ -65,7 +316,7 @@ GNU coreutils NEWS                                    -*- outline -*-
  Before `rm -rf DIR' would fail to remove all files in DIR
  if there were more than 338.

-* Major changes in release 5.0:
+* Major changes in release 5.0 (2003-04-02):
 - false --help now exits nonzero

 [4.5.12]
--- a/30
+++ b/30
@@ -19,8 +19,13 @@ See the file NEWS for a list of major changes in the current release.

 See the file INSTALL for compilation and installation instructions.

-These programs are intended to be POSIX.2 compliant (with BSD and other
-extensions), like the rest of the GNU system.
+These programs are intended to conform to POSIX (with BSD and other
+extensions), like the rest of the GNU system.  By default they conform
+to older POSIX (1003.2-1992), and therefore support obsolete usages
+like "head -10" and "chown owner.group file".  This default is
+overridden at build-time by the value of <unistd.h>'s _POSIX2_VERSION
+macro, and this in turn can be overridden at runtime as described in
+the documentation under "Standards conformance".

 The ls, dir, and vdir commands are all separate executables instead of
 one program that checks argv[0] because people often rename these
@@ -73,10 +78,23 @@ Here is one possible patch to correct the problem.
 -#ifndef __STDC_32_MODE__
 +#ifndef __LP64__

-On some systems, some of the tests fail when run as root.  All failures
-I've seen appear to be due to problems in the testing framework, not
-in the tools themselves.  I'll address that for the next release by
-using a program like setuidgid (see the comment in TODO).
+If you run the tests as root, note that a few of them create files
+and/or run programs as a non-root user, `nobody' by default.
+If you want to use some other non-root username, specify it via
+the NON_ROOT_USERNAME environment variable.  Depending on the
+permissions with which the working directories have been created,
+using `nobody' may fail, because that user won't have the required
+read and write access to the build and test directories.
+I find that it is best to unpack and build as a non-privileged
+user, and then to run the following command as that user in order
+to run the privilege-requiring tests:
+
+  sudo env NON_ROOT_USERNAME=$USER make check
+
+If you can run the tests as root, please do so and report any
+problems.  We get much less test coverage in that mode, and it's
+arguably more important that these tools work well when run by
+root than when run by less privileged users.

 ***************************************

--- a/18
+++ b/18
@@ -1,22 +1,22 @@
 #! /bin/bash

-# Fix valgrind script to exec "$@", not some var.
-# Fix valgrind sources to know about syscall 252, for exit_group
-
 # Convert Makefile.am files:
-#  find tests -name Makefile.am \
-#    | xargs grep -wl PATH|xargs perl -pi -e 's,src:\$\$PATH,src/vg:\$\$PATH,'
+#  find tests -name Makefile.am | xargs grep -wl PATH|xargs perl -pi -e \
+#    's,src(\$\(PATH_SEPARATOR\)\$\$PATH),src/vg$1,'
+#
+# Create this symlink for suppressions:
+# ln -s $PWD/.vg-suppressions /tmp/cu-vg

 # Create src/vg:

 coreutils=$(echo 'spy:;@echo $(all_programs)' | (cd src; make -f Makefile -f - spy | tr -s '\n ' '  '))
-mkdir src/vg
+mkdir -p src/vg
 pwd=`pwd`
-up=`dirname $pwd`
-path='export PATH='$up':${PATH#*:}'
+srcdir=$pwd/src
+path='export PATH='$srcdir':${PATH#*:}'
 pre='#!/bin/sh\n'"$path"'\n'
 n=9
-vg='exec /p/bin/valgrind --quiet --num-callers='$n
+vg='exec /usr/bin/valgrind --suppressions=/tmp/cu-vg --gen-suppressions=yes --leak-check=yes --quiet --num-callers='$n
 cat <<EOF > src/vg/gen
 for i in $coreutils; do
  printf "$pre$vg \$i"' "\$@"\n' > \$i
--- a/31
+++ b/31
@@ -6,6 +6,7 @@ files.  If your name has been left out, if you'd rather not be listed,
 or if you'd prefer a different address be used, please let me know.

 ???                                 kytek@cybercomm.net
+A Costa                             agcosta@gis.net
 Achim Blumensath                    blume@corona.oche.de
 Adam Klein                          aklein@debian.org
 Akim Demaille                       demaille@inf.enst.fr
@@ -66,6 +67,7 @@ Brendan O'Dea                       bod@compusol.com.au
 Brian Kimball                       bfk@footbag.org
 Brian Youmans                       3diff@gnu.org
 Bruce Korb                          bkorb@veritas.com
+Bruce Robertson                     brucer@theodolite.dyndns.org
 Bruno Haible                        haible@clisp.cons.org
 Carl Johnson                        carlj@cjlinux.home.org
 Carl Lowenstein                     cdl@mpl.UCSD.EDU
@@ -85,6 +87,7 @@ Christian Rose                      menthos@menthos.com
 Christian von Roques                roques@pond.sub.org
 Chuck Hedrick                       hedrick@klinzhai.rutgers.edu
 Clark Morgan                        cmorgan@aracnet.com
+Clement Wang                        clem.wang@overture.com
 Colin Plumb                         colin@nyx.net
 Colin Watson                        cjw44@riva.ucam.org
 Collin Rogowski                     collin@rogowski.de
@@ -94,6 +97,8 @@ Dan Hagerty                         hag@gnu.ai.it.edu
 Dan Jacobson                        http://www.geocities.com/jidani
 Dan Pascu                           dan@services.iiruc.ro
 Daniel Bergstrom                    noa@melody.se
+Dániel Varga                        danielv@axelero.hu
+Danny Levinson                      danny.levinson@overture.com
 Darren Salt                         ds@youmustbejoking.demon.co.uk
 Dave Beckett                        dajobe@dajobe.org
 David Dyck                          dcd@tc.fluke.COM
@@ -103,6 +108,7 @@ David Godfrey                       dave@delta.demon.co.uk
 David Luyer                         david_luyer@pacific.net.au
 Deepak Goel                         deego@gnufans.org
 Dennis Henriksen                    opus@flamingo.osrl.dk
+Dennis Smit                         ds@nerds-incorporated.org
 Derek Clegg                         dclegg@next.com
 Dick Streefland                     dick_streefland@tasking.com
 Dirk Lattermann                     dlatt@t-online.de
@@ -141,7 +147,9 @@ Gabor Z. Papp                       gzp@gzp.org.hu
 Gaël Quéri                          gqueri@mail.dotcom.fr
 Galen Hazelwood                     galenh@micron.net
 Gary Anderson                       ganderson@clark.net
+Gary V. Vaughan                     gary@gnu.org
 Gaute Hvoslef Kvalnes               gaute@verdsveven.com
+Geoff Collyer                       geoff at collyer.net
 Geoff Kuenning                      geoff@cs.hmc.edu
 Geoff Odhner                        geoff@franklin.com
 Geoff Whale                         geoffw@cse.unsw.EDU.AU
@@ -160,6 +168,7 @@ Hans Ginzel                         hans@matfyz.cz
 Hans Lermen                         lermen@fgan.de
 Hans Verkuil                        hans@wyst.hobby.nl
 Harry Liu                           rliu@lek.ugcs.caltech.edu
+Harti Brandt                        brandt@fokus.fraunhofer.de
 Herbert Xu                          herbert@gondor.apana.org.au
 Holger Berger                       hberger@ess.nec.de
 Hon-Yin Kok                         hkok@yoda.unl.edu
@@ -183,7 +192,7 @@ Janos Farkas                        chexum@shadow.banki.hu
 Jarkko Hietaniemi                   jhi@epsilon.hut.fi
 Jean Charles Delepine               delepine@u-picardie.fr
 Jeff Moore                          jbm@mordor.com
-Jeff Sheinberg                      jeffsh@localnet.com
+Jeff Sheinberg                      jeff@bsrd.net
 Jens Elkner                         elkner@imsgroup.de
 Jens Schmidt                        jms@jsds.hamburg.com
 Jerome Abela                        abela@hsc.fr
@@ -212,10 +221,11 @@ Joseph S. Myers                     jsm28@cam.ac.uk
 Juan F. Codagnone                   juam@arnet.com.ar
 Jungshik Shin                       jshin@pantheon.yale.edu
 Jürgen Fluk                         louis@dachau.marco.de
+Jurriaan                            thunder7@xs4all.nl
 jvogel                              jvogel@linkny.com
 Kai Henningsen                      kai@debian.org
 Kai-Uwe Rommel                      rommel@informatik.tu-muenchen.de
-Kalle Olavi Niemitalo               tosi@stekt.oulu.fi
+Kalle Olavi Niemitalo               kon@iki.fi
 Kamal Paul Nigam                    Kamal_Paul_Nigam@gs35.sp.cs.cmu.edu
 Karl Eichwalder                     keichwa@gmx.net
 Karl Heuer                          kwzh@gnu.org
@@ -231,6 +241,7 @@ Kjetil Torgrim Homme                kjetilho@ifi.uio.no
 Kristoffer Rose                     kris@diku.dk
 Larry McVoy                         lm@sgi.com
 Lars Hecking                        lhecking@nmrc.ucc.ie
+Leah Q                              eequor@earthlink.net
 Lehti Rami                          rammer@cs.tut.fi
 Leonard N. Zubkoff                  lnz@dandelion.com
 Leonardo Milano                     lmilano@udel.edu
@@ -246,10 +257,12 @@ Marco Franzen                       Marco.Franzen@Thyron.com
 Marcus Brinkmann                    http://www.marcus-brinkmann.de
 Marcus Daniels                      marcus@ee.pdx.edu
 Mark A. Thomas                      thommark@access.digex.net
+Mark Conty                          Mark_Conty@cargill.com
 Mark D. Roth                        roth@uiuc.edu
 Mark Harris                         mark@monitor.designacc.com
 Mark Hewitt                         mhewitt@armature.com
 Mark Hounschell                     markh@compro.net
+Mark Hubbart                        discord@mac.com
 Mark Kettenis                       kettenis@phys.uva.nl
 Mark Nudelman                       marknu@flash.net
 Mark W. Eichin                      eichin@cygnus.com
@@ -267,6 +280,7 @@ Mate Wierdl                         mw@moni.msci.memphis.edu
 Matej Vela                          mvela@public.srce.hr
 Matt Perry                          matt@primefactor.com
 Matt Schalit                        mschalit@pacbell.net
+Matt Swift                          swift@alum.mit.edu
 Matthew Arnison                     maffew@cat.org.au
 Matthew Braun                       matthew@ans.net
 Matthew Clarke                      Matthew_Clarke@mindlink.bc.ca
@@ -280,10 +294,12 @@ Meelis Roos                         mroos@tartu.cyber.ee
 Michael ???                         michael@roka.net
 Michael Bacarella                   mbac@netgraft.com>
 Michael Deutschmann                 michael@talamasca.ocis.net
+Michael Elizabeth Chastain          mec.gnu@mindspring.com
 Michael Gaughen                     mgaughen@polyserve.com
 Michael Hasselberg                  mikelh@zonta.ping.de
 Michael Hohn                        hohn@math.utah.edu
 Michael J. Croghan                  mcroghan@usatoday.com
+Michael McFarland                   sidlon@yahoo.com
 Michael Piefel                      piefel@informatik.hu-berlin.de
 Michael Steffens                    michael.steffens@s.netic.de
 Michael Stone                       mstone@debian.org
@@ -304,8 +320,10 @@ Morten Welinder                     terra@diku.dk
 Neal H Walfield                     neal@cs.uml.edu
 Neil Brown                          neilb@cse.unsw.edu.au
 Nelson H. F. Beebe                  beebe@math.utah.edu
+Nick Estes                          debian@nickstoys.com
 Nick Lawes                          nlawes@silverplatter.com
 Niklas Edmundsson                   nikke@acc.umu.se
+Nikola Milutinovic                  Nikola.Milutinovic@ev.co.yu
 Noah Friedman                       friedman@splode.com
 Noel Cragg                          noel@red-bean.com
 Olatunji Oluwabukunmi Ruwase        tjruwase@stanford.edu
@@ -314,15 +332,18 @@ Ole Laursen                         olau@hardworking.dk
 Oliver Kiddle                       okiddle@yahoo.co.uk
 Ørn E. Hansen                       oehansen@daimi.aau.dk
 Oskar Liljeblad                     osk@hem.passagen.se
+Patrick Mauritz                     oxygene@studentenbude.ath.cx
 Paul Eggert                         eggert@twinsun.com
 Paul Jarc                           prj@po.cwru.edu
 Paul Nevai                          nevai@ops.mps.ohio-state.edu
 Paul Sauer                          paul@alexa.com
 Paul Slootman                       paul@debian.org
+Paul Worrall                        paul@basilisk.uklinux.net
 Pawel Prokop                        pablo@wizard.ae.krakow.pl
 Per Cederqvist                      ceder@lysator.liu.se
 Per Kristian Hove                   perhov@math.ntnu.no
 Peter Eriksson                      peter@ifm.liu.se
+Peter Horst                         peter@ointment.org
 Peter Moulder                       reiter@netspace.net.au
 Peter Samuelson                     psamuels@sampo.creighton.edu
 Peter Seebach                       seebs@taniemarie.solon.com
@@ -340,9 +361,10 @@ Ralf W. Stephan                     stephan@tmt.de
 Ralph Loader                        loader@maths.ox.ac.uk
 Raul Miller                         moth@magenta.com
 Raúl Núñez de Arenas Coronado       raul@pleyades.net
+Reuben Thomas                       rrt@sc3d.org
 Richard A Downing                   richard.downing@bcs.org.uk
 Richard Braakman                    dark@xs4all.nl
-Richard Dawe                        richdawe@bigfoot.com
+Richard Dawe                        rich@phekda.freeserve.co.uk
 Richard J. Rauenzahn                rrauenza@hairball.cup.hp.com
 Richard Neill                       rn214@hermes.cam.ac.uk
 Richard Sharman                     rsharman@magmacom.com
@@ -384,6 +406,7 @@ TAKAI Kousuke                       takai@vlsi.kuee.kyoto-u.ac.jp
 Theodore Ts'o                       tytso@rsts-11.mit.edu
 Thomas Bushnell                     thomas@gnu.ai.mit.edu
 Thomas Goerlich                     thomas@schnappmatik.de
+Thomas Luzat                        thomas@luzat.com
 Thomas Quinot                       thomas@Cuivre.FR.EU.ORG
 Tim J. Robbins                      tjr@FreeBSD.org
 Tim Mooney                          mooney@dogbert.cc.ndsu.NoDak.edu
@@ -392,6 +415,7 @@ Tim Waugh                           twaugh@redhat
 Todd A. Jacobs                      tjacobs@codegnome.org
 Tom Haynes                          thomas@netapp.com
 Tom Quinn                           trq@dionysos.thphys.ox.ac.uk
+Tommi Kyntola                       tkyntola@cc.hut.fi
 Ton Hospel                          thospel@mail.dma.be
 Tony Kocurko                        akocurko@mun.ca
 Tony Leneis                         tony@plaza.ds.adp.com
@@ -405,6 +429,7 @@ Uwe H. Steinfeld                    usteinfeld@gmx.net
 Vesselin Atanasov                   vesselin@bgnet.bg
 Vin Shelton                         acs@alumni.princeton.edu
 Volker Borchert                     bt@teknon.de
+Volker Paul                         vpaul@dohle.com
 Wartan Hachaturow                   wart@tepkom.ru
 Wayne Stewart                       wstewa@atl.com
 Wenjun Zheng                        zwj@yahoo.com
--- a/95
+++ b/95
@@ -1,8 +1,6 @@
 restore djgpp, eventually
 merge TODO lists
 add unit tests for lib/*.c
-rewrite lib/ftw.c not to use explicit recursion, and then use nftw in
-  chown, chgrp, chmod, du

 strip: add an option to specify the program used to strip binaries.
  suggestion from Karl Berry
@@ -59,8 +57,6 @@ resolve RH report on cp -a forwarded by Tim Waugh

 Martin Michlmayr's patch to provide ls with `--sort directory' option

-Remove uses of PROTOTYPES
-
 tail: don't use xlseek; it *exits*.
  Instead, maybe use a macro and return nonzero.

@@ -70,19 +66,106 @@ Now that AC_FUNC_LSTAT and AC_FUNC_STAT are in autoconf,
 remove m4/stat.m4 and m4/lstat.m4.

 df: alignment problem of `Used' heading with e.g., -mP
+  reported by Karl Berry

 tr: support nontrivial equivalence classes, e.g. [=e=] with LC_COLLATE=fr_FR

 fix tail -f to work with named pipes; reported by Ian D. Allen
+  $ mkfifo j; tail -f j & sleep 1; echo x > j
+  ./tail: j: file truncated
+  ./tail: j: cannot seek to offset 0: Illegal seek

 lib/strftime.c: Since %N is the only format that we need but that
  glibc's strftime doesn't support, consider using a wrapper that
  would expand /%(-_)?\d*N/ to the desired string and then pass the
  resulting string to glibc's strftime.

-chown-core.c: warn when operating on set-UID or set-GID regular file
-
 sort: Compress temporary files when doing large external sort/merges.
  This improves performance when you can compress/uncompress faster than
  you can read/write, which is common in these days of fast CPUs.
  suggestion from Charles Randall on 2001-08-10
+
+sort: Add an ordering option -R that causes 'sort' to sort according
+  to a random permutation of the correct sort order.  Also, add an
+  option --random-seed=SEED that causes 'sort' to use an arbitrary
+  string SEED to select which permutations to use, in a deterministic
+  manner: that is, if you sort a permutation of the same input file
+  with the same --random-seed=SEED option twice, you'll get the same
+  output.  The default SEED is chosen at random, and contains enough
+  information to ensure that the output permutation is random.
+  suggestion from Feth AREZKI, Stephan Kasal, and Paul Eggert on 2003-07-17
+
+unexpand: [http://www.opengroup.org/onlinepubs/007908799/xcu/unexpand.html]
+  printf 'x\t \t y\n'|unexpand -t 8,9 should print its input, unmodified.
+  printf 'x\t \t y\n'|unexpand -t 5,8 should print "x\ty\n"
+
+Let GNU su use the `wheel' group if appropriate.
+  (there are a couple patches, already)
+
+sort: Investigate better sorting algorithms; see Knuth vol. 3.
+
+  We tried list merge sort, but it was about 50% slower than the
+  recursive algorithm currently used by sortlines, and it used more
+  comparisons.  We're not sure why this was, as the theory suggests it
+  should do fewer comparisons, so perhaps this should be revisited.
+  List merge sort was implemented in the style of Knuth algorithm
+  5.2.4L, with the optimization suggested by exercise 5.2.4-22.  The
+  test case was 140,213,394 bytes, 426,4424 lines, text taken from the
+  GCC 3.3 distribution, sort.c compiled with GCC 2.95.4 and running on
+  Debian 3.0r1 GNU/Linux, 2.4GHz Pentium 4, single pass with no
+  temporary files and plenty of RAM.
+
+  Since comparisons seem to be the bottleneck, perhaps the best
+  algorithm to try next should be merge insertion.  See Knuth section
+  5.3.1, who credits Lester Ford, Jr. and Selmer Johnson, American
+  Mathematical Monthly 66 (1959), 387-389.
+
+cp --recursive: perform dir traversals in source and dest hierarchy rather
+  than forming full file names.  The latter (current) approach fails
+  unnecessarily when the names become very long.
+
+tail --p is now ambiguous
+
+Remove suspicious uses of alloca (ones that may allocate more than
+   about 4k)
+
+Adapt these contribution guidelines for coreutils:
+  http://sources.redhat.com/automake/contribute.html
+
+
+Bug-fix changes expected to go in, right after 5.2.0:
+====================================================
+
+  expr patch from Paul Eggert
+
+
+Changes expected to go in, post-5.2.1:
+======================================
+
+  du and wc: add an option, --from0-file, to make them read NUL-delimited
+    file name arguments from a file.
+
+  dd patch from Olivier Delhomme
+
+  Apply Andreas Gruenbacher's ACL and xattr changes
+
+  Apply Bruno Haible's hostname changes
+
+  stat: no longer output trailing newline for user-supplied FORMATs
+    This will mean adding \n to default formats, internally.
+
+  test/mv/*: clean up $other_partition_tmpdir in all cases
+
+  ls: when both -l and --dereference-command-line-symlink-to-dir are
+  specified, consider whether to let the latter select whether to
+  dereference command line symlinks to directories.  Since -l has
+  an implicit --NO-dereference-command-line-symlink-to-dir meaning.
+  Pointed out by Karl Berry.
+
+  Re-add a separate test for du's stack space usage (like the one removed
+  from tests/rm/deep-1).
+
+  Pending copyright papers:
+  ------------------------
+  ls --color: Ed Avis' patch to suppress escape sequences for
+    non-highlighted files
--- a/32
+++ b/32
@@ -1,32 +0,0 @@
-Move things so there are no symlinks from repository to
-any directory other than common
-
-******************
-LINGUAS:
-  sort -u ../[fst]u/po/LINGUAS > po/LINGUAS
-
-go cu
-cd po
-for i in f s t; do
-  echo $i:
-  xu=${i}u
-  for j in $(cat ../../$xu/po/LINGUAS); do
-    echo "  $j"
-    msgmerge -o k ../../$xu/po/$j.po $j.po && mv k $j.po
-  done
-done
-
-go cu; cd po; export xu=tu j=zh_TW
-go cu; cd po; export xu=su j=ru
-go cu; cd po; export xu=fu j=zh_TW
-go cu; cd po; export xu=tu j=fr
-go cu; cd po; export xu=su j=tr
-go cu; cd po; export xu=fu j=ca
-
-go cu; cd po; export xu=su j=sl
-go cu; cd po; export xu=tu j=el
-go cu; cd po; export xu=su j=da
-go cu; cd po; export xu=fu j=lg
-k=$xu-$j
-msgmerge -o $k ../../$xu/po/$j.po $j.po && mv $k $j.po
-cvs ci -m 'merge from fileutils-4.1.11' $j.po
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/125
+++ b/125
@@ -6,7 +6,7 @@ use Getopt::Long;
 use Digest::MD5;
 use Digest::SHA1;

-(my $VERSION = '$Revision: 1.16 $ ') =~ tr/[0-9].//cd;
+(my $VERSION = '$Revision: 1.20 $ ') =~ tr/[0-9].//cd;
 (my $ME = $0) =~ s|.*/||;

 my %valid_release_types = map {$_ => 1} qw (alpha beta major);
@@ -72,6 +72,47 @@ EOF
  exit $exit_code;
 }

+sub print_news_deltas ($$$)
+{
+  my ($news_file, $prev_version, $curr_version) = @_;
+
+  print "\n$news_file\n\n";
+
+  # Print all lines from $news_file, starting with the first one
+  # that mentions $curr_version up to but not including
+  # the first occurrence of $prev_version.
+  my $in_items;
+
+  open NEWS, '<', $news_file
+    or die "$ME: $news_file: cannot open for reading: $!\n";
+  while (defined (my $line = <NEWS>))
+    {
+      if ( ! $in_items)
+	{
+	  # Match lines like this one:
+	  # * Major changes in release 5.0.1:
+	  # but not any other line that starts with a space, *, or -.
+	  $line =~ /^(\* Major changes.*|[^ *-].*)\Q$curr_version\E/o
+	    or next;
+	  $in_items = 1;
+	  print $line;
+	}
+      else
+	{
+	  # Be careful that this regexp cannot match version numbers
+	  # in NEWS items -- they might well say `introduced in 4.5.5',
+	  # and we don't want that to match.
+	  $line =~ /^(\* Major changes.*|[^ *-].*)\Q$prev_version\E/o
+	    and last;
+	  print $line;
+	}
+    }
+  close NEWS;
+
+  $in_items
+    or die "$ME: $news_file: no matching lines for `$curr_version'\n";
+}
+
 sub print_changelog_deltas ($$)
 {
  my ($package_name, $prev_version) = @_;
@@ -165,7 +206,7 @@ sub print_changelog_deltas ($$)
  my $curr_version;
  my $release_archive_dir;
  my @url_dir_list;
-  my $news_file;
+  my @news_file;

  GetOptions
    (
@@ -174,8 +215,8 @@ sub print_changelog_deltas ($$)
     'previous-version=s' => \$prev_version,
     'current-version=s' => \$curr_version,
     'release-archive-directory=s' => \$release_archive_dir,
-     'url-directory=s@' => \@url_dir_list,
-     'news=s@' => \$news_file,
+     'url-directory=s' => \@url_dir_list,
+     'news=s' => \@news_file,

     help => sub { usage 0 },
     version => sub { print "$ME version $VERSION\n"; exit },
@@ -211,7 +252,7 @@ sub print_changelog_deltas ($$)

  my %size;

-  foreach my $f (($tgz, $tbz, $xd))
+  foreach my $f ($tgz, $tbz, $xd)
    {
      my $cmd = "du --human $f";
      my $t = `$cmd`;
@@ -226,11 +267,13 @@ sub print_changelog_deltas ($$)
  $fail
    and exit 1;

+  # The markup is escaped as <\# so that when this script is sent by
+  # mail (or part of a diff), Gnus is not triggered.
  print <<EOF;

 Subject: $my_distdir released

-<#secure method=pgpmime mode=sign>
+<\#secure method=pgpmime mode=sign>

 FIXME: put comments here

@@ -252,8 +295,8 @@ EOF
  print "\nHere are GPG detached signatures:\n";
  foreach my $url (@url_dir_list)
    {
-      print "  $url/$tgz.asc\n";
-      print "  $url/$tbz.asc\n";
+      print "  $url/$tgz.sig\n";
+      print "  $url/$tbz.sig\n";
    }

  # FIXME: clean up upon interrupt or die
@@ -263,15 +306,17 @@ EOF

  print "\nHere are the MD5 and SHA1 signatures:\n";
  print "\n";
-  print "<#part type=text/plain filename=\"$tmp\" disposition=inline>\n"
-    . "<#/part>\n";
+  # The markup is escaped as <\# so that when this script is sent by
+  # mail (or part of a diff), Gnus is not triggered.
+  print "<\#part type=text/plain filename=\"$tmp\" disposition=inline>\n"
+    . "<\#/part>\n";

  open OUT, '>', $tmp
    or die "$ME: $tmp: cannot open for writing: $!\n";

  foreach my $meth (qw (md5 sha1))
    {
-      foreach my $f (($tgz, $tbz, $xd))
+      foreach my $f ($tgz, $tbz, $xd)
 	{
 	  open IN, '<', $f
 	    or die "$ME: $f: cannot open for reading: $!\n";
@@ -289,46 +334,30 @@ EOF
    or die "$ME: $tmp: while writing: $!\n";
  chmod 0400, $tmp;  # ignore failure

-  if ($news_file)
-    {
-      print "\nNEWS\n\n";
-
-      # Print all lines from $news_file, starting with the first one
-      # that mentions $curr_version up to but not including
-      # the first occurrence of $prev_version.
-      my $in_items;
-      open NEWS, '<', $news_file
-	or die "$ME: $news_file: cannot open for reading: $!\n";
-      while (defined (my $line = <NEWS>))
-	{
-	  if ( ! $in_items)
-	    {
-	      # Match lines like this one:
-	      # * Major changes in release 5.0.1:
-	      # but not any other line that starts with a space, *, or -.
-	      $line =~ /^(\* Major changes.*|[^ *-].*)\Q$curr_version\E/o
-		or next;
-	      $in_items = 1;
-	      print $line;
-	    }
-	  else
-	    {
-	      # Be careful that this regexp cannot match version numbers
-	      # in NEWS items -- they might well say `introduced in 4.5.5',
-	      # and we don't want that to match.
-	      $line =~ /^(\* Major changes.*|[^ *-].*)\Q$prev_version\E/o
-		and last;
-	      print $line;
-	    }
-	}
-      close NEWS;
-
-      $in_items
-	or die "$ME: $news_file: no matching lines for `$curr_version'\n";
-    }
+  print_news_deltas ($_, $prev_version, $curr_version)
+    foreach @news_file;

  $release_type eq 'major'
    or print_changelog_deltas ($package_name, $prev_version);

  exit 0;
 }
+
+
+
+### Setup "GNU" style for perl-mode and cperl-mode.
+## Local Variables:
+## perl-indent-level: 2
+## perl-continued-statement-offset: 2
+## perl-continued-brace-offset: 0
+## perl-brace-offset: 0
+## perl-brace-imaginary-offset: 0
+## perl-label-offset: -2
+## cperl-indent-level: 2
+## cperl-brace-offset: 0
+## cperl-continued-brace-offset: 0
+## cperl-label-offset: -2
+## cperl-extra-newline-before-brace: t
+## cperl-merge-trailing-else: nil
+## cperl-continued-statement-offset: 2
+## End:
--- a/config.hin
+++ b/config.hin
@@ -23,6 +23,18 @@
 /* Define to 1 if using `getloadavg.c'. */
 #undef C_GETLOADAVG

+/* Define the default level of POSIX conformance. The value is of the form
+   YYYYMM, specifying the year and month the standard was adopted. If not
+   defined here, it defaults to the value of _POSIX2_VERSION in <unistd.h>.
+   Define to 199209 to default to POSIX 1003.2-1992, which makes standard
+   programs like `head', `tail', and `sort' accept obsolete options like `+10'
+   and `-10'. Define to 200112 to default to POSIX 1003.1-2001, which makes
+   these standard programs treat leading-`+' operands as file names and
+   require modern usages like `-n 10' instead of `-10'. Whether defined here
+   or not, the default can be overridden at run time via the _POSIX2_VERSION
+   environment variable. */
+#undef DEFAULT_POSIX2_VERSION
+
 /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
 #undef DGUX

@@ -100,15 +112,15 @@
 /* Define to 1 if you have the `atexit' function. */
 #undef HAVE_ATEXIT

-/* Define to 1 if you have the `bcopy' function. */
-#undef HAVE_BCOPY
-
 /* Define to 1 if you have the <bp-sym.h> header file. */
 #undef HAVE_BP_SYM_H

 /* Define to 1 if you have the `btowc' function. */
 #undef HAVE_BTOWC

+/* Define to 1 if your system has a working `chown' function. */
+#undef HAVE_CHOWN
+
 /* Define to 1 if you have the `chroot' function. */
 #undef HAVE_CHROOT

@@ -121,9 +133,6 @@
 /* Define to 1 if you have the `clock_settime' function. */
 #undef HAVE_CLOCK_SETTIME

-/* Define if backslash-a works in C strings. */
-#undef HAVE_C_BACKSLASH_A
-
 /* FIXME */
 #undef HAVE_C_LINE

@@ -255,10 +264,6 @@
   */
 #undef HAVE_DECL_STPCPY

-/* Define to 1 if you have the declaration of `strerror', and to 0 if you
-   don't. */
-#undef HAVE_DECL_STRERROR
-
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
   don't. */
 #undef HAVE_DECL_STRERROR_R
@@ -283,10 +288,6 @@
   don't. */
 #undef HAVE_DECL_STRTOIMAX

-/* Define to 1 if you have the declaration of `strtol', and to 0 if you don't.
-   */
-#undef HAVE_DECL_STRTOL
-
 /* Define to 1 if you have the declaration of `strtoll', and to 0 if you
   don't. */
 #undef HAVE_DECL_STRTOLL
@@ -334,12 +335,12 @@
 /* Define to 1 if you have the `dirfd' function. */
 #undef HAVE_DIRFD

-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2

+/* Define to 1 if you have the <dustat.h> header file. */
+#undef HAVE_DUSTAT_H
+
 /* Define to 1 if you have the `endgrent' function. */
 #undef HAVE_ENDGRENT

@@ -379,9 +380,6 @@
 /* Define to 1 if you have the `fs_stat_dev' function. */
 #undef HAVE_FS_STAT_DEV

-/* Define to 1 if you have the `ftime' function. */
-#undef HAVE_FTIME
-
 /* Define to 1 if you have the `ftruncate' function. */
 #undef HAVE_FTRUNCATE

@@ -466,7 +464,7 @@
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
 #undef HAVE_INTMAX_T

-/* Define to 1 if you have the <inttypes.h> header file. */
+/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
 #undef HAVE_INTTYPES_H

 /* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
@@ -494,9 +492,6 @@
 /* Define to 1 if you have the `dgc' library (-ldgc). */
 #undef HAVE_LIBDGC

-/* Define to 1 if you have the <libintl.h> header file. */
-#undef HAVE_LIBINTL_H
-
 /* Define to 1 if you have the `kstat' library (-lkstat). */
 #undef HAVE_LIBKSTAT

@@ -521,21 +516,17 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H

-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
 /* Define if you have the 'long double' type. */
 #undef HAVE_LONG_DOUBLE

 /* Define to 1 if you support file names longer than 14 characters. */
 #undef HAVE_LONG_FILE_NAMES

-/* Define if you have the long long type. */
+/* Define if you have the 'long long' type. */
 #undef HAVE_LONG_LONG

-/* Define if lstat has the bug that it succeeds when given the zero-length
-   file name argument. The lstat from SunOS4.1.4 and the Hurd as of
-   1998-11-01) do this. */
+/* Define to 1 if `lstat' has the bug that it succeeds when given the
+   zero-length file name argument. */
 #undef HAVE_LSTAT_EMPTY_STRING_BUG

 /* Define to 1 if you have the <machine/hal_sysinfo.h> header file. */
@@ -569,9 +560,6 @@
 /* Define to 1 if you have the `memchr' function. */
 #undef HAVE_MEMCHR

-/* Define to 1 if you have the `memcmp' function. */
-#undef HAVE_MEMCMP
-
 /* Define to 1 if you have the `memcpy' function. */
 #undef HAVE_MEMCPY

@@ -656,6 +644,9 @@
 /* Define to 1 if you have the `raise' function. */
 #undef HAVE_RAISE

+/* Define to 1 if you have the `readlink' function. */
+#undef HAVE_READLINK
+
 /* Define to 1 if your system has a GNU libc compatible `realloc' function,
   and to 0 otherwise. */
 #undef HAVE_REALLOC
@@ -705,9 +696,8 @@
 /* Define to 1 if you have the `statvfs' function. */
 #undef HAVE_STATVFS

-/* Define if stat has the bug that it succeeds when given the zero-length file
-   name argument. The stat from SunOS4.1.4 and the Hurd as of 1998-11-01) do
-   this. */
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+   zero-length file name argument. */
 #undef HAVE_STAT_EMPTY_STRING_BUG

 /* Define to 1 if stdbool.h conforms to C99. */
@@ -738,6 +728,10 @@
 /* Define to 1 if you have the `strchr' function. */
 #undef HAVE_STRCHR

+/* Define to 1 if you have the `strcoll' function and it is properly defined.
+   */
+#undef HAVE_STRCOLL
+
 /* Define to 1 if you have the `strcspn' function. */
 #undef HAVE_STRCSPN

@@ -857,6 +851,9 @@
   have utime.h but don't declare the struct anywhere. */
 #undef HAVE_STRUCT_UTIMBUF

+/* Define to 1 if `ut_exit' is member of `struct utmpx'. */
+#undef HAVE_STRUCT_UTMPX_UT_EXIT
+
 /* Define to 1 if `ut_exit.e_exit' is member of `struct utmpx'. */
 #undef HAVE_STRUCT_UTMPX_UT_EXIT_E_EXIT

@@ -884,6 +881,9 @@
 /* Define to 1 if `ut_user' is member of `struct utmpx'. */
 #undef HAVE_STRUCT_UTMPX_UT_USER

+/* Define to 1 if `ut_exit' is member of `struct utmp'. */
+#undef HAVE_STRUCT_UTMP_UT_EXIT
+
 /* Define to 1 if `ut_exit.e_exit' is member of `struct utmp'. */
 #undef HAVE_STRUCT_UTMP_UT_EXIT_E_EXIT

@@ -1057,12 +1057,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H

-/* Define if you have the unsigned long long type. */
+/* Define if you have the 'unsigned long long' type. */
 #undef HAVE_UNSIGNED_LONG_LONG

-/* Define to 1 if you have the `utime' function. */
-#undef HAVE_UTIME
-
 /* Define if utimes accepts a null argument */
 #undef HAVE_UTIMES_NULL

@@ -1096,9 +1093,6 @@
 /* Define to 1 if you have the `vasprintf' function. */
 #undef HAVE_VASPRINTF

-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H

@@ -1108,6 +1102,9 @@
 /* Define to 1 if you have the `wcrtomb' function. */
 #undef HAVE_WCRTOMB

+/* Define to 1 if you have the `wcslen' function. */
+#undef HAVE_WCSLEN
+
 /* Define to 1 if you have the <wctype.h> header file. */
 #undef HAVE_WCTYPE_H

@@ -1123,6 +1120,9 @@
 /* Define if readdir is found to work properly in some unusual cases. */
 #undef HAVE_WORKING_READDIR

+/* Define if utimes works properly. */
+#undef HAVE_WORKING_UTIMES
+
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL

@@ -1264,9 +1264,9 @@
 /* If using the C implementation of alloca, define if you know the
   direction of stack growth for your system; otherwise it will be
   automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION

 /* Define if the block counts reported by statfs may be truncated to 2GB and
@@ -1335,9 +1335,6 @@
   <sys/cpustats.h>. */
 #undef UMAX4_3

-/* the maximum number of simultaneously open files per process */
-#undef UTILS_OPEN_MAX
-
 /* Version number of package */
 #undef VERSION

@@ -1379,6 +1376,11 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE

+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
 /* Define like PROTOTYPES; this can be used by system headers. */
 #undef __PROTOTYPES

@@ -1388,15 +1390,21 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

-/* Define to rpl_fnmatch if the replacement function should be used. */
+/* Define to a replacement function name for fnmatch(). */
 #undef fnmatch

+/* Define to rpl_free if the replacement function should be used. */
+#undef free
+
 /* Define to rpl_getcwd if the wrapper function should be used. */
 #undef getcwd

 /* Define as rpl_getgroups if getgroups doesn't work right. */
 #undef getgroups

+/* Define to a replacement function name for getline(). */
+#undef getline
+
 /* Define to rpl_gettimeofday if the replacement function should be used. */
 #undef gettimeofday

@@ -1406,11 +1414,13 @@
 /* Define to rpl_gmtime if the replacement function should be used. */
 #undef gmtime

-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
+#endif

-/* Define to `unsigned long' if <sys/types.h> does not define. */
+/* Define to `unsigned long int' if <sys/types.h> does not define. */
 #undef ino_t

 /* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
@@ -1464,6 +1474,9 @@
 /* Define to rpl_realloc if the replacement function should be used. */
 #undef realloc

+/* Define to rpl_rename if the replacement function should be used. */
+#undef rename
+
 /* Define to equivalent of C99 restrict keyword, or to nothing if this is not
   supported. Do not define if restrict is supported directly. */
 #undef restrict
@@ -1474,9 +1487,15 @@
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t

-/* Define to `int' if <sys/types.h> does not define. */
+/* Define as a signed type of the same size as size_t. */
 #undef ssize_t

+/* Define to rpl_strnlen if the replacement function should be used. */
+#undef strnlen
+
+/* Define to rpl_strtod if the replacement function should be used. */
+#undef strtod
+
 /* Define to rpl_tzset if the wrapper function should be used. */
 #undef tzset

@@ -1487,6 +1506,12 @@
   <inttypes.h> don't define. */
 #undef uintmax_t

+/* Define to `size_t' if <sys/types.h> does not define. */
+#undef uintptr_t
+
+/* Define to rpl_utime if the replacement function should be used. */
+#undef utime
+
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
   code using `volatile' can become incorrect without. Disable with care. */
 #undef volatile
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,10 @@
+2003-08-16  Paul Eggert  <eggert@twinsun.com>
+
+	* config.rpath, texinfo.tex: Sync with gnulib.
+
 2003-04-21  Jim Meyering  <jim@meyering.net>

-	* depcomp: New version, now that this file is now on the list
+	* depcomp: New version, now that this file is on the list
 	in ../Makefile.cfg.

 2003-01-12  Jim Meyering  <jim@meyering.net>
@@ -40,4 +44,4 @@
 2002-02-17  Jim Meyering  <jim@meyering.net>

 	* config.guess (main): Don't use `head -1'; it's no longer portable.
-        Use `sed 1q' instead.
+	Use `sed 1q' instead.
--- a/config/config.guess
+++ b/config/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

-timestamp='2003-07-02'
+timestamp='2004-01-05'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -221,6 +221,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -307,6 +310,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -734,7 +740,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -742,6 +748,11 @@ EOF
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -751,7 +762,7 @@ EOF
    *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+    *:FreeBSD:*:*)
 	# Determine whether the default compiler uses glibc.
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -763,7 +774,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
 	# FreeBSD's kernel, but not the complete OS.
 	case ${LIBC} in gnu) kernel_only='k' ;; esac
 	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
@@ -799,8 +810,13 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
    *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
@@ -948,6 +964,9 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
@@ -978,6 +997,9 @@ EOF
    i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1049,7 +1071,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1164,7 +1186,7 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
    *:NonStop-UX:*:*)
@@ -1208,6 +1230,9 @@ EOF
    SEI:*:*:SEIUX)
        echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
+    *:DRAGONFLY:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
+	exit 0 ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
--- a/config/config.rpath
+++ b/config/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2002 Free Software Foundation, Inc.
+#   Copyright 1996-2003 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -34,43 +34,57 @@
 #
 # The set of defined variables is at the end of this script.

+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
 # All known linkers require a `.a' archive for static linking (except M$VC,
 # which needs '.lib').
 libext=a
-shlibext=
+shrext=.so

 host="$1"
 host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
 wl=
 if test "$GCC" = yes; then
  wl='-Wl,'
 else
  case "$host_os" in
-    aix3* | aix4* | aix5*)
+    aix*)
      wl='-Wl,'
      ;;
+    mingw* | pw32* | os2*)
+      ;;
    hpux9* | hpux10* | hpux11*)
      wl='-Wl,'
      ;;
-    irix5* | irix6*)
+    irix5* | irix6* | nonstopux*)
      wl='-Wl,'
      ;;
+    newsos6)
+      ;;
    linux*)
-      echo '__INTEL_COMPILER' > conftest.$ac_ext
-      if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
-      then
-        :
-      else
-        # Intel icc
-        wl='-Qoption,ld,'
-      fi
+      case $CC in
+        icc|ecc)
+          wl='-Wl,'
+          ;;
+        ccc)
+          wl='-Wl,'
+          ;;
+      esac
      ;;
    osf3* | osf4* | osf5*)
      wl='-Wl,'
      ;;
+    sco3.2v5*)
+      ;;
    solaris*)
      wl='-Wl,'
      ;;
@@ -78,15 +92,17 @@ else
      wl='-Qoption ld '
      ;;
    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      if test "x$host_vendor" = xsni; then
-        wl='-LD'
-      else
-        wl='-Wl,'
-      fi
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    uts4*)
      ;;
  esac
 fi

+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
 hardcode_direct=no
@@ -110,8 +126,10 @@ ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
  case "$host_os" in
    aix3* | aix4* | aix5*)
-      # On AIX, the GNU linker is very broken
-      ld_shlibs=no
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
      ;;
    amigaos*)
      hardcode_libdir_flag_spec='-L$libdir'
@@ -125,7 +143,7 @@ if test "$with_gnu_ld" = yes; then
      ld_shlibs=no
      ;;
    beos*)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
@@ -135,11 +153,18 @@ if test "$with_gnu_ld" = yes; then
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
      ;;
    solaris* | sysv5*)
-      if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
        ld_shlibs=no
-      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
@@ -149,7 +174,7 @@ if test "$with_gnu_ld" = yes; then
      hardcode_direct=yes
      ;;
    *)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
@@ -157,6 +182,8 @@ if test "$with_gnu_ld" = yes; then
      ;;
  esac
  if test "$ld_shlibs" = yes; then
+    # Unlike libtool, we use -rpath here, not --rpath, since the documented
+    # option of GNU ld is called -rpath, not --rpath.
    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  fi
 else
@@ -209,13 +236,27 @@ else
          fi
        esac
      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
      if test "$aix_use_runtimelinking" = yes; then
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
      else
        if test "$host_cpu" = ia64; then
          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
        else
-          hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
        fi
      fi
      ;;
@@ -225,6 +266,8 @@ else
      # see comment about different semantics on the GNU ld section
      ld_shlibs=no
      ;;
+    bsdi4*)
+      ;;
    cygwin* | mingw* | pw32*)
      # When not using gcc, we currently assume that we are using
      # Microsoft Visual C++.
@@ -234,7 +277,12 @@ else
      libext=lib
      ;;
    darwin* | rhapsody*)
-      hardcode_direct=yes
+      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+        hardcode_direct=no
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
      ;;
    freebsd1*)
      ld_shlibs=no
@@ -251,14 +299,41 @@ else
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      ;;
-    hpux9* | hpux10* | hpux11*)
+    hpux9*)
      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
      hardcode_libdir_separator=:
      hardcode_direct=yes
-      hardcode_minus_L=yes # Not in the search PATH, but as the default
-                           # location of the library.
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
      ;;
-    irix5* | irix6*)
+    hpux10* | hpux11*)
+      if test "$with_gnu_ld" = no; then
+        case "$host_cpu" in
+          hppa*64*)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=no
+            ;;
+          ia64*)
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_direct=no
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      ;;
@@ -314,23 +389,20 @@ else
      hardcode_minus_L=yes
      ;;
    sysv4)
-      if test "x$host_vendor" = xsno; then
-        hardcode_direct=yes # is this really true???
-      else
-        hardcode_direct=no # Motorola manual says yes, but my tests say they lie
-      fi
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
      ;;
    sysv4.3*)
      ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
-      ;;
-    uts4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    dgux*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
    sysv4*MP*)
      if test -d /usr/nec; then
        ld_shlibs=yes
@@ -340,7 +412,13 @@ else
      hardcode_direct=yes
      hardcode_minus_L=no
      ;;
-    sysv5uw7* | unixware7*)
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      ;;
+    sysv5*)
+      hardcode_libdir_flag_spec=
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
      ;;
    *)
      ld_shlibs=no
@@ -349,134 +427,97 @@ else
 fi

 # Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
 libname_spec='lib$name'
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 case "$host_os" in
  aix3*)
-    shlibext=so
    ;;
  aix4* | aix5*)
-    shlibext=so
    ;;
  amigaos*)
-    shlibext=ixlibrary
    ;;
  beos*)
-    shlibext=so
    ;;
  bsdi4*)
-    shlibext=so
-    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
    ;;
  cygwin* | mingw* | pw32*)
-    case $GCC,$host_os in
-      yes,cygwin*)
-        shlibext=dll.a
-        ;;
-      yes,mingw*)
-        shlibext=dll
-        sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
-        ;;
-      yes,pw32*)
-        shlibext=dll
-        ;;
-      *)
-        shlibext=dll
-        ;;
-    esac
+    shrext=.dll
    ;;
  darwin* | rhapsody*)
-    shlibext=dylib
+    shrext=.dylib
+    ;;
+  dgux*)
    ;;
  freebsd1*)
    ;;
  freebsd*)
-    shlibext=so
    ;;
  gnu*)
-    shlibext=so
    ;;
  hpux9* | hpux10* | hpux11*)
-    shlibext=sl
+    case "$host_cpu" in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
    ;;
-  irix5* | irix6*)
-    shlibext=so
+  irix5* | irix6* | nonstopux*)
    case "$host_os" in
-      irix5*)
+      irix5* | nonstopux*)
        libsuff= shlibsuff=
        ;;
      *)
        case $LD in
-          *-32|*"-32 ") libsuff= shlibsuff= ;;
-          *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;;
-          *-64|*"-64 ") libsuff=64 shlibsuff=64 ;;
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
          *) libsuff= shlibsuff= ;;
        esac
        ;;
    esac
-    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
    ;;
-  linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+  linux*oldld* | linux*aout* | linux*coff*)
    ;;
-  linux-gnu*)
-    shlibext=so
+  linux*)
    ;;
  netbsd*)
-    shlibext=so
    ;;
  newsos6)
-    shlibext=so
+    ;;
+  nto-qnx)
    ;;
  openbsd*)
-    shlibext=so
    ;;
  os2*)
    libname_spec='$name'
-    shlibext=dll
+    shrext=.dll
    ;;
  osf3* | osf4* | osf5*)
-    shlibext=so
-    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  sco3.2v5*)
-    shlibext=so
    ;;
  solaris*)
-    shlibext=so
    ;;
  sunos4*)
-    shlibext=so
    ;;
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-    shlibext=so
-    case "$host_vendor" in
-      motorola)
-        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-        ;;
-    esac
-    ;;
-  uts4*)
-    shlibext=so
-    ;;
-  dgux*)
-    shlibext=so
    ;;
  sysv4*MP*)
-    if test -d /usr/nec; then
-      shlibext=so
-    fi
+    ;;
+  uts4*)
    ;;
 esac

 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`

 sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF

@@ -504,10 +545,4 @@ hardcode_direct="$hardcode_direct"
 # resulting binary.
 hardcode_minus_L="$hardcode_minus_L"

-# Compile-time system search path for libraries
-sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
-
 EOF
--- a/config/config.sub
+++ b/config/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

-timestamp='2003-07-04'
+timestamp='2004-01-05'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -228,13 +229,14 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
+	| ip2k | iq2000 \
 	| m32r | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
@@ -247,6 +249,7 @@ case $basic_machine in
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@@ -304,7 +307,7 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
+	| ip2k-* | iq2000-* \
 	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
@@ -319,6 +322,7 @@ case $basic_machine in
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@@ -376,6 +380,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -740,6 +747,10 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -960,6 +971,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1128,19 +1143,19 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1164,6 +1179,9 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1176,6 +1194,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1197,6 +1218,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1219,6 +1243,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1467,9 +1494,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
--- a/config/depcomp
+++ b/config/depcomp
@@ -1,6 +1,8 @@
 #! /bin/sh
-
 # depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2003-12-28.12
+
 # Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
@@ -25,22 +27,45 @@

 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.

+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit 0
+    ;;
+esac
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
  exit 1
 fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi

+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}

 rm -f "$tmpdepfile"
@@ -172,19 +197,25 @@ sgi)

 aix)
  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
  if test "$libtool" = yes; then
    "$@" -Wc,-M
  else
    "$@" -M
  fi
-
  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
@@ -192,6 +223,7 @@ aix)
  fi

  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
    # Each line is of the form `foo.o: dependent.h'.
    # Do two passes, one to just change these to
    # `$object: dependent.h' and one to simply `dependent.h:'.
@@ -292,7 +324,7 @@ tru64)

 dashmstdout)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o.
+  # always write the preprocessed file to stdout, regardless of -o.
  "$@" || exit $?

  # Remove the call to Libtool.
@@ -388,7 +420,7 @@ makedepend)

 cpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout.
+  # always write the preprocessed file to stdout.
  "$@" || exit $?

  # Remove the call to Libtool.
@@ -430,7 +462,7 @@ cpp)

 msvisualcpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout, regardless of -o,
  # because we must use -o when running libtool.
  "$@" || exit $?
  IFS=" "
@@ -470,3 +502,12 @@ none)
 esac

 exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/config/install-sh
+++ b/config/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile

-scriptversion=2003-06-13.21
+scriptversion=2004-01-13.14

 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -72,7 +72,8 @@ dst=
 dir_arg=

 usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
-   or: $0 -d DIR1 DIR2...
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 -d DIRECTORIES...

 In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
 In the second, create the directory path DIR.
@@ -134,144 +135,167 @@ while test -n "$1"; do

    --version) echo "$0 $scriptversion"; exit 0;;

-    *)  if test -z "$src"; then
-          src=$1
-        else
-          # this colon is to work around a 386BSD /bin/sh bug
-          :
-          dst=$1
-        fi
-        shift
-        continue;;
+    *)  # When -d is used, all remaining arguments are directories to create.
+	test -n "$dir_arg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
  esac
 done

-if test -z "$src"; then
-  echo "$0: no input file specified." >&2
-  exit 1
-fi
-
-if test -n "$dir_arg"; then
-  dst=$src
-  src=
-
-  if test -d "$dst"; then
-    instcmd=:
-    chmodcmd=
-  else
-    instcmd=$mkdirprog
-  fi
-else
-  # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-  # might cause directories to be created, which would be especially bad
-  # if $src (and thus $dsttmp) contains '*'.
-  if test ! -f "$src" && test ! -d "$src"; then
-    echo "$0: $src does not exist." >&2
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
    exit 1
  fi
-
-  if test -z "$dst"; then
-    echo "$0: no destination specified." >&2
-    exit 1
-  fi
-
-  # If destination is a directory, append the input filename; won't work
-  # if double slashes aren't ignored.
-  if test -d "$dst"; then
-    dst=$dst/`basename "$src"`
-  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
 fi

-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac

-# Make sure that the destination directory exists.
-# (this part is taken from Noah Friedman's mkinstalldirs script.)
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=

-# Skip lots of stat calls in the usual case.
-if test ! -d "$dstdir"; then
-  defaultIFS='
-	'
-  IFS="${IFS-$defaultIFS}"
-
-  oIFS=$IFS
-  # Some sh's can't handle IFS=/ for some reason.
-  IFS='%'
-  set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-  IFS=$oIFS
-
-  pathcomp=
-
-  while test $# -ne 0 ; do
-    pathcomp=$pathcomp$1
-    shift
-    test -d "$pathcomp" || $mkdirprog "$pathcomp"
-    pathcomp=$pathcomp/
-  done
-fi
-
-if test -n "$dir_arg"; then
-  $doit $instcmd "$dst" \
-    && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-    && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-    && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-    && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
-else
-  # If we're going to rename the final executable, determine the name now.
-  if test -z "$transformarg"; then
-    dstfile=`basename "$dst"`
+    if test -d "$dst"; then
+      instcmd=:
+      chmodcmd=
+    else
+      instcmd=$mkdirprog
+    fi
  else
-    dstfile=`basename "$dst" $transformbasename \
-             | sed $transformarg`$transformbasename
+    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      dst=$dst/`basename "$src"`
+    fi
  fi

-  # don't allow the sed command to completely eliminate the filename.
-  test -z "$dstfile" && dstfile=`basename "$dst"`
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`

-  # Make a couple of temp file names in the proper directory.
-  dsttmp=$dstdir/_inst.$$_
-  rmtmp=$dstdir/_rm.$$_
+  # Make sure that the destination directory exists.

-  # Trap to clean up those temp files at exit.
-  trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-  trap '(exit $?); exit' 1 2 13 15
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"

-  # Move or copy the file name to the temp name
-  $doit $instcmd "$src" "$dsttmp" &&
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    IFS=$oIFS

-  # and set any options; do chmod last to preserve setuid bits.
-  #
-  # If any of these fail, we abort the whole thing.  If we want to
-  # ignore errors from any of these, just make sure not to ignore
-  # errors from the above "$doit $instcmd $src $dsttmp" command.
-  #
-  { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-    && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-    && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-    && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+    pathcomp=

-  # Now remove or move aside any old file at destination location.  We
-  # try this two ways since rm can't unlink itself on some systems and
-  # the destination file might be busy for other reasons.  In this case,
-  # the final cleanup might fail but the new file should still install
-  # successfully.
-  {
-    if test -f "$dstdir/$dstfile"; then
-      $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-      || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-      || {
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      test -d "$pathcomp" || $mkdirprog "$pathcomp"
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $instcmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    # If we're going to rename the final executable, determine the name now.
+    if test -z "$transformarg"; then
+      dstfile=`basename "$dst"`
+    else
+      dstfile=`basename "$dst" $transformbasename \
+               | sed $transformarg`$transformbasename
+    fi
+
+    # don't allow the sed command to completely eliminate the filename.
+    test -z "$dstfile" && dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Move or copy the file name to the temp name
+    $doit $instcmd "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $instcmd $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now remove or move aside any old file at destination location.  We
+    # try this two ways since rm can't unlink itself on some systems and
+    # the destination file might be busy for other reasons.  In this case,
+    # the final cleanup might fail but the new file should still install
+    # successfully.
+    {
+      if test -f "$dstdir/$dstfile"; then
+        $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+        || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+        || {
 	  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
 	  (exit 1); exit
-      }
-    else
-      :
-    fi
-  } &&
+        }
+      else
+        :
+      fi
+    } &&

-  # Now rename the file to the real destination.
-  $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-fi &&
+    # Now rename the file to the real destination.
+    $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+  fi || { (exit 1); exit; }
+done

 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
--- a/config/mdate-sh
+++ b/config/mdate-sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
+
+scriptversion=2003-11-09.00
+
 # Copyright (C) 1995, 1996, 1997, 2003  Free Software Foundation, Inc.
 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
@@ -22,6 +25,31 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: mdate-sh [--help] [--version] FILE
+
+Pretty-print the modification time of FILE.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "mdate-sh $scriptversion"
+    exit 0
+    ;;
+esac
+
 # Prevent date giving response in another language.
 LANG=C
 export LANG
@@ -131,3 +159,12 @@ esac

 # The result.
 echo $day $month $year
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/config/missing
+++ b/config/missing
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+
+scriptversion=2003-09-02.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

 # This program is free software; you can redistribute it and/or modify
@@ -38,12 +42,23 @@ else
  configure_ac=configure.in
 fi

+msg="missing on your system"
+
 case "$1" in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
  ;;
 esac

@@ -74,11 +89,13 @@ Supported PROGRAM values:
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
    ;;

  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
    ;;

  -*)
@@ -94,7 +111,7 @@ Supported PROGRAM values:
    fi

    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
@@ -108,7 +125,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    fi

    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`${configure_ac}'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
@@ -122,7 +139,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    fi

    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
@@ -146,7 +163,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    fi

    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
@@ -162,10 +179,10 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    fi

    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
         proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."

    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
@@ -185,7 +202,7 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your

  bison|yacc)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
@@ -215,7 +232,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if

  lex|flex)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
@@ -243,7 +260,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    fi

    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
@@ -268,7 +285,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    fi

    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
@@ -323,10 +340,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.

  *)
    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
+         it often tells you about the needed prerequisites for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
@@ -334,3 +351,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
 esac

 exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/config/mkinstalldirs
+++ b/config/mkinstalldirs
@@ -1,10 +1,15 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
+
+scriptversion=2003-11-08.23
+
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
 # Public domain.
-
-scriptversion=2003-06-14.23
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.

 errstatus=0
 dirmode=""
@@ -14,7 +19,8 @@ Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...

 Create each directory DIR (with mode MODE, if specified), including all
 leading file name components.
-"
+
+Report bugs to <bug-automake@gnu.org>."

 # process command line arguments
 while test $# -gt 0 ; do
@@ -65,12 +71,25 @@ case $dirmode in
    if mkdir -p -- . 2>/dev/null; then
      echo "mkdir -p -- $*"
      exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./-- && rmdir ./--
    fi
    ;;
  *)
    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
      echo "mkdir -m $dirmode -p -- $*"
      exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./-- "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
    fi
    ;;
 esac
--- a/config/texinfo.tex
+++ b/config/texinfo.tex
--- a/56906
+++ b/56906
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +1,22 @@
 dnl Process this file with autoconf to produce a configure script. -*-m4-*-
-AC_INIT([GNU coreutils],[5.0.1],[bug-coreutils@gnu.org])
+AC_INIT([GNU coreutils],[5.2.0],[bug-coreutils@gnu.org])
 AC_CONFIG_SRCDIR(src/ls.c)

 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS([config.h:config.hin])
-AC_CANONICAL_HOST

-AM_INIT_AUTOMAKE([1.6b gnits dist-bzip2])
+AM_INIT_AUTOMAKE([1.8 gnits dist-bzip2])

-AC_GNU_SOURCE
+gl_DEFAULT_POSIX2_VERSION
+gl_USE_SYSTEM_EXTENSIONS
 jm_PERL
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_RANLIB
 AC_PROG_LN_S
-AC_AIX
-AC_MINIX
+AC_CANONICAL_HOST
+

 AC_CHECK_FUNCS(uname,
 	OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uname\$(EXEEXT)"
@@ -33,29 +33,6 @@ jm_MACROS
 AC_HEADER_TIOCGWINSZ()
 jm_WINSIZE_IN_PTEM

-# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
-# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
-# enable the work-around code in fsusage.c.
-AC_MSG_CHECKING([for statfs that truncates block counts])
-AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#if !defined(sun) && !defined(__sun)
-choke -- this is a workaround for a Sun-specific problem
-#endif
-#include <sys/types.h>
-#include <sys/vfs.h>]],
-  [[struct statfs t; long c = *(t.f_spare);]])],
-  [fu_cv_sys_truncating_statfs=yes],
-  [fu_cv_sys_truncating_statfs=no])])
-if test $fu_cv_sys_truncating_statfs = yes; then
-  AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1,
-[  Define if the block counts reported by statfs may be truncated to 2GB
-   and the correct values may be stored in the f_spare array.
-   (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
-   SunOS 4.1.1 seems not to be affected.)])
-fi
-AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
-
 AC_MSG_CHECKING(whether localtime caches TZ)
 AC_CACHE_VAL(utils_cv_localtime_cache,
 [if test x$ac_cv_func_tzset = xyes; then
@@ -142,9 +119,9 @@ else
  fi
 fi

-AC_DEFUN(jm_DUMMY_1,
+AC_DEFUN([jm_DUMMY_1],
 [
-  AC_REQUIRE([jm_PREREQ_READUTMP])
+  AC_REQUIRE([gl_READUTMP])
  if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
    OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS pinky\$(EXEEXT)"
    OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS users\$(EXEEXT)"
@@ -253,7 +230,7 @@ AC_CHECK_DECLS([strsignal, strtoimax, sys_siglist, _sys_siglist, __sys_siglist])
 jm_LIB_CHECK

 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.13.1)

 AC_CONFIG_FILES(
  Makefile
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -17,3 +17,4 @@ coreutils.tp
 coreutils.vr
 stamp-vti
 version.texi
+coreutils.tmp
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,7 +1,192 @@
+2004-02-17  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (csplit invocation): Correct typo (s/LINE/N/)
+	in description of `N' pattern.  From Reuben Thomas <rrt@sc3d.org>
+
+2004-02-11  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (Time directives): The %s value *is* changed by the
+	--date=DATE option; don't say otherwise.  Patch from Padraig Brady.
+
+2004-02-10  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi (Formatting the file names):
+	Improve wording for --quoting-style documentation.
+	Suggestions by Bruno Haible.
+
+2004-02-02  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (nice invocation): Add examples.
+	Prompted by a suggestion from Dan Jacobson.
+	(factor invocation): Add an example.
+	Update timing numbers for a more modern CPU.
+
+2004-01-27  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (seq invocation): Remove `@dots{}' at end of synopsis.
+	Separate `Synopses' section into three examples.
+	Clarify first paragraph.  @w{}-protect an expression.1
+	Use @option{--option}, rather than @code{--option}.
+
+2004-01-19  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi (Exit status): Document that ordinary failure
+	might not exit with status 1 on unusual platforms.
+	Mention chroot, env, nice, and su as having unusual exit
+	status patterns.  Don't bother to mention true and false
+	since their exit status patterns are actually normal.
+	(sort invocation, su invocation): Mention its unusual exit
+	status pattern.
+	(chroot invocation): Simplify description of exit status 1.
+	Remove duplicate description of status 127.
+	(env invocation): Use consistent tenses; simplifiy description
+	of status 1.
+	(nice invocation): Likewise.
+
+2003-12-15  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi (touch invocation): touch -r and -d can now
+	both be specified, with -r specifying the origin for -d.
+
+2004-01-15  Alfred M. Szmidt  <ams@kemisten.nu>
+
+	Factor out some common options.
+	* coreutils.texi (Common options): Define macros here.
+	(What information is listed, cp invocation): Use the macro(s).
+	(install invocation, mv invocation, ln invocation): Likewise.
+	(df invocation, du invocation): Likewise.
+
+2004-01-09  Jim Meyering  <jim@meyering.net>
+
+	Document the exit status of each and every program.
+	* coreutils.texi (yes invocation): Document that a write error
+	makes `yes' exit unsuccessfully.
+	(chroot invocation): Enumerate the meaning of exit status values.
+	(nice invocation): Likewise.
+	(Exit status) [@macro exitstatus]: New macro.
+	Use @exitstatus to describe the exit status of most programs.
+
+2004-01-02  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (du invocation): Mention that -H will eventually
+	mean not --si, but --dereference-args (-D).
+
+2003-12-20  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (du invocation): Describe new option: -0, --null.
+
+2003-12-03  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi (What information is listed, chroot invocation):
+	Adjust example 'ls' output to match new behavior with narrower
+	output columns.
+	(The cut command): Remove example that cut the output of
+	'ls -l'.  The output was incorrect even with the old 'ls', and
+	the whole idea of using 'cut' on 'ls -l' output is bogus anyway.
+
+2003-11-24  Paul Eggert  <eggert@twinsun.com>
+
+	Parse floating-point operands and options in the C locale.
+	POSIX requires this for printf, and we might as well be
+	consistent elsewhere (tail, sleep, seq).
+
+	* coreutils.texi (tail invocation, printf invocation,
+	sleep invocation, seq invocation): Document this.
+
+2003-11-24  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (Traversing symlinks, Treating / specially):
+	New sections.
+	(rm invocation, chown invocation, chmod invocation, chgrp invocation):
+	Describe new options, --preserve-root and --no-preserve-root.
+
+2003-11-11  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (chown invocation) [chownchgrpoptions]: New macro
+	describing -H, -L, -P options.  Use it here.
+	(chgrp invocation): And here.
+
+2003-11-09  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (dd invocation): Fix typo in example.
+
+2003-10-15  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (ln invocation): Note that --directory, -d, -F
+	probably won't work even for superuser.  Suggestion from Dan Jacobson.
+
+2003-09-29  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi (csplit invocation):
+	The regexp offset need not have a sign; POSIX requires support
+	for signless offets.
+
+2003-10-03  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (du invocation): Describe -P, --no-dereference.
+
+2003-09-28  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (Translating): Correct typo in menu description.
+	From A Costa.
+
+2003-09-02  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi (sort invocation): -d now overrides -i.
+	"whitespace" -> "blanks"; "whitespace" isn't correct.
+	-t '\0' now specifies a NUL tab.
+
+2003-08-17  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (who invocation): Add an entry for -l, --login.
+	Remove `-l' from the entry for --lookup.
+	(who invocation): Begin adding missing option documentation.
+
+2003-08-07  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi (split invocation):
+	Add -d or --numeric-suffixes option to 'split'.
+
+2003-07-31  Paul Eggert  <eggert@twinsun.com>
+
+	* getdate.texi (General date syntax): Add --rfc-2822 option to GNU date.
+	* coreutils.texi (Options for date): Fix a typo in format:
+	it's now %d not %_d.  Add URLs.
+
+2003-07-31  Paul Eggert  <eggert@twinsun.com>
+
+	* getdate.texi (Relative items in date strings): Warn about
+	fuzz in relative units.
+
+2003-07-29  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (tail invocation): Restore two end-of-sentence words
+	that were mistakenly removed on 2002-09-13.  Reported by Paul Worrall.
+
+2003-07-28  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (dd invocation): Explain that a SIGUSR1 signal
+	makes dd give a progress report to stderr.
+
+2003-07-24  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi: Document changes of 2003-07-24.
+
+2003-07-24  Jim Meyering  <jim@meyering.net>
+
+	* coreutils.texi (su invocation): Use `@subsection', not invalid
+	`@heading'.
+
+2003-07-17  Paul Eggert  <eggert@twinsun.com>
+
+	* coreutils.texi (expr invocation): Exit status is 2 if the
+	expression is syntactically invalid, 3 if there is some other error.
+	This change is for conformance to POSIX.
+
 2003-07-14  Paul Eggert  <eggert@twinsun.com>

-	* doc/coreutils.texi (uname invocation): Explain the POSIX
-        terminology behind uname -m and uname -s.
+	* coreutils.texi (uname invocation): Explain the POSIX
+	terminology behind uname -m and uname -s.

 2003-07-13  Jim Meyering  <jim@meyering.net>

@@ -61,7 +246,7 @@

 	Fix printf POSIX compatibility bug reported by Ben Harris in
 	<http://mail.gnu.org/archive/html/bug-coreutils/2003-04/msg00070.html>.
-	* doc/coreutils.texi (printf invocation): It's \NNN in the format,
+	* coreutils.texi (printf invocation): It's \NNN in the format,
 	\0NNN in the %b operand.

 2003-04-10  Jim Meyering  <jim@meyering.net>
@@ -159,7 +344,7 @@
 	compatible with FreeBSD and the POSIX spec is confusing
 	and somewhat contradictory.

-	* doc/coreutils.texi (Which files are listed, General output
+	* coreutils.texi (Which files are listed, General output
 	formatting): Undo last change.

 2003-01-15  Jim Meyering  <jim@meyering.net>
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  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.
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.

@SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -36,6 +34,127 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
+subdir = doc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/stamp-vti $(srcdir)/version.texi ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
+	$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/assert.m4 \
+	$(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/backupfile.m4 \
+	$(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/boottime.m4 \
+	$(top_srcdir)/m4/canon-host.m4 \
+	$(top_srcdir)/m4/canonicalize.m4 \
+	$(top_srcdir)/m4/check-decl.m4 $(top_srcdir)/m4/chown.m4 \
+	$(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/closeout.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \
+	$(top_srcdir)/m4/d-type.m4 $(top_srcdir)/m4/dirfd.m4 \
+	$(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \
+	$(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/error.m4 \
+	$(top_srcdir)/m4/euidaccess.m4 $(top_srcdir)/m4/exclude.m4 \
+	$(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/file-type.m4 $(top_srcdir)/m4/fileblocks.m4 \
+	$(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/fnmatch.m4 \
+	$(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/free.m4 \
+	$(top_srcdir)/m4/fstypename.m4 $(top_srcdir)/m4/fsusage.m4 \
+	$(top_srcdir)/m4/ftruncate.m4 \
+	$(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \
+	$(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getgroups.m4 \
+	$(top_srcdir)/m4/gethostname.m4 $(top_srcdir)/m4/getline.m4 \
+	$(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \
+	$(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/getpass.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/getugroups.m4 \
+	$(top_srcdir)/m4/getusershell.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/group-member.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hash.m4 \
+	$(top_srcdir)/m4/host-os.m4 $(top_srcdir)/m4/human.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/idcache.m4 \
+	$(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/jm-macros.m4 $(top_srcdir)/m4/jm-winsz1.m4 \
+	$(top_srcdir)/m4/jm-winsz2.m4 $(top_srcdir)/m4/lchown.m4 \
+	$(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/link-follow.m4 \
+	$(top_srcdir)/m4/long-options.m4 \
+	$(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/ls-mntd-fs.m4 $(top_srcdir)/m4/lstat.m4 \
+	$(top_srcdir)/m4/makepath.m4 $(top_srcdir)/m4/malloc.m4 \
+	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbswidth.m4 \
+	$(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \
+	$(top_srcdir)/m4/memcmp.m4 $(top_srcdir)/m4/memcoll.m4 \
+	$(top_srcdir)/m4/memcpy.m4 $(top_srcdir)/m4/memmove.m4 \
+	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/memset.m4 \
+	$(top_srcdir)/m4/mkdir-slash.m4 $(top_srcdir)/m4/mkstemp.m4 \
+	$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \
+	$(top_srcdir)/m4/mountlist.m4 $(top_srcdir)/m4/nanosleep.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/obstack.m4 \
+	$(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/path-concat.m4 \
+	$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perl.m4 \
+	$(top_srcdir)/m4/physmem.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/posixtm.m4 $(top_srcdir)/m4/posixver.m4 \
+	$(top_srcdir)/m4/prereq.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/putenv.m4 $(top_srcdir)/m4/quote.m4 \
+	$(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readdir.m4 \
+	$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readtokens.m4 \
+	$(top_srcdir)/m4/readutmp.m4 $(top_srcdir)/m4/realloc.m4 \
+	$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \
+	$(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/rmdir-errno.m4 \
+	$(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rpmatch.m4 \
+	$(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \
+	$(top_srcdir)/m4/same.m4 $(top_srcdir)/m4/save-cwd.m4 \
+	$(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/settime.m4 \
+	$(top_srcdir)/m4/sha.m4 $(top_srcdir)/m4/sig2str.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/st_mtim.m4 \
+	$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio-safer.m4 \
+	$(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
+	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
+	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/strndup.m4 \
+	$(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tzset.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/unlink-busy.m4 \
+	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
+	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
+	$(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \
+	$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
+	$(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+	$(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xstrtod.m4 \
+	$(top_srcdir)/m4/xstrtoimax.m4 $(top_srcdir)/m4/xstrtol.m4 \
+	$(top_srcdir)/m4/xstrtoumax.m4 $(top_srcdir)/m4/yesno.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+INFO_DEPS = $(srcdir)/coreutils.info
+TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
+am__TEXINFO_TEX_DIR = $(top_srcdir)/config
+DVIS = coreutils.dvi
+PDFS = coreutils.pdf
+PSS = coreutils.ps
+HTMLS = coreutils.html
+TEXINFOS = coreutils.texi
+TEXI2DVI = texi2dvi
+TEXI2PDF = $(TEXI2DVI) --pdf --batch
+MAKEINFOHTML = $(MAKEINFO) --html
+AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
+DVIPS = dvips
+am__installdirs = $(DESTDIR)$(infodir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -52,6 +171,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
+DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -61,6 +181,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
+FNMATCH_H = @FNMATCH_H@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
@@ -152,6 +273,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -160,81 +282,112 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 info_TEXINFOS = coreutils.texi
-
 EXTRA_DIST = perm.texi getdate.texi constants.texi doclicense.texi
-
 MAINTAINERCLEANFILES = constants.texi
-subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
-am__TEXINFO_TEX_DIR = $(top_srcdir)/config
-INFO_DEPS = coreutils.info
-DVIS = coreutils.dvi
-PDFS = coreutils.pdf
-PSS = coreutils.ps
-TEXINFOS = coreutils.texi
-DIST_COMMON = ChangeLog Makefile.am Makefile.in stamp-vti version.texi
 all: all-am

 .SUFFIXES:
-.SUFFIXES: .dvi .info .pdf .ps .texi
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+.SUFFIXES: .dvi .html .info .pdf .ps .texi
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits  doc/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  doc/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

 .texi.info:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+	restore=: && \
+	backupdir="$(am__leading_dot)am$$$$" && \
+	am__cwd=`pwd` && cd $(srcdir) && \
+	rm -rf $$backupdir && mkdir $$backupdir && \
+	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+	  if test -f $$f; then \
+	    mv $$f $$backupdir; \
+	    restore=mv; \
+	  fi; \
+	done; \
+	cd "$$am__cwd"; \
+	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	 -o $@ $<; \
+	then \
+	  rc=0; \
+	  cd $(srcdir); \
+	else \
+	  rc=$$?; \
+	  cd $(srcdir) && \
+	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+	fi; \
+	rm -rf $$backupdir; \
+	exit $$rc

 .texi.dvi:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
+	$(TEXI2DVI) $<

 .texi.pdf:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
-coreutils.info: coreutils.texi version.texi
-coreutils.dvi: coreutils.texi version.texi
-coreutils.pdf: coreutils.texi version.texi
-version.texi:  stamp-vti
-stamp-vti: coreutils.texi $(top_srcdir)/configure
+	$(TEXI2PDF) $<
+
+.texi.html:
+	$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	 -o $@ $<
+	if test ! -d $@ && test -d $(@:.html=); then \
+	  mv $(@:.html=) $@; else :; fi
+$(srcdir)/coreutils.info: coreutils.texi $(srcdir)/version.texi
+coreutils.dvi: coreutils.texi $(srcdir)/version.texi
+coreutils.pdf: coreutils.texi $(srcdir)/version.texi
+coreutils.html: coreutils.texi $(srcdir)/version.texi
+$(srcdir)/version.texi:  $(srcdir)/stamp-vti
+$(srcdir)/stamp-vti: coreutils.texi $(top_srcdir)/configure
 	@(dir=.; test -f ./coreutils.texi || dir=$(srcdir); \
 	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/coreutils.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
 	echo "@set VERSION $(VERSION)") > vti.tmp
-	@cmp -s vti.tmp version.texi \
-	  || (echo "Updating version.texi"; \
-	      cp vti.tmp version.texi)
+	@cmp -s vti.tmp $(srcdir)/version.texi \
+	  || (echo "Updating $(srcdir)/version.texi"; \
+	      cp vti.tmp $(srcdir)/version.texi)
 	-@rm -f vti.tmp
-	@cp version.texi $@
+	@cp $(srcdir)/version.texi $@

 mostlyclean-vti:
 	-rm -f vti.tmp

 maintainer-clean-vti:
-	-rm -f stamp-vti version.texi
-TEXI2DVI = texi2dvi
-
-TEXI2PDF = $(TEXI2DVI) --pdf --batch
-DVIPS = dvips
+	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 .dvi.ps:
 	$(DVIPS) -o $@ $<

 uninstall-info-am:
 	$(PRE_UNINSTALL)
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -254,8 +407,12 @@ uninstall-info-am:
 	done

 dist-info: $(INFO_DEPS)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; \
 	for base in $$list; do \
+	  case $$base in \
+	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
+	  esac; \
 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
 	  for file in $$d/$$base*; do \
 	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
@@ -265,10 +422,11 @@ dist-info: $(INFO_DEPS)
 	done

 mostlyclean-aminfo:
-	-rm -f coreutils.aux coreutils.cp coreutils.cps coreutils.fl coreutils.fn \
+	-rm -rf coreutils.aux coreutils.cp coreutils.cps coreutils.fl coreutils.fn \
 	  coreutils.ky coreutils.log coreutils.op coreutils.pg \
 	  coreutils.tmp coreutils.toc coreutils.tp coreutils.tps \
-	  coreutils.vr coreutils.dvi coreutils.pdf coreutils.ps
+	  coreutils.vr coreutils.dvi coreutils.pdf coreutils.ps \
+	  coreutils.html

 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -282,10 +440,6 @@ TAGS:
 ctags: CTAGS
 CTAGS:

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -299,7 +453,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -320,9 +474,8 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(INFO_DEPS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
+	$(mkdir_p) $(DESTDIR)$(infodir)
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -334,7 +487,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -342,7 +495,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -353,13 +506,17 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am

 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic

 dvi: dvi-am

 dvi-am: $(DVIS)

+html: html-am
+
+html-am: $(HTMLS)
+
 info: info-am

 info-am: $(INFO_DEPS)
@@ -372,9 +529,13 @@ install-info: install-info-am

 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	@list='$(INFO_DEPS)'; \
+	$(mkdir_p) $(DESTDIR)$(infodir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  esac; \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
 	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
@@ -388,7 +549,7 @@ install-info-am: $(INFO_DEPS)
 	done
 	@$(POST_INSTALL)
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -401,7 +562,7 @@ install-man:
 installcheck-am:

 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
 	maintainer-clean-generic maintainer-clean-vti

@@ -420,11 +581,11 @@ ps-am: $(PSS)
 uninstall-am: uninstall-info-am

 .PHONY: all all-am check check-am clean clean-generic dist-info \
-	distclean distclean-generic distdir dvi dvi-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-aminfo \
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-aminfo \
 	maintainer-clean-generic maintainer-clean-vti mostlyclean \
 	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
--- a/doc/getdate.texi
+++ b/doc/getdate.texi
@@ -122,7 +122,7 @@ $ TZ=UTC0 date +"%Y-%m-%d %H:%M:%SZ"
 2000-12-15 19:48:05Z
 $ date --iso-8601=seconds  # a GNU extension
 2000-12-15T11:48:05-0800
-$ date --rfc-822  # a GNU extension
+$ date --rfc-2822  # a GNU extension
 Fri, 15 Dec 2000 11:48:05 -0800
 $ date +"%Y-%m-%d %H:%M:%S %z"  # %z is a GNU extension.
 2000-12-15 11:48:05 -0800
@@ -370,6 +370,26 @@ When a relative item causes the resulting date to cross a boundary
 where the clocks were adjusted, typically for daylight-saving time,
 the resulting date and time are adjusted accordingly.

+The fuzz in units can cause problems with relative items.  For
+example, @samp{2003-07-31 -1 month} might evaluate to 2003-07-01,
+because 2003-06-31 is an invalid date.  To determine the previous
+month more reliably, you can ask for the month before the 15th of the
+current month.  For example:
+
+@example
+$ date -R
+Thu, 31 Jul 2003 13:02:39 -0700
+$ date --date="-1 month" +'Last month was %B?'
+Last month was July?
+$ date --date="$(date +%Y-%m-15) -1 month" +'Last month was %B!'
+Last month was June!
+@end example
+
+Also, take care when manipulating dates around clock changes such as
+daylight saving leaps.  In a few cases these have added or subtracted
+as much as 24 hours from the clock, so it is often wise to adopt
+universal time by setting the @env{TZ} environment variable to
+@samp{UTC0} before embarking on calendrical calculations.

@node Pure numbers in date strings
@section Pure numbers in date strings
--- a/166
+++ b/166
@@ -0,0 +1,166 @@
+#!/bin/sh
+# Sign files and upload them.
+
+scriptversion=2004-01-28.17
+
+# Copyright (C) 2004  Free Software Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# Originally written by Alexandre Duret-Lutz <adl@gnu.org>.
+
+set -e
+
+GPG='/usr/bin/gpg --batch --no-tty'
+to=
+
+usage="Usage: $0 [OPTIONS]... FILES...
+
+Sign all FILES, and upload them to selected destinations.
+
+Options:
+  --help                   print this help text and exit
+  --to DEST                specify one destination for FILES
+                           (multiple --to options are allowed)
+  --user NAME              sign with key NAME
+  --version                output version information and exit
+
+Recognized destinations are:
+  alpha.gnu.org:DIRECTORY  build directive files and upload files by FTP
+  ftp.gnu.org:DIRECTORY    build directive files and upload files by FTP
+  [user@]host:DIRECTORY    upload files with scp
+
+Example:
+  gnupload --to sources.redhat.com:~ftp/automake \\
+           --to alpha.gnu.org:automake \\
+           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
+
+Report bugs to <bug-automake@gnu.org>.
+Send patches to <automake-patches@gnu.org>."
+
+while test -n "$1"; do
+  case $1 in
+    --help)
+      echo "$usage"
+      exit 0
+      ;;
+    --to)
+      if test -z "$2"; then
+	echo "$0: Missing argument for --to" 1>&2
+        exit 1
+      else
+        to="$to $2"
+        shift 2
+      fi
+      ;;
+    --user)
+      if test -z "$2"; then
+	echo "$0: Missing argument for --user" 1>&2
+        exit 1
+      else
+        GPG="$GPG --local-user $2"
+        shift 2
+      fi
+      ;;
+    --version)
+      echo "gnupload $scriptversion"
+      exit 0
+      ;;
+    -*)
+      echo "$0: Unknown option \`$1', try \`$0 --help'" 1>&2
+      exit 1
+      ;;
+    *)
+      break
+      ;;
+  esac
+done
+
+if test $# = 0; then
+  echo "$0: No file to upload" 1>&2
+  exit 1
+else
+  :
+fi
+
+# Make sure all files exist.  We don't want to ask
+# for the passphrase if the script will fail.
+for file;
+do
+  if test ! -f $file; then
+    echo "$0: Cannot find \`$file'" 1>&2
+    exit 1
+  else
+    :
+  fi
+done
+
+# Make sure passphrase is not exported in the environment.
+unset passphrase
+
+# Reset PATH to be sure that echo is a built-in.  We will later use
+# `echo $passphrase' to output the passphrase, so it is important that
+# it is a built-in (third-party programs tend to appear in `ps'
+# listings with their arguments...).
+# Remember this script runs with `set -e', so if echo is not built-in
+# it will exit now.
+PATH=/empty echo -n "Enter GPG passphrase: "
+stty -echo
+read -r passphrase
+stty echo
+echo
+
+for file;
+do
+  echo "Signing $file..."
+  rm -f $file.sig
+  echo $passphrase | $GPG --passphrase-fd 0 -ba -o $file.sig $file
+done
+
+for dest in $to;
+do
+  for file;
+  do
+    echo "Uploading $file to $dest..."
+    files="$file $file.sig"
+    case $dest in
+      alpha.gnu.org:*)
+	rm -f $file.directive $file.directive.asc
+	echo directory: `echo $dest | sed 's/[^:]*://'` >$file.directive
+	echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
+        ncftpput ftp-upload.gnu.org /incoming/alpha $files $file.directive.asc
+	rm -f $file.directive $file.directive.asc
+	;;
+      ftp.gnu.org:*)
+	rm -f $file.directive $file.directive.asc
+	echo directory: `echo $dest | sed 's/[^:]*://'` >$file.directive
+	echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
+        ncftpput ftp-upload.gnu.org /incoming/ftp $files $file.directive.asc
+	rm -f $file.directive $file.directive.asc
+	;;
+      *)
+	scp $files $dest
+	;;
+    esac
+  done
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/lib/.cppi-disable
+++ b/lib/.cppi-disable
@@ -1,16 +1,24 @@
 error.h
+exit.h
 fnmatch.h
 fts.c
 fts_.h
+getndelim2.h
 getopt.c
 getopt.h
 getopt1.c
 getpagesize.h
+gettext.h
+localcharset.h
 md5.h
 obstack.h
 printf-args.h
 printf-parse.h
 regex.c
 regex.h
+stdbool_.h
+strndup.h
+time_r.h
 vasnprintf.h
 vasprintf.h
+strtoul.c
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,5 +1,6 @@
 .deps
 Makefile
+alloca.h
 charset.alias
 getdate.c
 getdate.tab.c
--- a/lib/.gdb-history
+++ b/lib/.gdb-history
@@ -227,3 +227,95 @@ n
 p slash
 p slash - path + 1
 q
+q
+r
+b asprintf
+q
+b main
+r
+n
+s
+q
+r
+q
+b asprintf
+r
+n
+s
+s
+s
+b 515
+fin
+b 515
+c
+p length
+c
+p length
+c
+p length
+n
+p maxlen
+p allocated
+n
+n
+p arg
+p maxlen
+n
+p count
+p result
+b 153
+r
+c
+c
+c
+p length
+b 147
+r
+c
+p cp
+cp dp->dir_start
+p dp->dir_start
+p cp
+p length
+n
+n
+q
+r
+q
+b vasnprintf
+n 20
+r
+n 29
+n
+p allocated
+n 20
+n
+complete p alloca
+p allocated 
+p length
+n
+p maxlen
+n
+p maxlen
+n
+p arg
+n
+p result
+q
+complete b vasnp
+b vasnprintf 
+r
+n 30
+n
+p buf
+p result
+complete p alloc
+p allocated
+n
+n
+n
+n
+p count
+p maxlen
+n
+n
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,7 +20,7 @@

 noinst_LIBRARIES = libfetish.a

-INCLUDES = -I.. -I$(srcdir)
+AM_CPPFLAGS = -I.. -I$(srcdir)
 DEFS += -DLIBDIR=\"$(libdir)\"

 ## Put relatively complex files at the beginning of the list so
@@ -42,7 +42,7 @@ libfetish_a_SOURCES = \
  argmatch.c argmatch.h \
  backupfile.c backupfile.h \
  basename.c \
-  bumpalloc.h \
+  c-strtod.c c-strtod.h \
  canon-host.c \
  canonicalize.h \
  closeout.c closeout.h \
@@ -54,16 +54,15 @@ libfetish_a_SOURCES = \
  dup-safer.c \
  euidaccess.h \
  exclude.c exclude.h \
+  exit.h \
  exitfail.c exitfail.h \
  filemode.c filemode.h \
  file-type.c file-type.h \
-  fnmatch_.h \
  fopen-safer.c \
  fsusage.h \
-  ftw_.h \
+  fts.c fts_.h \
  full-read.c full-read.h \
  full-write.c full-write.h \
-  getdelim2.c getdelim2.h \
  getline.h \
  getpagesize.h \
  gettime.c \
@@ -77,7 +76,7 @@ libfetish_a_SOURCES = \
  imaxtostr.c \
  lchown.h \
  linebuffer.c linebuffer.h \
-  localcharset.c \
+  localcharset.c localcharset.h \
  long-options.c long-options.h \
  makepath.c makepath.h \
  mbswidth.c mbswidth.h \
@@ -95,37 +94,42 @@ libfetish_a_SOURCES = \
  readtokens.c readtokens.h \
  readutmp.h \
  regex.h \
+  root-dev-ino.c root-dev-ino.h \
  safe-read.c safe-read.h \
  safe-write.c safe-write.h \
  same.c same.h \
  save-cwd.c save-cwd.h \
  savedir.c savedir.h \
-  search_.h \
  settime.c \
-  sha.c sha.h \
+  sha1.c sha1.h \
  sig2str.h \
  stdio-safer.h \
  stripslash.c \
+  strndup.h \
  strverscmp.h \
+  time_r.c time_r.h \
  timespec.h \
  umaxtostr.c \
  unicodeio.c unicodeio.h \
  unistd-safer.h \
  unlocked-io.h \
-  userspec.c \
+  userspec.c userspec.h \
+  utimens.c utimens.h \
  version-etc.c version-etc.h \
  xalloc.h \
+  xfts.c xfts.h \
  xgetcwd.c xgetcwd.h \
-  xgethostname.c \
+  xgethostname.c xgethostname.h \
  xmalloc.c \
  xmemcoll.c xmemcoll.h \
  xnanosleep.c xnanosleep.h \
  xreadlink.c xreadlink.h \
  xstrdup.c \
+  xstrndup.c xstrndup.h \
  xstrtod.c xstrtod.h \
+  xstrtoimax.c \
  xstrtol.c xstrtol.h \
  xstrtoul.c \
-  xstrtoimax.c \
  xstrtoumax.c \
  yesno.c

@@ -138,15 +142,20 @@ libfetish_a_SOURCES += \
 libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA)
 libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)

+lib_OBJECTS = $(libfetish_a_OBJECTS)
+

 BUILT_SOURCES = getdate.c
+CLEANFILES =
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 MOSTLYCLEANFILES =
+SUFFIXES =

 EXTRA_DIST = config.charset ref-add.sin ref-del.sin \
-  fnmatch_loop.c inttostr.c inttostr.h
+  getndelim2.c getndelim2.h \
+  inttostr.c inttostr.h

-# The following is needed in order to install a simple file in $(libdir)
+# We need the following in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
 # packages so that "make uninstall" will remove the file if and only if it
 # is not used by another installed package.
@@ -158,13 +167,13 @@ all-local: charset.alias ref-add.sed ref-del.sed
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
 	if test -f $(charset_alias); then \
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	  rm -f $(charset_tmp) ; \
 	else \
-	  if test @GLIBC21@ = no; then \
+	  if test $(GLIBC21) = no; then \
 	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
 	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	    rm -f $(charset_tmp) ; \
@@ -184,30 +193,42 @@ uninstall-local: all-local
 	fi

 charset.alias: config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
 	mv t-$@ $@

-BUILT_SOURCES += $(STDBOOL_H)
-EXTRA_DIST += stdbool.hin
-MOSTLYCLEANFILES += stdbool.h stdbool.ht
-# Create stdbool.h on systems that lack a working one.
-stdbool.h: stdbool.hin
-	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool.hin > $@t
-	mv $@t $@
-
-BUILT_SOURCES += $(ALLOCA_H)
-EXTRA_DIST += alloca_.h
-MOSTLYCLEANFILES += alloca.h alloca.ht
-# Create an <alloca.h> when the system
-# doesn't have one that works with the given compiler.
-alloca.h: alloca_.h
-	cp $(srcdir)/alloca_.h $@t
-	mv $@t $@
-
-SUFFIXES = .sed .sin
+SUFFIXES += .sed .sin
 .sin.sed:
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
 	mv t-$@ $@

-CLEANFILES = charset.alias ref-add.sed ref-del.sed
-DISTCLEANFILES = ftw.h search.h fnmatch.h
+CLEANFILES += charset.alias ref-add.sed ref-del.sed
+
+BUILT_SOURCES += $(STDBOOL_H)
+EXTRA_DIST += stdbool_.h
+MOSTLYCLEANFILES += stdbool.h stdbool.ht
+# Create stdbool.h on systems that lack a working one.
+stdbool.h: stdbool_.h
+	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool_.h > $@t
+	mv $@t $@
+
+BUILT_SOURCES += $(ALLOCA_H)
+EXTRA_DIST += alloca_.h
+
+# We need the following in order to create an <alloca.h> when the system
+# doesn't have one that works with the given compiler.
+all-local $(lib_OBJECTS): $(ALLOCA_H)
+alloca.h: alloca_.h
+	cp $(srcdir)/alloca_.h $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += alloca.h alloca.h-t
+
+BUILT_SOURCES += $(FNMATCH_H)
+EXTRA_DIST += fnmatch_.h fnmatch_loop.c
+
+# We need the following in order to create an <fnmatch.h> when the system
+# doesn't have one that supports the required API.
+all-local $(lib_OBJECTS): $(FNMATCH_H)
+fnmatch.h: fnmatch_.h
+	cp $(srcdir)/fnmatch_.h $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@

-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  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.
@@ -17,6 +17,8 @@
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free
 # Software Foundation, Inc.

+SOURCES = $(libfetish_a_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -24,7 +26,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -39,6 +40,253 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
+subdir = lib
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	ChangeLog TODO __fpending.c alloca.c asnprintf.c asprintf.c \
+	atexit.c canonicalize.c chown.c dirfd.c dup2.c error.c error.h \
+	euidaccess.c fchdir-stub.c fchown-stub.c fileblocks.c \
+	fnmatch.c free.c fsusage.c ftruncate.c getcwd.c getdate.c \
+	getgroups.c gethostname.c getline.c getloadavg.c getndelim2.c \
+	getpass.c gettimeofday.c getusershell.c group-member.c \
+	lchown.c lstat.c malloc.c memchr.c memcmp.c memcpy.c memmove.c \
+	memrchr.c memset.c mkdir.c mkstemp.c mktime.c mountlist.c \
+	nanosleep.c obstack.c obstack.h printf-args.c printf-parse.c \
+	putenv.c raise.c readlink.c readutmp.c realloc.c regex.c \
+	rename.c rmdir.c rpmatch.c sig2str.c stat.c stpcpy.c \
+	strcasecmp.c strcspn.c strdup.c strncasecmp.c strndup.c \
+	strnlen.c strpbrk.c strstr.c strtod.c strtoimax.c strtol.c \
+	strtoll.c strtoul.c strtoull.c strtoumax.c strverscmp.c \
+	tempname.c utime.c vasnprintf.c vasprintf.c
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
+	$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/assert.m4 \
+	$(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/backupfile.m4 \
+	$(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/boottime.m4 \
+	$(top_srcdir)/m4/canon-host.m4 \
+	$(top_srcdir)/m4/canonicalize.m4 \
+	$(top_srcdir)/m4/check-decl.m4 $(top_srcdir)/m4/chown.m4 \
+	$(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/closeout.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \
+	$(top_srcdir)/m4/d-type.m4 $(top_srcdir)/m4/dirfd.m4 \
+	$(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \
+	$(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/error.m4 \
+	$(top_srcdir)/m4/euidaccess.m4 $(top_srcdir)/m4/exclude.m4 \
+	$(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/file-type.m4 $(top_srcdir)/m4/fileblocks.m4 \
+	$(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/fnmatch.m4 \
+	$(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/free.m4 \
+	$(top_srcdir)/m4/fstypename.m4 $(top_srcdir)/m4/fsusage.m4 \
+	$(top_srcdir)/m4/ftruncate.m4 \
+	$(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \
+	$(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getgroups.m4 \
+	$(top_srcdir)/m4/gethostname.m4 $(top_srcdir)/m4/getline.m4 \
+	$(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \
+	$(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/getpass.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/getugroups.m4 \
+	$(top_srcdir)/m4/getusershell.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/group-member.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hash.m4 \
+	$(top_srcdir)/m4/host-os.m4 $(top_srcdir)/m4/human.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/idcache.m4 \
+	$(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/jm-macros.m4 $(top_srcdir)/m4/jm-winsz1.m4 \
+	$(top_srcdir)/m4/jm-winsz2.m4 $(top_srcdir)/m4/lchown.m4 \
+	$(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/link-follow.m4 \
+	$(top_srcdir)/m4/long-options.m4 \
+	$(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/ls-mntd-fs.m4 $(top_srcdir)/m4/lstat.m4 \
+	$(top_srcdir)/m4/makepath.m4 $(top_srcdir)/m4/malloc.m4 \
+	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbswidth.m4 \
+	$(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \
+	$(top_srcdir)/m4/memcmp.m4 $(top_srcdir)/m4/memcoll.m4 \
+	$(top_srcdir)/m4/memcpy.m4 $(top_srcdir)/m4/memmove.m4 \
+	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/memset.m4 \
+	$(top_srcdir)/m4/mkdir-slash.m4 $(top_srcdir)/m4/mkstemp.m4 \
+	$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \
+	$(top_srcdir)/m4/mountlist.m4 $(top_srcdir)/m4/nanosleep.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/obstack.m4 \
+	$(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/path-concat.m4 \
+	$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perl.m4 \
+	$(top_srcdir)/m4/physmem.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/posixtm.m4 $(top_srcdir)/m4/posixver.m4 \
+	$(top_srcdir)/m4/prereq.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/putenv.m4 $(top_srcdir)/m4/quote.m4 \
+	$(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readdir.m4 \
+	$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readtokens.m4 \
+	$(top_srcdir)/m4/readutmp.m4 $(top_srcdir)/m4/realloc.m4 \
+	$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \
+	$(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/rmdir-errno.m4 \
+	$(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rpmatch.m4 \
+	$(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \
+	$(top_srcdir)/m4/same.m4 $(top_srcdir)/m4/save-cwd.m4 \
+	$(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/settime.m4 \
+	$(top_srcdir)/m4/sha.m4 $(top_srcdir)/m4/sig2str.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/st_mtim.m4 \
+	$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio-safer.m4 \
+	$(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
+	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
+	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/strndup.m4 \
+	$(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tzset.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/unlink-busy.m4 \
+	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
+	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
+	$(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \
+	$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
+	$(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+	$(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xstrtod.m4 \
+	$(top_srcdir)/m4/xstrtoimax.m4 $(top_srcdir)/m4/xstrtol.m4 \
+	$(top_srcdir)/m4/xstrtoumax.m4 $(top_srcdir)/m4/yesno.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+AR = ar
+ARFLAGS = cru
+LIBRARIES = $(noinst_LIBRARIES)
+libfetish_a_AR = $(AR) $(ARFLAGS)
+am__DEPENDENCIES_1 = @LIBOBJS@
+am__DEPENDENCIES_2 = @ALLOCA@
+am_libfetish_a_OBJECTS = acl.$(OBJEXT) getdate.$(OBJEXT) \
+	posixtm.$(OBJEXT) posixver.$(OBJEXT) strftime.$(OBJEXT) \
+	getopt.$(OBJEXT) getopt1.$(OBJEXT) hash.$(OBJEXT) \
+	hash-pjw.$(OBJEXT) addext.$(OBJEXT) argmatch.$(OBJEXT) \
+	backupfile.$(OBJEXT) basename.$(OBJEXT) c-strtod.$(OBJEXT) \
+	canon-host.$(OBJEXT) closeout.$(OBJEXT) cycle-check.$(OBJEXT) \
+	diacrit.$(OBJEXT) dirname.$(OBJEXT) dup-safer.$(OBJEXT) \
+	exclude.$(OBJEXT) exitfail.$(OBJEXT) filemode.$(OBJEXT) \
+	file-type.$(OBJEXT) fopen-safer.$(OBJEXT) fts.$(OBJEXT) \
+	full-read.$(OBJEXT) full-write.$(OBJEXT) gettime.$(OBJEXT) \
+	getugroups.$(OBJEXT) hard-locale.$(OBJEXT) human.$(OBJEXT) \
+	idcache.$(OBJEXT) isdir.$(OBJEXT) imaxtostr.$(OBJEXT) \
+	linebuffer.$(OBJEXT) localcharset.$(OBJEXT) \
+	long-options.$(OBJEXT) makepath.$(OBJEXT) mbswidth.$(OBJEXT) \
+	md5.$(OBJEXT) memcasecmp.$(OBJEXT) memcoll.$(OBJEXT) \
+	modechange.$(OBJEXT) offtostr.$(OBJEXT) path-concat.$(OBJEXT) \
+	physmem.$(OBJEXT) quote.$(OBJEXT) quotearg.$(OBJEXT) \
+	readtokens.$(OBJEXT) root-dev-ino.$(OBJEXT) \
+	safe-read.$(OBJEXT) safe-write.$(OBJEXT) same.$(OBJEXT) \
+	save-cwd.$(OBJEXT) savedir.$(OBJEXT) settime.$(OBJEXT) \
+	sha1.$(OBJEXT) stripslash.$(OBJEXT) time_r.$(OBJEXT) \
+	umaxtostr.$(OBJEXT) unicodeio.$(OBJEXT) userspec.$(OBJEXT) \
+	utimens.$(OBJEXT) version-etc.$(OBJEXT) xfts.$(OBJEXT) \
+	xgetcwd.$(OBJEXT) xgethostname.$(OBJEXT) xmalloc.$(OBJEXT) \
+	xmemcoll.$(OBJEXT) xnanosleep.$(OBJEXT) xreadlink.$(OBJEXT) \
+	xstrdup.$(OBJEXT) xstrndup.$(OBJEXT) xstrtod.$(OBJEXT) \
+	xstrtoimax.$(OBJEXT) xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) \
+	xstrtoumax.$(OBJEXT) yesno.$(OBJEXT)
+libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/__fpending.Po $(DEPDIR)/alloca.Po \
+@AMDEP_TRUE@	$(DEPDIR)/asnprintf.Po $(DEPDIR)/asprintf.Po \
+@AMDEP_TRUE@	$(DEPDIR)/atexit.Po $(DEPDIR)/canonicalize.Po \
+@AMDEP_TRUE@	$(DEPDIR)/chown.Po $(DEPDIR)/dirfd.Po \
+@AMDEP_TRUE@	$(DEPDIR)/dup2.Po $(DEPDIR)/error.Po \
+@AMDEP_TRUE@	$(DEPDIR)/euidaccess.Po $(DEPDIR)/fchdir-stub.Po \
+@AMDEP_TRUE@	$(DEPDIR)/fchown-stub.Po $(DEPDIR)/fileblocks.Po \
+@AMDEP_TRUE@	$(DEPDIR)/fnmatch.Po $(DEPDIR)/free.Po \
+@AMDEP_TRUE@	$(DEPDIR)/fsusage.Po $(DEPDIR)/ftruncate.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getcwd.Po $(DEPDIR)/getgroups.Po \
+@AMDEP_TRUE@	$(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getloadavg.Po $(DEPDIR)/getndelim2.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getpass.Po $(DEPDIR)/gettimeofday.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getusershell.Po \
+@AMDEP_TRUE@	$(DEPDIR)/group-member.Po $(DEPDIR)/lchown.Po \
+@AMDEP_TRUE@	$(DEPDIR)/lstat.Po $(DEPDIR)/malloc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mkdir.Po $(DEPDIR)/mkstemp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mktime.Po $(DEPDIR)/mountlist.Po \
+@AMDEP_TRUE@	$(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
+@AMDEP_TRUE@	$(DEPDIR)/printf-args.Po $(DEPDIR)/printf-parse.Po \
+@AMDEP_TRUE@	$(DEPDIR)/putenv.Po $(DEPDIR)/raise.Po \
+@AMDEP_TRUE@	$(DEPDIR)/readlink.Po $(DEPDIR)/readutmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rpmatch.Po $(DEPDIR)/sig2str.Po \
+@AMDEP_TRUE@	$(DEPDIR)/stat.Po $(DEPDIR)/stpcpy.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strdup.Po $(DEPDIR)/strncasecmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtod.Po $(DEPDIR)/strtoimax.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtol.Po $(DEPDIR)/strtoll.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/tempname.Po $(DEPDIR)/utime.Po \
+@AMDEP_TRUE@	$(DEPDIR)/vasnprintf.Po $(DEPDIR)/vasprintf.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/acl.Po ./$(DEPDIR)/addext.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/argmatch.Po ./$(DEPDIR)/backupfile.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/basename.Po ./$(DEPDIR)/c-strtod.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/canon-host.Po ./$(DEPDIR)/closeout.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/cycle-check.Po ./$(DEPDIR)/diacrit.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/dirname.Po ./$(DEPDIR)/dup-safer.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/exclude.Po ./$(DEPDIR)/exitfail.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/file-type.Po ./$(DEPDIR)/filemode.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/fopen-safer.Po ./$(DEPDIR)/fts.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/full-read.Po ./$(DEPDIR)/full-write.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/getdate.Po ./$(DEPDIR)/getopt.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/gettime.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/getugroups.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/hard-locale.Po ./$(DEPDIR)/hash-pjw.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/hash.Po ./$(DEPDIR)/human.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/idcache.Po ./$(DEPDIR)/imaxtostr.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/isdir.Po ./$(DEPDIR)/linebuffer.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/localcharset.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/long-options.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/makepath.Po ./$(DEPDIR)/mbswidth.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/md5.Po ./$(DEPDIR)/memcasecmp.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/memcoll.Po ./$(DEPDIR)/modechange.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/offtostr.Po ./$(DEPDIR)/path-concat.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/physmem.Po ./$(DEPDIR)/posixtm.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/posixver.Po ./$(DEPDIR)/quote.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/quotearg.Po ./$(DEPDIR)/readtokens.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/root-dev-ino.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/safe-read.Po ./$(DEPDIR)/safe-write.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/same.Po ./$(DEPDIR)/save-cwd.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/savedir.Po ./$(DEPDIR)/settime.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/sha1.Po ./$(DEPDIR)/strftime.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/stripslash.Po ./$(DEPDIR)/time_r.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/umaxtostr.Po ./$(DEPDIR)/unicodeio.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/userspec.Po ./$(DEPDIR)/utimens.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/version-etc.Po ./$(DEPDIR)/xfts.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xgetcwd.Po ./$(DEPDIR)/xgethostname.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xmalloc.Po ./$(DEPDIR)/xmemcoll.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xnanosleep.Po ./$(DEPDIR)/xreadlink.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xstrdup.Po ./$(DEPDIR)/xstrndup.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xstrtod.Po ./$(DEPDIR)/xstrtoimax.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xstrtol.Po ./$(DEPDIR)/xstrtoul.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xstrtoumax.Po ./$(DEPDIR)/yesno.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+SOURCES = $(libfetish_a_SOURCES)
+DIST_SOURCES = $(libfetish_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -55,6 +303,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
+DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@
 DEFS = @DEFS@ -DLIBDIR=\"$(libdir)\"
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -64,6 +313,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
+FNMATCH_H = @FNMATCH_H@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
@@ -146,6 +396,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -153,11 +404,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 noinst_LIBRARIES = libfetish.a
-
-INCLUDES = -I.. -I$(srcdir)
-
+AM_CPPFLAGS = -I.. -I$(srcdir)
 libfetish_a_SOURCES = \
  acl.h acl.c \
  getdate.h getdate.y \
@@ -172,7 +420,7 @@ libfetish_a_SOURCES = \
  argmatch.c argmatch.h \
  backupfile.c backupfile.h \
  basename.c \
-  bumpalloc.h \
+  c-strtod.c c-strtod.h \
  canon-host.c \
  canonicalize.h \
  closeout.c closeout.h \
@@ -184,16 +432,15 @@ libfetish_a_SOURCES = \
  dup-safer.c \
  euidaccess.h \
  exclude.c exclude.h \
+  exit.h \
  exitfail.c exitfail.h \
  filemode.c filemode.h \
  file-type.c file-type.h \
-  fnmatch_.h \
  fopen-safer.c \
  fsusage.h \
-  ftw_.h \
+  fts.c fts_.h \
  full-read.c full-read.h \
  full-write.c full-write.h \
-  getdelim2.c getdelim2.h \
  getline.h \
  getpagesize.h \
  gettime.c \
@@ -207,7 +454,7 @@ libfetish_a_SOURCES = \
  imaxtostr.c \
  lchown.h \
  linebuffer.c linebuffer.h \
-  localcharset.c \
+  localcharset.c localcharset.h \
  long-options.c long-options.h \
  makepath.c makepath.h \
  mbswidth.c mbswidth.h \
@@ -225,37 +472,42 @@ libfetish_a_SOURCES = \
  readtokens.c readtokens.h \
  readutmp.h \
  regex.h \
+  root-dev-ino.c root-dev-ino.h \
  safe-read.c safe-read.h \
  safe-write.c safe-write.h \
  same.c same.h \
  save-cwd.c save-cwd.h \
  savedir.c savedir.h \
-  search_.h \
  settime.c \
-  sha.c sha.h \
+  sha1.c sha1.h \
  sig2str.h \
  stdio-safer.h \
  stripslash.c \
+  strndup.h \
  strverscmp.h \
+  time_r.c time_r.h \
  timespec.h \
  umaxtostr.c \
  unicodeio.c unicodeio.h \
  unistd-safer.h \
  unlocked-io.h \
-  userspec.c \
+  userspec.c userspec.h \
+  utimens.c utimens.h \
  version-etc.c version-etc.h \
  xalloc.h \
+  xfts.c xfts.h \
  xgetcwd.c xgetcwd.h \
-  xgethostname.c \
+  xgethostname.c xgethostname.h \
  xmalloc.c \
  xmemcoll.c xmemcoll.h \
  xnanosleep.c xnanosleep.h \
  xreadlink.c xreadlink.h \
  xstrdup.c \
+  xstrndup.c xstrndup.h \
  xstrtod.c xstrtod.h \
+  xstrtoimax.c \
  xstrtol.c xstrtol.h \
  xstrtoul.c \
-  xstrtoimax.c \
  xstrtoumax.c \
  yesno.c\
 \
@@ -264,177 +516,54 @@ libfetish_a_SOURCES = \
  vasprintf.h \
  vasnprintf.h

-
 libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA)
 libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
-
-BUILT_SOURCES = getdate.c $(STDBOOL_H) $(ALLOCA_H)
+lib_OBJECTS = $(libfetish_a_OBJECTS)
+BUILT_SOURCES = getdate.c $(STDBOOL_H) $(ALLOCA_H) $(FNMATCH_H)
+CLEANFILES = charset.alias ref-add.sed ref-del.sed
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-MOSTLYCLEANFILES = stdbool.h stdbool.ht alloca.h alloca.ht
-
+MOSTLYCLEANFILES = stdbool.h stdbool.ht alloca.h alloca.h-t fnmatch.h fnmatch.h-t
+SUFFIXES = .sed .sin
 EXTRA_DIST = config.charset ref-add.sin ref-del.sin \
-  fnmatch_loop.c inttostr.c inttostr.h\
-stdbool.hin alloca_.h
-
+  getndelim2.c getndelim2.h \
+  inttostr.c inttostr.h\
+stdbool_.h alloca_.h fnmatch_.h fnmatch_loop.c
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-
-SUFFIXES = .sed .sin
-
-CLEANFILES = charset.alias ref-add.sed ref-del.sed
-DISTCLEANFILES = ftw.h search.h fnmatch.h
-subdir = lib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libfetish_a_AR = $(AR) cru
-am_libfetish_a_OBJECTS = acl.$(OBJEXT) getdate.$(OBJEXT) \
-	posixtm.$(OBJEXT) posixver.$(OBJEXT) strftime.$(OBJEXT) \
-	getopt.$(OBJEXT) getopt1.$(OBJEXT) hash.$(OBJEXT) \
-	hash-pjw.$(OBJEXT) addext.$(OBJEXT) argmatch.$(OBJEXT) \
-	backupfile.$(OBJEXT) basename.$(OBJEXT) canon-host.$(OBJEXT) \
-	closeout.$(OBJEXT) cycle-check.$(OBJEXT) diacrit.$(OBJEXT) \
-	dirname.$(OBJEXT) dup-safer.$(OBJEXT) exclude.$(OBJEXT) \
-	exitfail.$(OBJEXT) filemode.$(OBJEXT) file-type.$(OBJEXT) \
-	fopen-safer.$(OBJEXT) full-read.$(OBJEXT) full-write.$(OBJEXT) \
-	getdelim2.$(OBJEXT) gettime.$(OBJEXT) getugroups.$(OBJEXT) \
-	hard-locale.$(OBJEXT) human.$(OBJEXT) idcache.$(OBJEXT) \
-	isdir.$(OBJEXT) imaxtostr.$(OBJEXT) linebuffer.$(OBJEXT) \
-	localcharset.$(OBJEXT) long-options.$(OBJEXT) \
-	makepath.$(OBJEXT) mbswidth.$(OBJEXT) md5.$(OBJEXT) \
-	memcasecmp.$(OBJEXT) memcoll.$(OBJEXT) modechange.$(OBJEXT) \
-	offtostr.$(OBJEXT) path-concat.$(OBJEXT) physmem.$(OBJEXT) \
-	quote.$(OBJEXT) quotearg.$(OBJEXT) readtokens.$(OBJEXT) \
-	safe-read.$(OBJEXT) safe-write.$(OBJEXT) same.$(OBJEXT) \
-	save-cwd.$(OBJEXT) savedir.$(OBJEXT) settime.$(OBJEXT) \
-	sha.$(OBJEXT) stripslash.$(OBJEXT) umaxtostr.$(OBJEXT) \
-	unicodeio.$(OBJEXT) userspec.$(OBJEXT) version-etc.$(OBJEXT) \
-	xgetcwd.$(OBJEXT) xgethostname.$(OBJEXT) xmalloc.$(OBJEXT) \
-	xmemcoll.$(OBJEXT) xnanosleep.$(OBJEXT) xreadlink.$(OBJEXT) \
-	xstrdup.$(OBJEXT) xstrtod.$(OBJEXT) xstrtol.$(OBJEXT) \
-	xstrtoul.$(OBJEXT) xstrtoimax.$(OBJEXT) xstrtoumax.$(OBJEXT) \
-	yesno.$(OBJEXT)
-libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/__fpending.Po $(DEPDIR)/alloca.Po \
-@AMDEP_TRUE@	$(DEPDIR)/asnprintf.Po $(DEPDIR)/asprintf.Po \
-@AMDEP_TRUE@	$(DEPDIR)/atexit.Po $(DEPDIR)/canonicalize.Po \
-@AMDEP_TRUE@	$(DEPDIR)/chown.Po $(DEPDIR)/dirfd.Po \
-@AMDEP_TRUE@	$(DEPDIR)/dup2.Po $(DEPDIR)/error.Po \
-@AMDEP_TRUE@	$(DEPDIR)/euidaccess.Po $(DEPDIR)/fchdir-stub.Po \
-@AMDEP_TRUE@	$(DEPDIR)/fchown-stub.Po $(DEPDIR)/fileblocks.Po \
-@AMDEP_TRUE@	$(DEPDIR)/fnmatch.Po $(DEPDIR)/fsusage.Po \
-@AMDEP_TRUE@	$(DEPDIR)/ftruncate.Po $(DEPDIR)/ftw.Po \
-@AMDEP_TRUE@	$(DEPDIR)/getcwd.Po $(DEPDIR)/getgroups.Po \
-@AMDEP_TRUE@	$(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po \
-@AMDEP_TRUE@	$(DEPDIR)/getloadavg.Po $(DEPDIR)/getpass.Po \
-@AMDEP_TRUE@	$(DEPDIR)/gettimeofday.Po $(DEPDIR)/getusershell.Po \
-@AMDEP_TRUE@	$(DEPDIR)/group-member.Po $(DEPDIR)/lchown.Po \
-@AMDEP_TRUE@	$(DEPDIR)/lstat-stub.Po $(DEPDIR)/lstat.Po \
-@AMDEP_TRUE@	$(DEPDIR)/malloc.Po $(DEPDIR)/memchr.Po \
-@AMDEP_TRUE@	$(DEPDIR)/memcmp.Po $(DEPDIR)/memcpy.Po \
-@AMDEP_TRUE@	$(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po \
-@AMDEP_TRUE@	$(DEPDIR)/memset.Po $(DEPDIR)/mkdir.Po \
-@AMDEP_TRUE@	$(DEPDIR)/mkstemp.Po $(DEPDIR)/mktime.Po \
-@AMDEP_TRUE@	$(DEPDIR)/mountlist.Po $(DEPDIR)/nanosleep.Po \
-@AMDEP_TRUE@	$(DEPDIR)/obstack.Po $(DEPDIR)/printf-args.Po \
-@AMDEP_TRUE@	$(DEPDIR)/printf-parse.Po $(DEPDIR)/putenv.Po \
-@AMDEP_TRUE@	$(DEPDIR)/raise.Po $(DEPDIR)/readlink-stub.Po \
-@AMDEP_TRUE@	$(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po \
-@AMDEP_TRUE@	$(DEPDIR)/regex.Po $(DEPDIR)/rename.Po \
-@AMDEP_TRUE@	$(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po \
-@AMDEP_TRUE@	$(DEPDIR)/sig2str.Po $(DEPDIR)/stat.Po \
-@AMDEP_TRUE@	$(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strcspn.Po $(DEPDIR)/strdup.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strtoimax.Po $(DEPDIR)/strtol.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strtoll.Po $(DEPDIR)/strtoul.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strtoull.Po $(DEPDIR)/strtoumax.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strverscmp.Po $(DEPDIR)/tempname.Po \
-@AMDEP_TRUE@	$(DEPDIR)/tsearch.Po $(DEPDIR)/utime.Po \
-@AMDEP_TRUE@	$(DEPDIR)/vasnprintf.Po $(DEPDIR)/vasprintf.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/acl.Po ./$(DEPDIR)/addext.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/argmatch.Po ./$(DEPDIR)/backupfile.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/basename.Po ./$(DEPDIR)/canon-host.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/closeout.Po ./$(DEPDIR)/cycle-check.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/diacrit.Po ./$(DEPDIR)/dirname.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/dup-safer.Po ./$(DEPDIR)/exclude.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/exitfail.Po ./$(DEPDIR)/file-type.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/filemode.Po ./$(DEPDIR)/fopen-safer.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/full-read.Po ./$(DEPDIR)/full-write.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/getdate.Po ./$(DEPDIR)/getdelim2.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gettime.Po ./$(DEPDIR)/getugroups.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/hard-locale.Po ./$(DEPDIR)/hash-pjw.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/hash.Po ./$(DEPDIR)/human.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/idcache.Po ./$(DEPDIR)/imaxtostr.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/isdir.Po ./$(DEPDIR)/linebuffer.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/localcharset.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/long-options.Po ./$(DEPDIR)/makepath.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mbswidth.Po ./$(DEPDIR)/md5.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/memcasecmp.Po ./$(DEPDIR)/memcoll.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/modechange.Po ./$(DEPDIR)/offtostr.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/path-concat.Po ./$(DEPDIR)/physmem.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/posixtm.Po ./$(DEPDIR)/posixver.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/quote.Po ./$(DEPDIR)/quotearg.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/readtokens.Po ./$(DEPDIR)/safe-read.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/safe-write.Po ./$(DEPDIR)/same.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/save-cwd.Po ./$(DEPDIR)/savedir.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/settime.Po ./$(DEPDIR)/sha.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/strftime.Po ./$(DEPDIR)/stripslash.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/umaxtostr.Po ./$(DEPDIR)/unicodeio.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/userspec.Po ./$(DEPDIR)/version-etc.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xgetcwd.Po ./$(DEPDIR)/xgethostname.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xmalloc.Po ./$(DEPDIR)/xmemcoll.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xnanosleep.Po ./$(DEPDIR)/xreadlink.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xstrdup.Po ./$(DEPDIR)/xstrtod.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xstrtoimax.Po ./$(DEPDIR)/xstrtol.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xstrtoul.Po ./$(DEPDIR)/xstrtoumax.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/yesno.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-DIST_SOURCES = $(libfetish_a_SOURCES)
-DIST_COMMON = README ChangeLog Makefile.am Makefile.in TODO \
-	__fpending.c alloca.c asnprintf.c asprintf.c atexit.c \
-	canonicalize.c chown.c dirfd.c dup2.c error.c error.h \
-	euidaccess.c fchdir-stub.c fchown-stub.c fileblocks.c fnmatch.c \
-	fsusage.c ftruncate.c ftw.c getcwd.c getdate.c getgroups.c \
-	gethostname.c getline.c getloadavg.c getpass.c gettimeofday.c \
-	getusershell.c group-member.c lchown.c lstat-stub.c lstat.c \
-	malloc.c memchr.c memcmp.c memcpy.c memmove.c memrchr.c \
-	memset.c mkdir.c mkstemp.c mktime.c mountlist.c nanosleep.c \
-	obstack.c obstack.h printf-args.c printf-parse.c putenv.c \
-	raise.c readlink-stub.c readutmp.c realloc.c regex.c rename.c \
-	rmdir.c rpmatch.c sig2str.c stat.c stpcpy.c strcasecmp.c \
-	strcspn.c strdup.c strncasecmp.c strndup.c strnlen.c strpbrk.c \
-	strstr.c strtod.c strtoimax.c strtol.c strtoll.c strtoul.c \
-	strtoull.c strtoumax.c strverscmp.c tempname.c tsearch.c \
-	utime.c vasnprintf.c vasprintf.c
-SOURCES = $(libfetish_a_SOURCES)
-
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am

 .SUFFIXES:
 .SUFFIXES: .sed .sin .c .o .obj .y
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits  lib/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  lib/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;

-AR = ar
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -444,7 +573,7 @@ libfetish.a: $(libfetish_a_OBJECTS) $(libfetish_a_DEPENDENCIES)
 	$(RANLIB) libfetish.a

 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)

 distclean-compile:
 	-rm -f *.tab.c
@@ -464,20 +593,20 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fchown-stub.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fileblocks.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/free.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fsusage.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftruncate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftw.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getcwd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getgroups.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gethostname.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getline.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getloadavg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getndelim2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getpass.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gettimeofday.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getusershell.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/group-member.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lchown.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lstat-stub.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lstat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memchr.Po@am__quote@
@@ -496,7 +625,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/printf-parse.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putenv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/raise.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/readlink-stub.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/readlink.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/readutmp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@
@@ -523,7 +652,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoumax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strverscmp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempname.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tsearch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/utime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasnprintf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Po@am__quote@
@@ -532,6 +660,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argmatch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backupfile.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strtod.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canon-host.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cycle-check.Po@am__quote@
@@ -543,10 +672,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-type.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemode.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fopen-safer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fts.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-read.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-write.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdelim2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettime.Po@am__quote@
@@ -575,19 +704,23 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quote.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readtokens.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/root-dev-ino.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-write.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/same.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/savedir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strftime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umaxtostr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicodeio.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/userspec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimens.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfts.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgetcwd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgethostname.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
@@ -595,6 +728,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xnanosleep.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xreadlink.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrdup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtod.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoimax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtol.Po@am__quote@
@@ -602,33 +736,24 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoumax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yesno.Po@am__quote@

-distclean-depend:
-	-rm -rf $(DEPDIR) ./$(DEPDIR)
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<

 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`

 .y.c:
-	$(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
+	$(YACCCOMPILE) $<
 	if test -f y.tab.h; then \
 	  to=`echo "$*_H" | sed \
                -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
@@ -648,14 +773,6 @@ distclean-depend:
 	rm -f y.tab.c
 uninstall-info-am:

-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -664,6 +781,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS

 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -678,7 +796,6 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
-
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -701,10 +818,6 @@ GTAGS:

 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -718,7 +831,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -737,7 +850,6 @@ check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LIBRARIES) all-local
-
 installdirs:
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -751,7 +863,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -761,8 +873,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -775,14 +886,17 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am

 distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-tags
+	-rm -rf $(DEPDIR) ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags

 dvi: dvi-am

 dvi-am:

+html: html-am
+
 info: info-am

 info-am:
@@ -798,7 +912,8 @@ install-man:
 installcheck-am:

 maintainer-clean: maintainer-clean-am
-
+	-rm -rf $(DEPDIR) ./$(DEPDIR)
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-am
@@ -817,18 +932,17 @@ uninstall-am: uninstall-info-am uninstall-local

 .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 	clean-generic clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-exec-local install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am uninstall-local


-# The following is needed in order to install a simple file in $(libdir)
+# We need the following in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
 # packages so that "make uninstall" will remove the file if and only if it
 # is not used by another installed package.
@@ -837,13 +951,13 @@ uninstall-am: uninstall-info-am uninstall-local

 all-local: charset.alias ref-add.sed ref-del.sed
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
 	if test -f $(charset_alias); then \
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	  rm -f $(charset_tmp) ; \
 	else \
-	  if test @GLIBC21@ = no; then \
+	  if test $(GLIBC21) = no; then \
 	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
 	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	    rm -f $(charset_tmp) ; \
@@ -863,20 +977,29 @@ uninstall-local: all-local
 	fi

 charset.alias: config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
 	mv t-$@ $@
-# Create stdbool.h on systems that lack a working one.
-stdbool.h: stdbool.hin
-	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool.hin > $@t
-	mv $@t $@
-# Create an <alloca.h> when the system
-# doesn't have one that works with the given compiler.
-alloca.h: alloca_.h
-	cp $(srcdir)/alloca_.h $@t
-	mv $@t $@
 .sin.sed:
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
 	mv t-$@ $@
+# Create stdbool.h on systems that lack a working one.
+stdbool.h: stdbool_.h
+	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool_.h > $@t
+	mv $@t $@
+
+# We need the following in order to create an <alloca.h> when the system
+# doesn't have one that works with the given compiler.
+all-local $(lib_OBJECTS): $(ALLOCA_H)
+alloca.h: alloca_.h
+	cp $(srcdir)/alloca_.h $@-t
+	mv $@-t $@
+
+# We need the following in order to create an <fnmatch.h> when the system
+# doesn't have one that supports the required API.
+all-local $(lib_OBJECTS): $(FNMATCH_H)
+fnmatch.h: fnmatch_.h
+	cp $(srcdir)/fnmatch_.h $@-t
+	mv $@-t $@
 # 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:
--- a/lib/README
+++ b/lib/README
@@ -1,3 +1,3 @@
 The files in this directory are used in many GNU packages,
-including diffutils, fileutils, sh-utils, tar, and textutils.
+including coreutils, diffutils, and tar.
 The autoconf tests required for these files are in ../m4.
--- a/lib/addext.c
+++ b/lib/addext.c
@@ -37,11 +37,7 @@
 #endif

 #include <stddef.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>

 #if HAVE_UNISTD_H
 # include <unistd.h>
--- a/lib/alloca.c
+++ b/lib/alloca.c
@@ -25,23 +25,18 @@
 # include <config.h>
 #endif

-#if HAVE_STRING_H
-# include <string.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>

 #ifdef emacs
 # include "lisp.h"
 # include "blockinput.h"
-# define xalloc_die() memory_full ()
 # ifdef EMACS_FREE
 #  undef free
 #  define free EMACS_FREE
 # endif
 #else
-# include <xalloc.h>
+# define memory_full() abort ()
 #endif

 /* If compiling with GCC 2, this file's not needed.  */
@@ -77,19 +72,6 @@ long i00afunc ();
 #   define ADDRESS_FUNCTION(arg) &(arg)
 #  endif

-#  ifndef POINTER_TYPE
-#   ifdef __STDC__
-#    define POINTER_TYPE void
-#   else
-#    define POINTER_TYPE char
-#   endif
-#  endif
-typedef POINTER_TYPE *pointer;
-
-#  ifndef NULL
-#   define NULL 0
-#  endif
-
 /* Define STACK_DIRECTION if you know the direction of stack
   growth for your system; otherwise it will be automatically
   deduced at run-time.
@@ -112,7 +94,7 @@ static int stack_dir;		/* 1 or -1 once known.  */
 #   define STACK_DIR	stack_dir

 static void
-find_stack_direction ()
+find_stack_direction (void)
 {
  static char *addr = NULL;	/* Address of first `dummy', once known.  */
  auto char dummy;		/* To get stack address.  */
@@ -165,9 +147,8 @@ static header *last_alloca_header = NULL;	/* -> last alloca header.  */
   caller, but that method cannot be made to work for some
   implementations of C, for example under Gould's UTX/32.  */

-pointer
-alloca (size)
-     size_t size;
+void *
+alloca (size_t size)
 {
  auto char probe;		/* Probes stack depth: */
  register char *depth = ADDRESS_FUNCTION (probe);
@@ -214,25 +195,25 @@ alloca (size)

  {
    /* Address of header.  */
-    register pointer new;
+    register header *new;

    size_t combined_size = sizeof (header) + size;
    if (combined_size < sizeof (header))
-      xalloc_die ();
+      memory_full ();

-    new = xmalloc (combined_size);
+    new = malloc (combined_size);

-    if (new == 0)
-      abort();
+    if (! new)
+      memory_full ();

-    ((header *) new)->h.next = last_alloca_header;
-    ((header *) new)->h.deep = depth;
+    new->h.next = last_alloca_header;
+    new->h.deep = depth;

-    last_alloca_header = (header *) new;
+    last_alloca_header = new;

    /* User storage begins just after header.  */

-    return (pointer) ((char *) new + sizeof (header));
+    return (void *) (new + 1);
  }
 }

--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -1,7 +1,7 @@
 /* argmatch.c -- find a match for a string in an array

-   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004 Free
+   Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@
 #define _(msgid) gettext (msgid)

 #include "error.h"
+#include "exit.h"
 #include "quotearg.h"
 #include "quote.h"
 #include "unlocked-io.h"
@@ -46,13 +47,10 @@
 # define ARGMATCH_QUOTING_STYLE locale_quoting_style
 #endif

-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
-
 /* Non failing version of argmatch call this function after failing. */
 #ifndef ARGMATCH_DIE
-# define ARGMATCH_DIE exit (EXIT_FAILURE)
+# include "exitfail.h"
+# define ARGMATCH_DIE exit (exit_failure)
 #endif

 #ifdef ARGMATCH_DIE_DECL
@@ -212,7 +210,6 @@ argmatch_to_argument (const char *value,
 * Based on "getversion.c" by David MacKenzie <djm@gnu.ai.mit.edu>
 */
 char *program_name;
-extern const char *getenv ();

 /* When to make backup files.  */
 enum backup_type
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -1,5 +1,7 @@
 /* argmatch.h -- definitions and prototypes for argmatch.c
-   Copyright (C) 1990, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2004 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
@@ -55,7 +57,7 @@ int argmatch (char const *arg, char const *const *arglist,

 /* xargmatch calls this function when it fails.  This function should not
   return.  By default, this is a function that calls ARGMATCH_DIE which
-   in turn defaults to `exit (EXIT_FAILURE)'.  */
+   in turn defaults to `exit (exit_failure)'.  */
 typedef void (*argmatch_exit_fn) (void);
 extern argmatch_exit_fn argmatch_die;

--- a/lib/asnprintf.c
+++ b/lib/asnprintf.c
@@ -1,20 +1,19 @@
 /* Formatted output to strings.
   Copyright (C) 1999, 2002 Free Software Foundation, Inc.

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

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

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

 #ifdef HAVE_CONFIG_H
 # include <config.h>
--- a/lib/asprintf.c
+++ b/lib/asprintf.c
@@ -1,20 +1,19 @@
 /* Formatted output to strings.
   Copyright (C) 1999, 2002 Free Software Foundation, Inc.

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

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

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

 #ifdef HAVE_CONFIG_H
 # include <config.h>
--- a/lib/atexit.c
+++ b/lib/atexit.c
@@ -4,8 +4,7 @@
 #include "config.h"

 int
-atexit(f)
-     void (*f)();
+atexit (void (*f) (void))
 {
  /* If the system doesn't provide a definition for atexit, use on_exit
     if the system provides that.  */
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -27,11 +27,7 @@

 #include <stddef.h>
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>

 #if HAVE_DIRENT_H
 # include <dirent.h>
@@ -57,23 +53,7 @@
 # define CLOSEDIR(d) closedir (d)
 #endif

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifndef HAVE_DECL_GETENV
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_GETENV
-char *getenv ();
-#endif
-
-#ifndef HAVE_DECL_MALLOC
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_MALLOC
-char *malloc ();
-#endif
+#include <stdlib.h>

 #if HAVE_DIRENT_H || HAVE_NDIR_H || HAVE_SYS_DIR_H || HAVE_SYS_NDIR_H
 # define HAVE_DIR 1
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -1,5 +1,7 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
-   Copyright (C) 1990-1992, 1997-1999 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1991, 1992, 1997, 1998, 1999, 2003 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
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,5 +1,7 @@
 /* basename.c -- return the last element in a path
-   Copyright (C) 1990, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1998, 1999, 2000, 2001, 2003 Free Software
+   Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,10 +21,8 @@
 # include <config.h>
 #endif

-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#endif
 #include "dirname.h"
+#include <string.h>

 /* In general, we can't use the builtin `basename' function if available,
   since it has different meanings in different environments.
--- a/lib/bcopy.c
+++ b/lib/bcopy.c
@@ -3,11 +3,13 @@
   In the public domain.
   By David MacKenzie <djm@gnu.ai.mit.edu>.  */

+#include <stddef.h>
+
 void
-bcopy (source, dest, length)
-     char *source, *dest;
-     unsigned length;
+bcopy (void const *source0, void *dest0, size_t length)
 {
+  char const *source = source0;
+  char *dest = dest0;
  if (source < dest)
    /* Moving from low mem to hi mem; start at end.  */
    for (source += length, dest += length; length; --length)
--- a/lib/bumpalloc.h
+++ b/lib/bumpalloc.h
@@ -1,63 +0,0 @@
-/* BUMP_ALLOC macro - increase table allocation by one element.
-   Copyright (C) 1990, 1991, 1993, 1998, 2000, 2003 Free Software Foundation, Inc.
-   François Pinard <pinard@iro.umontreal.ca>, 1990.
-
-   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.  */
-
-/*-------------------------------------------------------------------------.
-| Bump the allocation of the array pointed to by TABLE whenever required.  |
-| The table already has already COUNT elements in it, this macro ensure it |
-| has enough space to accommodate at least one more element.  Space is	   |
-| allocated (2 ^ EXPONENT) elements at a time.  Each element of the array  |
-| is of type TYPE.							   |
-`-------------------------------------------------------------------------*/
-
-/* Routines `xmalloc' and `xrealloc' are called to do the actual memory
-   management.  This implies that the program will abort with a "memory
-   exhausted" error if any problem arise.
-
-   To work correctly, at least EXPONENT and TYPE should always be the
-   same for all uses of this macro for any given TABLE.  A secure way to
-   achieve this is to never use this macro directly, but use it to define
-   other macros, which would then be TABLE-specific.
-
-   The first time through, COUNT is usually zero.  Note that COUNT is not
-   updated by this macro, but it should be update elsewhere, later.  This
-   is convenient, because it allows TABLE[COUNT] to refer to the new
-   element at the end.  Once its construction is completed, COUNT++ will
-   record it in the table.  Calling this macro several times in a row
-   without updating COUNT is a bad thing to do.  */
-
-#define BUMP_ALLOC(Table, Count, Exponent, Type) \
-  BUMP_ALLOC_WITH_SIZE ((Table), (Count), (Exponent), Type, sizeof (Type))
-
-/* In cases `sizeof TYPE' would not always yield the correct value for
-   the size of each element entry, this macro accepts a supplementary
-   SIZE argument.  The EXPONENT, TYPE and SIZE parameters should still
-   have the same value for all macro calls related to a specific TABLE.  */
-
-#define BUMP_ALLOC_WITH_SIZE(Table, Count, Exponent, Type, Size)	\
-  do									\
-    {									\
-      if (((Count) & (~(~0 << (Exponent)))) == 0)			\
-	{								\
-	  if ((Count) == 0)						\
-	    (Table) = xmalloc ((1 << (Exponent)) * (Size));		\
-	  else								\
-	    (Table) =							\
-	      xrealloc ((Table), ((Count) + (1 << (Exponent))) * (Size)); \
-	}								\
-    }									\
-  while (0)
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -0,0 +1,49 @@
+/* Convert string to double, using the C locale.
+
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Paul Eggert.  */
+
+#include "c-strtod.h"
+
+#include <locale.h>
+#include <stdlib.h>
+
+#include "xalloc.h"
+
+double
+c_strtod (char const *nptr, char **endptr)
+{
+  double r;
+  char *saved_locale = setlocale (LC_NUMERIC, NULL);
+
+  if (saved_locale)
+    {
+      saved_locale = xstrdup (saved_locale);
+      setlocale (LC_NUMERIC, "C");
+    }
+
+  r = strtod (nptr, endptr);
+
+  if (saved_locale)
+    {
+      setlocale (LC_NUMERIC, saved_locale);
+      free (saved_locale);
+    }
+
+  return r;
+}
--- a/lib/c-strtod.h
+++ b/lib/c-strtod.h
@@ -0,0 +1 @@
+double c_strtod (char const *, char **);
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -1,6 +1,6 @@
 /* Host name canonicalization

-   Copyright (C) 1995, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.

   Written by Miles Bader <miles@gnu.ai.mit.edu>

@@ -26,12 +26,8 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #ifdef HAVE_NETDB_H
 # include <netdb.h>
 #endif
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -19,12 +19,7 @@
 # include <config.h>
 #endif

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+#include "closeout.h"

 #include <stdio.h>

@@ -36,33 +31,23 @@ extern int errno;
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

-#include "closeout.h"
 #include "error.h"
+#include "exitfail.h"
 #include "quotearg.h"
 #include "unlocked-io.h"
 #include "__fpending.h"

-static int default_exit_status = EXIT_FAILURE;
 static const char *file_name;

-/* Set the value to be used for the exit status when close_stdout is called.
-   This is useful when it is not convenient to call close_stdout_status,
-   e.g., when close_stdout is called via atexit.  */
-void
-close_stdout_set_status (int status)
-{
-  default_exit_status = status;
-}
-
 /* Set the file name to be reported in the event an error is detected
-   by close_stdout_status.  */
+   by close_stdout.  */
 void
 close_stdout_set_file_name (const char *file)
 {
  file_name = file;
 }

-/* Close standard output, exiting with status STATUS on failure.
+/* Close standard output, exiting with status 'exit_failure' on failure.
   If a program writes *anything* to stdout, that program should `fflush'
   stdout and make sure that it succeeds before exiting.  Otherwise,
   suppose that you go to the extreme of checking the return status
@@ -86,7 +71,7 @@ close_stdout_set_file_name (const char *file)
   on being able to detect failure in other tools via their exit status.  */

 void
-close_stdout_status (int status)
+close_stdout (void)
 {
  int e = ferror (stdout) ? 0 : -1;

@@ -102,15 +87,9 @@ close_stdout_status (int status)
    {
      char const *write_error = _("write error");
      if (file_name)
-	error (status, e, "%s: %s", quotearg_colon (file_name), write_error);
+	error (exit_failure, e, "%s: %s", quotearg_colon (file_name),
+	       write_error);
      else
-	error (status, e, "%s", write_error);
+	error (exit_failure, e, "%s", write_error);
    }
 }
-
-/* Close standard output, exiting with status EXIT_FAILURE on failure.  */
-void
-close_stdout (void)
-{
-  close_stdout_status (default_exit_status);
-}
--- a/lib/closeout.h
+++ b/lib/closeout.h
@@ -19,9 +19,7 @@
 #ifndef CLOSEOUT_H
 # define CLOSEOUT_H 1

-void close_stdout_set_status (int status);
 void close_stdout_set_file_name (const char *file);
 void close_stdout (void);
-void close_stdout_status (int status);

 #endif
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -3,20 +3,19 @@
 #
 #   Copyright (C) 2000-2003 Free Software Foundation, Inc.
 #
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2, or (at your option)
 #   any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
 #
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
+#   You should have received a copy of the GNU 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.
 #
 # The table consists of lines of the form
 #    ALIAS  CANONICAL
--- a/lib/dev-ino.h
+++ b/lib/dev-ino.h
@@ -1,6 +1,9 @@
 #ifndef DEV_INO_H
 # define DEV_INO_H 1

+# include <sys/types.h>
+# include <sys/stat.h>
+
 struct dev_ino
 {
  ino_t st_ino;
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -1,5 +1,5 @@
 /* dirname.c -- return all but the last element in a path
-   Copyright 1990, 1998, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2000, 2001, 2003 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,11 +19,9 @@
 # include <config.h>
 #endif

-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#endif
-
 #include "dirname.h"
+
+#include <string.h>
 #include "xalloc.h"

 /* Return the length of `dirname (PATH)', or zero if PATH is
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -1,4 +1,6 @@
-/*  Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+/*  Take file names apart into directory and base names.
+
+    Copyright (C) 1998, 2001, 2003 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
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,5 +1,7 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2002, 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)
@@ -20,7 +22,12 @@
 # include <config.h>
 #endif

+#include "error.h"
+
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 #ifdef _LIBC
 # include <libintl.h>
@@ -33,28 +40,6 @@
 # define mbsrtowcs __mbsrtowcs
 #endif

-#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# if __STDC__
-#  include <stdarg.h>
-#  define VA_START(args, lastarg) va_start(args, lastarg)
-# else
-#  include <varargs.h>
-#  define VA_START(args, lastarg) va_start(args)
-# endif
-#else
-# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
-# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
-#endif
-
-#if STDC_HEADERS || _LIBC
-# include <stdlib.h>
-# include <string.h>
-#else
-void exit ();
-#endif
-
-#include "error.h"
-
 #if !_LIBC
 # include "unlocked-io.h"
 #endif
@@ -66,11 +51,7 @@ void exit ();
 /* If NULL, error will flush stdout, then print on stderr the program
   name, a colon and a space.  Otherwise, error will call this
   function without parameters instead.  */
-void (*error_print_progname) (
-#if __STDC__ - 0
-			      void
-#endif
-			      );
+void (*error_print_progname) (void);

 /* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count;
@@ -98,6 +79,8 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # undef putc
 # define putc(c, fp) INTUSE(_IO_putc) (c, fp)

+# include <bits/libc-lock.h>
+
 #else /* not _LIBC */

 # if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
@@ -107,34 +90,17 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 char *strerror_r ();
 # endif

+# ifndef SIZE_MAX
+#  define SIZE_MAX ((size_t) -1)
+# endif
+
 /* The calling program should define program_name and set it to the
   name of the executing program.  */
 extern char *program_name;

 # if HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r
-# else
-#  if HAVE_STRERROR
-#   ifndef HAVE_DECL_STRERROR
-"this configure-time declaration test was not run"
-#   endif
-#   if !HAVE_DECL_STRERROR
-char *strerror ();
-#   endif
-#  else
-static char *
-private_strerror (int errnum)
-{
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-
-  if (errnum > 0 && errnum <= sys_nerr)
-    return _(sys_errlist[errnum]);
-  return _("Unknown system error");
-}
-#   define strerror private_strerror
-#  endif /* HAVE_STRERROR */
-# endif	/* HAVE_STRERROR_R || defined strerror_r */
+# endif
 #endif	/* not _LIBC */

 static void
@@ -172,93 +138,70 @@ print_errno_message (int errnum)
  fprintf (stderr, ": %s", s);
 }

-#ifdef VA_START
 static void
 error_tail (int status, int errnum, const char *message, va_list args)
 {
-# if HAVE_VPRINTF || _LIBC
-#  if _LIBC
+#if _LIBC
  if (_IO_fwide (stderr, 0) > 0)
    {
-#   define ALLOCA_LIMIT	2000
+# define ALLOCA_LIMIT 2000
      size_t len = strlen (message) + 1;
-      wchar_t *wmessage = NULL;
-      mbstate_t st;
-      size_t res;
-      const char *tmp;
+      const wchar_t *wmessage = L"out of memory";
+      wchar_t *wbuf = (len < ALLOCA_LIMIT
+		       ? alloca (len * sizeof *wbuf)
+		       : len <= SIZE_MAX / sizeof *wbuf
+		       ? malloc (len * sizeof *wbuf)
+		       : NULL);

-      do
+      if (wbuf)
 	{
-	  if (len < ALLOCA_LIMIT)
-	    wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
-	  else
-	    {
-	      if (wmessage != NULL && len / 2 < ALLOCA_LIMIT)
-		wmessage = NULL;
-
-	      wmessage = (wchar_t *) realloc (wmessage,
-					      len * sizeof (wchar_t));
-
-	      if (wmessage == NULL)
-		{
-		  fputws_unlocked (L"out of memory\n", stderr);
-		  return;
-		}
-	    }
-
+	  size_t res;
+	  mbstate_t st;
+	  const char *tmp = message;
 	  memset (&st, '\0', sizeof (st));
-	  tmp =message;
+	  res = mbsrtowcs (wbuf, &tmp, len, &st);
+	  wmessage = res == (size_t) -1 ? L"???" : wbuf;
 	}
-      while ((res = mbsrtowcs (wmessage, &tmp, len, &st)) == len);
-
-      if (res == (size_t) -1)
-	/* The string cannot be converted.  */
-	wmessage = (wchar_t *) L"???";

      __vfwprintf (stderr, wmessage, args);
+      if (! (len < ALLOCA_LIMIT))
+	free (wbuf);
    }
  else
-#  endif
+#endif
    vfprintf (stderr, message, args);
-# else
-  _doprnt (message, args, stderr);
-# endif
  va_end (args);

  ++error_message_count;
  if (errnum)
    print_errno_message (errnum);
-# if _LIBC
+#if _LIBC
  if (_IO_fwide (stderr, 0) > 0)
    putwc (L'\n', stderr);
  else
-# endif
+#endif
    putc ('\n', stderr);
  fflush (stderr);
  if (status)
    exit (status);
 }
-#endif


 /* Print the program name and error message MESSAGE, which is a printf-style
   format string with optional args.
   If ERRNUM is nonzero, print its corresponding system error message.
   Exit with status STATUS if it is nonzero.  */
-/* VARARGS */
 void
-#if defined VA_START && __STDC__
 error (int status, int errnum, const char *message, ...)
-#else
-error (status, errnum, message, va_alist)
-     int status;
-     int errnum;
-     char *message;
-     va_dcl
-#endif
 {
-#ifdef VA_START
  va_list args;
+
+#if defined _LIBC && defined __libc_ptf_call
+  /* We do not want this call to be cut short by a thread
+     cancellation.  Therefore disable cancellation for now.  */
+  int state = PTHREAD_CANCEL_ENABLE;
+  __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
+		   0);
 #endif

  fflush (stdout);
@@ -277,23 +220,14 @@ error (status, errnum, message, va_alist)
 	fprintf (stderr, "%s: ", program_name);
    }

-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
  error_tail (status, errnum, message, args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-
-  ++error_message_count;
-  if (errnum)
-    print_errno_message (errnum);
-  putc ('\n', stderr);
-  fflush (stderr);
-  if (status)
-    exit (status);
-#endif

 #ifdef _LIBC
  _IO_funlockfile (stderr);
+# ifdef __libc_ptf_call
+  __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+# endif
 #endif
 }

@@ -302,22 +236,10 @@ error (status, errnum, message, va_alist)
 int error_one_per_line;

 void
-#if defined VA_START && __STDC__
 error_at_line (int status, int errnum, const char *file_name,
 	       unsigned int line_number, const char *message, ...)
-#else
-error_at_line (status, errnum, file_name, line_number, message, va_alist)
-     int status;
-     int errnum;
-     const char *file_name;
-     unsigned int line_number;
-     char *message;
-     va_dcl
-#endif
 {
-#ifdef VA_START
  va_list args;
-#endif

  if (error_one_per_line)
    {
@@ -334,6 +256,14 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
      old_line_number = line_number;
    }

+#if defined _LIBC && defined __libc_ptf_call
+  /* We do not want this call to be cut short by a thread
+     cancellation.  Therefore disable cancellation for now.  */
+  int state = PTHREAD_CANCEL_ENABLE;
+  __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
+		   0);
+#endif
+
  fflush (stdout);
 #ifdef _LIBC
  _IO_flockfile (stderr);
@@ -360,23 +290,14 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
 	fprintf (stderr, "%s:%d: ", file_name, line_number);
    }

-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
  error_tail (status, errnum, message, args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-
-  ++error_message_count;
-  if (errnum)
-    print_errno_message (errnum);
-  putc ('\n', stderr);
-  fflush (stderr);
-  if (status)
-    exit (status);
-#endif

 #ifdef _LIBC
  _IO_funlockfile (stderr);
+# ifdef __libc_ptf_call
+  __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+# endif
 #endif
 }

--- a/lib/error.h
+++ b/lib/error.h
@@ -1,24 +1,20 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.

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

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

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

 #ifndef _ERROR_H
 #define _ERROR_H 1
@@ -40,17 +36,15 @@
 extern "C" {
 #endif

-#if defined (__STDC__) && __STDC__
-
 /* Print a message with `fprintf (stderr, FORMAT, ...)';
   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */

-extern void error (int status, int errnum, const char *format, ...)
+extern void error (int __status, int __errnum, const char *__format, ...)
     __attribute__ ((__format__ (__printf__, 3, 4)));

-extern void error_at_line (int status, int errnum, const char *fname,
-			   unsigned int lineno, const char *format, ...)
+extern void error_at_line (int __status, int __errnum, const char *__fname,
+			   unsigned int __lineno, const char *__format, ...)
     __attribute__ ((__format__ (__printf__, 5, 6)));

 /* If NULL, error will flush stdout, then print on stderr the program
@@ -58,12 +52,6 @@ extern void error_at_line (int status, int errnum, const char *fname,
   function without parameters instead.  */
 extern void (*error_print_progname) (void);

-#else
-void error ();
-void error_at_line ();
-extern void (*error_print_progname) ();
-#endif
-
 /* This variable is incremented each time `error' is called.  */
 extern unsigned int error_message_count;

--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -1,22 +1,23 @@
 /* euidaccess -- check if effective user id can access file
-   Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003 Free Software Foundation, Inc.

-This file is part of the GNU C Library.
+   Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003 Free Software
+   Foundation, Inc.

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

-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.
+   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.

-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.  */
+   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 David MacKenzie and Torbjorn Granlund.
   Adapted for GNU C library by Roland McGrath.  */
@@ -25,6 +26,10 @@ Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif

+#ifndef _LIBC
+# include "euidaccess.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>

@@ -69,7 +74,6 @@ extern int errno;
 #ifndef __set_errno
 # define __set_errno(val) errno = (val)
 #endif
-#include "euidaccess.h"

 #if defined(EACCES) && !defined(EACCESS)
 # define EACCESS EACCES
@@ -207,9 +211,7 @@ weak_alias (__euidaccess, euidaccess)
 char *program_name;

 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
  char *file;
  int mode;
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -26,38 +26,33 @@

 #include <stdbool.h>

+#include <ctype.h>
 #include <errno.h>
 #ifndef errno
 extern int errno;
 #endif
 #include <stddef.h>
 #include <stdio.h>
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>

 #include "exclude.h"
 #include "fnmatch.h"
 #include "unlocked-io.h"
 #include "xalloc.h"

-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
+#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
+# define IN_CTYPE_DOMAIN(c) true
+#else
+# define IN_CTYPE_DOMAIN(c) isascii (c)
 #endif

+static inline bool
+is_space (unsigned char c)
+{
+  return IN_CTYPE_DOMAIN (c) && isspace (c);
+}
+
 /* Verify a requirement at compile-time (unlike assert, which is runtime).  */
 #define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }

@@ -98,11 +93,7 @@ struct exclude
 struct exclude *
 new_exclude (void)
 {
-  struct exclude *ex = xmalloc (sizeof *ex);
-  ex->exclude_count = 0;
-  ex->exclude_alloc = (1 << 6); /* This must be a power of 2.  */
-  ex->exclude = xmalloc (ex->exclude_alloc * sizeof ex->exclude[0]);
-  return ex;
+  return xzalloc (sizeof *new_exclude ());
 }

 /* Free the storage associated with an exclude list.  */
@@ -193,14 +184,9 @@ add_exclude (struct exclude *ex, char const *pattern, int options)
 {
  struct patopts *patopts;

-  if (ex->exclude_alloc <= ex->exclude_count)
-    {
-      size_t s = 2 * ex->exclude_alloc;
-      if (! (0 < s && s <= SIZE_MAX / sizeof ex->exclude[0]))
-	xalloc_die ();
-      ex->exclude_alloc = s;
-      ex->exclude = xrealloc (ex->exclude, s * sizeof ex->exclude[0]);
-    }
+  if (ex->exclude_count == ex->exclude_alloc)
+    ex->exclude = x2nrealloc (ex->exclude, &ex->exclude_alloc,
+			      sizeof *ex->exclude);

  patopts = &ex->exclude[ex->exclude_count++];
  patopts->pattern = pattern;
@@ -208,8 +194,9 @@ add_exclude (struct exclude *ex, char const *pattern, int options)
 }

 /* Use ADD_FUNC to append to EX the patterns in FILENAME, each with
-   OPTIONS.  LINE_END terminates each pattern in the file.  Return -1
-   on failure, 0 on success.  */
+   OPTIONS.  LINE_END terminates each pattern in the file.  If
+   LINE_END is a space character, ignore trailing spaces and empty
+   lines in FILE.  Return -1 on failure, 0 on success.  */

 int
 add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
@@ -218,11 +205,11 @@ add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
 {
  bool use_stdin = filename[0] == '-' && !filename[1];
  FILE *in;
-  char *buf;
+  char *buf = NULL;
  char *p;
  char const *pattern;
  char const *lim;
-  size_t buf_alloc = (1 << 10);  /* This must be a power of two.  */
+  size_t buf_alloc = 0;
  size_t buf_count = 0;
  int c;
  int e = 0;
@@ -232,18 +219,11 @@ add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
  else if (! (in = fopen (filename, "r")))
    return -1;

-  buf = xmalloc (buf_alloc);
-
  while ((c = getc (in)) != EOF)
    {
-      buf[buf_count++] = c;
      if (buf_count == buf_alloc)
-	{
-	  buf_alloc *= 2;
-	  if (! buf_alloc)
-	    xalloc_die ();
-	  buf = xrealloc (buf, buf_alloc);
-	}
+	buf = x2realloc (buf, &buf_alloc);
+      buf[buf_count++] = c;
    }

  if (ferror (in))
@@ -253,12 +233,28 @@ add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
    e = errno;

  buf = xrealloc (buf, buf_count + 1);
+  buf[buf_count] = line_end;
+  lim = buf + buf_count + ! (buf_count == 0 || buf[buf_count - 1] == line_end);
+  pattern = buf;

-  for (pattern = p = buf, lim = buf + buf_count;  p <= lim;  p++)
-    if (p < lim ? *p == line_end : buf < p && p[-1])
+  for (p = buf; p < lim; p++)
+    if (*p == line_end)
      {
-	*p = '\0';
+	char *pattern_end = p;
+
+	if (is_space (line_end))
+	  {
+	    for (; ; pattern_end--)
+	      if (pattern_end == pattern)
+		goto next_pattern;
+	      else if (! is_space (pattern_end[-1]))
+		break;
+	  }
+
+	*pattern_end = '\0';
 	(*add_func) (ex, pattern, options);
+
+      next_pattern:
 	pattern = p + 1;
      }

--- a/lib/exit.h
+++ b/lib/exit.h
@@ -0,0 +1,32 @@
+/* exit() function.
+   Copyright (C) 1995, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _EXIT_H
+#define _EXIT_H
+
+/* Get exit() declaration.  */
+#include <stdlib.h>
+
+/* Some systems do not define EXIT_*, even with STDC_HEADERS.  */
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+#endif /* _EXIT_H */
--- a/lib/exitfail.c
+++ b/lib/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,11 +21,7 @@
 # include <config.h>
 #endif

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+#include "exitfail.h"
+#include "exit.h"

 int volatile exit_failure = EXIT_FAILURE;
--- a/lib/fatal.c
+++ b/lib/fatal.c
@@ -1,71 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* FIXME: define EXIT_FAILURE */
-
-#include <stdio.h>
-
-#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# if __STDC__
-#  include <stdarg.h>
-#  define VA_START(args, lastarg) va_start(args, lastarg)
-# else
-#  include <varargs.h>
-#  define VA_START(args, lastarg) va_start(args)
-# endif
-#else
-# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
-# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
-#endif
-
-#if STDC_HEADERS || _LIBC
-# include <stdlib.h>
-# include <string.h>
-#else
-void exit ();
-#endif
-
-#ifdef _LIBC
-# define program_name program_invocation_name
-#else /* not _LIBC */
-/* The calling program should define program_name and set it to the
-   name of the executing program.  */
-extern char *program_name;
-#endif
-
-#include "fatal.h"
-#include "unlocked-io.h"
-
-/* Like error, but always exit with EXIT_FAILURE.  */
-
-void
-#if defined VA_START && __STDC__
-fatal (int errnum, const char *message, ...)
-#else
-fatal (errnum, message, va_alist)
-     int errnum;
-     char *message;
-     va_dcl
-#endif
-{
-#ifdef VA_START
-  va_list args;
-#endif
-
-  if (error_print_progname)
-    (*error_print_progname) ();
-  else
-    {
-      fflush (stdout);
-      fprintf (stderr, "%s: ", program_name);
-    }
-
-#ifdef VA_START
-  VA_START (args, message);
-  error (EXIT_FAILURE, errnum, message, args);
-  va_end (args);
-#else
-  error (EXIT_FAILURE, errnum, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
-}
--- a/lib/fatal.h
+++ b/lib/fatal.h
@@ -1,68 +0,0 @@
-#include "error.h"
-
-/* FIXME: this is all from ansidecl.  better to simply swipe
-   that file from egcs/include and include it from here.  */
-
-/* Using MACRO(x,y) in cpp #if conditionals does not work with some
-   older preprocessors.  Thus we can't define something like this:
-
-#define HAVE_GCC_VERSION(MAJOR, MINOR) \
-  (__GNUC__ > (MAJOR) || (__GNUC__ == (MAJOR) && __GNUC_MINOR__ >= (MINOR)))
-
-and then test "#if HAVE_GCC_VERSION(2,7)".
-
-So instead we use the macro below and test it against specific values.  */
-
-/* This macro simplifies testing whether we are using gcc, and if it
-   is of a particular minimum version. (Both major & minor numbers are
-   significant.)  This macro will evaluate to 0 if we are not using
-   gcc at all.  */
-#ifndef GCC_VERSION
-# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-#endif /* GCC_VERSION */
-
-/* Define macros for some gcc attributes.  This permits us to use the
-   macros freely, and know that they will come into play for the
-   version of gcc in which they are supported.  */
-
-#if (GCC_VERSION < 2007)
-# define __attribute__(x)
-#endif
-
-/* Attribute __malloc__ on functions was valid as of gcc 2.96. */
-#ifndef ATTRIBUTE_MALLOC
-# if (GCC_VERSION >= 2096)
-#  define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
-# else
-#  define ATTRIBUTE_MALLOC
-# endif /* GNUC >= 2.96 */
-#endif /* ATTRIBUTE_MALLOC */
-
-/* Attributes on labels were valid as of gcc 2.93. */
-#ifndef ATTRIBUTE_UNUSED_LABEL
-# if (GCC_VERSION >= 2093)
-#  define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
-# else
-#  define ATTRIBUTE_UNUSED_LABEL
-# endif /* GNUC >= 2.93 */
-#endif /* ATTRIBUTE_UNUSED_LABEL */
-
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#endif /* ATTRIBUTE_UNUSED */
-
-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-#endif /* ATTRIBUTE_NORETURN */
-
-#ifndef ATTRIBUTE_PRINTF
-# define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
-# define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
-# define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
-# define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
-# define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
-# define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
-#endif /* ATTRIBUTE_PRINTF */
-
-extern void fatal (int errnum, const char *format, ...)
-     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF_2;
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004
+	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
@@ -45,23 +45,14 @@ char *alloca ();
 # define __builtin_expect(expr, expected) (expr)
 #endif

-#include <assert.h>
-#include <errno.h>
 #include <fnmatch.h>
+
+#include <assert.h>
 #include <ctype.h>
-
-#if HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-#  include <strings.h>
-# endif
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stddef.h>
-# include <stdlib.h>
-#endif
+#include <errno.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>

 #define WIDE_CHAR_SUPPORT (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC)

@@ -83,17 +74,20 @@ char *alloca ();
 # include <shlib-compat.h>

 # define CONCAT(a,b) __CONCAT(a,b)
-# define mbsinit __mbsinit
 # define mbsrtowcs __mbsrtowcs
 # define fnmatch __fnmatch
 extern int fnmatch (const char *pattern, const char *string, int flags);
 #endif

+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+
 /* We often have to test for FNM_FILE_NAME and FNM_PERIOD being both set.  */
 #define NO_LEADING_PERIOD(flags) \
  ((flags & (FNM_FILE_NAME | FNM_PERIOD)) == (FNM_FILE_NAME | FNM_PERIOD))

-/* Comment out all this code if we are using the GNU C Library, are not
+/* Comment out all this code if we are using the GNU C Library, and are not
   actually compiling the library itself, and have not detected a bug
   in the library.  This code is part of the GNU C
   Library, but also included in many other GNU distributions.  Compiling
@@ -178,10 +172,6 @@ extern int fnmatch (const char *pattern, const char *string, int flags);
 /* Avoid depending on library functions or files
   whose names are inconsistent.  */

-# if !defined _LIBC && !defined getenv && !HAVE_DECL_GETENV
-extern char *getenv ();
-# endif
-
 # ifndef errno
 extern int errno;
 # endif
@@ -328,46 +318,73 @@ is_char_class (const wchar_t *wcs)


 int
-fnmatch (pattern, string, flags)
-     const char *pattern;
-     const char *string;
-     int flags;
+fnmatch (const char *pattern, const char *string, int flags)
 {
 # if HANDLE_MULTIBYTE
+#  define ALLOCA_LIMIT 2000
  if (__builtin_expect (MB_CUR_MAX, 1) != 1)
    {
      mbstate_t ps;
-      size_t n;
+      size_t patsize;
+      size_t strsize;
+      size_t totsize;
      wchar_t *wpattern;
      wchar_t *wstring;
+      int res;
+
+      /* Calculate the size needed to convert the strings to
+	 wide characters.  */
+      memset (&ps, '\0', sizeof (ps));
+      patsize = mbsrtowcs (NULL, &pattern, 0, &ps) + 1;
+      if (__builtin_expect (patsize == 0, 0))
+	/* Something wrong.
+	   XXX Do we have to set `errno' to something which mbsrtows hasn't
+	   already done?  */
+	return -1;
+      assert (mbsinit (&ps));
+      strsize = mbsrtowcs (NULL, &string, 0, &ps) + 1;
+      if (__builtin_expect (strsize == 0, 0))
+	/* Something wrong.
+	   XXX Do we have to set `errno' to something which mbsrtows hasn't
+	   already done?  */
+	return -1;
+      assert (mbsinit (&ps));
+      totsize = patsize + strsize;
+      if (__builtin_expect (! (patsize <= totsize
+			       && totsize <= SIZE_MAX / sizeof (wchar_t)),
+			    0))
+	{
+	  errno = ENOMEM;
+	  return -1;
+	}
+
+      /* Allocate room for the wide characters.  */
+      if (__builtin_expect (totsize < ALLOCA_LIMIT, 1))
+	wpattern = (wchar_t *) alloca (totsize * sizeof (wchar_t));
+      else
+	{
+	  wpattern = malloc (totsize * sizeof (wchar_t));
+	  if (__builtin_expect (! wpattern, 0))
+	    {
+	      errno = ENOMEM;
+	      return -1;
+	    }
+	}
+      wstring = wpattern + patsize;

      /* Convert the strings into wide characters.  */
-      memset (&ps, '\0', sizeof (ps));
-      n = mbsrtowcs (NULL, &pattern, 0, &ps);
-      if (__builtin_expect (n, 0) == (size_t) -1)
-	/* Something wrong.
-	   XXX Do we have to set `errno' to something which mbsrtows hasn't
-	   already done?  */
-	return -1;
-      wpattern = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
+      mbsrtowcs (wpattern, &pattern, patsize, &ps);
      assert (mbsinit (&ps));
-      (void) mbsrtowcs (wpattern, &pattern, n + 1, &ps);
+      mbsrtowcs (wstring, &string, strsize, &ps);

-      assert (mbsinit (&ps));
-      n = mbsrtowcs (NULL, &string, 0, &ps);
-      if (__builtin_expect (n, 0) == (size_t) -1)
-	/* Something wrong.
-	   XXX Do we have to set `errno' to something which mbsrtows hasn't
-	   already done?  */
-	return -1;
-      wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
-      assert (mbsinit (&ps));
-      (void) mbsrtowcs (wstring, &string, n + 1, &ps);
+      res = internal_fnwmatch (wpattern, wstring, wstring + strsize - 1,
+			       flags & FNM_PERIOD, flags);

-      return internal_fnwmatch (wpattern, wstring, wstring + n,
-				flags & FNM_PERIOD, flags);
+      if (__builtin_expect (! (totsize < ALLOCA_LIMIT), 0))
+	free (wpattern);
+      return res;
    }
-# endif  /* mbstate_t and mbsrtowcs or _LIBC.  */
+# endif /* HANDLE_MULTIBYTE */

  return internal_fnmatch (pattern, string, string + strlen (string),
 			   flags & FNM_PERIOD, flags);
@@ -380,6 +397,7 @@ versioned_symbol (libc, __fnmatch, fnmatch, GLIBC_2_2_3);
 strong_alias (__fnmatch, __fnmatch_old)
 compat_symbol (libc, __fnmatch_old, fnmatch, GLIBC_2_0);
 #  endif
+libc_hidden_ver (__fnmatch, fnmatch)
 # endif

 #endif	/* _LIBC or not __GNU_LIBRARY__.  */
--- a/lib/fnmatch_.h
+++ b/lib/fnmatch_.h
@@ -22,19 +22,6 @@
 extern "C" {
 # endif

-# if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
-#  if !defined __GLIBC__ || !defined __P
-#   undef	__P
-#   define __P(protos)	protos
-#  endif
-# else /* Not C++ or ANSI C.  */
-#  undef	__P
-#  define __P(protos)	()
-/* We can get away without defining `const' here only because in this file
-   it is used only inside the prototype for `fnmatch', which is elided in
-   non-ANSI C where `const' is problematical.  */
-# endif /* C++ or ANSI C.  */
-
 /* We #undef these before defining them because some losing systems
   (HP-UX A.08.07 for example) define these in <unistd.h>.  */
 # undef	FNM_PATHNAME
@@ -66,8 +53,8 @@ extern "C" {

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

 # ifdef	__cplusplus
 }
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004
+	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
@@ -17,9 +17,6 @@

 /* Match STRING against the filename pattern PATTERN, returning zero if
   it matches, nonzero if not.  */
-static int FCT (const CHAR *pattern, const CHAR *string,
-		const CHAR *string_end, int no_leading_period, int flags)
-     internal_function;
 static int EXT (INT opt, const CHAR *pattern, const CHAR *string,
 		const CHAR *string_end, int no_leading_period, int flags)
     internal_function;
@@ -27,12 +24,8 @@ static const CHAR *END (const CHAR *patternp) internal_function;

 static int
 internal_function
-FCT (pattern, string, string_end, no_leading_period, flags)
-     const CHAR *pattern;
-     const CHAR *string;
-     const CHAR *string_end;
-     int no_leading_period;
-     int flags;
+FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
+     int no_leading_period, int flags)
 {
  register const CHAR *p = pattern, *n = string;
  register UCHAR c;
@@ -538,11 +531,13 @@ FCT (pattern, string, string_end, no_leading_period, flags)
 				if (! is_range)
 				  {
 # ifdef WIDE_CHAR_VERSION
-				    for (c1 = 0; c1 < wextra[idx]; ++c1)
+				    for (c1 = 0;
+					 (int32_t) c1 < wextra[idx];
+					 ++c1)
 				      if (n[c1] != wextra[1 + c1])
 					break;

-				    if (c1 == wextra[idx])
+				    if ((int32_t) c1 == wextra[idx])
 				      goto matched;
 # else
 				    for (c1 = 0; c1 < extra[idx]; ++c1)
@@ -618,7 +613,7 @@ FCT (pattern, string, string_end, no_leading_period, flags)

 # ifdef WIDE_CHAR_VERSION
 			/* Search in the `names' array for the characters.  */
-			fcollseq = collseq_table_lookup (collseq, fn);
+			fcollseq = __collseq_table_lookup (collseq, fn);
 			if (fcollseq == ~((uint32_t) 0))
 			  /* XXX We don't know anything about the character
 			     we are supposed to match.  This means we are
@@ -628,7 +623,7 @@ FCT (pattern, string, string_end, no_leading_period, flags)
 			if (is_seqval)
 			  lcollseq = cold;
 			else
-			  lcollseq = collseq_table_lookup (collseq, cold);
+			  lcollseq = __collseq_table_lookup (collseq, cold);
 # else
 			fcollseq = collseq[fn];
 			lcollseq = is_seqval ? cold : collseq[(UCHAR) cold];
@@ -790,7 +785,7 @@ FCT (pattern, string, string_end, no_leading_period, flags)
 			      {
 # ifdef WIDE_CHAR_VERSION
 				hcollseq =
-				  collseq_table_lookup (collseq, cend);
+				  __collseq_table_lookup (collseq, cend);
 				if (hcollseq == ~((uint32_t) 0))
 				  {
 				    /* Hum, no information about the upper
@@ -931,7 +926,7 @@ FCT (pattern, string, string_end, no_leading_period, flags)
 	case L('/'):
 	  if (NO_LEADING_PERIOD (flags))
 	    {
-	      if (n == string_end || c != *n)
+	      if (n == string_end || c != (UCHAR) *n)
 		return FNM_NOMATCH;

 	      new_no_leading_period = 1;
@@ -1014,6 +1009,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
  size_t pattern_len = STRLEN (pattern);
  const CHAR *p;
  const CHAR *rs;
+  enum { ALLOCA_LIMIT = 8000 };

  /* Parse the pattern.  Store the individual parts in the list.  */
  level = 0;
@@ -1052,13 +1048,19 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
 #define NEW_PATTERN \
 	    struct patternlist *newp;					      \
 	    size_t plen;						      \
+	    size_t plensize;						      \
+	    size_t newpsize;						      \
 									      \
 	    plen = (opt == L('?') || opt == L('@')			      \
 		    ? pattern_len					      \
 		    : p - startp + 1);					      \
-	    newp = (struct patternlist *)				      \
-	      alloca (offsetof (struct patternlist, str)		      \
-		      + (plen * sizeof (CHAR)));			      \
+	    plensize = plen * sizeof (CHAR);				      \
+	    newpsize = offsetof (struct patternlist, str) + plensize;	      \
+	    if ((size_t) -1 / sizeof (CHAR) < plen			      \
+		|| newpsize < offsetof (struct patternlist, str)	      \
+		|| ALLOCA_LIMIT <= newpsize)				      \
+	      return -1;						      \
+	    newp = (struct patternlist *) alloca (newpsize);		      \
 	    *((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L('\0');    \
 	    newp->next = NULL;						      \
 	    *lastp = newp;						      \
--- a/lib/free.c
+++ b/lib/free.c
@@ -0,0 +1,33 @@
+/* Work around incompatibility on older systems where free (NULL) fails.
+
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* written by Paul Eggert */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef free
+
+#include <stdlib.h>
+
+void
+rpl_free (void *p)
+{
+  if (p)
+    free (p);
+}
--- a/lib/fsusage.h
+++ b/lib/fsusage.h
@@ -1,5 +1,6 @@
 /* fsusage.h -- declarations for filesystem space usage info
-   Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
+
+   Copyright (C) 1991, 1992, 1997, 2003 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
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -42,14 +42,18 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 # include <include/sys/stat.h>
 #else
 # include <sys/stat.h>
+# undef __P
+# define __P(x) x
 #endif
 #include <fcntl.h>
 #include <errno.h>
-#include <fts.h>
-#include <search.h>
+#include "fts_.h"
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif

 #if defined _LIBC
 # include <dirent.h>
@@ -86,12 +90,6 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 # define opendir __opendir
 # undef readdir
 # define readdir __readdir
-# undef tdestroy
-# define tdestroy __tdestroy
-# undef tfind
-# define tfind __tfind
-# undef tsearch
-# define tsearch __tsearch
 #else
 # undef internal_function
 # define internal_function /* empty */
@@ -112,8 +110,10 @@ int rpl_lstat (const char *, struct stat *);

 /* Largest alignment size needed, minus one.
   Usually long double is the worst case.  */
-#ifndef ALIGNBYTES
+# if __GNUC__ >= 2
 # define ALIGNBYTES	(__alignof__ (long double) - 1)
+#else
+# define ALIGNBYTES	(sizeof (long double) - 1)
 #endif
 /* Align P to that size.  */
 #ifndef ALIGN
@@ -134,66 +134,139 @@ static int      fts_safe_changedir __P((FTS *, FTSENT *, int, const char *))
     internal_function;

 #ifndef MAX
-# define MAX(a, b)	({ __typeof__ (a) _a = (a); \
-			   __typeof__ (b) _b = (b); \
-			   _a > _b ? _a : _b; })
+# define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif

-#define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
+#define ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))

 #define CLR(opt)	(sp->fts_options &= ~(opt))
-#define	ISSET(opt)	(sp->fts_options & (opt))
-#define	SET(opt)	(sp->fts_options |= (opt))
+#define ISSET(opt)	(sp->fts_options & (opt))
+#define SET(opt)	(sp->fts_options |= (opt))

 #define FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))

 /* fts_build flags */
-#define	BCHILD		1		/* fts_children */
-#define	BNAMES		2		/* fts_children, names only */
-#define	BREAD		3		/* fts_read */
+#define BCHILD		1		/* fts_children */
+#define BNAMES		2		/* fts_children, names only */
+#define BREAD		3		/* fts_read */

-struct known_object
+#define HT_INITIAL_SIZE 31
+
+#if FTS_DEBUG
+int fts_debug = 0;
+# include <stdio.h>
+# define Dprintf(x) do { if (fts_debug) printf x; } while (0)
+#else
+# define Dprintf(x)
+#endif
+
+#define ENTER_DIR(Fts, Ent, Tag)				\
+  do {								\
+      Dprintf (("  %s-entering: %s\n", Tag, (Ent)->fts_path));	\
+      enter_dir (sp, p);					\
+    } while (0)
+
+#define LEAVE_DIR(Fts, Ent, Tag)				\
+  do {								\
+      Dprintf (("  %s-leaving: %s\n", Tag, (Ent)->fts_path));	\
+      leave_dir (sp, p);					\
+    } while (0)
+
+/* Use these each of these to map a device/inode pair to an FTSENT.  */
+struct Active_dir
 {
  dev_t dev;
  ino_t ino;
  FTSENT *fts_ent;
 };

-static int
-object_compare (const void *p1, const void *p2)
+static bool
+AD_compare (void const *x, void const *y)
 {
-  /* We don't need a sophisticated and useful comparison.  We are only
-     interested in equality.  However, we must be careful not to
-     accidentally compare `holes' in the structure.  */
-  const struct known_object *kp1 = p1, *kp2 = p2;
-  int cmp1;
-  cmp1 = (kp1->ino > kp2->ino) - (kp1->ino < kp2->ino);
-  if (cmp1 != 0)
-    return cmp1;
-  return (kp1->dev > kp2->dev) - (kp1->dev < kp2->dev);
+  struct Active_dir const *ax = x;
+  struct Active_dir const *ay = y;
+  return ax->ino == ay->ino
+      && ax->dev == ay->dev;
 }

-static inline int
-add_object (FTS *fts, FTSENT *data, const struct stat *st)
+static size_t
+AD_hash (void const *x, size_t table_size)
 {
-  struct known_object *newp = malloc (sizeof (struct known_object));
-  if (newp == NULL)
-    return -1;
-  newp->dev = st->st_dev;
-  newp->ino = st->st_ino;
-  newp->fts_ent = data;
-  return tsearch (newp, &fts->fts_dir_signatures, object_compare) ? 0 : -1;
+  struct Active_dir const *ax = x;
+  return (uintmax_t) ax->ino % table_size;
 }

-static inline FTSENT *
-find_object (const FTS *fts, const struct stat *st)
+static void
+enter_dir (FTS *fts, FTSENT *ent)
 {
-  struct known_object obj;
-  struct known_object const *t;
-  obj.dev = st->st_dev;
-  obj.ino = st->st_ino;
-  t = tfind (&obj, &fts->fts_dir_signatures, object_compare);
-  return t ? t->fts_ent : NULL;
+  if (fts->active_dir_ht)
+    {
+      struct stat const *st = ent->fts_statp;
+      struct Active_dir *ad = malloc (sizeof (struct Active_dir));
+      struct Active_dir *ad_from_table;
+
+      if (ad == NULL)
+	goto give_up;
+
+      ad->dev = st->st_dev;
+      ad->ino = st->st_ino;
+      ad->fts_ent = ent;
+
+      /* See if we've already encountered this directory.
+	 This can happen when following symlinks as well as
+	 with a corrupted directory hierarchy. */
+      ad_from_table = hash_insert (fts->active_dir_ht, ad);
+
+      if (ad_from_table == NULL)
+	{
+	give_up:
+	  /* Insertion failed due to lack of memory.  Free the hash
+	     table and turn off this sort of cycle detection.  */
+	  hash_free (fts->active_dir_ht);
+	  fts->active_dir_ht = NULL;
+	  return;
+	}
+
+      if (ad_from_table != ad)
+	{
+	  /* There was an entry with matching dev/inode already in the table.
+	     Record the fact that we've found a cycle.  */
+	  ent->fts_cycle = ad_from_table->fts_ent;
+	  ent->fts_info = FTS_DC;
+
+	  /* ad was not inserted, so free it.  */
+	  free (ad);
+	}
+    }
+  else if (fts->cycle_state)
+    {
+      if (cycle_check (fts->cycle_state, ent->fts_statp))
+	{
+	  /* FIXME: setting fts_cycle like this isn't proper.
+	     To do what the documentation requires, we'd have to
+	     go around the cycle again and find the right entry.
+	     But no callers in coreutils use the fts_cycle member. */
+	  ent->fts_cycle = ent;
+	  ent->fts_info = FTS_DC;
+	}
+    }
+}
+
+static void
+leave_dir (FTS *fts, FTSENT *ent)
+{
+  if (fts->active_dir_ht)
+    {
+      struct stat const *st = ent->fts_statp;
+      struct Active_dir obj;
+      void *found;
+      obj.dev = st->st_dev;
+      obj.ino = st->st_ino;
+      found = hash_delete (fts->active_dir_ht, &obj);
+      if (!found)
+	abort ();
+      free (found);
+    }
 }

 FTS *
@@ -289,7 +362,23 @@ fts_open(argv, options, compar)
 	sp->fts_cur->fts_link = root;
 	sp->fts_cur->fts_info = FTS_INIT;

-	sp->fts_dir_signatures = NULL;
+	if (ISSET (FTS_TIGHT_CYCLE_CHECK))
+	  {
+	    sp->active_dir_ht = hash_initialize (HT_INITIAL_SIZE,
+						 NULL, AD_hash,
+						 AD_compare, free);
+	    if (sp->active_dir_ht == NULL)
+	      goto mem3;
+	    sp->cycle_state = malloc (sizeof *sp->cycle_state);
+	  }
+	else
+	  {
+	    sp->cycle_state = malloc (sizeof *sp->cycle_state);
+	    if (sp->cycle_state == NULL)
+	      goto mem3;
+	    cycle_check_init (sp->cycle_state);
+	    sp->active_dir_ht = NULL;
+	  }

 	/*
 	 * If using chdir(2), grab a file descriptor pointing to dot to ensure
@@ -373,8 +462,11 @@ fts_close(sp)
 		(void)close(sp->fts_rfd);
 	}

-	/* Free all of the directory fingerprint info.  */
-	tdestroy (sp->fts_dir_signatures, free);
+	/* Free any memory used for cycle detection.  */
+	if (sp->active_dir_ht)
+	  hash_free (sp->active_dir_ht);
+	if (sp->cycle_state)
+	  free (sp->cycle_state);

 	/* Free up the stream pointer. */
 	free(sp);
@@ -392,7 +484,7 @@ fts_close(sp)
 * Special case of "/" at the end of the path so that slashes aren't
 * appended which would cause paths to be written as "....//foo".
 */
-#define	NAPPEND(p)							\
+#define NAPPEND(p)							\
 	(p->fts_path[p->fts_pathlen - 1] == '/'				\
 	    ? p->fts_pathlen - 1 : p->fts_pathlen)

@@ -421,6 +513,8 @@ fts_read(sp)
 		p->fts_info = fts_stat(sp, p, 0);
 		return (p);
 	}
+	Dprintf (("fts_read: p=%s\n",
+		  p->fts_info == FTS_INIT ? "" : p->fts_path));

 	/*
 	 * Following a symlink -- SLNONE test allows application to see
@@ -438,6 +532,8 @@ fts_read(sp)
 			} else
 				p->fts_flags |= FTS_SYMFOLLOW;
 		}
+		if (p->fts_info == FTS_D)
+			ENTER_DIR (sp, p, "7");
 		return (p);
 	}

@@ -453,6 +549,7 @@ fts_read(sp)
 				sp->fts_child = NULL;
 			}
 			p->fts_info = FTS_DP;
+			LEAVE_DIR (sp, p, "1");
 			return (p);
 		}

@@ -492,6 +589,8 @@ fts_read(sp)
 			   subdirectory, tell the caller.  */
 			if (p->fts_errno)
 				p->fts_info = FTS_ERR;
+			/* FIXME: see if this should be in an else block */
+			LEAVE_DIR (sp, p, "2");
 			return (p);
 		}
 		p = sp->fts_child;
@@ -514,6 +613,8 @@ next:	tmp = p;
 				return (NULL);
 			}
 			fts_load(sp, p);
+			if (p->fts_info == FTS_D)
+				ENTER_DIR (sp, p, "8");
 			return (sp->fts_cur = p);
 		}

@@ -540,6 +641,8 @@ next:	tmp = p;
 name:		t = sp->fts_path + NAPPEND(p->fts_parent);
 		*t++ = '/';
 		memmove(t, p->fts_name, p->fts_namelen + 1);
+		if (p->fts_info == FTS_D)
+			ENTER_DIR (sp, p, "9");
 		return (sp->fts_cur = p);
 	}

@@ -585,6 +688,8 @@ name:		t = sp->fts_path + NAPPEND(p->fts_parent);
 		return (NULL);
 	}
 	p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
+	if (p->fts_errno == 0)
+		LEAVE_DIR (sp, p, "3");
 	return (sp->fts_cur = p);
 }

@@ -706,8 +811,9 @@ fts_build(sp, type)
 	FTSENT *cur, *tail;
 	DIR *dirp;
 	void *oldaddr;
-	int cderrno, descend, len, level, maxlen, nlinks, saved_errno,
+	int cderrno, descend, level, nlinks, saved_errno,
 	    nostat, doadjust;
+	size_t len, maxlen, new_len;
 	char *cp;

 	/* Set current node pointer. */
@@ -843,10 +949,11 @@ mem1:				saved_errno = errno;
 			maxlen = sp->fts_pathlen - len;
 		}

-		if (len + NAMLEN (dp) >= USHRT_MAX) {
+		new_len = len + NAMLEN (dp);
+		if (new_len < len) {
 			/*
-			 * In an FTSENT, fts_pathlen is a u_short so it is
-			 * possible to wraparound here.  If we do, free up
+			 * In the unlikely even that we would end up
+			 * with a path longer than SIZE_MAX, free up
 			 * the current structure and the structures already
 			 * allocated, then error out with ENAMETOOLONG.
 			 */
@@ -860,7 +967,7 @@ mem1:				saved_errno = errno;
 		}
 		p->fts_level = level;
 		p->fts_parent = sp->fts_cur;
-		p->fts_pathlen = len + NAMLEN (dp);
+		p->fts_pathlen = new_len;

 #if defined FTS_WHITEOUT && 0
 		if (dp->d_type == DT_WHT)
@@ -875,7 +982,7 @@ mem1:				saved_errno = errno;
 				p->fts_info = FTS_NSOK;
 			p->fts_accpath = cur->fts_accpath;
 		} else if (nlinks == 0
-#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
+# if HAVE_STRUCT_DIRENT_D_TYPE
 			   || (nostat &&
 			       dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
 #endif
@@ -958,6 +1065,69 @@ mem1:				saved_errno = errno;
 	return (head);
 }

+#if FTS_DEBUG
+
+/* Walk ->fts_parent links starting at E_CURR, until the root of the
+   current hierarchy.  There should be a directory with dev/inode
+   matching those of AD.  If not, print a lot of diagnostics.  */
+static void
+find_matching_ancestor (FTSENT const *e_curr, struct Active_dir const *ad)
+{
+  FTSENT const *ent;
+  for (ent = e_curr; ent->fts_level >= FTS_ROOTLEVEL; ent = ent->fts_parent)
+    {
+      if (ad->ino == ent->fts_statp->st_ino
+	  && ad->dev == ent->fts_statp->st_dev)
+	return;
+    }
+  printf ("ERROR: tree dir, %s, not active\n", ad->fts_ent->fts_accpath);
+  printf ("active dirs:\n");
+  for (ent = e_curr;
+       ent->fts_level >= FTS_ROOTLEVEL; ent = ent->fts_parent)
+    printf ("  %s(%d/%d) to %s(%d/%d)...\n",
+	    ad->fts_ent->fts_accpath,
+	    (int)ad->dev,
+	    (int)ad->ino,
+	    ent->fts_accpath,
+	    (int)ent->fts_statp->st_dev,
+	    (int)ent->fts_statp->st_ino);
+}
+
+void
+fts_cross_check (FTS const *sp)
+{
+  FTSENT const *ent = sp->fts_cur;
+  FTSENT const *t;
+  if ( ! ISSET (FTS_TIGHT_CYCLE_CHECK))
+    return;
+
+  Dprintf (("fts-cross-check cur=%s\n", ent->fts_path));
+  /* Make sure every parent dir is in the tree.  */
+  for (t = ent->fts_parent; t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
+    {
+      struct Active_dir ad;
+      ad.ino = t->fts_statp->st_ino;
+      ad.dev = t->fts_statp->st_dev;
+      if ( ! hash_lookup (sp->active_dir_ht, &ad))
+	printf ("ERROR: active dir, %s, not in tree\n", t->fts_path);
+    }
+
+  /* Make sure every dir in the tree is an active dir.
+     But ENT is not necessarily a directory.  If so, just skip this part. */
+  if (ent->fts_parent->fts_level >= FTS_ROOTLEVEL
+      && (ent->fts_info == FTS_DP
+	  || ent->fts_info == FTS_D))
+    {
+      struct Active_dir *ad;
+      for (ad = hash_get_first (sp->active_dir_ht); ad != NULL;
+	   ad = hash_get_next (sp->active_dir_ht, ad))
+	{
+	  find_matching_ancestor (ent, ad);
+	}
+    }
+}
+#endif
+
 static u_short
 internal_function
 fts_stat(sp, p, follow)
@@ -1004,7 +1174,6 @@ err:		memset(sbp, 0, sizeof(struct stat));
 	}

 	if (S_ISDIR(sbp->st_mode)) {
-		FTSENT *t;
 		/*
 		 * Set the device/inode.  Used to find cycles and check for
 		 * crossing mount points.  Also remember the link count, used
@@ -1019,20 +1188,6 @@ err:		memset(sbp, 0, sizeof(struct stat));
 		if (ISDOT(p->fts_name))
 			return (FTS_DOT);

-		/*
-		 * See if we've already encountered this directory.
-		 * This can happen when following symlinks as well as
-		 * with a corrupted directory hierarchy.
-		 */
-		if ((t = find_object (sp, sbp))) {
-			p->fts_cycle = t;
-			return (FTS_DC);
-		}
-
-		/* Remember the object, ignoring any failure.  If we're running
-		   out of memory, detecting cycles isn't a high priority.  */
-		add_object (sp, p, sbp);
-
 		return (FTS_D);
 	}
 	if (S_ISLNK(sbp->st_mode))
@@ -1147,14 +1302,12 @@ fts_palloc(sp, more)
 	size_t more;
 {
 	char *p;
+	size_t new_len = sp->fts_pathlen + more + 256;

-	sp->fts_pathlen += more + 256;
 	/*
-	 * Check for possible wraparound.  In an FTS, fts_pathlen is
-	 * a signed int but in an FTSENT it is an unsigned short.
-	 * We limit fts_pathlen to USHRT_MAX to be safe in both cases.
+	 * See if fts_pathlen would overflow.
 	 */
-	if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) {
+	if (new_len < sp->fts_pathlen) {
 		if (sp->fts_path) {
 			free(sp->fts_path);
 			sp->fts_path = NULL;
@@ -1163,6 +1316,7 @@ fts_palloc(sp, more)
 		__set_errno (ENAMETOOLONG);
 		return (1);
 	}
+	sp->fts_pathlen = new_len;
 	p = realloc(sp->fts_path, sp->fts_pathlen);
 	if (p == NULL) {
 		free(sp->fts_path);
@@ -1186,7 +1340,7 @@ fts_padjust(sp, head)
 	FTSENT *p;
 	char *addr = sp->fts_path;

-#define	ADJUST(p) do {							\
+#define ADJUST(p) do {							\
 	if ((p)->fts_accpath != (p)->fts_name) {			\
 		(p)->fts_accpath =					\
 		    (char *)addr + ((p)->fts_accpath - (p)->fts_path);	\
@@ -1231,14 +1385,14 @@ fts_safe_changedir(sp, p, fd, path)
 	const char *path;
 {
 	int ret, oerrno, newfd;
-	struct stat64 sb;
+	struct stat sb;

 	newfd = fd;
 	if (ISSET(FTS_NOCHDIR))
 		return (0);
 	if (fd < 0 && (newfd = open(path, O_RDONLY, 0)) < 0)
 		return (-1);
-	if (__fxstat64(_STAT_VER, newfd, &sb)) {
+	if (fstat(newfd, &sb)) {
 		ret = -1;
 		goto bail;
 	}
--- a/lib/fts_.h
+++ b/lib/fts_.h
@@ -32,9 +32,20 @@
 #ifndef	_FTS_H
 # define _FTS_H 1

-# include <features.h>
-# include <sys/types.h>
+# ifdef _LIBC
+#  include <features.h>
+# else
+#  undef __THROW
+#  define __THROW
+#  undef __BEGIN_DECLS
+#  define __BEGIN_DECLS
+#  undef __END_DECLS
+#  define __END_DECLS
+# endif

+# include <sys/types.h>
+# include "hash.h"
+# include "cycle-check.h"

 typedef struct {
 	struct _ftsent *fts_cur;	/* current node */
@@ -43,7 +54,7 @@ typedef struct {
 	dev_t fts_dev;			/* starting device # */
 	char *fts_path;			/* path for this descent */
 	int fts_rfd;			/* fd for root */
-	int fts_pathlen;		/* sizeof(path) */
+	size_t fts_pathlen;		/* sizeof(path) */
 	int fts_nitems;			/* elements in the sort array */
 	int (*fts_compar) (const void *, const void *); /* compare fn */

@@ -55,14 +66,38 @@ typedef struct {
 # define FTS_SEEDOT	0x0020		/* return dot and dot-dot */
 # define FTS_XDEV	0x0040		/* don't cross devices */
 # define FTS_WHITEOUT	0x0080		/* return whiteout information */
-# define FTS_OPTIONMASK	0x00ff		/* valid user option mask */

-# define FTS_NAMEONLY	0x0100		/* (private) child names only */
-# define FTS_STOP	0x0200		/* (private) unrecoverable error */
+  /* There are two ways to detect cycles.
+     The lazy way, with which one may process a directory that is a
+     part of the cycle several times before detecting the cycle.
+     The `tight' way, whereby fts uses more memory (proportional
+     to number of `active' directories, aka distance from root
+     of current tree to current directory -- see active_dir_ht)
+     to detect any cycle right away.  For example, du must use
+     this option to avoid counting disk space in a cycle multiple
+     times, but chown -R need not.
+     The default is to use the constant-memory lazy way. */
+# define FTS_TIGHT_CYCLE_CHECK	0x0100
+
+# define FTS_OPTIONMASK	0x01ff		/* valid user option mask */
+
+# define FTS_NAMEONLY	0x1000		/* (private) child names only */
+# define FTS_STOP	0x2000		/* (private) unrecoverable error */
 	int fts_options;		/* fts_open options, global flags */
-	/* Data structure in which to store the fingerprint
-	   of each directory we've encountered.  */
-	void *fts_dir_signatures;
+
+	/* This data structure records the directories between a starting
+	   point and the current directory.  I.e., a directory is recorded
+	   here IFF we have visited it once, but we have not yet completed
+	   processing of all its entries.  Every time we visit a new directory,
+	   we add that directory to this set.  When we finish with a directory
+	   (usually by visiting it a second time), we remove it from this
+	   set.  Each entry in this data structure is a device/inode pair.
+	   This data structure is used to detect directory cycles efficiently
+	   and promptly even when the depth of a hierarchy is in the tens
+	   of thousands.  Lazy checking, as done by GNU rm via cycle-check.c,
+	   wouldn't be appropriate for du.  */
+	Hash_table *active_dir_ht;
+	struct cycle_check_state *cycle_state;
 } FTS;

 typedef struct _ftsent {
@@ -75,8 +110,7 @@ typedef struct _ftsent {
 	char *fts_path;			/* root path */
 	int fts_errno;			/* errno for this node */
 	int fts_symfd;			/* fd for symlink */
-	u_short fts_pathlen;		/* strlen(fts_path) */
-	u_short fts_namelen;		/* strlen(fts_name) */
+	size_t fts_pathlen;		/* strlen(fts_path) */

 	ino_t fts_ino;			/* inode */
 	dev_t fts_dev;			/* device */
@@ -84,15 +118,17 @@ typedef struct _ftsent {

 # define FTS_ROOTPARENTLEVEL	-1
 # define FTS_ROOTLEVEL		 0
-	short fts_level;		/* depth (-1 to N) */
+	int fts_level;			/* depth (-1 to N) */
+
+	u_short fts_namelen;		/* strlen(fts_name) */

 # define FTS_D		 1		/* preorder directory */
 # define FTS_DC		 2		/* directory that causes cycles */
 # define FTS_DEFAULT	 3		/* none of the above */
-# define FTS_DNR		 4		/* unreadable directory */
-# define FTS_DOT		 5		/* dot or dot-dot */
+# define FTS_DNR	 4		/* unreadable directory */
+# define FTS_DOT	 5		/* dot or dot-dot */
 # define FTS_DP		 6		/* postorder directory */
-# define FTS_ERR		 7		/* error; errno is set */
+# define FTS_ERR	 7		/* error; errno is set */
 # define FTS_F		 8		/* regular file */
 # define FTS_INIT	 9		/* initialized only */
 # define FTS_NS		10		/* stat(2) failed */
--- a/lib/ftw.c
+++ b/lib/ftw.c
@@ -1,852 +0,0 @@
-/* File tree walker functions.
-   Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if __GNUC__
-# define alloca __builtin_alloca
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #  pragma alloca
-#  else
-char *alloca ();
-#  endif
-# endif
-#endif
-
-#include <sys/types.h>
-
-#if defined _LIBC
-# include <dirent.h>
-# define NAMLEN(dirent) _D_EXACT_NAMLEN (dirent)
-#else
-# if HAVE_DIRENT_H
-#  include <dirent.h>
-#  define NAMLEN(dirent) strlen ((dirent)->d_name)
-# else
-#  define dirent direct
-#  define NAMLEN(dirent) (dirent)->d_namlen
-#  if HAVE_SYS_NDIR_H
-#   include <sys/ndir.h>
-#  endif
-#  if HAVE_SYS_DIR_H
-#   include <sys/dir.h>
-#  endif
-#  if HAVE_NDIR_H
-#   include <ndir.h>
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#include <ftw.h>
-#include <limits.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#if HAVE_SYS_PARAM_H || defined _LIBC
-# include <sys/param.h>
-#endif
-#ifdef _LIBC
-# include <include/sys/stat.h>
-#else
-# include <sys/stat.h>
-#endif
-
-#if ! _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy
-char *stpcpy ();
-#endif
-
-#if ! _LIBC && ! defined HAVE_MEMPCPY && ! defined mempcpy
-/* Be CAREFUL that there are no side effects in N.  */
-# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
-#endif
-
-/* #define NDEBUG 1 */
-#include <assert.h>
-
-#include "save-cwd.h"
-
-#ifndef _LIBC
-# undef __chdir
-# define __chdir chdir
-# undef __closedir
-# define __closedir closedir
-# undef __fchdir
-# define __fchdir fchdir
-# undef __mempcpy
-# define __mempcpy mempcpy
-# undef __opendir
-# define __opendir opendir
-# undef __readdir64
-# define __readdir64 readdir
-# undef __stpcpy
-# define __stpcpy stpcpy
-# undef __tdestroy
-# define __tdestroy tdestroy
-# undef __tfind
-# define __tfind tfind
-# undef __tsearch
-# define __tsearch tsearch
-# undef internal_function
-# define internal_function /* empty */
-# undef dirent64
-# define dirent64 dirent
-# undef MAX
-# define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-/* Arrange to make lstat calls go through the wrapper function
-   on systems with an lstat function that does not dereference symlinks
-   that are specified with a trailing slash.  */
-#if ! _LIBC && ! LSTAT_FOLLOWS_SLASHED_SYMLINK
-int rpl_lstat (const char *, struct stat *);
-# undef lstat
-# define lstat(Name, Stat_buf) rpl_lstat(Name, Stat_buf)
-#endif
-
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
-
-/* Support for the LFS API version.  */
-#ifndef FTW_NAME
-# define FTW_NAME ftw
-# define NFTW_NAME nftw
-# define INO_T ino_t
-# define FTW_STAT stat
-# ifdef _LIBC
-#  define LXSTAT __lxstat
-#  define XSTAT __xstat
-# else
-#  define LXSTAT(V,f,sb) lstat (f,sb)
-#  define XSTAT(V,f,sb) stat (f,sb)
-# endif
-# define FTW_FUNC_T __ftw_func_t
-# define NFTW_FUNC_T __nftw_func_t
-#endif
-
-/* We define PATH_MAX if the system does not provide a definition.
-   This does not artificially limit any operation.  PATH_MAX is simply
-   used as a guesstimate for the expected maximal path length.
-   Buffers will be enlarged if necessary.  */
-#ifndef PATH_MAX
-# define PATH_MAX 1024
-#endif
-
-#ifndef S_IFMT
-# define S_IFMT 0170000
-#endif
-
-#if STAT_MACROS_BROKEN
-# undef S_ISLNK
-#endif
-
-#ifndef S_ISLNK
-# ifdef S_IFLNK
-#  define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-# else
-#  define S_ISLNK(m) 0
-# endif
-#endif
-
-struct dir_data
-{
-  DIR *stream;
-  char *content;
-};
-
-struct known_object
-{
-  dev_t dev;
-  INO_T ino;
-};
-
-struct ftw_data
-{
-  /* Array with pointers to open directory streams.  */
-  struct dir_data **dirstreams;
-  size_t actdir;
-  size_t maxdir;
-
-  /* Buffer containing name of currently processed object.  */
-  char *dirbuf;
-  size_t dirbufsize;
-
-  /* Passed as fourth argument to `nftw' callback.  The `base' member
-     tracks the content of the `dirbuf'.  */
-  struct FTW ftw;
-
-  /* Flags passed to `nftw' function.  0 for `ftw'.  */
-  int flags;
-
-  /* Conversion array for flag values.  It is the identity mapping for
-     `nftw' calls, otherwise it maps the values to those known by
-     `ftw'.  */
-  const int *cvt_arr;
-
-  /* Callback function.  We always use the `nftw' form.  */
-  NFTW_FUNC_T func;
-
-  /* Device of starting point.  Needed for FTW_MOUNT.  */
-  dev_t dev;
-
-  /* Data structure for keeping fingerprints of already processed
-     object.  This is needed when not using FTW_PHYS.  */
-  void *known_objects;
-};
-
-
-/* Internally we use the FTW_* constants used for `nftw'.  When invoked
-   as `ftw', map each flag to the subset of values used by `ftw'.  */
-static const int nftw_arr[] =
-{
-  /* Extract with:
-     perl -ne '/^  (FTW_\w+)\b[^=]*$/ and print "$1, "' ftw_.h; echo */
-  FTW_F, FTW_D, FTW_DNR, FTW_NS, FTW_DCH, FTW_DCHP, FTW_DPRE, FTW_SL, FTW_DP, FTW_SLN
-};
-
-static const int ftw_arr[] =
-{
-  /* Generate with:
-     perl -ne '/^  (FTW_\w+)\b[^=]*$/ and print "$1, "' ftw_.h \
-       | sed 's/_SL/_F/;s/_DP\>/_D/;s/_SLN/_NS/'; echo  */
-  FTW_F, FTW_D, FTW_DNR, FTW_NS, FTW_DCH, FTW_DCHP, FTW_DPRE, FTW_F, FTW_D, FTW_NS
-};
-
-/* Ensure that each of the above arrays has the number of
-   initializers corresponding to enum Ftw_option.  */
-struct dummy
-{
-  int p1 [sizeof nftw_arr / sizeof nftw_arr[0] == FTW_N_MEMBERS ? 1 : -1];
-  int p2 [sizeof nftw_arr / sizeof  ftw_arr[0] == FTW_N_MEMBERS ? 1 : -1];
-};
-
-
-/* Forward declarations of local functions.  */
-static int ftw_dir (struct ftw_data *data, struct FTW_STAT *st)
-     internal_function;
-
-
-static int
-object_compare (const void *p1, const void *p2)
-{
-  /* We don't need a sophisticated and useful comparison.  We are only
-     interested in equality.  However, we must be careful not to
-     accidentally compare `holes' in the structure.  */
-  const struct known_object *kp1 = p1, *kp2 = p2;
-  int cmp1;
-  cmp1 = (kp1->ino > kp2->ino) - (kp1->ino < kp2->ino);
-  if (cmp1 != 0)
-    return cmp1;
-  return (kp1->dev > kp2->dev) - (kp1->dev < kp2->dev);
-}
-
-
-static inline int
-add_object (struct ftw_data *data, struct FTW_STAT *st)
-{
-  struct known_object *newp = malloc (sizeof (struct known_object));
-  if (newp == NULL)
-    return -1;
-  newp->dev = st->st_dev;
-  newp->ino = st->st_ino;
-  return __tsearch (newp, &data->known_objects, object_compare) ? 0 : -1;
-}
-
-
-static inline int
-find_object (struct ftw_data *data, struct FTW_STAT *st)
-{
-  struct known_object obj;
-  obj.dev = st->st_dev;
-  obj.ino = st->st_ino;
-  return __tfind (&obj, &data->known_objects, object_compare) != NULL;
-}
-
-
-static inline int
-open_dir_stream (struct ftw_data *data, struct dir_data *dirp)
-{
-  int result = 0;
-
-  if (data->dirstreams[data->actdir] != NULL)
-    {
-      /* Oh, oh.  We must close this stream.  Get all remaining
-	 entries and store them as a list in the `content' member of
-	 the `struct dir_data' variable.  */
-      size_t bufsize = 1024;
-      char *buf = malloc (bufsize);
-
-      if (buf == NULL)
-	result = -1;
-      else
-	{
-	  DIR *st = data->dirstreams[data->actdir]->stream;
-	  struct dirent64 *d;
-	  size_t actsize = 0;
-
-	  while ((d = __readdir64 (st)) != NULL)
-	    {
-	      size_t this_len = NAMLEN (d);
-	      if (actsize + this_len + 2 >= bufsize)
-		{
-		  char *newp;
-		  bufsize += MAX (1024, 2 * this_len);
-		  newp = (char *) realloc (buf, bufsize);
-		  if (newp == NULL)
-		    {
-		      /* No more memory.  */
-		      int save_err = errno;
-		      free (buf);
-		      __set_errno (save_err);
-		      result = -1;
-		      break;
-		    }
-		  buf = newp;
-		}
-
-	      *((char *) __mempcpy (buf + actsize, d->d_name, this_len))
-		= '\0';
-	      actsize += this_len + 1;
-	    }
-
-	  /* Terminate the list with an additional NUL byte.  */
-	  buf[actsize++] = '\0';
-
-	  /* Shrink the buffer to what we actually need.  */
-	  data->dirstreams[data->actdir]->content = realloc (buf, actsize);
-	  if (data->dirstreams[data->actdir]->content == NULL)
-	    {
-	      int save_err = errno;
-	      free (buf);
-	      __set_errno (save_err);
-	      result = -1;
-	    }
-	  else
-	    {
-	      __closedir (st);
-	      data->dirstreams[data->actdir]->stream = NULL;
-	      data->dirstreams[data->actdir] = NULL;
-	    }
-	}
-    }
-
-  /* Open the new stream.  */
-  if (result == 0)
-    {
-      const char *name = ((data->flags & FTW_CHDIR)
-			  ? data->dirbuf + data->ftw.base: data->dirbuf);
-      assert (data->dirstreams[data->actdir] == NULL);
-
-      dirp->stream = __opendir (name);
-      if (dirp->stream == NULL)
-	result = -1;
-      else
-	{
-	  dirp->content = NULL;
-	  data->dirstreams[data->actdir] = dirp;
-
-	  if (++data->actdir == data->maxdir)
-	    data->actdir = 0;
-	}
-    }
-
-  return result;
-}
-
-
-static inline int
-process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
-	       size_t namlen)
-{
-  struct FTW_STAT st;
-  int result = 0;
-  int flag = 0;
-  size_t new_buflen;
-
-  if (name[0] == '.' && (name[1] == '\0'
-			 || (name[1] == '.' && name[2] == '\0')))
-    /* Don't process the "." and ".." entries.  */
-    return 0;
-
-  new_buflen = data->ftw.base + namlen + 2;
-  if (data->dirbufsize < new_buflen)
-    {
-      /* Enlarge the buffer.  */
-      char *newp;
-
-      data->dirbufsize = 2 * new_buflen;
-      newp = (char *) realloc (data->dirbuf, data->dirbufsize);
-      if (newp == NULL)
-	return -1;
-      data->dirbuf = newp;
-    }
-
-  *((char *) __mempcpy (data->dirbuf + data->ftw.base, name, namlen)) = '\0';
-
-  if ((data->flags & FTW_CHDIR) == 0)
-    name = data->dirbuf;
-
-  if (((data->flags & FTW_PHYS)
-       ? LXSTAT (_STAT_VER, name, &st)
-       : XSTAT (_STAT_VER, name, &st)) < 0)
-    {
-      if (errno != EACCES && errno != ENOENT)
-	result = -1;
-      else if (!(data->flags & FTW_PHYS)
-	       && LXSTAT (_STAT_VER, name, &st) == 0
-	       && S_ISLNK (st.st_mode))
-	flag = FTW_SLN;
-      else
-	flag = FTW_NS;
-    }
-  else
-    {
-      if (S_ISDIR (st.st_mode))
-	flag = FTW_D;
-      else if (S_ISLNK (st.st_mode))
-	flag = FTW_SL;
-      else
-	flag = FTW_F;
-    }
-
-  if (result == 0
-      && (flag == FTW_NS
-	  || !(data->flags & FTW_MOUNT) || st.st_dev == data->dev))
-    {
-      if (flag == FTW_D)
-	{
-	  if ((data->flags & FTW_PHYS)
-	      || (!find_object (data, &st)
-		  /* Remember the object.  */
-		  && (result = add_object (data, &st)) == 0))
-	    {
-	      /* When processing a directory as part of a depth-first traversal,
-		 invoke the user's callback function with type=FTW_DPRE
-		 just before processing any entry in that directory.
-		 And if the callback sets ftw.skip, then don't process
-		 any entries of the directory.  */
-	      if ((data->flags & FTW_DEPTH)
-		  && (result = (*data->func) (data->dirbuf, &st, FTW_DPRE,
-					      &data->ftw)) == 0
-		  && ! data->ftw.skip)
-		result = ftw_dir (data, &st);
-
-	      if (result == 0 && (data->flags & FTW_CHDIR))
-		{
-		  /* Change back to the parent directory.  */
-		  int done = 0;
-		  if (dir->stream != NULL)
-		    if (__fchdir (dirfd (dir->stream)) == 0)
-		      done = 1;
-
-		  if (!done)
-		    {
-		      if (data->ftw.base == 1)
-			{
-			  if (__chdir ("/") < 0)
-			    result = -1;
-			}
-		      else
-			if (__chdir ("..") < 0)
-			  result = -1;
-		    }
-
-		  if (result < 0)
-		    {
-		      result = (*data->func) (data->dirbuf, NULL, FTW_DCHP,
-				&data->ftw);
-		    }
-		}
-	    }
-	}
-      else
-	result = (*data->func) (data->dirbuf, &st, data->cvt_arr[flag],
-				&data->ftw);
-    }
-
-  return result;
-}
-
-
-static int
-internal_function
-ftw_dir (struct ftw_data *data, struct FTW_STAT *st)
-{
-  struct dir_data dir;
-  struct dirent64 *d;
-  int previous_base = data->ftw.base;
-  int result;
-  char *startp;
-
-  /* Open the stream for this directory.  This might require that
-     another stream has to be closed.  */
-  result = open_dir_stream (data, &dir);
-  if (result != 0)
-    {
-      if (errno == EACCES)
-	/* We cannot read the directory.  Signal this with a special flag.  */
-	result = (*data->func) (data->dirbuf, st, FTW_DNR, &data->ftw);
-
-      return result;
-    }
-
-  /* First, report the directory (if not depth-first).  */
-  if (!(data->flags & FTW_DEPTH))
-    {
-      result = (*data->func) (data->dirbuf, st, FTW_D, &data->ftw);
-      if (result != 0)
-	return result;
-    }
-
-  /* If necessary, change to this directory.  */
-  if (data->flags & FTW_CHDIR)
-    {
-      if (__fchdir (dirfd (dir.stream)) < 0)
-	{
-	  if (errno == ENOSYS)
-	    {
-	      if (__chdir (data->dirbuf) < 0)
-		result = -1;
-	    }
-	  else
-	    result = -1;
-	}
-
-      if (result != 0)
-	{
-	  int save_err = errno;
-	  __closedir (dir.stream);
-	  __set_errno (save_err);
-
-	  if (data->actdir-- == 0)
-	    data->actdir = data->maxdir - 1;
-	  data->dirstreams[data->actdir] = NULL;
-
-	  /* We cannot change to the directory.
-	     Signal this with a special flag.  */
-	  result = (*data->func) (data->dirbuf, st, FTW_DCH, &data->ftw);
-
-	  return result;
-	}
-    }
-
-  /* Next, update the `struct FTW' information.  */
-  ++data->ftw.level;
-  startp = strchr (data->dirbuf, '\0');
-  /* There always must be a directory name.  */
-  assert (startp != data->dirbuf);
-  if (startp[-1] != '/')
-    *startp++ = '/';
-  data->ftw.base = startp - data->dirbuf;
-
-  while (dir.stream != NULL && (d = __readdir64 (dir.stream)) != NULL)
-    {
-      result = process_entry (data, &dir, d->d_name, NAMLEN (d));
-      if (result != 0)
-	break;
-    }
-
-  if (dir.stream != NULL)
-    {
-      /* The stream is still open.  I.e., we did not need more
-	 descriptors.  Simply close the stream now.  */
-      int save_err = errno;
-
-      assert (dir.content == NULL);
-
-      __closedir (dir.stream);
-      __set_errno (save_err);
-
-      if (data->actdir-- == 0)
-	data->actdir = data->maxdir - 1;
-      data->dirstreams[data->actdir] = NULL;
-    }
-  else
-    {
-      int save_err;
-      char *runp = dir.content;
-
-      while (result == 0 && *runp != '\0')
-	{
-	  char *endp = strchr (runp, '\0');
-
-	  result = process_entry (data, &dir, runp, endp - runp);
-
-	  runp = endp + 1;
-	}
-
-      save_err = errno;
-      free (dir.content);
-      __set_errno (save_err);
-    }
-
-  /* Prepare the return, revert the `struct FTW' information.
-     If ftw.base is 1, be careful to preserve the `/'.  */
-  data->dirbuf[data->ftw.base == 1 ? 1 : data->ftw.base - 1] = '\0';
-  --data->ftw.level;
-  data->ftw.base = previous_base;
-
-  /* Finally, if we process depth-first report the directory.  */
-  if (result == 0 && (data->flags & FTW_DEPTH))
-    result = (*data->func) (data->dirbuf, st, FTW_DP, &data->ftw);
-
-  return result;
-}
-
-
-#ifdef _LIBC
-# define ISSLASH(C) ((C) == '/')
-# define FILESYSTEM_PREFIX_LEN(Filename) 0
-#endif
-
-/* In general, we can't use the builtin `basename' function if available,
-   since it has different meanings in different environments.
-   In some environments the builtin `basename' modifies its argument.
-
-   Return the address of the last file name component of NAME.  If
-   NAME has no file name components because it is all slashes, return
-   NAME if it is empty, the address of its last slash otherwise.  */
-
-static char *
-base_name (char const *name)
-{
-  char const *base = name + FILESYSTEM_PREFIX_LEN (name);
-  char const *p;
-
-  for (p = base; *p; p++)
-    {
-      if (ISSLASH (*p))
-	{
-	  /* Treat multiple adjacent slashes like a single slash.  */
-	  do p++;
-	  while (ISSLASH (*p));
-
-	  /* If the file name ends in slash, use the trailing slash as
-	     the basename if no non-slashes have been found.  */
-	  if (! *p)
-	    {
-	      if (ISSLASH (*base))
-		base = p - 1;
-	      break;
-	    }
-
-	  /* *P is a non-slash preceded by a slash.  */
-	  base = p;
-	}
-    }
-
-  return (char *) base;
-}
-
-
-static int
-internal_function
-ftw_startup (const char *dir, int is_nftw, NFTW_FUNC_T func, int descriptors,
-	     int flags)
-{
-  struct ftw_data data;
-  struct FTW_STAT st;
-  int result = 0;
-  int save_err;
-  struct saved_cwd cwd;
-  size_t dir_len;
-
-  /* First make sure the parameters are reasonable.  */
-  if (dir[0] == '\0')
-    {
-      __set_errno (ENOENT);
-      return -1;
-    }
-
-  data.maxdir = descriptors < 1 ? 1 : descriptors;
-  data.actdir = 0;
-  data.dirstreams = (struct dir_data **) alloca (data.maxdir
-						 * sizeof (struct dir_data *));
-  if (data.dirstreams == NULL)
-    return -1;
-  memset (data.dirstreams, '\0', data.maxdir * sizeof (struct dir_data *));
-
-  /* PATH_MAX is always defined when we get here.  */
-  dir_len = strlen (dir);
-  data.dirbufsize = MAX (2 * dir_len, PATH_MAX);
-  data.dirbuf = (char *) malloc (data.dirbufsize);
-  if (data.dirbuf == NULL)
-    return -1;
-  memcpy (data.dirbuf, dir, dir_len + 1);
-
-  data.ftw.level = 0;
-
-  /* Find offset of basename.  */
-  data.ftw.base = base_name (data.dirbuf) - data.dirbuf;
-
-  data.flags = flags;
-
-  /* This assignment might seem to be strange but it is what we want.
-     The trick is that the first three arguments to the `ftw' and
-     `nftw' callback functions are equal.  Therefore we can call in
-     every case the callback using the format of the `nftw' version
-     and get the correct result since the stack layout for a function
-     call in C allows this.  */
-  data.func = func;
-
-  /* Since we internally use the complete set of FTW_* values we need
-     to reduce the value range before calling a `ftw' callback.  */
-  data.cvt_arr = is_nftw ? nftw_arr : ftw_arr;
-
-  /* No object known so far.  */
-  data.known_objects = NULL;
-
-  /* Now go to the directory containing the initial file/directory.  */
-  if (flags & FTW_CHDIR)
-    {
-      if (save_cwd (&cwd))
-	result = -1;
-      else if (data.ftw.base > 0)
-	{
-	  /* Change to the directory the file is in.  In data.dirbuf
-	     we have a writable copy of the file name.  Just NUL
-	     terminate it for now and change the directory.  */
-	  if (data.ftw.base == 1)
-	    /* I.e., the file is in the root directory.  */
-	    result = __chdir ("/");
-	  else
-	    {
-	      char ch = data.dirbuf[data.ftw.base - 1];
-	      data.dirbuf[data.ftw.base - 1] = '\0';
-	      result = __chdir (data.dirbuf);
-	      data.dirbuf[data.ftw.base - 1] = ch;
-	    }
-	}
-    }
-
-  /* Get stat info for start directory.  */
-  if (result == 0)
-    {
-      const char *name = ((data.flags & FTW_CHDIR)
-			  ? data.dirbuf + data.ftw.base
-			  : data.dirbuf);
-
-      if (((flags & FTW_PHYS)
-	   ? LXSTAT (_STAT_VER, name, &st)
-	   : XSTAT (_STAT_VER, name, &st)) < 0)
-	{
-	  if (!(flags & FTW_PHYS)
-	      && errno == ENOENT
-	      && LXSTAT (_STAT_VER, name, &st) == 0
-	      && S_ISLNK (st.st_mode))
-	    result = (*data.func) (data.dirbuf, &st, data.cvt_arr[FTW_SLN],
-				   &data.ftw);
-	  else
-	    /* No need to call the callback since we cannot say anything
-	       about the object.  */
-	    result = -1;
-	}
-      else
-	{
-	  if (S_ISDIR (st.st_mode))
-	    {
-	      /* Remember the device of the initial directory in case
-		 FTW_MOUNT is given.  */
-	      data.dev = st.st_dev;
-
-	      /* We know this directory now.  */
-	      if (!(flags & FTW_PHYS))
-		result = add_object (&data, &st);
-
-	      if (result == 0)
-		{
-		  /* If we're doing a depth-first traversal, give the user
-		     a chance to prune the top-level directory.  */
-		  if ((flags & FTW_DEPTH)
-		      && (result = (*data.func) (data.dirbuf, &st, FTW_DPRE,
-						 &data.ftw)) == 0
-		      && ! data.ftw.skip)
-		    result = ftw_dir (&data, &st);
-		}
-	    }
-	  else
-	    {
-	      int flag = S_ISLNK (st.st_mode) ? FTW_SL : FTW_F;
-
-	      result = (*data.func) (data.dirbuf, &st, data.cvt_arr[flag],
-				     &data.ftw);
-	    }
-	}
-    }
-
-  /* Return to the start directory (if necessary).  */
-  if (flags & FTW_CHDIR)
-    {
-      save_err = errno;
-      /* If restore_cwd fails and there wasn't a prior failure,
-	 then let this new errno override any prior value.
-	 FIXME: ideally, we'd be able to return some indication
-	 of what the failure means.  Otherwise, the caller will
-	 have a hard time distinguishing between e.g., `out of memory'
-	 and this sort of failure.  */
-      if (restore_cwd (&cwd) && result == 0)
-	{
-	  save_err = errno;
-	  result = -1;
-	}
-      free_cwd (&cwd);
-
-      __set_errno (save_err);
-    }
-
-  /* Free all memory.  */
-  save_err = errno;
-  __tdestroy (data.known_objects, free);
-  free (data.dirbuf);
-  __set_errno (save_err);
-
-  return result;
-}
-
-
-
-/* Entry points.  */
-
-int
-FTW_NAME (path, func, descriptors)
-     const char *path;
-     FTW_FUNC_T func;
-     int descriptors;
-{
-  return ftw_startup (path, 0, (NFTW_FUNC_T) func, descriptors, 0);
-}
-
-int
-NFTW_NAME (path, func, descriptors, flags)
-     const char *path;
-     NFTW_FUNC_T func;
-     int descriptors;
-     int flags;
-{
-  return ftw_startup (path, 1, func, descriptors, flags);
-}
--- a/lib/ftw_.h
+++ b/lib/ftw_.h
@@ -1,189 +0,0 @@
-/* Copyright (C) 1992, 1996, 1997, 1998, 1999, 2003
-   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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/*
- *	X/Open Portability Guide 4.2: ftw.h
- */
-
-#ifndef _FTW_H
-# define _FTW_H	1
-
-# ifdef _LIBC
-#  include <features.h>
-# else
-#  undef __THROW
-#  define __THROW
-#  undef __BEGIN_DECLS
-#  define __BEGIN_DECLS
-#  undef __END_DECLS
-#  define __END_DECLS
-# endif
-
-# include <sys/types.h>
-# include <sys/stat.h>
-
-/* When compiling stand-alone on a system that does not define
-   __USE_XOPEN_EXTENDED, define that symbol so that all the
-   required declarations appear.  */
-# if ! defined _LIBC && ! defined __USE_XOPEN_EXTENDED
-#  define FTW_H_STANDALONE 1
-#  define __USE_XOPEN_EXTENDED 1
-# endif
-
-__BEGIN_DECLS
-
-/* Values for the FLAG argument to the user function passed to `ftw'
-   and 'nftw'.  */
-enum Ftw_option
-{
-  FTW_F,		/* Regular file.  */
-# define FTW_F	 FTW_F
-  FTW_D,		/* Directory.  */
-# define FTW_D	 FTW_D
-  FTW_DNR,		/* Unreadable directory.  */
-# define FTW_DNR	 FTW_DNR
-  FTW_NS,		/* Unstatable file.  */
-# define FTW_NS	 FTW_NS
-
-  /* Can't chdir to named directory.  This can happen only when using
-     FTW_CHDIR.  Note that although we can't chdir into that directory,
-     we were able to stat it, so SB (2nd argument to callback) is valid.  */
-  FTW_DCH,
-# define FTW_DCH FTW_DCH
-
-  /* Can't chdir to parent of named directory.  This can happen only when
-     using FTW_CHDIR.  Unlike for FTW_DCH, in this case, SB is not valid.
-     In fact, it is NULL.  */
-  FTW_DCHP,
-# define FTW_DCHP FTW_DCHP
-
-  /* nftw calls the user-supplied function at most twice for each directory
-     it encounters.  When calling it the first time, it passes this value
-     as the `type'.  */
-  FTW_DPRE,
-# define FTW_DPRE FTW_DPRE
-
-# if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-
-  FTW_SL,		/* Symbolic link.  */
-#  define FTW_SL	 FTW_SL
-# endif
-
-# ifdef __USE_XOPEN_EXTENDED
-/* These flags are only passed from the `nftw' function.  */
-  FTW_DP,		/* Directory, all subdirs have been visited. */
-#  define FTW_DP	 FTW_DP
-  FTW_SLN,		/* Symbolic link naming non-existing file.  */
-#  define FTW_SLN FTW_SLN
-
-# endif	/* extended X/Open */
-
-  FTW_N_MEMBERS
-# define FTW_N_MEMBERS FTW_N_MEMBERS
-};
-
-
-# ifdef __USE_XOPEN_EXTENDED
-/* Flags for fourth argument of `nftw'.  */
-enum
-{
-  FTW_PHYS = 1,		/* Perform physical walk, ignore symlinks.  */
-#  define FTW_PHYS	FTW_PHYS
-  FTW_MOUNT = 2,	/* Report only files on same file system as the
-			   argument.  */
-#  define FTW_MOUNT	FTW_MOUNT
-  FTW_CHDIR = 4,	/* Change to current directory while processing it.  */
-#  define FTW_CHDIR	FTW_CHDIR
-  FTW_DEPTH = 8		/* Report files in directory before directory itself.*/
-#  define FTW_DEPTH	FTW_DEPTH
-};
-
-/* Structure used for fourth argument to callback function for `nftw'.  */
-struct FTW
-  {
-    int base;
-    int level;
-    int skip;
-  };
-# endif	/* extended X/Open */
-
-
-/* Convenient types for callback functions.  */
-typedef int (*__ftw_func_t) (const char *__filename,
-			     const struct stat *__status, int __flag);
-# ifdef __USE_LARGEFILE64
-typedef int (*__ftw64_func_t) (const char *__filename,
-			       const struct stat64 *__status, int __flag);
-# endif
-# ifdef __USE_XOPEN_EXTENDED
-typedef int (*__nftw_func_t) (const char *__filename,
-			      const struct stat *__status, int __flag,
-			      struct FTW *__info);
-#  ifdef __USE_LARGEFILE64
-typedef int (*__nftw64_func_t) (const char *__filename,
-				const struct stat64 *__status,
-				int __flag, struct FTW *__info);
-#  endif
-# endif
-
-/* Call a function on every element in a directory tree.  */
-# ifndef __USE_FILE_OFFSET64
-extern int ftw (const char *__dir, __ftw_func_t __func, int __descriptors)
-     __THROW;
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (ftw, (const char *__dir, __ftw_func_t __func,
-			     int __descriptors) __THROW, ftw64);
-#  else
-#   define ftw ftw64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int ftw64 (const char *__dir, __ftw64_func_t __func,
-		  int __descriptors) __THROW;
-# endif
-
-# ifdef __USE_XOPEN_EXTENDED
-/* Call a function on every element in a directory tree.  FLAG allows
-   to specify the behaviour more detailed.  */
-#  ifndef __USE_FILE_OFFSET64
-extern int nftw (const char *__dir, __nftw_func_t __func, int __descriptors,
-		 int __flag) __THROW;
-#  else
-#   ifdef __REDIRECT
-extern int __REDIRECT (nftw, (const char *__dir, __nftw_func_t __func,
-			      int __descriptors, int __flag) __THROW, nftw64);
-#   else
-#    define nftw nftw64
-#   endif
-#  endif
-#  ifdef __USE_LARGEFILE64
-extern int nftw64 (const char *__dir, __nftw64_func_t __func,
-		   int __descriptors, int __flag) __THROW;
-#  endif
-# endif
-
-/* If we defined __USE_XOPEN_EXTENDED above, undefine it here.  */
-# ifdef FTW_H_STANDALONE
-#  undef __USE_XOPEN_EXTENDED
-# endif
-
-__END_DECLS
-
-#endif	/* ftw.h */
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -20,20 +20,25 @@
 # include <config.h>
 #endif

+/* Specification.  */
+#ifdef FULL_READ
+# include "full-read.h"
+#else
+# include "full-write.h"
+#endif
+
 #include <errno.h>
 #ifndef errno
 extern int errno;
 #endif

 #ifdef FULL_READ
-# include "full-read.h"
 # include "safe-read.h"
 # define safe_rw safe_read
 # define full_rw full_read
 # undef const
 # define const /* empty */
 #else
-# include "full-write.h"
 # include "safe-write.h"
 # define safe_rw safe_write
 # define full_rw full_write
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -43,9 +43,7 @@

 #include <ctype.h>

-#if HAVE_STDLIB_H
-# include <stdlib.h> /* for `free'; used by Bison 1.27 */
-#endif
+#include <stdlib.h> /* for `free'; used by Bison 1.27 */

 #if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
 # define IN_CTYPE_DOMAIN(c) 1
@@ -67,9 +65,7 @@
   of `digit' even when the host does not conform to POSIX.  */
 #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)

-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>

 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
 # define __attribute__(x)
@@ -527,10 +523,10 @@ static table const time_units_table[] =
 /* Assorted relative-time words. */
 static table const relative_time_table[] =
 {
-  { "TOMORROW",	tMINUTE_UNIT,	24 * 60 },
-  { "YESTERDAY",tMINUTE_UNIT,	- (24 * 60) },
-  { "TODAY",	tMINUTE_UNIT,	 0 },
-  { "NOW",	tMINUTE_UNIT,	 0 },
+  { "TOMORROW",	tDAY_UNIT,	 1 },
+  { "YESTERDAY",tDAY_UNIT,	-1 },
+  { "TODAY",	tDAY_UNIT,	 0 },
+  { "NOW",	tDAY_UNIT,	 0 },
  { "LAST",	tUNUMBER,	-1 },
  { "THIS",	tUNUMBER,	 0 },
  { "NEXT",	tUNUMBER,	 1 },
--- a/lib/getdelim2.c
+++ b/lib/getdelim2.c
@@ -1,110 +0,0 @@
-/* getdelim2.c -- a variant of getdelim
-
-   Copyright (C) 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "getdelim2.h"
-
-#include <stdlib.h>
-
-#include "unlocked-io.h"
-
-/* 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
-getdelim2 (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
-	   size_t offset)
-{
-  size_t 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;
-    }
-
-  if (*n < offset)
-    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.  */
-
-      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;
-	}
-
-      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;
-}
--- a/lib/getdelim2.h
+++ b/lib/getdelim2.h
@@ -1,10 +0,0 @@
-#ifndef GETDELIM2_H_
-# define GETDELIM2_H_ 1
-
-# include <stddef.h>
-# include <stdio.h>
-
-int getdelim2 (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
-	       size_t offset);
-
-#endif
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -20,6 +20,8 @@
 #include <config.h>
 #include <stdio.h>
 #include <sys/types.h>
+#include <errno.h>
+#include <stdlib.h>

 #include "xalloc.h"

@@ -29,10 +31,11 @@
   provided function handle all others. */

 int
-getgroups (size_t n, GETGROUPS_T *group)
+getgroups (int n, GETGROUPS_T *group)
 {
  int n_groups;
  GETGROUPS_T *gbuf;
+  int saved_errno;

 #undef getgroups

@@ -40,17 +43,22 @@ getgroups (size_t n, GETGROUPS_T *group)
    return getgroups (n, group);

  n = 20;
-  gbuf = NULL;
  while (1)
    {
-      gbuf = xrealloc (gbuf, n * sizeof (GETGROUPS_T));
+      /* No need to worry about address arithmetic overflow here,
+	 since the ancient systems that we're running on have low
+	 limits on the number of secondary groups.  */
+      gbuf = xmalloc (n * sizeof *gbuf);
      n_groups = getgroups (n, gbuf);
      if (n_groups < n)
 	break;
+      free (gbuf);
      n += 10;
    }

+  saved_errno = errno;
  free (gbuf);
+  errno = saved_errno;

  return n_groups;
 }
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -1,5 +1,5 @@
 /* gethostname emulation for SysV and POSIX.1.
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2003 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
@@ -29,10 +29,10 @@
   Null terminate it if the name is shorter than LEN.
   Return 0 if ok, -1 if error.  */

+#include <stddef.h>
+
 int
-gethostname (name, len)
-     char *name;
-     int len;
+gethostname (char *name, size_t len)
 {
 #ifdef HAVE_UNAME
  struct utsname uts;
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -23,37 +23,36 @@
 # include <config.h>
 #endif

+/* Specification.  */
 #include "getline.h"
-#include "getdelim2.h"
-
-/* The `getdelim' function is only declared if the following symbol
-   is defined.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif

 #include <stddef.h>
 #include <stdio.h>

+/* Get ssize_t.  */
+#include <sys/types.h>
+
 #if defined __GNU_LIBRARY__ && HAVE_GETDELIM

-int
-getline (char **lineptr, size_t *n, FILE *stream)
+ssize_t
+getline (char **lineptr, size_t *linesize, FILE *stream)
 {
-  return getdelim (lineptr, n, '\n', stream);
+  return getdelim (lineptr, linesize, '\n', stream);
 }

 #else /* ! have getdelim */

-int
-getline (char **lineptr, size_t *n, FILE *stream)
+# include "getndelim2.h"
+
+ssize_t
+getline (char **lineptr, size_t *linesize, FILE *stream)
 {
-  return getdelim2 (lineptr, n, stream, '\n', 0, 0);
+  return getndelim2 (lineptr, linesize, (size_t)(-1), stream, '\n', 0, 0);
 }

-int
-getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream)
+ssize_t
+getdelim (char **lineptr, size_t *linesize, int delimiter, FILE *stream)
 {
-  return getdelim2 (lineptr, n, stream, delimiter, 0, 0);
+  return getndelim2 (lineptr, linesize, (size_t)(-1), stream, delimiter, 0, 0);
 }
 #endif
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -1,4 +1,7 @@
-/*  Copyright (C) 1995, 1997, 1999, 2000-2002 Free Software Foundation, Inc.
+/* Replacement for GNU C library function getline
+
+   Copyright (C) 1995, 1997, 1999, 2000, 2001, 2002, 2003 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
@@ -20,12 +23,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <stddef.h>
 # include <stdio.h>

+/* Get ssize_t.  */
+# include <sys/types.h>
+
 /* glibc2 has these functions declared in <stdio.h>.  Avoid redeclarations.  */
 # if __GLIBC__ < 2

-int getline (char **_lineptr, size_t *_n, FILE *_stream);
+extern ssize_t getline (char **_lineptr, size_t *_linesize, FILE *_stream);

-int getdelim (char **_lineptr, size_t *_n, int _delimiter, FILE *_stream);
+extern ssize_t getdelim (char **_lineptr, size_t *_linesize, int _delimiter,
+			  FILE *_stream);

 # endif

--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -1,6 +1,10 @@
 /* Get the system load averages.
-   Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994, 1995, 1997, 2003
-   Free Software Foundation, Inc.
+
+   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994,
+   1995, 1997, 1999, 2000, 2003 Free Software Foundation, Inc.
+
+   NOTE: The canonical source of this file is maintained with gnulib.
+   Bugs can be reported to bug-gnulib@gnu.org.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -35,12 +39,17 @@
   LOAD_AVE_TYPE		Type of the load average array in the kernel.
 				Must be defined unless one of
 				apollo, DGUX, NeXT, or UMAX is defined;
+                                or we have libkstat;
 				otherwise, no load average is available.
+   HAVE_NLIST_H                 nlist.h is available.  NLIST_STRUCT defaults
+                                to this.
   NLIST_STRUCT			Include nlist.h, not a.out.h, and
 				the nlist n_name element is a pointer,
 				not an array.
-   NLIST_NAME_UNION		struct nlist has an n_un member, not n_name.
+   HAVE_STRUCT_NLIST_N_UN_N_NAME `n_un.n_name' is member of `struct nlist'.
   LINUX_LDAV_FILE		[__linux__]: File containing load averages.
+   HAVE_LOCALE_H                locale.h is available.
+   HAVE_SETLOCALE               The `setlocale' function is available.

   Specific system predefines this file uses, aside from setting
   default values if not emacs:
@@ -81,7 +90,7 @@
 /* Both the Emacs and non-Emacs sections want this.  Some
   configuration files' definitions for the LOAD_AVE_CVT macro (like
   sparc.h's) use macros like FSCALE, defined here.  */
-#ifdef unix
+#if defined (unix) || defined (__unix)
 # include <sys/param.h>
 #endif

@@ -98,10 +107,10 @@
 extern int errno;
 #endif

-#if HAVE_LOCALE_H
+#ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
-#if !HAVE_SETLOCALE
+#ifndef HAVE_SETLOCALE
 # define setlocale(Category, Locale) /* empty */
 #endif

@@ -117,7 +126,7 @@ extern int errno;
   LOAD_AVE_CVT, but future machine config files should just define
   LDAV_CVT directly.  */

-# if !defined(LDAV_CVT) && defined(LOAD_AVE_CVT)
+# if !defined (LDAV_CVT) && defined (LOAD_AVE_CVT)
 #  define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0)
 # endif

@@ -137,6 +146,12 @@ extern int errno;
 #  undef FSCALE
 # endif

+/* Same issues as for NeXT apply to the HURD-based GNU system.  */
+# ifdef __GNU__
+#  undef BSD
+#  undef FSCALE
+# endif /* __GNU__ */
+
 /* Set values that are different from the defaults, which are
   set a little farther down with #ifndef.  */

@@ -155,11 +170,11 @@ extern int errno;
 #  define sun
 # endif

-# if defined(hp300) && !defined(hpux)
+# if defined (hp300) && !defined (hpux)
 #  define MORE_BSD
 # endif

-# if defined(ultrix) && defined(mips)
+# if defined (ultrix) && defined (mips)
 #  define decstation
 # endif

@@ -167,7 +182,7 @@ extern int errno;
 #  define SVR4
 # endif

-# if (defined(sun) && defined(SVR4)) || defined (SOLARIS2)
+# if (defined (sun) && defined (SVR4)) || defined (SOLARIS2)
 #  define SUNOS_5
 # endif

@@ -239,7 +254,7 @@ extern int errno;
 #   define LOAD_AVE_TYPE long
 #  endif

-#  if defined(alliant) && defined(i860) /* Alliant FX/2800 */
+#  if defined (alliant) && defined (i860) /* Alliant FX/2800 */
 #   define LOAD_AVE_TYPE long
 #  endif

@@ -263,7 +278,7 @@ extern int errno;
 #  define FSCALE 1024.0
 # endif

-# if defined(alliant) && defined(i860) /* Alliant FX/2800 */
+# if defined (alliant) && defined (i860) /* Alliant FX/2800 */
 /* <sys/param.h> defines an incorrect value for FSCALE on an
   Alliant FX/2800 Concentrix 2.2, according to ghazi@noc.rutgers.edu.  */
 #  undef FSCALE
@@ -279,7 +294,7 @@ extern int errno;
 #   define FSCALE 2048.0
 #  endif

-#  if defined(MIPS) || defined(SVR4) || defined(decstation)
+#  if defined (MIPS) || defined (SVR4) || defined (decstation)
 #   define FSCALE 256
 #  endif

@@ -314,69 +329,7 @@ extern int errno;
 #  endif
 # endif

-/* VAX C can't handle multi-line #ifs, or lines longer that 256 characters.  */
-# ifndef NLIST_STRUCT
-
-#  ifdef MORE_BSD
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef sun
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef decstation
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef hpux
-#   define NLIST_STRUCT
-#  endif
-
-#  if defined (_SEQUENT_) || defined (sequent)
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef sgi
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef SVR4
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef sony_news
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef OSF_ALPHA
-#   define NLIST_STRUCT
-#  endif
-
-#  if defined (ardent) && defined (titan)
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef tek4300
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef butterfly
-#   define NLIST_STRUCT
-#  endif
-
-#  if defined(alliant) && defined(i860) /* Alliant FX/2800 */
-#   define NLIST_STRUCT
-#  endif
-
-#  ifdef _AIX
-#   define NLIST_STRUCT
-#  endif
-
-# endif /* defined (NLIST_STRUCT) */
-
-
-# if defined(sgi) || (defined(mips) && !defined(BSD))
+# if defined (sgi) || (defined (mips) && !defined (BSD))
 #  define FIXUP_KERNEL_SYMBOL_ADDR(nl) ((nl)[0].n_value &= ~(1 << 31))
 # endif

@@ -389,7 +342,7 @@ extern int errno;
 #  define KERNEL_FILE "/hp-ux"
 # endif

-# if !defined(KERNEL_FILE) && (defined(_SEQUENT_) || defined(MIPS) || defined(SVR4) || defined(ISC) || defined (sgi) || (defined (ardent) && defined (titan)))
+# if !defined (KERNEL_FILE) && (defined (_SEQUENT_) || defined (MIPS) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (ardent) && defined (titan)))
 #  define KERNEL_FILE "/unix"
 # endif

@@ -398,7 +351,7 @@ extern int errno;
 #  define LDAV_SYMBOL "_Loadavg"
 # endif

-# if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)) || defined (_AIX))
+# if !defined (LDAV_SYMBOL) && ((defined (hpux) && !defined (hp9000s300)) || defined (_SEQUENT_) || defined (SVR4) || defined (ISC) || defined (sgi) || (defined (ardent) && defined (titan)) || defined (_AIX))
 #  define LDAV_SYMBOL "avenrun"
 # endif

@@ -410,7 +363,7 @@ extern int errno;

 /* LOAD_AVE_TYPE should only get defined if we're going to use the
   nlist method.  */
-# if !defined(LOAD_AVE_TYPE) && (defined(BSD) || defined(LDAV_CVT) || defined(KERNEL_FILE) || defined(LDAV_SYMBOL))
+# if !defined (LOAD_AVE_TYPE) && (defined (BSD) || defined (LDAV_CVT) || defined (KERNEL_FILE) || defined (LDAV_SYMBOL))
 #  define LOAD_AVE_TYPE double
 # endif

@@ -459,7 +412,7 @@ extern int errno;

 # endif /* LOAD_AVE_TYPE */

-# if defined(__GNU__) && !defined (NeXT)
+# if defined (__GNU__) && !defined (NeXT)
 /* Note that NeXT Openstep defines __GNU__ even though it should not.  */
 /* GNU system acts much like NeXT, for load average purposes,
   but not exactly.  */
@@ -506,7 +459,7 @@ extern int errno;
 #  include <sys/dg_sys_info.h>
 # endif

-# if defined(HAVE_FCNTL_H) || defined(_POSIX_VERSION)
+# if defined (HAVE_FCNTL_H) || defined (_POSIX_VERSION)
 #  include <fcntl.h>
 # else
 #  include <sys/file.h>
@@ -528,7 +481,7 @@ static unsigned int samples;
 static struct dg_sys_info_load_info load_info;	/* what-a-mouthful! */
 # endif /* DGUX */

-# ifdef LOAD_AVE_TYPE
+# if !defined (HAVE_LIBKSTAT) && defined (LOAD_AVE_TYPE)
 /* File descriptor open to /dev/kmem or VMS load ave driver.  */
 static int channel;
 /* Nonzero iff channel is valid.  */
@@ -536,7 +489,7 @@ static int getloadavg_initialized;
 /* Offset in kmem to seek to read load average, or 0 means invalid.  */
 static long offset;

-#  if !defined(VMS) && !defined(sgi) && !defined(__linux__)
+#  if !defined (VMS) && !defined (sgi) && !defined (__linux__)
 static struct nlist nl[2];
 #  endif /* Not VMS or sgi */

@@ -544,7 +497,7 @@ static struct nlist nl[2];
 static kvm_t *kd;
 #  endif /* SUNOS_5 */

-# endif /* LOAD_AVE_TYPE */
+# endif /* LOAD_AVE_TYPE && !HAVE_LIBKSTAT */

 /* Put the 1 minute, 5 minute and 15 minute load averages
   into the first NELEM elements of LOADAVG.
@@ -552,9 +505,7 @@ static kvm_t *kd;
   or -1 if an error occurred.  */

 int
-getloadavg (loadavg, nelem)
-     double loadavg[];
-     int nelem;
+getloadavg (double loadavg[], int nelem)
 {
  int elem = 0;			/* Return value.  */

@@ -577,7 +528,7 @@ getloadavg (loadavg, nelem)
  if (kc == 0)
    return -1;
  ksp = kstat_lookup (kc, "unix", 0, "system_misc");
-  if (ksp == 0 )
+  if (ksp == 0)
    return -1;
  if (kstat_read (kc, ksp, 0) == -1)
    return -1;
@@ -592,20 +543,20 @@ getloadavg (loadavg, nelem)
    }

  if (nelem >= 1)
-    loadavg[elem++] = (double) kn->value.ul/FSCALE;
+    loadavg[elem++] = (double) kn->value.ul / FSCALE;

  if (nelem >= 2)
    {
      kn = kstat_data_lookup (ksp, "avenrun_5min");
      if (kn != 0)
 	{
-	  loadavg[elem++] = (double) kn->value.ul/FSCALE;
+	  loadavg[elem++] = (double) kn->value.ul / FSCALE;

 	  if (nelem >= 3)
 	    {
 	      kn = kstat_data_lookup (ksp, "avenrun_15min");
 	      if (kn != 0)
-		loadavg[elem++] = (double) kn->value.ul/FSCALE;
+		loadavg[elem++] = (double) kn->value.ul / FSCALE;
 	    }
 	}
    }
@@ -870,8 +821,8 @@ getloadavg (loadavg, nelem)
  for (elem = 0; elem < nelem; elem++)
    loadavg[elem]
      = (load_ave.tl_lscale == 0
-       ? load_ave.tl_avenrun.d[elem]
-       : (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
+	 ? load_ave.tl_avenrun.d[elem]
+	 : (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
 # endif /* OSF_ALPHA */

 # if !defined (LDAV_DONE) && defined (VMS)
@@ -914,7 +865,7 @@ getloadavg (loadavg, nelem)
    return -1;
 # endif /* VMS */

-# if !defined (LDAV_DONE) && defined(LOAD_AVE_TYPE) && !defined(VMS)
+# if !defined (LDAV_DONE) && defined (LOAD_AVE_TYPE) && !defined (VMS)

  /* UNIX-specific code -- read the average from /dev/kmem.  */

@@ -930,13 +881,13 @@ getloadavg (loadavg, nelem)
      strcpy (nl[0].n_name, LDAV_SYMBOL);
      strcpy (nl[1].n_name, "");
 #   else /* NLIST_STRUCT */
-#    ifdef NLIST_NAME_UNION
+#    ifdef HAVE_STRUCT_NLIST_N_UN_N_NAME
      nl[0].n_un.n_name = LDAV_SYMBOL;
      nl[1].n_un.n_name = 0;
-#    else /* not NLIST_NAME_UNION */
+#    else /* not HAVE_STRUCT_NLIST_N_UN_N_NAME */
      nl[0].n_name = LDAV_SYMBOL;
      nl[1].n_name = 0;
-#    endif /* not NLIST_NAME_UNION */
+#    endif /* not HAVE_STRUCT_NLIST_N_UN_N_NAME */
 #   endif /* NLIST_STRUCT */

 #   ifndef SUNOS_5
@@ -973,7 +924,7 @@ getloadavg (loadavg, nelem)
 	{
 	  /* Set the channel to close on exec, so it does not
 	     litter any child's descriptor table.  */
-#   ifdef FD_SETFD
+#   ifdef F_SETFD
 #    ifndef FD_CLOEXEC
 #     define FD_CLOEXEC 1
 #    endif
@@ -1010,9 +961,9 @@ getloadavg (loadavg, nelem)
 #  else  /* SUNOS_5 */
      if (kvm_read (kd, offset, (char *) load_ave, sizeof (load_ave))
 	  != sizeof (load_ave))
-        {
-          kvm_close (kd);
-          getloadavg_initialized = 0;
+	{
+	  kvm_close (kd);
+	  getloadavg_initialized = 0;
 	}
 #  endif /* SUNOS_5 */
    }
@@ -1046,9 +997,7 @@ getloadavg (loadavg, nelem)

 #ifdef TEST
 void
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
  int naptime = 0;

--- a/lib/getndelim2.c
+++ b/lib/getndelim2.c
@@ -0,0 +1,124 @@
+/* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
+   with bounded memory allocation.
+
+   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003 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.  */
+
+/* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "getndelim2.h"
+
+#include <stdlib.h>
+
+#include "unlocked-io.h"
+
+/* Always add at least this many bytes when extending the buffer.  */
+#define MIN_CHUNK 64
+
+ssize_t
+getndelim2 (char **lineptr, size_t *linesize, size_t nmax,
+	    FILE *stream, int delim1, int delim2, size_t offset)
+{
+  size_t nbytes_avail;		/* Allocated but unused chars in *LINEPTR.  */
+  char *read_pos;		/* Where we're reading into *LINEPTR. */
+
+  if (!lineptr || !linesize || !nmax || !stream)
+    return -1;
+
+  if (!*lineptr)
+    {
+      size_t newlinesize = MIN_CHUNK;
+
+      if (newlinesize > nmax)
+	newlinesize = nmax;
+
+      *linesize = newlinesize;
+      *lineptr = malloc (*linesize);
+      if (!*lineptr)
+	return -1;
+    }
+
+  if (*linesize < offset)
+    return -1;
+
+  nbytes_avail = *linesize - offset;
+  read_pos = *lineptr + offset;
+
+  if (nbytes_avail == 0 && *linesize >= nmax)
+    return -1;
+
+  for (;;)
+    {
+      /* Here always *lineptr + *linesize == read_pos + nbytes_avail.  */
+
+      register int c;
+
+      /* 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.  */
+
+      if (nbytes_avail < 2 && *linesize < nmax)
+	{
+	  size_t newlinesize =
+	    (*linesize > MIN_CHUNK ? 2 * *linesize : *linesize + MIN_CHUNK);
+
+	  if (newlinesize > nmax)
+	    newlinesize = nmax;
+
+	  if (newlinesize > *linesize)
+	    {
+	      *linesize = newlinesize;
+	      nbytes_avail = *linesize + *lineptr - read_pos;
+	      *lineptr = realloc (*lineptr, *linesize);
+	      if (!*lineptr)
+		return -1;
+	      read_pos = *linesize - nbytes_avail + *lineptr;
+	    }
+	}
+
+      c = getc (stream);
+      if (c == EOF)
+	{
+	  /* Return partial line, if any.  */
+	  if (read_pos == *lineptr)
+	    return -1;
+	  else
+	    break;
+	}
+
+      if (nbytes_avail >= 2)
+	{
+	  *read_pos++ = c;
+	  nbytes_avail--;
+	}
+
+      if (c == delim1 || (delim2 && c == delim2))
+	/* Return the line.  */
+	break;
+    }
+
+  /* Done - NUL terminate and return the number of chars read.
+     At this point we know that nbytes_avail >= 1.  */
+  *read_pos = '\0';
+
+  return read_pos - (*lineptr + offset);
+}
--- a/lib/getndelim2.h
+++ b/lib/getndelim2.h
@@ -0,0 +1,42 @@
+/* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
+   with bounded memory allocation.
+
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef GETNDELIM2_H
+#define GETNDELIM2_H 1
+
+#include <stddef.h>
+#include <stdio.h>
+
+/* Get ssize_t.  */
+#include <sys/types.h>
+
+/* 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 *LINESIZE bytes of
+   space.  It is realloc'd as necessary.  Reallocation is limited to
+   NMAX bytes; if the line is longer than that, the extra bytes are read but
+   thrown away.
+   Return the number of bytes read and stored at *LINEPTR + OFFSET (not
+   including the NUL terminator), or -1 on error or EOF.  */
+extern ssize_t getndelim2 (char **lineptr, size_t *linesize, size_t nmax,
+			   FILE *stream, int delim1, int delim2,
+			   size_t offset);
+
+#endif /* GETNDELIM2_H */
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -2,8 +2,11 @@
   NOTE: getopt is now part of the C library, so if you don't know what
   "Keep this file name-space clean" means, talk to drepper@gnu.org
   before changing it!
-   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002
-	Free Software Foundation, Inc.
+
+   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
+   Inc.
+
   This file is part of the GNU C Library.

   This program is free software; you can redistribute it and/or modify
@@ -30,14 +33,6 @@
 # include <config.h>
 #endif

-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-# ifndef const
-#  define const
-# endif
-#endif
-
 #include <stdio.h>

 /* Comment out all this code if we are using the GNU C Library, and are not
@@ -68,11 +63,10 @@
 # include <unistd.h>
 #endif	/* GNU C library.  */

+#include <string.h>
+
 #ifdef VMS
 # include <unixlib.h>
-# if HAVE_STRING_H - 0
-#  include <string.h>
-# endif
 #endif

 #ifdef _LIBC
@@ -193,20 +187,7 @@ static enum
 /* Value of POSIXLY_CORRECT environment variable.  */
 static char *posixly_correct;

-#ifdef	__GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
-   because there are many ways it can cause trouble.
-   On some systems, it contains special magic macros that don't work
-   in GCC.  */
-# include <string.h>
-# define my_index	strchr
-#else
-
-# if HAVE_STRING_H
-#  include <string.h>
-# else
-#  include <strings.h>
-# endif
+#ifndef	__GNU_LIBRARY__

 /* Avoid depending on library functions or files
   whose names are inconsistent.  */
@@ -215,32 +196,6 @@ static char *posixly_correct;
 extern char *getenv ();
 #endif

-static char *
-my_index (str, chr)
-     const char *str;
-     int chr;
-{
-  while (*str)
-    {
-      if (*str == chr)
-	return (char *) str;
-      str++;
-    }
-  return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
-   If not using GCC, it is ok not to declare it.  */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
-   That was relevant to code that was here before.  */
-# if (!defined __STDC__ || !__STDC__) && !defined strlen
-/* gcc with -traditional declares the built-in strlen to return int,
-   and has done so at least since version 2.4.5. -- rms.  */
-extern int strlen (const char *);
-# endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
 #endif /* not __GNU_LIBRARY__ */

 /* Handle permutation of arguments.  */
@@ -294,13 +249,8 @@ static int nonoption_flags_len;
   `first_nonopt' and `last_nonopt' are relocated so that they describe
   the new indices of the non-options in ARGV after they are moved.  */

-#if defined __STDC__ && __STDC__
-static void exchange (char **);
-#endif
-
 static void
-exchange (argv)
-     char **argv;
+exchange (char **argv)
 {
  int bottom = first_nonopt;
  int middle = last_nonopt;
@@ -380,14 +330,8 @@ exchange (argv)

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

-#if defined __STDC__ && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
-#endif
 static const char *
-_getopt_initialize (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
+_getopt_initialize (int argc, char *const *argv, const char *optstring)
 {
  /* Start processing options with ARGV-element 1 (since ARGV-element 0
     is the program name); the sequence of previously skipped
@@ -506,13 +450,9 @@ _getopt_initialize (argc, argv, optstring)
   long-named options.  */

 int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-     const struct option *longopts;
-     int *longind;
-     int long_only;
+_getopt_internal (int argc, char *const *argv,
+		  const char *optstring, const struct option *longopts,
+		  int *longind, int long_only)
 {
  int print_errors = opterr;
  if (optstring[0] == ':')
@@ -637,7 +577,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)

  if (longopts != NULL
      && (argv[optind][1] == '-'
-	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
+	  || (long_only
+	      && (argv[optind][2] || !strchr (optstring, argv[optind][1])))))
    {
      char *nameend;
      const struct option *p;
@@ -822,7 +763,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	 option, then it's an error.
 	 Otherwise interpret it as a short option.  */
      if (!long_only || argv[optind][1] == '-'
-	  || my_index (optstring, *nextchar) == NULL)
+	  || strchr (optstring, *nextchar) == NULL)
 	{
 	  if (print_errors)
 	    {
@@ -877,7 +818,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)

  {
    char c = *nextchar++;
-    char *temp = my_index (optstring, c);
+    char *temp = strchr (optstring, c);

    /* Increment `optind' when we start to process its last character.  */
    if (*nextchar == '\0')
@@ -1187,10 +1128,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 }

 int
-getopt (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
+getopt (int argc, char *const *argv, const char *optstring)
 {
  return _getopt_internal (argc, argv, optstring,
 			   (const struct option *) 0,
@@ -1206,9 +1144,7 @@ getopt (argc, argv, optstring)
   the above definition of `getopt'.  */

 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
  int c;
  int digit_optind = 0;
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -1,5 +1,8 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc.
+
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
+   1999, 2001, 2003 Free Software Foundation, Inc.
+
   This file is part of the GNU C Library.

   This program is free software; you can redistribute it and/or modify
@@ -92,11 +95,7 @@ extern int optopt;

 struct option
 {
-# if (defined __STDC__ && __STDC__) || defined __cplusplus
  const char *name;
-# else
-  char *name;
-# endif
  /* has_arg can't be an enum because some compilers complain about
     type mismatches in all the code that assumes it is an int.  */
  int has_arg;
@@ -136,17 +135,16 @@ struct option
   arguments to the option '\0'.  This behavior is specific to the GNU
   `getopt'.  */

-#if (defined __STDC__ && __STDC__) || defined __cplusplus
-# ifdef __GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__
 /* Many other libraries have conflicting prototypes for getopt, with
   differences in the consts, in stdlib.h.  To avoid compilation
   errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
-# else /* not __GNU_LIBRARY__ */
+#else /* not __GNU_LIBRARY__ */
 extern int getopt ();
-# endif /* __GNU_LIBRARY__ */
+#endif /* __GNU_LIBRARY__ */

-# ifndef __need_getopt
+#ifndef __need_getopt
 extern int getopt_long (int ___argc, char *const *___argv,
 			const char *__shortopts,
 		        const struct option *__longopts, int *__longind);
@@ -159,16 +157,7 @@ extern int _getopt_internal (int ___argc, char *const *___argv,
 			     const char *__shortopts,
 		             const struct option *__longopts, int *__longind,
 			     int __long_only);
-# endif
-#else /* not __STDC__ */
-extern int getopt ();
-# ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-# endif
-#endif /* __STDC__ */
+#endif

 #ifdef	__cplusplus
 }
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -1,6 +1,8 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
-     Free Software Foundation, Inc.
+
+   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996,
+   1997, 1998, 2003 Free Software Foundation, Inc.
+
   This file is part of the GNU C Library.

   This program is free software; you can redistribute it and/or modify
@@ -27,14 +29,6 @@
 # include "getopt.h"
 #endif

-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
 #include <stdio.h>

 /* Comment out all this code if we are using the GNU C Library, and are not
@@ -67,12 +61,11 @@
 #endif

 int
-getopt_long (argc, argv, options, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *options;
-     const struct option *long_options;
-     int *opt_index;
+getopt_long (int argc,
+	     char *const *argv,
+	     const char *options,
+	     const struct option *long_options,
+	     int *opt_index)
 {
  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
 }
@@ -83,12 +76,11 @@ getopt_long (argc, argv, options, long_options, opt_index)
   instead.  */

 int
-getopt_long_only (argc, argv, options, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *options;
-     const struct option *long_options;
-     int *opt_index;
+getopt_long_only (int argc,
+		  char *const *argv,
+		  const char *options,
+		  const struct option *long_options,
+		  int *opt_index)
 {
  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
 }
@@ -105,9 +97,7 @@ libc_hidden_def (getopt_long_only)
 #include <stdio.h>

 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
  int c;
  int digit_optind = 0;
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,93,94,95,96,97,98,99,2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003 Free Software Foundation, Inc.
   This file is part of the GNU C Library.

   This program is free software; you can redistribute it and/or modify
@@ -19,11 +19,53 @@
 # include <config.h>
 #endif

+#if _LIBC
+# define HAVE_STDIO_EXT_H 1
+#endif
+
+#include <stdbool.h>
+
 #include <stdio.h>
+#if HAVE_STDIO_EXT_H
+# include <stdio_ext.h>
+#else
+# define __fsetlocking(stream, type) /* empty */
+#endif
+#if !_LIBC
+# include "getline.h"
+#endif
+
 #include <termios.h>
 #include <unistd.h>
-#include "getline.h"
-#include "unlocked-io.h"
+
+#if _LIBC
+# include <wchar.h>
+#endif
+
+#if _LIBC
+# define NOTCANCEL_MODE "c"
+#else
+# define NOTCANCEL_MODE
+#endif
+
+#if _LIBC
+# define flockfile(s) _IO_flockfile (s)
+# define funlockfile(s) _IO_funlockfile (s)
+#else
+# include "unlocked-io.h"
+#endif
+
+#if _LIBC
+# include <bits/libc-lock.h>
+#else
+# define __libc_cleanup_push(function, arg) /* empty */
+# define __libc_cleanup_pop(execute) /* empty */
+#endif
+
+#if !_LIBC
+# define __getline getline
+# define __tcgetattr tcgetattr
+#endif

 /* 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
@@ -34,12 +76,20 @@
 # define TCSASOFT 0
 #endif

+static void
+call_fclose (void *arg)
+{
+  if (arg != NULL)
+    fclose (arg);
+}
+
 char *
 getpass (const char *prompt)
 {
+  FILE *tty;
  FILE *in, *out;
  struct termios s, t;
-  int tty_changed;
+  bool tty_changed;
  static char *buf;
  static size_t bufsize;
  ssize_t nread;
@@ -47,18 +97,29 @@ getpass (const char *prompt)
  /* 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)
+  tty = fopen ("/dev/tty", "w+" NOTCANCEL_MODE);
+  if (tty == NULL)
    {
      in = stdin;
      out = stderr;
    }
  else
-    out = in;
+    {
+      /* We do the locking ourselves.  */
+      __fsetlocking (tty, FSETLOCKING_BYCALLER);
+
+      out = in = tty;
+    }
+
+  /* Make sure the stream we opened is closed even if the thread is
+     canceled.  */
+  __libc_cleanup_push (call_fclose, tty);
+
+  flockfile (out);

  /* Turn echoing off if it is on now.  */

-  if (tcgetattr (fileno (in), &t) == 0)
+  if (__tcgetattr (fileno (in), &t) == 0)
    {
      /* Save the old one. */
      s = t;
@@ -67,14 +128,35 @@ getpass (const char *prompt)
      tty_changed = (tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t) == 0);
    }
  else
-    tty_changed = 0;
+    tty_changed = false;

  /* Write the prompt.  */
-  fputs (prompt, out);
-  fflush (out);
+#ifdef USE_IN_LIBIO
+  if (_IO_fwide (out, 0) > 0)
+    __fwprintf (out, L"%s", prompt);
+  else
+#endif
+    fputs_unlocked (prompt, out);
+  fflush_unlocked (out);

  /* Read the password.  */
-  nread = getline (&buf, &bufsize, in);
+  nread = __getline (&buf, &bufsize, in);
+
+#if !_LIBC
+  /* As far as is known, glibc doesn't need this no-op fseek.  */
+
+  /* According to the C standard, input may not be followed by output
+     on the same stream without an intervening call to a file
+     positioning function.  Suppose in == out; then without this fseek
+     call, on Solaris, HP-UX, AIX, OSF/1, the previous input gets
+     echoed, whereas on IRIX, the following newline is not output as
+     it should be.  POSIX imposes similar restrictions if fileno (in)
+     == fileno (out).  The POSIX restrictions are tricky and change
+     from POSIX version to POSIX version, so play it safe and invoke
+     fseek even if in != out.  */
+  fseek (out, 0, SEEK_CUR);
+#endif
+
  if (buf != NULL)
    {
      if (nread < 0)
@@ -84,8 +166,15 @@ getpass (const char *prompt)
 	  /* Remove the newline.  */
 	  buf[nread - 1] = '\0';
 	  if (tty_changed)
-	    /* Write the newline that was not echoed.  */
-	    putc ('\n', out);
+	    {
+	      /* Write the newline that was not echoed.  */
+#ifdef USE_IN_LIBIO
+	      if (_IO_fwide (out, 0) > 0)
+		putwc_unlocked (L'\n', out);
+	      else
+#endif
+		putc_unlocked ('\n', out);
+	    }
 	}
    }

@@ -93,9 +182,11 @@ getpass (const char *prompt)
  if (tty_changed)
    (void) tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &s);

-  if (in != stdin)
-    /* We opened the terminal; now close it.  */
-    fclose (in);
+  funlockfile (out);
+
+  __libc_cleanup_pop (0);
+
+  call_fclose (tty);

  return buf;
 }
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -1,31 +1,30 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.

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

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

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

 #ifndef _LIBGETTEXT_H
-# define _LIBGETTEXT_H 1
+#define _LIBGETTEXT_H 1

 /* NLS can be disabled through the configure --disable-nls option.  */
-# if ENABLE_NLS
+#if ENABLE_NLS

 /* Get declarations of GNU message catalog functions.  */
-#  include <libintl.h>
+# include <libintl.h>

-# else
+#else

 /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
   chokes if dcgettext is defined as a macro.  So include it now, to make
@@ -33,29 +32,29 @@
   as well because people using "gettext.h" will not include <libintl.h>,
   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
   is OK.  */
-#  if defined(__sun)
-#   include <locale.h>
-#  endif
+#if defined(__sun)
+# include <locale.h>
+#endif

 /* Disabled NLS.
   The casts to 'const char *' serve the purpose of producing warnings
   for invalid uses of the value returned from these functions.
   On pre-ANSI systems without 'const', the config.h file is supposed to
   contain "#define const".  */
-#  define gettext(Msgid) ((const char *) (Msgid))
-#  define dgettext(Domainname, Msgid) ((const char *) (Msgid))
-#  define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
-#  define ngettext(Msgid1, Msgid2, N) \
+# define gettext(Msgid) ((const char *) (Msgid))
+# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+# define ngettext(Msgid1, Msgid2, N) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-#  define dngettext(Domainname, Msgid1, Msgid2, N) \
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-#  define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-#  define textdomain(Domainname) ((const char *) (Domainname))
-#  define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
-#  define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))

-# endif
+#endif

 /* A pseudo function call that serves as a marker for the automated
   extraction of messages, but does not call gettext().  The run-time
@@ -64,6 +63,6 @@
   and other string expressions won't work.
   The macro's expansion is not parenthesized, so that it is suitable as
   initializer for static 'char[]' or 'const char[]' variables.  */
-# define gettext_noop(String) String
+#define gettext_noop(String) String

 #endif /* _LIBGETTEXT_H */
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .0
 .1.3