diff options
| author | Tim J. Robbins <tjr@FreeBSD.org> | 2004-07-02 09:18:31 +0000 |
|---|---|---|
| committer | Tim J. Robbins <tjr@FreeBSD.org> | 2004-07-02 09:18:31 +0000 |
| commit | 0f69c78ac227e8f00c8034e4db69cde5bda34f22 (patch) | |
| tree | 358fddd101657afb17cacc5d9a8c20fb7b59a7d1 | |
| parent | 6e341a6d9cddc2bcf1a59035813b34678356c001 (diff) | |
| parent | 38f6f12285c36f90b87e302610e1a58ae0691fea (diff) | |
| download | src-0f69c78ac227e8f00c8034e4db69cde5bda34f22.tar.gz src-0f69c78ac227e8f00c8034e4db69cde5bda34f22.zip | |
This commit was generated by cvs2svn to compensate for changes in r131447,
which included commits to RCS files with non-trunk default branches.
Notes
Notes:
svn path=/head/; revision=131448
56 files changed, 8728 insertions, 9791 deletions
diff --git a/contrib/gnu-sort/ABOUT-NLS b/contrib/gnu-sort/ABOUT-NLS index 57e4b6760cfb..b6f64a07ab6f 100644 --- a/contrib/gnu-sort/ABOUT-NLS +++ b/contrib/gnu-sort/ABOUT-NLS @@ -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,230 +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 July -2002. The matrix shows, in regard of each package, for which languages +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 be bg ca cs da de el en eo es et fi fr - +----------------------------------------+ - a2ps | [] [] [] [] | - bash | [] [] [] [] | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] [] | - clisp | [] [] [] [] | - clisp | | - clisplow | | - cpio | [] [] [] [] | - darkstat | () | - diffutils | [] [] [] [] [] [] | - enscript | [] [] | - error | [] [] [] | - fetchmail | [] () [] [] [] () | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - gas | [] [] | - gawk | [] [] [] | - gcal | [] [] | - gcc | [] [] | - gettext | [] [] [] [] [] | - gnupg | [] [] [] [] [] [] [] | - gprof | [] [] | - gpsdrive | () () () () () | - grep | [] [] [] [] [] [] [] | - gretl | [] | - gthumb | () () () | - hello | [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] | - jpilot | () [] [] [] | - jwhois | [] [] | - kbd | [] [] [] | - ld | [] [] | - libc | [] [] [] [] [] [] [] | - libiconv | [] [] [] [] | - lifelines | () () | - lilypond | [] [] [] | - lingoteach | [] [] | - lingoteach_lessons| () () | - lynx | [] [] [] [] [] | - m4 | [] [] [] [] [] | - make | [] [] [] [] | - man-db | [] () () [] () () | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] [] | - nano_1_0 | [] () [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - recode | [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] | - sharutils | [] [] [] [] [] [] | - sketch | () [] () | - soundtracker | [] [] [] | - sp | [] | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] [] [] | - textutils | [] [] [] [] [] | - util-linux | [] [] [] [] [] [] | - vorbis-tools | [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] [] [] | - +----------------------------------------+ - be bg ca cs da de el en eo es et fi fr - 0 2 19 10 30 44 9 1 12 45 16 3 53 + 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 - gl he hr hu id it ja ko lv nb nl nn - +-------------------------------------+ - a2ps | () () [] | - bash | [] | - bfd | [] | - binutils | [] | - bison | [] [] [] [] | - clisp | [] | - clisp | | - clisplow | | - cpio | [] [] [] [] | - darkstat | () | - diffutils | [] [] [] [] [] | - enscript | [] [] | - error | [] | - fetchmail | [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] [] [] [] | - flex | [] | - gas | | - gawk | [] | - gcal | | - gcc | [] | - gettext | [] [] | - gnupg | [] [] [] [] | - gprof | | - gpsdrive | [] () () | - grep | [] [] [] [] [] [] [] | - gretl | | - gthumb | () () | - hello | [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] | - indent | [] [] [] [] | - jpilot | () () | - jwhois | [] [] | - kbd | | - ld | | - libc | [] [] [] [] | - libiconv | [] [] [] | - lifelines | | - lilypond | [] [] | - lingoteach | [] | - lingoteach_lessons| | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - make | [] [] [] [] [] [] | - man-db | () () | - mysecretdiary | [] | - nano | [] [] [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] | - ptx | [] [] [] [] [] | - python | | - recode | [] [] [] | - sed | [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - sharutils | [] [] [] | - sketch | () | - soundtracker | [] [] | - sp | | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - util-linux | () [] | - vorbis-tools | | - wastesedge | | - wdiff | [] [] [] | - wget | [] [] [] [] [] [] | - +-------------------------------------+ - gl he hr hu id it ja ko lv nb nl nn - 23 9 12 18 14 13 26 9 1 8 19 4 + 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 - no pl pt pt_BR ru sk sl sv tr uk zh_TW - +----------------------------------------+ - a2ps | () () () [] [] [] [] [] | 10 - bash | [] | 6 - bfd | [] [] | 5 - binutils | [] [] | 5 - bison | [] [] [] | 11 - clisp | | 5 - clisp | | 0 - clisplow | | 0 - cpio | [] [] [] [] | 12 - darkstat | [] () | 1 - diffutils | [] [] [] [] [] [] | 17 - enscript | [] [] [] [] | 8 - error | [] [] [] | 7 - fetchmail | () () [] | 6 - fileutils | [] [] [] [] [] | 13 - findutils | [] [] [] [] [] [] [] | 21 - flex | [] [] [] | 9 - gas | [] | 3 - gawk | [] [] | 6 - gcal | [] [] | 4 - gcc | [] | 4 - gettext | [] [] [] [] [] [] | 13 - gnupg | [] [] [] | 14 - gprof | [] [] | 4 - gpsdrive | [] [] () | 3 - grep | [] [] [] [] | 18 - gretl | | 1 - gthumb | () () [] | 1 - hello | [] [] [] [] [] [] [] | 28 - id-utils | [] [] [] [] | 9 - indent | [] [] [] [] [] | 14 - jpilot | () () [] | 4 - jwhois | [] () () [] [] | 7 - kbd | [] [] | 5 - ld | [] [] | 4 - libc | [] [] [] [] [] [] | 17 - libiconv | [] [] [] [] | 11 - lifelines | [] | 1 - lilypond | [] | 6 - lingoteach | [] [] | 5 - lingoteach_lessons| | 0 - lynx | [] [] [] [] | 13 - m4 | [] [] [] | 12 - make | [] [] [] [] | 14 - man-db | | 3 - mysecretdiary | [] [] [] | 7 - nano | [] [] [] [] | 15 - nano_1_0 | [] [] [] [] | 14 - opcodes | [] [] | 7 - parted | [] [] [] | 11 - ptx | [] [] [] [] [] [] [] | 19 - python | | 0 - recode | [] [] [] [] [] [] | 15 - sed | [] [] [] [] [] [] | 23 - sh-utils | [] | 8 - sharutils | [] [] [] [] | 13 - sketch | [] () [] | 4 - soundtracker | [] | 6 - sp | | 1 - tar | [] [] [] [] [] [] [] | 18 - texinfo | [] [] | 10 - textutils | [] [] [] [] [] | 13 - util-linux | [] [] [] | 10 - vorbis-tools | [] | 2 - wastesedge | | 0 - wdiff | [] [] [] [] [] | 14 - wget | [] [] [] [] [] [] [] [] | 24 - +----------------------------------------+ - 36 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW - 67 domains 4 15 2 24 26 12 10 47 42 4 8 594 + 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 @@ -406,15 +691,15 @@ 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 July 2002 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 + 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'. 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 @@ -423,7 +708,7 @@ library, whereas only free software can use `libintl' as a static library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle -to use of `gettext' the only thing missing are the translations. The +the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact diff --git a/contrib/gnu-sort/AUTHORS b/contrib/gnu-sort/AUTHORS index 43f5b2d1f4dc..1aea6b442239 100644 --- a/contrib/gnu-sort/AUTHORS +++ b/contrib/gnu-sort/AUTHORS @@ -1,10 +1,86 @@ -Authors of parts of GNU textutils. +Here are the names of the programs in this package, +each followed by the name(s) of its author(s). -The following contributions warranted legal paper exchanges with the -Free Software Foundation. Also see files ChangeLog and THANKS. - -GPTX François Pinard CANADA, 1949 -Assigns the program. - -GPTX Odyssee Recherches Appliquees -Disclaims work by François Pinard +basename: FIXME unknown +cat: Torbjorn Granlund and Richard M. Stallman +chgrp: David MacKenzie +chmod: David MacKenzie +chown: David MacKenzie +chroot: Roland McGrath +cksum: Q. Frank Xia +comm: Richard Stallman and David MacKenzie +cp: Torbjorn Granlund, David MacKenzie, and Jim Meyering +csplit: Stuart Kemp and David MacKenzie +cut: David Ihnat, David MacKenzie, and Jim Meyering +date: David MacKenzie +dd: Paul Rubin, David MacKenzie, and Stuart Kemp +df: Torbjorn Granlund, David MacKenzie, Larry McVoy, and Paul Eggert +dircolors: H. Peter Anvin +dirname: David MacKenzie and Jim Meyering +du: Torbjorn Granlund, David MacKenzie, Larry McVoy, and Paul Eggert +echo: FIXME unknown +env: Richard Mlynarik and David MacKenzie +expand: David MacKenzie +expr: Mike Parker +factor: Paul Rubin +false: no one +fmt: Ross Paterson +fold: David MacKenzie +head: David MacKenzie +hostid: Jim Meyering +hostname: Jim Meyering +id: Arnold Robbins and David MacKenzie +install: David MacKenzie +join: Mike Haertel +kill: Paul Eggert +link: Michael Stone +ln: Mike Parker and David MacKenzie +logname: FIXME: unknown +ls: Richard Stallman and David MacKenzie +md5sum: Ulrich Drepper and Scott Miller +mkdir: David MacKenzie +mkfifo: David MacKenzie +mknod: David MacKenzie +mv: Mike Parker, David MacKenzie, and Jim Meyering +nice: David MacKenzie +nl: Scott Bartram and David MacKenzie +od: Jim Meyering +paste: David M. Ihnat and David MacKenzie +pathchk: David MacKenzie and Jim Meyering +pinky: Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi +pr: Pete TerMaat and Roland Huebner +printenv: David MacKenzie and Richard Mlynarik +printf: David MacKenzie +ptx: François Pinard +pwd: Jim Meyering +rm: Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering +rmdir: David MacKenzie +seq: Ulrich Drepper +shred: Colin Plumb +sleep: Jim Meyering and Paul Eggert +sort: Mike Haertel and Paul Eggert +split: Torbjorn Granlund and Richard M. Stallman +stat: Michael Meskes +stty: David MacKenzie +su: David MacKenzie +sum: Kayvan Aghaiepour and David MacKenzie +sync: Jim Meyering +tac: Jay Lepreau and David MacKenzie +tail: Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering +tee: Mike Parker, Richard M. Stallman, and David MacKenzie +test: FIXME: ksb and mjb +touch: Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith +tr: Jim Meyering +true: no one +tsort: Mark Kettenis +tty: David MacKenzie +uname: David MacKenzie +unexpand: David MacKenzie +uniq: Richard Stallman and David MacKenzie +unlink: Michael Stone +uptime: Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi +users: Joseph Arceneaux and David MacKenzie +wc: Paul Rubin and David MacKenzie +who: Joseph Arceneaux, David MacKenzie, and Michael Stone +whoami: Richard Mlynarik +yes: David MacKenzie diff --git a/contrib/gnu-sort/ChangeLog b/contrib/gnu-sort/ChangeLog index bc43c75876f1..7836f77340cc 100644 --- a/contrib/gnu-sort/ChangeLog +++ b/contrib/gnu-sort/ChangeLog @@ -1,8743 +1,5040 @@ -2002-07-29 Jim Meyering <meyering@lucent.com> +2004-03-12 Jim Meyering <jim@meyering.net> - * Version 2.1. + * Version 5.2.1. - * src/tail.c: Adjust command examples in comments to use - POSIX 1003.1-2001 option syntax. - * src/sort.c: Likewise. - From Paul Eggert. - -2002-07-28 Jim Meyering <meyering@lucent.com> - - * configure.ac: Require automake-1.6b. - -2002-07-20 Jim Meyering <meyering@lucent.com> - - * Version 2.0.22. - - * Upgrade to cvs automake -- required to work with 2.53b. - * configure.ac: Require automake-1.6a. - - * Upgrade to gettext-0.11.3. - * Upgrade to autoconf-2.53b. - -2002-07-02 Jim Meyering <meyering@lucent.com> - - * src/cat.c, src/cksum.c, src/comm.c, src/csplit.c, src/cut.c (usage): - Use the PACKAGE_BUGREPORT e-mail address, rather than hard-coding it. - * src/expand.c, src/fmt.c, src/fold.c, src/head.c, src/join.c: Likewise. - * src/md5sum.c, src/nl.c, src/od.c, src/paste.c, src/pr.c: Likewise. - * src/sort.c, src/split.c, src/sum.c, src/tac.c, src/tail.c: Likewise. - * src/tr.c, src/tsort.c, src/unexpand.c, src/uniq.c, src/wc.c: Likewise. - -2002-06-22 Jim Meyering <meyering@lucent.com> - - * configure.ac: Invoke AC_GNU_SOURCE very early. - -2002-06-15 Jim Meyering <meyering@lucent.com> - - * src/cksum.c: Include <sys/types.h> before system.h. - -2002-05-22 Jim Meyering <meyering@lucent.com> - - * src/od.c [struct dummy]: Renamed. Don't rely on portability of - zero-length arrays. Instead, use sizes of -1 or +1. - Reported by Eric Backus. - -2002-05-14 Jim Meyering <meyering@lucent.com> - - `od -t f8' didn't work. - This bug was introduced with my change of 2000-10-22 (textutils-2.0.8). - * src/od.c (ulonglong_t): Move declaration to precede new use. - [enum size_spec] (N_SIZE_SPECS): New member. - (width_bytes): Add initializer corresponding to ulonglong_t type. - (struct assert_width_bytes_matches_size_spec_decl): Declare. - Based on a patch from Tony Kocurko. - -2002-04-29 Paul Eggert <eggert@twinsun.com> - - Use ENABLE_NLS only for gettext-related stuff, not also for - setlocale-related stuff. From a patch suggested by Bruno - Haible. - - Since setlocale is now almost universal, this patch also - removes some of the optimizations that clutter up the code and - which don't help all that much even on hosts that lack - setlocale. - - * lib/hard-locale.c: Upgrade to version used in GNU Diffutils 2.8.1. - * m4/prereq.m4 (jm_PREREQ_HARD_LOCALE): Check for stdlib.h. - Do not check for alloca.h (no longer used) or stdbool.h (was never - used?). Add AM_C_PROTOTYPES since hard-locale.h uses it. - - * src/sys2.h (HAVE_SETLOCALE): Define to 0 if not defined. - * src/comm.c (compare_files): Replace #ifdef ENABLE_NLS - with if (HAVE_SETLOCALE). - * src/join.c (keycmp): Likewise. - * src/sort.c (keycompare, compare): Likewise. - - * src/comm.c (hard_LC_COLLATE): Define even if ! ENABLE_NLS. - * src/join.c (hard_LC_COLLATE): Likewise. - * src/sort.c (hard_LC_COLLATE): Likewise. - - * src/comm.c (main): Always initialize hard_LC_COLLATE. - Put initialization next to other locale-related stuff. - * src/join.c (main): Likewise. - * src/sort.c (main): Likewise. - - * src/sort.c: Include <langinfo.h> even if ! ENABLE_NLS. - (decimal_point, th_sep): Depend on HAVE_SETLOCALE, not ENABLE_NLS. - (main): Likewise. - (MONTHTAB_CONST): Remove; all uses removed. - (struct_month_cmp, inittables): Do not depend on ENABLE_NLS. - (main): hard_LC_TIME locale does not depend on ENABLE_NLS. - -2002-04-29 Jim Meyering <meyering@lucent.com> - - * src/tail.c (parse_obsolescent_option): Do not limit the maximum - line/byte count (when specified via obsolete option syntax) to be - less than ULONG_MAX on systems where OFF_T_MAX is larger. - -2002-04-28 Paul Eggert <eggert@twinsun.com> - - * src/tail.c (tail_forever): Do not treat - max_n_unchanged_stats_between_opens specially (as if it were - infinite) if it has its maximal value. Similarly for - max_n_consecutive_size_changes_between_opens. - -2002-04-28 Jim Meyering <meyering@lucent.com> - - Avoid new warnings from gcc. - * src/pr.c [struct COLUMN] <name>: Declare member to be const. - (init_fps): Declare local variable `firstname' to be const. - -2002-04-25 Jim Meyering <meyering@lucent.com> - - * src/wc.c (usage): Adjust ordering to match that of default output. - Suggestion from Gaute Hvoslef Kvalnes. - - * configure.ac (AM_GNU_GETTEXT): Add external arg. - (AC_CONFIG_FILES): Remove intl/Makefile. - * Makefile.am (SUBDIRS): Remove intl. - * src/Makefile.am (INCLUDES): Remove -I../intl. - -2002-04-15 Jim Meyering <meyering@lucent.com> - - * src/tr.c (usage): Give a verbose description of --squeeze-repeats, - including the mention of SET1. Reported by Dan Jacobson. - -2002-04-12 Jim Meyering <meyering@lucent.com> - - * src/Makefile.am (LDADD): List ../lib/libfetish.a both before - and after @LIBINTL@. Thanks to Paul Eggert for the fix and to - Bruno Haible for diagnosing the problem. - -2002-03-16 Jim Meyering <meyering@lucent.com> - - * src/Makefile.am (datadir): Don't override $(datadir) - which might be set by --datadir and different from $(prefix)/share. - Patch from Albert Chin-A-Young. - -2002-03-10 Jim Meyering <meyering@lucent.com> - - * configure.ac (AM_INIT_AUTOMAKE): Specify the required version - of automake (1.6), and options (gnits dist-bzip2), rather than... - * Makefile.am (AUTOMAKE_OPTIONS): ...here. Remove definition. - -2002-03-09 Jim Meyering <meyering@lucent.com> - - * Makefile.am (EXTRA_DIST): Remove config/config.rpath, - now that automake knows about it. - -2002-03-05 Jim Meyering <meyering@lucent.com> - - * Makefile.am (EXTRA_DIST): Add config/config.rpath. - -2002-02-23 Paul Eggert <eggert@twinsun.com> - - * src/cat.c (simple_cat, cat, main): Use char * rather than - unsigned char *, to avoid some technical violations of the C - standard, and to avoid the need for casts. I guess the - unsigned char * was probably there for improved performance - with ancient compilers, but the code wasn't using the - unsignedness any more. - Reported by Nelson H. F. Beebe. - - (cat): int -> size_t for full_write arg. This doesn't - fix any bugs since the buffer size is small, but it makes - the code a bit clearer. - -2002-02-18 Jim Meyering <meyering@lucent.com> - - * Version 2.0.21. - - * tests/tail/Test.pm: For tests matching /^(obs|err-[134])/, - put _POSIX2_VERSION=199209 in the environment, so the tests succeed - even when the environment would have contained _POSIX2_VERSION=200112. - * tests/uniq/Test.pm (test_vector): Rename tests of obsolete usage - to have prefix of `obs'. Adjust environment for those tests as above. - - * tests/mk-script: When getting input via a pipe, apply the - environment settings to the command in question, not to `cat'. - No longer allow more than one element in the $Test::env or - $Test::env_default arrays. No caller used that feature. - -2002-02-17 Jim Meyering <meyering@lucent.com> - - * tests/head/Test.pm: Accept pre-POSIX 1003.1-2001 options. - * tests/pr/Test.pm: Likewise. - * tests/sort/Test.pm: Likewise. - - * Makefile.cfg (wget_files): Reflect new location of these files. - -2002-02-16 Jim Meyering <meyering@lucent.com> - - * ABOUT-NLS, intl/*: Update to Gettext 0.11. - * INSTALL: Update to Autoconf 2.52h. - - * src/Makefile.am (datadir): Use `share' in place of @DATADIRNAME@, - per Gettext-0.11. - (LDADD): Use @LIBINTL@ instead of @INTLLIBS@, per Gettext-0.11. - - * configure.ac (AC_CONFIG_AUX_DIR): New macro invocation. - (ALL_LINGUAS): Remove: now in po/LINGUAS as per Gettext 0.11. - - * config: New subdirectory, containing the following files from .: - config.guess, config.sub, depcomp, missing, install-sh, mkinstalldirs. - Move the following files here from doc: texinfo.tex, mdate-sh. - -2002-02-15 Paul Eggert <eggert@twinsun.com> - - Add support for _POSIX2_VERSION, which lets you pick which POSIX - version you want the utilities to conform to. Remove warnings about - failure to conform to a future POSIX version. - - * NEWS, doc/coreutils.texi: Document _POSIX2_VERSION. - * doc/coreutils.texi (Standards Conformance): New section. - - * src/expand.c: Include posixver.h. - (usage): Document only the intersection of the old and new behaviors, - to encourage portability. - * src/fold.c: Likewise. - * src/head.c: Likewise. - * src/od.c: Likewise. - * src/pr.c: Likewise. - * src/sort.c: Likewise. - * src/split.c: Likewise. - * src/uniq.c: Likewise. - * src/tail.c: Likewise. - * src/unexpand.c: Likewise. - - * src/expand.c (shortopts): Remove; no longer needed. - * src/od.c (short_options): Likewise. - * src/pr.c (short_options): Likewise. - * src/sort.c (short_options): Likewise. - * src/split.c (shortopts): Likewise. - * src/uniq.c (shortopts): Likewise. - * src/unexpand.c (shortopts): Likewise. - - * src/od.c (COMMON_SHORT_OPTIONS): New macro. - * src/pr.c (COMMON_SHORT_OPTIONS): Likewise. - * src/sort.c (COMMON_SHORT_OPTIONS): Likewise. - - * src/expand.c (main): Revert to previous behavior, except report - an error and exit if the obsolete syntax is used and if conforming - to the new standard. - * src/fold.c (main): Likewise. - * src/head.c (main): Likewise. - * src/split.c (main): Likewise. - * src/uniq.c (main): Likewise. - * src/tail.c (main, parse_obsolescent_option): Likewise. - * src/unexpand.c (main): Likewise. - - * src/od.c (STRINGS_OPTION, WIDTH_OPTION): Remove; no longer needed. - All uses changed back to the corresponding short options. - * src/pr.c (SEP_STRING_OPTION): Likewise. - - * src/od.c (main): Parse options using POSIX 1003.1-2001 rules if - conforming to that standard. Do not warn of obsolete options. - * src/pr.c (main): Likewise. - * src/sort.c (main): Likewise. - - * src/system.h (_POSIX2_VERSION, POSIX2_VERSION): Remove definitions. - (OPTARG_POSIX, OBSOLETE_OPTION_WARNINGS): Likewise. - -2002-02-16 Jim Meyering <meyering@lucent.com> - - * tests/misc/split-a: New test for change of 2002-02-05. - * tests/misc/Makefile.am (TESTS): Add split-a. - -2002-02-12 Jim Meyering <meyering@lucent.com> - - * src/split.c (DEFAULT_SUFFIX_LENGTH): Define constant. - (suffix_length): Use it here. - (usage): Use it here. - -2002-02-05 Paul Eggert <eggert@twinsun.com> - - Change 'split' to conform to POSIX. It now accepts an -a or - --suffix-length option, and refuses to generate more files - than there are suffixes. - - * NEWS, doc/coreutils.texi: Document this. - * src/split.c: Include "dirname.h". - (outbase): Now a global var. - (outfile_end): Remove. - (suffix_length): New var. - (shortopts, longopts, main): Add -a or --suffix-length. - (next_file_name): Implement -a. Do not extend the suffix length. - Check for file names that are too long. - (main): Move outfile initialization to next_file_name. - - * src/split.c (shortopts): Remove -v (a typo). - -2002-02-11 Jim Meyering <meyering@lucent.com> - - * tests/misc/head-pos: New file/test for the change of 2002-02-08. - * tests/misc/Makefile.am (TESTS): Add head-pos. - - * src/tr.c (unquote): Make comment a little clearer. - -2002-02-08 Paul Eggert <eggert@twinsun.com> - - * src/head.c (head_lines): If we have read too much data, try - to seek back to the position we would have gotten to had we - been reading one byte at a time. POSIX currently doesn't - require this, but it's easy to do and some software relies on it. - -2002-02-02 Jim Meyering <meyering@lucent.com> - - * src/uniq.c (main): Prepend `warning: ' to the diagnostic, so it's - consistent with all of the other `... is obsolete...' diagnostics. - -2002-01-31 Paul Eggert <eggert@twinsun.com> - - Add more support for POSIX 1003.1-2001, which requires removal for - support of obsolete "-N" option syntax in expand, head, fold, - split, tail, unexpand, uniq, and which prohibits options with - optional arguments in od and pr. - - * NEWS: Document this. - * doc/coreutils.texi: Likewise. - * src/expand.c (usage): Likewise. - * src/fold.c (usage): Likewise. - * src/head.c (usage): Likewise. - * src/od.c (usage): Likewise. - * src/pr.c (usage): Likewise. - * src/split.c (usage): Likewise. - * src/unexpand.c (usage): Likewise. - * src/uniq.c (usage): Likewise. - - * NEWS: Improve doc for previous fix in this area. - - * src/expand.c (shortopts): New constant. - * src/od.c (short_options): Likewise. - * src/pr.c (short_options): Likewise. - * src/sort.c (short_options): Likewise. - * src/split.c (shortopts): Likewise. - * src/unexpand.c (shortopts): Likewise. - * src/uniq.c (shortopts): Likewise. - - * src/expand.c (main): Check for obsolete options. - * src/fold.c (main): Likewise. - * src/head.c (main): Likewise. - * src/od.c (main): Likewise. - * src/pr.c (main): Likewise. - * src/sort.c (main): Likewise. - * src/split.c (main): Likewise. - * src/tail.c (parse_obsolescent_option, main): Likewise. - * src/unexpand.c (main): Likewise. - * src/uniq.c (main): Likewise. - - * src/head.c (header_mode_option): New constant. - - * src/od.c: New enum for long options. - - * src/pr.c (SEP_STRING_OPTION): New enum value. - (long_options): Use it. - - * src/split.c (main): Use -1, not EOF, for getopt_long. - - * src/system.h (OPTARG_POSIX, OBSOLETE_OPTION_WARNINGS): New macros. - - * src/fold.c (main): Fix bug: -- -N was treated as -N --. - -2002-02-01 Jim Meyering <meyering@lucent.com> - - * src/tail.c (start_lines): Handle the case in which bytes_read is zero. - -2002-01-28 Jim Meyering <meyering@lucent.com> - - * Makefile.maint (ac-check): Remove, now that we no longer have - to duplicate that information. - (local-check): Remove ac-check. - - * Makefile.am (AUTOMAKE_OPTIONS): Require automake-1.5d. - - * configure.ac (AM_INIT_AUTOMAKE): Use zero-arg form of this macro. - (ALL_LINGUAS): Add the bokmål dialect of Norwegian (nb). - -2002-01-27 Jim Meyering <meyering@lucent.com> - - tail -n +2 would perform an extra read after encountering EOF - * src/tail.c (start_lines): Detect EOF, inform caller. - (tail_lines): Upon EOF in start_lines, return immediately. - -2002-01-22 Jim Meyering <meyering@lucent.com> - - * Version 2.0.20. - -2002-01-22 Paul Eggert <eggert@twinsun.com> - - * src/od.c (skip): Remove redundant check for overflow. - fseeko's seek argument is already known to be in range, - since it is less than the file size. - -2002-01-22 Jim Meyering <meyering@lucent.com> - - * po/POTFILES.in: Add lib/xmemcoll.c. - -2002-01-22 Paul Eggert <eggert@twinsun.com> - - * src/tac.c (save_stdin): Report proper errno value after - fwrite failures. Do not bother to rewind the temp file, as - it'll be read backwards anyway. - -2002-01-22 Paul Eggert <eggert@twinsun.com> - - * src/ptx.c (swallow_file_in_memory): Work even if `open' returns 0. - Check for `close' error. - -2002-01-22 Paul Eggert <eggert@twinsun.com> - - Port to glibc 2.2.5, whose mmap stdio positions the underlying - file descriptor at a nonzero offset after an fopen. - - * m4/jm-macros.m4 (jm_MACROS): Require AC_FUNC_FSEEKO. - * src/od.c (skip): Use fseeko rather than lseek. - (Also, check for overflow when converting uintmax_t to off_t.) - * src/sys2.h (EOVERFLOW, fseeko): New macros. - -2001-01-21 Paul Eggert <eggert@twinsun.com> - - * src/comm.c: Include xmemcoll.h, not memcoll.h. - Use xmemcoll instead of memcoll. - * src/join.c: Likewise. - * src/sort.c: Likewise. - - * src/sort.c (die): Do not invoke cleanup; atexit does this now. - (main): Use atexit to invoke cleanup on exit. - Set xmemcoll_exit_failure to SORT_FAILURE. - -2002-01-20 Paul Eggert <eggert@twinsun.com> - - * src/comm.c (compare_files): Don't assume that the difference - between two size_t values can be stored in an int; this doesn't - work, for example, on 64-bit Solaris. - * src/sort.c (CMP_WITH_IGNORE): Likewise. - * src/join.c (keycmp): Likewise. Also, fix the type of two locals - to be size_t instead of int. - -2002-01-20 Paul Eggert <eggert@twinsun.com> - - * src/csplit.c: Don't include "xalloc.h", as system.h already - does that via sys2.h. - * src/sort.c: Likewise. - -2002-01-19 Jim Meyering <meyering@lucent.com> - - * configure.ac: Remove code that set LIBOBJS in support of ansi2knr. - The latest version of autoconf objected to it, and besides, I don't - care too much about K&R support these days. - -2002-01-18 Jim Meyering <meyering@lucent.com> - - Fix tr so it no longer gets a failed assertion for [::] or [==]. - - * src/tr.c (xmemdup): Rename from `substr' and rewrite to - take only pointer/length parameters. - (build_spec_list): Update sole caller. - Properly diagnose the invalid specs [::] and [==]. - Pawel Prokop reported that `tr '[::]' x' elicits a failed assertion. - * tests/tr/Test.pm: Add tests for the above fix. - -2002-01-14 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (main): Issue a warning for obsolete usage, unless - POSIXLY_CORRECT. - * src/tail.c (parse_obsolescent_option): Likewise. - * src/uniq.c (main): Likewise. - -2002-01-14 Paul Eggert <eggert@twinsun.com> - - Add support for POSIX 1003.1-2001, which requires removal for - support of obsolete "+" option syntax in sort, tail, and uniq. - - * NEWS: Document this. - - * src/sort.c (usage, main): Implement this. - * src/tail.c (usage, parse_obsolescent_option): Likewise. - * src/uniq.c (usage, main): Likewise. - * src/system.h (_POSIX2_VERSION, POSIX2_VERSION): New macros. - - * src/sys2.h (ISDIGIT, S_ISVTX, S_IXUGO): Comment fix. - -2002-01-14 Jim Meyering <meyering@lucent.com> - - * tests/misc/sort: New test, for just-fixed bug. - * tests/misc/Makefile.am (TESTS): Add sort. - (TESTS_ENVIRONMENT): Add PROG=$$tst. This is a gross kludge - that depends on the name of an automake-generated local variable. - -2002-01-13 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (mergefps): Fix bug when eliminating empty files. - Bug reported by James Hutt. - -2002-01-13 Jim Meyering <meyering@lucent.com> - - * tests/help-version: Tweak to work with the programs in diffutils. - -2002-01-09 Jim Meyering <meyering@lucent.com> - - * configure.in (ALL_LINGUAS): Add Turkish (tr). - -2001-12-18 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (usage, specify_sort_size): Accept 'K' (which is - now preferred, as it connotes 1024) as well as 'k'. - * NEWS: Document this change. - -2001-12-17 Jim Meyering <meyering@lucent.com> - - * src/uniq.c (usage): Remove stray `)' in --help output. - Reported by Padraig Brady. - - * Makefile.maint (real_dir): Remove unused variable. - (url_dir_list): Don't set define it here, but... - * Makefile.cfg (url_dir_list): ...define it here instead. - (hosts, a_host, b_host): Remove now-unused variables. - (alpha_subdir, a_url_dir, b_url_dir): Remove now-unused variables. - -2001-12-12 Bruno Haible <bruno@clisp.org> - Paul Eggert <eggert@twinsun.com> - - * src/wc.c (wc): Use ISSPACE and iswspace in addition to hard-coding - the ASCII space character. - -2001-12-08 Jim Meyering <meyering@lucent.com> - - * Version 2.0.19. - - * Makefile.cfg (wget_files): Remove ansi2knr.c, since it's - no longer available at that location. + Sometimes, when source and destination partition are different, + mv mistakenly fails to preserve a hard link. Reported by IIDA Yosiaki. -2001-12-03 Jim Meyering <meyering@lucent.com> + * src/copy.c: When moving a set of N hard-linked files between + partitions, via two or more command line arguments where the + command line argument containing the Nth link contains no other + link to that same file, mv would mistakenly copy the file, rather + than hard-linking it to the other(s). That happens because when the + final link is processed, its link count has been reduced to 1 since + the other links have been `copied' to the destination partition + and the source links have been removed. + (copy_internal): When in move mode, use the source dev/inode + pair to look up destination name even when st_nlink == 1. + * src/cp-hash.c (src_to_dest_lookup): New function. + * src/cp-hash.h (src_to_dest_lookup): Add prototype. + * tests/mv/part-hardlink: New file. Test for the above fix. + * tests/mv/Makefile.am (TESTS): Add part-hardlink. - * src/od.c, src/tail.c, src/tr.c (usage): I will not split translatable - strings in the middle of a sentence. I will not split translatable - strings in the middle of a sentence. I will not split translatable - strings in the middle of a sentence. ... - * src/join.c (usage): Merge lone "\n" into adjacent string. - * src/md5sum.c (usage): Likewise. - * src/paste.c (usage): Likewise. - Reported by Karl Eichwalder. - -2001-12-02 Jim Meyering <meyering@lucent.com> - - * Makefile.maint (emit-upload-commands): Fix typo: s/distdir/PACKAGE/. - -2001-12-01 Jim Meyering <meyering@lucent.com> - - * Version 2.0.18. - - * Makefile.maint (po-check): Check for uses of _() not just in .c - files, but also in .h files. - - Ideally, there would be just one translation for all --help - and --version description strings. Before this change, they - differed only in the number of blanks between the option name - and the description. Someday gettext may be smart enough - to merge such strings and to reconstruct the proper spacing at - run time. In the mean time, now there is one string for each, - and those descriptions in the --help output are no longer aligned - with the others. - * src/sys2.h (HELP_OPTION_DESCRIPTION): New macro. - (VERSION_OPTION_DESCRIPTION): New macro. - * src/cat.c, src/cksum.c, src/comm.c, src/csplit.c, src/cut.c: - * src/expand.c, src/fmt.c, src/fold.c, src/head.c, src/join.c: - * src/md5sum.c, src/nl.c, src/od.c, src/paste.c, src/pr.c, src/ptx.c: - * src/sort.c, src/split.c, src/sum.c, src/sys2.h, src/tac.c: - * src/tail.c, src/tr.c, src/tsort.c, src/unexpand.c, src/uniq.c: - * src/wc.c (usage): Use new macros, HELP_OPTION_DESCRIPTION and - VERSION_OPTION_DESCRIPTION instead of hard-coding --help and - --version descriptions. - * po/POTFILES.in: Add src/sys2.h. - -2001-11-27 Jim Meyering <meyering@lucent.com> - - * src/system.h (SET_MODE) [O_BINARY]: Call setmode, not set_mode. - From Matthew Smith. - -2001-11-26 Jim Meyering <meyering@lucent.com> - - * src/cat.c (cat): Don't test whether the full_write return value - (of type size_t) is less than 0. Reported by Nelson H. F. Beebe, - as a warning from Irix 6.5's C compiler. + * announce-gen: Sync with autoconf. -2001-11-25 Jim Meyering <meyering@lucent.com> + * tests/ls/time-1: Exit 77 (not 1) if we can't set up for the test. + This was triggered on a Linux-2.2.19 system using a file system + NFS-mounted from some sort of Sun. - * src/cksum.c (usage): Indent --help and --version strings to - start in the 7th column. - * src/pr.c (usage): Likewise. +2004-03-11 Jim Meyering <jim@meyering.net> -2001-11-23 Jim Meyering <meyering@lucent.com> + * Use automake-1.8.3. Regenerate dependent files. - Factor out some common strings to make translation easier. +2004-03-10 Jim Meyering <jim@meyering.net> - * cat.c, cksum.c, comm.c, csplit.c, cut.c, expand.c, fmt.c, fold.c: - * head.c, join.c, md5sum.c, nl.c, od.c, paste.c, pr.c, ptx.c: - * sort.c, split.c, sum.c, tac.c, tail.c, tr.c, tsort.c, unexpand.c: - * uniq.c, wc.c: Split usage strings so that --help and --version - descriptions are alone in their own string. - Likewise for the one that says ``Mandatory arguments to long - options are mandatory for short options too.'' - Suggestion from Karl Eichwalder. - - * src/ptx.c (main): Don't split copyright string in the middle - of a sentence. - -2001-11-22 Jim Meyering <meyering@lucent.com> - - * Version 2.0.17. - - csplit could get a failed assertion: printf 'a\n\n'|csplit - '/^$/' 2 - * src/csplit.c: No longer include assert.h. - (process_line_count): Remove invalid assertion. The test that caused - the failure has been in the code since before 1992-11-08, but since - 1996 it's been in an assertion. That assertion was disabled by default - until textutils-1.22g (1999-01-10). Reported by Eric Pemente. - - * tests/misc/csplit: New file. Test for the above fix and others. - * tests/misc/Makefile.am (TESTS): Add csplit. - * tests/Makefile.am (EXTRA_DIST): Add lang-default. + * tests/du/deref-args: Also convert sizes in the 70-79 kB range, + so that this test works with SELinux-enabled systems. + Based on a patch from Tim Waugh. -2001-11-19 Jim Meyering <meyering@lucent.com> + `join -1 x' would give a misleading diagnostic + * src/join.c (string_to_join_field): Report that a non-numeric field + number is invalid, rather than `so large that it is not representable'. + * tests/join/Test.pm (invalid-j): New partial test for the above fix. - * src/tail.c (xlseek): New function. - Call it instead of lseek, in most cases, so any failure is reported. +2004-03-06 Jim Meyering <jim@meyering.net> -2001-11-18 Jim Meyering <meyering@lucent.com> + cp --sparse=always sparse-image-file.img /dev/hda1 could + produce an invalid copy on the destination device. - * config.sub: Update from master repository. - * config.guess: Likewise. + * src/copy.c (copy_reg): Even with --sparse=always, try to + make `holes' only if the destination is a regular file. + Reported by Szakacsits Szabolcs. -2001-11-17 Jim Meyering <meyering@lucent.com> +2004-03-03 Paul Eggert <eggert@twinsun.com> - * Makefile.cfg ($(srcdir)/m4/jm-glibc-io.m4): Use $(move_if_change), - not the literal `move-if-change'. + * src/nohup.c (main): Don't invoke set_cloexec_flag with + a file descriptor of -1. - * src/tail.c (tail_forever): Add a cast. +2004-03-02 Dmitry V. Levin <ldv@altlinux.org> - Avoid compiler warnings. - * src/fmt.c: Remove `unsigned' attribute from type of global `prefix'. - (copy_rest): Cast to (unsigned char *) before dereferencing. - (get_prefix): Likewise. + * src/nohup.c: Include "cloexec.h". + (main): Set the copy of stderr to close on exec. - * configure.ac: Replace use of the one-arg form of AC_INIT - with a use of the 3-arg form and a use of AC_CONFIG_SRCDIR. +2004-03-01 Paul Eggert <eggert@twinsun.com> -2001-11-14 Paul Eggert <eggert@twinsun.com> + * configure.ac: Include <signal.h> when checking for strsignal, + sys_siglist, and friends. Problem reported by Tony Leneis in + <http://mail.gnu.org/archive/html/bug-coreutils/2004-02/msg00136.html>. - * src/tail.c (file_lines): Remove unnecessary cast. - (tail_lines): Could have called file_lines even though the first - lseek failed. Fix that. +2004-02-25 Paul Eggert <eggert@twinsun.com> -2001-11-14 Jim Meyering <meyering@lucent.com> + * tests/du/deref-args, tests/du/exclude, tests/du/slash: + * tests/du/trailing-slash: Run envvar-check in case BLOCK_SIZE + etc. are set. - * src/tail.c (file_lines): Add a parameter, start_pos. - Work properly even when the read pointer is not at beginning of file. - (tail_lines): Call file_lines for any regular file, as long as lseek - can be used to seek to its end, not just when the initial read pointer - is at beginning of file. +2004-02-23 Paul Eggert <eggert@twinsun.com> -2001-11-13 Jim Meyering <meyering@lucent.com> + * NEWS: Document how chown's USER.GROUP argument is now parsed. - * src/tail.c (tail_lines): Move declaration of local `length' - into scope where it's used. - (tail_file): Likewise for local `stats'. +2004-02-23 Jim Meyering <jim@meyering.net> - * tests/tail-2/Makefile.am (TESTS): Add proc-ksyms and start-middle. - * tests/tail-2/start-middle: New test, for the bug fixed on 1995-07-24. + * src/seq.c (usage): Remove stray space after \n in --help output. - `tail /proc/ksyms' would segfault on Linux. - * src/tail.c (tail_lines): Use status of lseek (...SEEK_END) call - in deciding whether to call file_lines or pipe_lines. - From Herbert Xu. - * tests/tail-2/proc-ksyms: New test, for the above fix. +2004-02-22 Jim Meyering <jim@meyering.net> -2001-11-11 Jim Meyering <meyering@lucent.com> + * src/du.c (usage): Separate -H and --si. Say that the meaning + of -H will soon change to that of --dereference-args (-D). - * src/od.c (struct tspec): Declare function pointer with prototype. +2004-02-21 Jim Meyering <jim@meyering.net> - * src/sum.c (main): Declare function pointer with prototype. + * src/comm.c (usage): Tell what comm does when there are no options. + Reword in terms of FILE1 and FILE2 rather than `left file' and + `right file'. Suggestion from Dan Jacobson. - * src/tsort.c (count_items): Mark parameter as unused. +2004-02-15 Paul Eggert <eggert@twinsun.com> - * src/sort.c (struct_month_cmp): Guard definition with the same - cpp condition that guards the use. + Fix some POSIX-conformance bugs in expr. - * src/tail.c (xwrite): Remove assertion that size_t N >= 0. + * NEWS: document the following changes to src/expr.c. + * doc/coreutils.texi (expr invocation): Likewise. + Document what forms integers may take, and say "integer" + consistently instead of "number". Warn about operands + that "expr" can misinterpret, and how to work around the + problem. + * src/expr.c (eval, eval7, eval6, eval5, eval4, eval3, eval2, eval1): + Accept a bool argument specifying whether to evaluate the + expression. This is to allow short-circuit evaluation. All + callers changed. + (null): Report that a string is zero even if it has + a form like "-0" or "00". + (eval1, eval): Use short-circuit evaluation for | and &. + (eval): Return 0 if both arguments are null or zero, instead + of returning the first argument. + * tests/expr/basic: Add some tests for the above. - * src/pr.c (struct COLUMN) [print_func]: Declare with a protype. - (struct COLUMN) [char_func]: Declare with a protype. +2004-02-17 Jim Meyering <jim@meyering.net> - * src/od.c (parse_old_offset): Declare to be static. + * Version 5.2.0. - * src/join.c (make_blank): Declare to be static. - (prfield): Declare local to be of type size_t, not int. + `make check' from a build inside a chroot environment would fail + * tests/help-version: Specify an argument (`/') for df, in the + unusual event that there is no valid entry in /etc/mtab. + Likewise for id: add the -u option, so we don't get spurious + failures when there are no user or group names. + Patch by Tim Waugh. - Some help strings were very long. Split them so that - they're no longer than the magic length 509 that ISO C89 - compilers are required to support. Sorry, translators :-( + * src/sort.c (usage) [-u]: Add punctuation so that the description in + the help2man-generated (line-joined) man page is more readable. + Reported by Tim Waugh. + [-T]: Add a semicolon, for the same reason. - * src/md5sum.c (usage): Split --help output into smaller pieces. - * src/ptx.c (main, usage): Likewise. - * src/fmt.c (usage): Likewise. +2004-02-15 Jim Meyering <jim@meyering.net> - * src/wc.c (usage): Split --help output into smaller pieces. - Use fputs, not printf. - * src/cat.c (usage): Likewise. - * src/cut.c (usage): Likewise. - * src/csplit.c (usage): Likewise. - * src/expand.c (usage): Likewise. - * src/head.c (usage): Likewise. - * src/join.c (usage): Likewise. - * src/nl.c (usage): Likewise. - * src/od.c (usage): Likewise. - * src/pr.c (usage): Likewise. - * src/sort.c (usage): Likewise. - * src/split.c (usage): Likewise. - * src/tac.c (usage): Likewise. - * src/tr.c (usage): Likewise. - * src/unexpand.c (usage): Likewise. - * src/uniq.c (usage): Likewise. - * src/tail.c (usage): Likewise. + * Makefile.am (dist-hook): Qualify target with $(srcdir)/ prefix. - * src/sys2.h (alloca) [__GNUC__]: Define only if not already defined. +2004-02-11 Jim Meyering <jim@meyering.net> - * src/Makefile.am (sort_LDADD): Reflect spelling change: - s/POW_LIBM/POW_LIB/. + * tests/Makefile.am.in ($(srcdir)/Makefile.am): Use more portable + $(srcdir)/../Makefile.am.in, rather than $<. + Suggestion from Michael Elizabeth Chastain. -2001-11-10 Jim Meyering <meyering@lucent.com> +2004-02-10 Jim Meyering <jim@meyering.net> - * src/nl.c (proc_text): Use `puts' to output a string of spaces, - not printf. This avoids a warning from gcc's -Wformat-security. + * config/install-sh: Make this script executable. + * Makefile.am (dist-hook): New target, to ensure that config/install-sh + is executable. Otherwise, on systems that lack a suitable install + binary, `make install' would fail, because of the way this script + is invoked (without `$SHELL ' prefix). + Reported by Bob Proulx. -2001-11-09 Jim Meyering <meyering@lucent.com> +2004-02-08 Jim Meyering <jim@meyering.net> - * configure.ac: Use AC_CONFIG_FILES(...) and call AC_OUTPUT with no - arguments. + * Version 5.1.3. -2001-11-05 Jim Meyering <meyering@lucent.com> + * tests/rm/rm5: Avoid triggering a bug in OSF/Tru64's sed + that would cause an unwarranted test failure. + * tests/rm/rm3: Likewise. - * src/sort.c (usage): Don't recommend setting LC_COLLATE=C. - That can cause problems (now documented in coreutils.texi). +2004-02-07 Jim Meyering <jim@meyering.net> -2001-11-04 Jim Meyering <meyering@lucent.com> + Remove xstat function pointer member. The way it was used was not + portable, since some systems (OSF V5.1, Solaris 2.5.1) provide static + inline `stat' and `lstat' functions, thus making the tests of + `xstat == lstat' in copy.c always fail. + * src/copy.h (struct cp_options) [xstat]: Remove member. + (XSTAT): New macro. + * src/copy.c (copy_dir): Set `.dereference' member, not .xstat. + (copy_internal): Use `XSTAT (x, ...)' in place of `*(x->xstat) (...)'. + Use `x->dereference == DEREF_NEVER' in place of `x->xstat == lstat'. + (valid_options): Remove now-obsolete FIXME comments. - * uniq.c, unexpand.c, tail.c, tac.c, split.c, sort.c, pr.c, paste.c: - * od.c, nl.c, head.c, fold.c, expand.c, cut.c, csplit.c (usage): - Say that ``Mandatory arguments to long options are mandatory for - short options too.'' + * src/cp.c (re_protect): Use `XSTAT (x, ...)' in place of + `*(x->xstat) (...)'. + (do_copy): Declare/use local xstat rather than x->xstat. + (main): Remove code that set x.xstat. + * src/mv.c (cp_option_init): Don't initialize xstat member. + * src/install.c (cp_option_init): Likewise. - * src/ptx.c (usage): Add one-line description. + * Makefile.cfg (gnu_ftp_host-alpha, etc.): Un-factor .gnu.org suffix, + so that emit_upload_commands can use these variables, too. -2001-10-28 Jim Meyering <meyering@lucent.com> +2004-02-06 Jim Meyering <jim@meyering.net> - * tests/sum/sysv: New test for the fix below. - * tests/sum/Makefile.am (TESTS): Add sysv. + * tests/rm/deep-1: Remove `du' stack space test. + Apparently, `ulimit -s N' isn't portable enough. + This test will be restored (with a guard against losing ulimit) + in its own file later. -2001-10-27 Paul Eggert <eggert@twinsun.com> + * tests/rm/deep-1 (deep): Remove progress-style diagnostics, + since this test doesn't take long enough to merit them. + Run du on $tmp (the containing dir), not $deep, the full path to leaf. - * src/sum.c: Include human.h. - (ROTATE_RIGHT): Remove; it was slow and the comment was - misleading anyway. - (bsd_sum_file): Avoid unsigned and long when they're not needed. - Compute total input bytes as uintmax_t, not long, so that the - code works even with files whose size does not fit in 'long'. - (sysv_sum_file): Likewise. - (sysv_sum_file): Do not reduce checksum until the end; this is - what System V does. - Reported by Nick Lawes. + * Makefile.maint (signatures): Remove definition. + Now, automake's gnupload handles this. + (%.sig: %): Remove now-unused rule. + (rel-files): Use automake's $(DIST_ARCHIVES), rather than + `$(distdir).tar.bz2 $(distdir).tar.gz'. + (emit-upload-commands): Adjust to use gnupload. + +2004-02-05 Jim Meyering <jim@meyering.net> + + * src/system.h (ST_TIME_CMP_NS, ST_TIME_CMP): Remove definitions. + (ATIME_CMP, CTIME_CMP, MTIME_CMP, TIMESPEC_NS): Likewise. + Now, those are all defined in timespec.h. + Include timespec.h. -2001-10-27 Jim Meyering <meyering@lucent.com> + * src/date.c: Don't include timespec.h, now that system.h does it. - Give an accurate diagnostic when `head --bytes=30M' fails. - * src/head.c (string_to_integer): Check explicitly for overflow, - and lump everything else together as `invalid'. +2004-02-02 Paul Eggert <eggert@twinsun.com> -2001-10-04 Jim Meyering <meyering@lucent.com> + Don't dump core if localtime returns NULL (possible on + hosts with 64-bit time_t and 32-bit int). + * src/date.c: Include "inttostr.h". + (batch_convert, main): + If time conversion fails, exit with nonzero status. + (show_date): Return int to report conversion failure. + Print the time as an int if localtime fails. + * src/uptime.c: Print "??" if the current clock can't + be converted by localtime. This won't happen until the year + 2*31 + 1900, but we don't want to dump core even if the current + clock has the wrong value. - Rename --all-repeated argument `precede' to `prepend'. - * src/uniq.c (enum delimit_method): s/DM_PRECEDE/DM_PREPEND/ - and change all uses. - (delimit_method_string): s/precede/prepend/ - * tests/uniq/Test.pm: Adjust tests accordingly. - Patches by Padraig Brady. - - * src/uniq.c (usage): Correct typo in description of --all-repeated. - Patch by Padraig Brady. + * src/stat.c: Include "inttostr.h". + (human_time): Print the date/time as a number of seconds since the + epoch if it can't be converted by localtime. This is better than + just saying "invalid", and is consistent with what "ls" does. + Don't dump core if the year has more than 48 digits; this isn't + possible on any contemporary host, but we might as well do it right. -2001-09-30 Jim Meyering <meyering@lucent.com> +2004-01-31 Paul Eggert <eggert@twinsun.com> - * Version 2.0.16. + * src/stat.c (human_time): Accept time rather than + pointer-to-const-time parameter, for clarity. All callers changed. - tail -F would segfault - * src/tail.c (parse_options): Add missing `break;' from last change. +2004-02-02 Jim Meyering <jim@meyering.net> -2001-09-28 Jim Meyering <meyering@lucent.com> + * src/stat.c (do_stat): Remove extra trailing newline from + default formats. Reported by Nelson H. F. Beebe. - * configure.ac: Tell automake to use the file name `config.hin' - rather than the two-`.' config.h.in. + Print actual fractional seconds in time stamps, not just `.00000000'. + * src/stat.c (human_time): Add and use new parameter, t_ns. + (print_stat): Update callers. + * src/ls.c (TIMESPEC_NS): Remove definition. + * src/system.h (TIMESPEC_NS): Define here, instead, now that stat.c + also uses this macro. + Nelson H. F. Beebe noticed that ls --full-time printed nonzero + fractional seconds for files on an XFS file system, but that stat's + fractional seconds were always zero. -2001-09-26 Jim Meyering <meyering@lucent.com> +2004-01-28 Paul Eggert <eggert@twinsun.com> - * man/Makefile.am (common_dep): Define it, so we depend on configure.ac. + * src/seq.c (print_numbers): Use 'double' for loop index, not + 'int', to avoid problems with integer overflow. On almost all + machines 'double' works in every case where 'int' works, and + it works on other cases besides. - * configure.ac: Renamed from configure.in. +2004-01-27 Jim Meyering <jim@meyering.net> -2001-09-25 Jim Meyering <meyering@lucent.com> + * src/seq.c (usage): Mention that if INCREMENT is omitted, + it defaults to 1, even when FIRST is larger than LAST. + Reword so as not to exclude the possibility that INCREMENT be zero. + +2004-01-25 Jim Meyering <jim@meyering.net> - * src/Makefile.am (sort_DEPENDENCIES): Remove definition altogether. - It adds nothing to the existing: $(PROGRAMS): ../lib/libfetish.a. + * Version 5.1.2. -2001-09-24 Paul Eggert <eggert@twinsun.com> + * Makefile.maint (signatures): Comment out definition. - * src/Makefile.am (sort_DEPENDENCIES): Depend only on - ../lib/libfetish.a, not on $(LDADD), since the latter may - contain `-lintl'. This resembles yesterday's patch for the - `$(PROGRAMS)' rule. +2004-01-23 Jim Meyering <jim@meyering.net> -2001-09-23 Jim Meyering <meyering@lucent.com> + * Makefile.maint (header_regexp): Add exitfail. - * Version 2.0.15. - - * src/Makefile.am ($(PROGRAMS)): Depend only on ../lib/libfetish.a, - not on $(LDADD), since the former may contain `-lintl'. - - * Makefile.am (SUBDIRS): When using newer gettext (in which - intl/libintl.h is created by rules intl/Makefile) - `intl' must precede `lib'. + * man/Makefile.am (EXTRA_DIST): Add help2man. + Reported by Nelson H. F. Beebe. -2001-09-22 Jim Meyering <meyering@lucent.com> + * man/Makefile.am (.x.1): Prefix help2man invocation with `$(PERL) --' + so it works on systems with Perl installed somewhere other than in + /usr/bin. + + * src/paste.c (paste_parallel): Declare local, chr, to be of type + `int', not `char', since it must hold EOF. This bug would make + paste infloop on some systems. Test failures reported by + Nelson H. F. Beebe and Christian Krackowizer. + +2004-01-22 Jim Meyering <jim@meyering.net> + + * tests/rmdir/fail-perm: New file. Test for just-fixed rmdir bug. + * tests/rmdir/Makefile.am (TESTS): Add fail-perm. + + * man/help2man: Fix it so using --info-page='coreutils PROG' works. + * man/Makefile.am (.x.1): Invoke our own (tweaked) copy of help2man. + Use --info-page='coreutils PROG' option. + Now, readlink.1 refers the user to `info coreutils readlink' + rather than to `info readlink'. Reported by Matt Swift. + +2004-01-21 Paul Eggert <eggert@twinsun.com> + + Exit status cleanup. + + * src/basename.c (usage): Use EXIT_SUCCESS, not 0, for clarity. + * src/cat.c, src/chgrp.c, src/chmod.c, src/chown.c, src/chroot.c, + * src/cksum.c, src/comm.c, src/cp.c, src/csplit.c, src/cut.c, + * src/date.c, src/dd.c, src/df.c, src/dircolors.c, src/dirname.c, + * src/du.c, src/echo.c, src/env.c, src/expand.c, src/expr.c, + * src/factor.c, src/fmt.c, src/fold.c, src/head.c, src/hostid.c, + * src/hostname.c, src/id.c, src/install.c, src/join.c, src/kill.c, + * src/link.c, src/ln.c, src/logname.c, src/ls.c, src/md5sum.c, + * src/mkdir.c, src/mkfifo.c, src/mknod.c, src/mv.c, src/nice.c, + * src/nl.c, src/nohup.c, src/od.c, src/paste.c, src/pathchk.c, + * src/pinky.c, src/pr.c, src/printenv.c, src/printf.c, src/pwd.c, + * src/rm.c, src/rmdir.c, src/seq.c, src/setuidgid.c, src/shred.c, + * src/sleep.c, src/sort.c, src/split.c, src/stat.c, src/stty.c, + * src/su.c, src/sum.c, src/sync.c, src/tac.c, src/tail.c, src/tee.c, + * src/test.c, src/touch.c, src/tr.c, src/tsort.c, src/tty.c, + * src/uname.c, src/unexpand.c, src/uniq.c, src/unlink.c, src/uptime.c, + * src/users.c, src/wc.c, src/who.c, src/whoami.c, src/yes.c: Likewise. + + * src/cat.c (usage): Don't bother normalizing exit status + since the arg is already the correct exit status now. + * src/cksum.c, src/comm.c, src/csplit.c, src/cut.c, + * src/dircolors.c, src/expand.c, src/fmt.c, src/fold.c, src/head.c, + * src/join.c, src/md5sum.c, src/nl.c, src/od.c, src/paste.c, + * src/pr.c, src/split.c, src/sum.c, src/tac.c, src/tail.c, src/tr.c, + * src/tsort.c, unexpand.c, src/src/uniq.c, src/src/wc.c: Likewise. + + * src/chown.c (main): Removed unused local 'fail'. + + * src/chroot.c (CHROOT_FOUND_BUT_CANNOT_INVOKE, CHROOT_FAILURE): + Remove. + + * src/chroot.c (main): Initialize exit_failure to EXIT_FAIL. + * src/env.c, src/nice.c, src/su.c: Likewise. + * src/nohup.c (main): Likewise, to NOHUP_FAILURE. + * src/setuidgid.c (main): Likewise, to SETUIDGID_FAILURE. + * src/expr.c (main): Use initialize_exit_failure rather than + setting exit_failure directly; this optimizes away redundant + assignments. + * src/printenv.c, src/sort.c, src/test.c, src/tty.c: Likewise. + + * src/chroot.c (main): Exit with status 1 rather than 127 + if chroot itself fails, as per documentation. + + * src/chroot.c (main): Use EXIT_ENOENT and EXIT_CANNOT_INVOKE + rather than roll-your-own symbols or integers. + * src/env.c (main): Likewise. + * src/nohup.c (main): Likewise. + * src/su.c (run_shell): Likewise. + + * src/cp.c (exit_status): Remove static var.... + (main): Making it local here instead. Use =, not |=, to set it. + + * src/cut.c (FATAL_ERROR, main): Exit with status EXIT_FAILURE, + not 2, on errors. + * src/date.c (batch_convert, main): Likewise. + * src/dd.c (dd_copy): Likewise. + * src/pr.c (first_last_page, main, getoptarg): Likewise. + * src/tr.c (main): Likewise. + * src/date.c (main): Don't assume EXIT_FAILURE == 1, as + POSIX doesn't require it. + * src/dd.c (write_output, skip, dd_copy): Likewise. + * src/df.c (main): Likewise. + * src/id.c (main): Likewise. + * src/install.c (main): Likewise. + * src/ln.c (main): Likewise. + * src/ls.c (main): Likewise. + * src/mv.c (main): Likewise. + * src/shred.c (main): Likewise. + + * src/env.c (main): Exit with status 1, not 2, on errors detected + by env proper. + * src/hostname.c (main): Likewise. + * src/nl.c (main): Likewise. + * src/stty.c (main): Likewise. + + * src/expr.c (EXPR_FAILURE): Renamed from EXPR_ERROR, for + consistency with the other programs' naming conventions. + All uses changed. - * ABOUT-NLS: Upgrade to gettext 0.10.40 - * intl: Upgrade entire directory to gettext 0.10.40 - * po/ChangeLog: New file. + * src/factor.c (main): Do not report a usage error simply + because stdin has bad numbers. - * Makefile.am (DISTCLEANFILES): Remove definition, since intl/libintl.h - is no longer created via configure. + * src/id.c (problems): Now a boolean int, not a counter, + so that we don't have to worry about int overflow. All uses changed. + * src/touch.c (err): Likewise. - * tests/od/od-N: New test for the 2001-09-19 fix by Ian Bruce. - * tests/od/Makefile.am: New file. - * tests/od: New directory. - * tests/Makefile.am (SUBDIRS): Add od. - * configure.in (AC_OUTPUT): Add tests/od/Makefile. + * src/md5sum.c (main): Use int, not size_t, to store boolean int. -2001-09-19 Paul Eggert <eggert@twinsun.com> + * src/mkfifo.c (main): Exit with status 1, not 4, if not implemented. + * src/mknod.c: Likewise. - * src/od.c (MAX_ADDRESS_LENGTH, pseudo_offset, format_address, - n_bytes_to_skip, skip, format_address_none, - format_address_std, format_address_paren, - format_address_label, write_block, parse_old_offset, dump, - dump_strings, main): - Use uintmax_t, not off_t, for file addresses, so that we can - handle multiple large files even if the sum of their sizes - exceeds off_t limits. + * src/nice.c (main): Exit with status EXIT_FAIL, not EXIT_FAILURE, + on error; this is in case EXIT_FAILURE is unusual. + * src/su.c (main): Likewise. - (print_s_char, print_char, print_s_short, print_short, - print_int, print_long, print_long_long, print_float, - print_double, print_long_double, dump_hexl_mode_trailer, - print_named_ascii, print_ascii, decode_one_format): - Use size_t, not off_t, for in-memory byte counts. + * src/nohup.c (NOHUP_FOUND_BUT_CANNOT_INVOKE): Remove; all uses + changed to EXIT_CANNOT_INVOKE. - (end_offset): New var. - (dump, dump_strings): Use it. - (main): Set it, but check for overflow while doing so. + * src/printenv.c (PRINTENV_FAILURE): New constant. + (main): Exit with status PRINTENV_FAILURE, not EXIT_FAILURE, on + command-line syntax problems. - (skip): Report an error if an in-range lseek fails on a - regular file, as something's seriously wrong. Check for - negative regular file sizes (possible with some broken NFS - implementations). + * src/rmdir.c (remove_parents): Don't set 'fail' to a negative number. + (main): Avoid integer overflow when seeing whether errors occurred. - (parse_old_offset): Now all offsets are valid, so return a - success boolean and take a pointer to an offset as an argument. + * src/seq.c (print_numbers): Now returns void, not (zero) int. All callers changed. + (main): Remove unused local variable 'errs'. Always exit successfully + if we reach the end. - (dump_strings): Check for overflow when computing end_offset - - string_min. - - (main): Remove OFF_T_MAX checks that are no longer needed. - Don't bother assigning through temporary when there's no size - limit to check. + * src/setuidgid.c (SETUIDGID_FAILURE): Renamed from FAIL_STATUS, + for consistency with other programs here. All uses changed. + (main): Use 'error' to exit rather than invoking 'exit' here. -2001-09-19 Jim Meyering <meyering@lucent.com> + * src/sort.c: Don't include <assert.h>. + (SORT_OUT_OF_ORDER, SORT_FAILURE): Now enums, not macros. + (usage): Don't use 'assert'. + (main): Remove redundant assignment to exit_failure. - * src/od.c (open_next_file): Use SETVBUF, not setbuf. - (skip): Revert part of last change: use lseek, not fseek. + * src/system.h (EXIT_FAIL, EXIT_CANNOT_INVOKE, EXIT_ENOENT): + New enum values. + (initialize_exit_failure): New inline function. + Include exitfail.h here, since we refer to exit_failure. + All callers changed to not include exitfail.h. - When --read-bytes=N (-N N) is used, disable input buffering in - the standard I/O library. Otherwise, od would read more input - than requested. This could have caused problems when reading - from pipes, character devices, or open file descriptors inherited - from a parent process. + * src/tty.c (TTY_FAILURE, TTY_WRITE_ERROR): New enum values; + substitute them for the corresponding integer constants. - * src/od.c (open_next_file): New function, factored out of... - (skip): Adapt to use open_next_file. - (read_char): Likewise. - (read_block): Likewise. - (main): Likewise. - (dump): Fix an off-by-one error that could have made od fail to - report a read error when reading from a named file (not stdin). - (check_and_close): Account for the fact that in_stream may now be NULL. - (usage): Correct descriptions of -j and -N options. - Patch by Ian Bruce. - -2001-09-16 Jim Meyering <meyering@lucent.com> + * tests/help-version (expected_failure_status_date): Remove, as + 'date' is now normal. + (expected_failure_status_nohup): New var. - * Makefile.am (AUTOMAKE_OPTIONS): Require automake-1.5. +2004-01-21 Jim Meyering <jim@meyering.net> - * man/Makefile.am: Revamp this file, as for fileutils. + * tests/touch/relative: Remove `command' syntax. + Thanks to Nelson H. F. Beebe and Paul Eggert. - * src/md5sum.c (digest_check): On systems for which setmode actually - does something, arrange to read the file containing checksum strings - in text mode. Based on a patch from Chris Faylor. - * src/system.h (SET_MODE): Define. + * tests/touch/relative: Test only year/month/day, not hours/min/sec, + so as to avoid problems with systems using TAI clocks. + Although it's no longer necessary, set TZ=UTC0 also for the + initial touch command. Reported by Paul Jarc here: + http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/1504 -2001-09-12 Jim Meyering <meyering@lucent.com> +2004-01-20 Diego Biurrun <diego@biurrun.de> - The command `echo a|./fmt -2147483647' would cause fmt to segfault. - * src/fmt.c (fmt_paragraph): Test for sentinal directly, rather than - doing arithmetic with it's potentially large (INT_MAX) length. - * tests/fmt/basic: Add tests for the above. + * src/dircolors.hin: Add .mov to the list of media files. - tail: accept new option: -F, equivalent to `--follow=name --retry', - for compatibility with FreeBSD and NetBSD versions of tail. +2004-01-19 Paul Eggert <eggert@twinsun.com> - * src/tail.c (usage): Describe new option. - (parse_options): Accept it. - Patch by Christian Kurz, via Herbert Xu. + * tests/touch/relative: Use TZ=UTC0, not TZ=utc (which isn't + portable). Problem reported by Christian Krackowizer. Also, use + +0000 rather than +0 to specify a time zone, as the documentation + requires four digits. - The command `echo foo|fmt -w N' for N>=32K would cause fmt to segfault. +2004-01-19 Jim Meyering <jim@meyering.net> - * src/fmt.c [struct Word]: Declare members length, space, and - line_length to be of type `int', not short. - (MAXCOST): Define using TYPE_MAXIMUM. - Reported by Herbert Xu. + * tests/mv/hard-4: Run envvar-check in case SIMPLE_BACKUP_SUFFIX is set. + * tests/mv/backup-is-src: Likewise. + Problem reported by Peter Horst -2001-08-31 Jim Meyering <meyering@lucent.com> +2004-01-17 Jim Meyering <jim@meyering.net> - * src/fmt.c (bool): Remove typedef, now that it's in system.h. - (TRUE): Define to `true', not 1. - (FALSE): Define to `false', not 0. + * announce-gen (print_changelog_deltas): Use .sig suffix, not .asc. -2001-08-30 Paul Eggert <eggert@twinsun.com> + * Version 5.1.1. - * src/cat.c: Include full-write.h. - (full_write): Remove decl; not needed. - * src/split.c: Likewise. +2003-12-15 Paul Eggert <eggert@twinsun.com> - * src/cat.c (simple_cat, cat): - Don't assume read and write size fits in int. + * NEWS, doc/coreutils.texi: touch -r and -d can now both be specified, + with -r specifying the origin for -d. + * src/touch.c (flexible_date): Remove static var. + (get_reldate): New function. + (main): Use it, to implement this new behavior. -2001-08-28 Jim Meyering <meyering@lucent.com> +2004-01-16 Jim Meyering <jim@meyering.net> - * src/fmt.c (main): Correct the diagnostic for invalid argument to -w. - (main): Diagnose an invalid, old-style width option. + * tests/touch/relative: New test for the above. + * tests/touch/Makefile.am (TESTS): Add relative. -2001-08-27 Jim Meyering <meyering@lucent.com> +2004-01-13 Jim Meyering <jim@meyering.net> - * Makefile.maint: Undo last change. Instead, simply remove `N_(', - since the `Copyright ...' line should not be translated. + * src/system.h: Include contents of sys2.h. + * src/sys2.h: Remove file. + * src/Makefile.am (noinst_HEADERS): Remove sys2.h. -2001-08-26 Jim Meyering <meyering@lucent.com> + * Use automake-1.8.2. Regenerate dependent files. - * Makefile.maint (copyright-check): Update to reflect fact that - the copyright year is now defined separately. + * Update to gettext-0.13.1. + * configure.ac: Use gettext-0.13.1. + * .x-sc_space_tab: Add m4/po.m4 to the list of exceptions. -2001-08-08 Charles Randall <crandall@matchlogic.com> +2004-01-12 Jim Meyering <jim@meyering.net> - * src/sort.c (mergefps): Do not allocate at least sort_size - bytes for each merge buffer. Instead, allocate at least - sort_size bytes total. + * Makefile.maint (%.sig): Use .sig suffix rather than .asc. -2001-08-25 Jim Meyering <meyering@lucent.com> + * Makefile.maint (po-check): Ensure that cvsu works before using it. + Reported by Alexandre Duret-Lutz. - * tests/uniq/Test.pm: Re-enable some commented-out tests. + * src/tail.c (main): Warn about following stdin only when it's a tty. -2001-08-25 Paul Eggert <eggert@twinsun.com> + * configure.ac: Use gl_DEFAULT_POSIX2_VERSION. - * src/uniq.c (main): Fix a typo in the previous patch: missing - a bounds check for examples like `uniq a b c'. +2004-01-10 Jim Meyering <jim@meyering.net> - * uniq.c (main): Fix some more incompatibilities with POSIX.2, - (e.g. `uniq +3 --' did not work) by invoking getopt_long with - leading '-', resembling what was done to 'sort' on 2001-03-20. - Recognize an +N option only if it is an integer in range, and - (if POSIXLY_CORRECT) only if a file name argument has not been seen; - otherwise silently treat it as a file name. + * tests/misc/stat-fmt: Use backticks, not `$()' notation. - If the user specifies too many operands, output the first one - in the error message, as a diagnostic aid. +2004-01-09 Jim Meyering <jim@meyering.net> -2001-08-24 Paul Eggert <eggert@twinsun.com> + * configure.ac: Quote underquoted `jm_DUMMY_1' to avoid new warning. - * src/uniq.c (main): Don't report an error when given the - valid options `+3 -d'. +2004-01-08 Jim Meyering <jim@meyering.net> -2001-08-24 Paul Eggert <eggert@twinsun.com> + * src/stat.c (human_fstype): Use %lx, not %x format for `unsigned long'. + From Andreas Schwab. - * src/uniq.c (different): Don't assume that lengths can fit - into size_t. Tune code for the common case where the line - lengths differ: we avoid comparing them entirely in that case. + * tests/Makefile.am (TESTS_ENVIRONMENT): Remove `/vg' (prerelease test + remnant) from PATH component. That would cause tests in this directory + not to run the just-built binaries, but rather whatever happened + to be in one's PATH. Reported by Christian Krackowizer. -2001-08-25 Jim Meyering <meyering@lucent.com> +2004-01-04 Jim Meyering <jim@meyering.net> - * tests/uniq/Test.pm: Add tests for -s 0 and -w 0. + * src/csplit.c (new_control_record): Use x2nrealloc + rather than xrealloc. -2001-08-24 Paul Eggert <eggert@twinsun.com> + * src/cp.c (re_protect): Use ASSIGN_STRDUPA rather than + alloca and strcpy. + (make_path_private): Likewise. - Remove arbitrary restrictions on sizes, fixing a bug reported - by Geoff Whale. +2004-01-03 Jim Meyering <jim@meyering.net> - * src/uniq.c (skip_fields, skip_chars, check_chars): Now size_t, - not int. - (size_opt): New function. Do not arbitrarily reject size zero. - Change the wording of the error message slightly, for convenience. - (find_field): Use size_t, not int, to compute sizes. - (different, main): check_chars==0 is no longer a special case, as - it defaults to SIZE_MAX. - (main): Check for overflow with args like -234234234234234. - Use 'size_opt' to convert optional arguments to sizes. + * src/paste.c: Use `bool' (not int) as the type for a few + global variables. + (collapse_escapes): Rewrite to set globals rather than modifying + its parameter. + Use size_t (not int) for all counters and related index variables. + (paste_parallel): Remove needless complexity of + using xrealloc in the loop; just allocate the buffers up front. + Free the two temporary buffers. + Move declarations of locals `down' into scope where used. + (paste_serial): Remove `register' attributes. + (main): Simplify delim-related code. + Free `delims', now that it's malloc'd. -2001-08-25 Jim Meyering <meyering@lucent.com> +2004-01-02 Jim Meyering <jim@meyering.net> - * tests/uniq/Test.pm: Add new test, #54, for the just-fixed bug. + * src/chroot.c: Include "quote.h". + (CHROOT_FOUND_BUT_CANNOT_INVOKE, CHROOT_FAILURE): Define. + (main): Exit with status of 127, not 1, for too-few-args, + chroot failure, or chdir failure. + Give a better diagnostic upon execvp failure. -2001-08-24 Paul Eggert <eggert@twinsun.com> + * src/du.c (usage): Mention that, with its current meaning, + -H is deprecated. - * src/uniq.c (find_field): Don't count trailing newline to be - part of the field. This disagrees with POSIX.2, but it's - gotta be a bug in the standard. An interpretations request - has been submitted to PASC. - Reported by Geoff Whale. + * src/tail.c (main): Warn about following stdin when it's a tty. + Fail when following by name but no names are specified. -2001-08-18 Jim Meyering <meyering@lucent.com> +2003-12-30 Jim Meyering <jim@meyering.net> - * Makefile.maint: Merge in changes from autoconf. + * src/fold.c (main): Use memcpy, not strcpy. - * Makefile.maint ($(v_etc_file)): Define. - (copyright-check): Use the new variable. - (my-distcheck): Depend on local-check so those checks are once - again run by `make distcheck'. + * src/copy.c (copy_internal): Use ASSIGN_STRDUPA rather than + alloca and strcpy. - * src/head.c (head_bytes): Read no more than the specified - number of bytes. Patch by Ian Bruce. +2003-12-28 Jim Meyering <jim@meyering.net> - * tests/misc/head-c: New test for the above. - * tests/misc/Makefile.am: New file. - * tests/misc: New directory. - * tests/Makefile.am (SUBDIRS): Add misc. - * configure.in (AC_OUTPUT): Add tests/misc/Makefile. + * src/unexpand.c (n_tabs_allocated): New global. + (add_tabstop): Use x2nrealloc rather than xrealloc. + * src/expand.c: Likewise. -2001-08-14 Jim Meyering <meyering@lucent.com> + * tests/misc/expand: New file. + * tests/misc/Makefile.am (TESTS): Add expand. - * src/Makefile.am (INCLUDES): Add -I../lib so sys2.h can include - the new, generated file, unlocked-io.h. + * src/sort.c (add_temp_dir): Use x2nrealloc rather than xrealloc. + (fillbuf): Use x2nrealloc rather than xrealloc. + (sort): Use xnmalloc rather than xmalloc. + (main): Likewise. -2001-08-13 Jim Meyering <meyering@lucent.com> +2003-12-27 Jim Meyering <jim@meyering.net> - * src/cat.c (AUTHORS): Mark string for translation, since it - contains the English word `and'. - * src/comm.c: Likewise - * src/csplit.c: Likewise - * src/cut.c: Likewise - * src/md5sum.c: Likewise - * src/nl.c: Likewise - * src/paste.c: Likewise - * src/pr.c: Likewise - * src/sort.c: Likewise - * src/split.c: Likewise - * src/sum.c: Likewise - * src/tac.c: Likewise - * src/uniq.c: Likewise - * src/wc.c: Likewise + * src/tee.c (tee): Use xnmalloc rather than xmalloc. -2001-08-12 Jim Meyering <meyering@lucent.com> +2003-12-29 Paul Eggert <eggert@twinsun.com> - * tests/mk-script ($program_name): Define. - (main): Use $program_name, rather than long-inaccurate `build-script'. - (main): Iterate over the sorted keys (rather than `while...each...'), - so this script produces the same output regardless of which version - of perl (e.g., perl5.6) is used. + * NEWS: Remove support for join -j1 FIELD, -j2 FIELD, and -o LIST1 + LIST2 in POSIX 1003.1-2001 hosts, as required by POSIX. -2001-08-04 Jim Meyering <meyering@lucent.com> + * doc/coreutils.texi (join invocation): Remove documentation + accordingly. Document that -t makes all separators significant. - * Makefile.am (EXTRA_DIST): Add Makefile.cfg. + * src/join.c: Include posixver.h. + (obsolete_usage): New var. + (longopts): Put obsolete options first. + (OBSOLETE_LONG_OPTIONS): New constant. + (get_option, add_file_name): New functions. + (main): Use them to support new behavior. + (usage): Remove documentation for -j1 FIELD and -j2 FIELD. + Do not mark -j FIELD as obsolescent; it is longstanding + UNIX tradition and is a valid extension to POSIX. - * man/Makefile.am (EXTRA_DIST): Remove duplicate definition. + * tests/join/Test.pm (tv): Avoid obsolete -o usage. -2001-07-08 Jim Meyering <meyering@lucent.com> +2003-12-28 Paul Eggert <eggert@twinsun.com> - * src/tail.c (usage): Reformat so help2man generates a properly - indented man page. Patch by Herbert Xu. + * src/join.c (add_field_list): Don't use alloca with unbounded + size; just modify the argument, which is no longer const *. -2001-07-04 Jim Meyering <meyering@lucent.com> + Various other minor cleanups, mostly to avoid the need for casts. - * Makefile.cfg: New file with package-specific definitions. - * Makefile.am (EXTRA_DIST): Add Makefile.cfg. + (extract_field): Renamed from ADD_FIELD, as it's now a function. -2001-07-01 Jim Meyering <meyering@lucent.com> + (struct field.beg): Now char *, not unsigned char const *. All + uses changed. It shouldn't be const since xmemcoll writes on its + arguments. + (extract_field): Likewise, for 2nd arg. + (keycmp): Remove now-unnecessary cast of xmemcoll args. - * src/sort.c (usage): Suggest setting LC_COLLATE=C, rather - than LC_ALL=C. + (is_blank): New function, to avoid need to cast arg to unsigned char. + (extract_field): Use it. -2001-06-10 Jim Meyering <meyering@lucent.com> + (xfields): Rewrite pretty much from scratch. - * tests/sort/Test.pm: Add a test based on a report from Herbert Xu. + (hard_LC_COLLATE): Now bool, not int. + (get_line, getseq, add_field_list): Now returns bool, not int. + (decode_field_spec, add_field_list): Return true on success (not + false), for consistency with the rest of the code. All uses changed. -2001-05-20 Jim Meyering <meyering@lucent.com> + (tab): Now char, not unsigned char. This wasn't 100% necessary + but is slightly cleaner. + (prjoin): Hoist (tab ? tab : ' ') expression, to help the compiler. - * src/uniq.c: Rename new option values: s/all/precede/ and - s/minimum/separate/. - * tests/uniq/Test.pm: Reflect the above renamings. + (empty_filler): Now const *. -2001-05-12 Bruno Haible <haible@clisp.cons.org> + (make_blank): Remove; wasn't needed. Remove all calls. + (main): Don't set uni_blank.nfields; zero is fine. - * src/tail.c (parse_obsolescent_option): Accept a b suffix. +2003-12-27 Jim Meyering <jim@meyering.net> -2001-05-19 Jim Meyering <meyering@lucent.com> + * src/join.c: Include "quote.h". + (min, max): Remove definitions. + Make a few function parameters and corresponding + locals `const'. Use bool for boolean variables. + Use size_t (not int) for all counters and related index variables. + (prjoin): Remove now-useless assertion. + (string_to_join_field): New function. + (main): Accept join fields as large as SIZE_MAX. + (keycmp): Rename `min' to MIN and max to MAX. - msgmerge-0.10.37 complains about some `invalid multibyte sequences.' - * po/el.po: Remove the offending entries. - * po/ko.po: Likewise. - * po/zh.po: Likewise. +2003-12-26 Jim Meyering <jim@meyering.net> -2001-05-19 Jim Meyering <meyering@lucent.com> + fold -s didn't work on e.g., alpha-based systems. + * src/fold.c (fold_file): Adjust types (int->size_t) so that using + x2nrealloc works properly on systems with differing sizes for int + and size_t. Reported by Nelson Beebe. - Support new modes for uniq's --all-repeated option. - The default behavior is unchanged. + * src/fold.c: Use `bool' (not int) as the type for a few + global variables. - * src/uniq.c: Include argmatch.h. - (usage): Update. - (check_file): Implement it. - (main): Handle new, optional arguments. - * tests/uniq/Test.pm: New tests for the above. - Patch by Padraig Brady. +2003-12-23 Paul Eggert <eggert@twinsun.com> -2001-05-12 Bruno Haible <haible@clisp.cons.org> + * src/ls.c (length_of_file_names_and_frills): + Remove forward decl; not needed. + (print_file_name_and_frills, length_of_file_name_and_frills): + With -m, don't output spaces before inum or size. + (print_with_commas): Don't output space just before newline. - * src/tail.c (parse_obsolescent_option): Use t_count_lines, not - count_lines, in error message. +2003-12-24 Jim Meyering <jim@meyering.net> -2001-05-05 Jim Meyering <meyering@lucent.com> + * tests/ls/Makefile.am (TESTS): Add m-option. + * tests/ls/m-option: New file. Test for above fixes. - * src/comm.c (usage): Correct description of -3. - Reported by Soeren Sonnenburg. +2003-12-20 Jim Meyering <jim@meyering.net> -2001-04-22 Jim Meyering <meyering@lucent.com> + * Version 5.1.0. - * Version 2.0.14. + * src/pr.c: Change type of global, buff_allocated, to size_t. - * configure: Regenerate using a patched copy of autoconf-2.49e to - work around a bug in its test for a working memcmp function. + * src/join.c [struct seq]: Change types of members count and alloc + from `int' to `size_t'. -2001-03-28 Paul Eggert <eggert@twinsun.com> + * tests/Makefile.am (root-hint): Tweak wording. - * src/cksum.c: Fix bugs when computing length of large files. - Add overflow and write error checks. Use uint_fast32_t, not - unsigned long, to do checksum calculation, as C99 says - uint_fast32_t should be no slower and might be faster. + * src/du.c: Accept new option (-0, --null) that makes it so each + output line is NUL-terminated rather than newline-terminated. - Include <stdio.h> and "system.h" even if CRCTAB is defined, - so that the code will compile if CRCTAB is defined. - Include "human.h" if CRCTAB is not defined. - (uint_fast32_t): Define if it appears that stdint.h didn't. - (BIT, remainder, main, crctab): Use uint_fast32_t, not unsigned long, - for checksums. - (fill_r, remainder, main): Use ANSI prototypes. - (fill_r, remainder, main): Omit duplicate code. - (main): Use uintmax_t, not unsigned long, for file lengths. - Use size_t, not long, for result of fread. - Check for overflow when computing file lengths. - Check for write error immediately after printing a line, so that - we don't write to stdout indefinitely after an error. + * src/dd.c (apply_translations): Don't prohibit conv=unblock,sync. + Reported by Volker Paul. + * tests/dd/Makefile.am (TESTS): Add unblock-sync. + * tests/dd/unblock-sync: New test for the above. -2001-04-14 Paul Eggert <eggert@twinsun.com> +2003-12-19 Jim Meyering <jim@meyering.net> - * src/sort.c (default_sort_size): Leave a 1/16 margin for RSS. - Suggestion from Solar Designer. + * tests/misc/nohup: Double quote back-ticked expression, + in case it ends up having an unexpected value. -2001-04-14 Jim Meyering <meyering@lucent.com> + * tests/ls/no-arg: Use ls's -1 option in both runs. - * src/wc.c (usage): Tweak --help output: s/line,/newline,/ + * src/du.c (fts_debug): New global. + (FTS_CROSS_CHECK, DEBUG_OPT): Define. + (main): Make fts use FTS_TIGHT_CYCLE_CHECK. + (main) [DU_DEBUG]: Accept -d option. -2001-04-13 Jim Meyering <meyering@lucent.com> +2003-12-18 Jim Meyering <jim@meyering.net> - * src/sort.c (main): Add a comment justifying the use of - `multi-character' rather than `multibyte' in a diagnostic. + * src/ls.c (format_user): Increment dired_pos via two statements, + `dired_pos += width; dired_pos++;' rather than one, + `dired_pos += width + 1;' since the latter could conceivably overflow. + (format_group): Likewise. From Paul Eggert. -2001-04-12 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (RLIMIT_AS): Do not define; just use conditional - code, since RLIMIT_RSS is similar (and is not standardized). - (default_sort_size): Don't allocate more than the RSS limit, - if this host has such a limit. - -2001-03-20 Paul Eggert <eggert@twinsun.com> - - * NEWS, doc/textutils.texi: sort now accepts long options and - checks POSIX option syntax. - - * doc/textutils.texi: Document --, -, sort long options, and - sort -o after files. - - * src/sort.c: Include <getopt.h>. - (usage, main): Add support for long options, and check option - syntax as POSIX requires, though (as usual for GNU apps) - options can follow file names unless POSIXLY_CORRECT is set. - Many diagnostic revamped. - (long_options): New constant. - (badfieldspec): New arg MSGID. Mark as noreturn. - (parse_field_count): New arg MSGID; if null, just return null on error. - (new_key): Renamed from key_init. All callers changed. Now allocates - the new key. - -2001-03-18 Jim Meyering <meyering@lucent.com> - - * Version 2.0.13. - - * tests/Fetish.pm: If the $DJDIR envvar is defined, set SHELL - to $DJDIR/bin/bash.exe. Patch from Richard Dawe, based on a - suggestion from Eli Zaretskii. - -2001-03-17 Paul Eggert <eggert@twinsun.com> - - * src/sort.c, src/tail.c, src/uniq.c (usage): - Warn that the +N form will be withdrawn. - * doc/textutils.texi: Likewise. - -2001-03-08 Paul Eggert <eggert@twinsun.com> - - * NEWS, doc/textutils.texi: Document pr changes. - - * src/pr.c: Include mbswidth.h. - (standard_header, header, test_suite): Remove. - (date_format, date_text, file_text, header_width_available): New vars. - (long_options, main, init_header, usage): - Add new -D or --date-format option. - (CHARS_FOR_DATE_AND_PAGE, T_BUF_FMT, T_BUF_SIZE, NO_DATE): Remove. - (init_header): Allow arbitrary width for date format. Change - "Page %5d" to "Page %d", since the code no longer assumes fixed width. - Do not assume that localtime succeeds. - (init_header, print_header, usage): Do not truncate headers. - (init_header, print_header): Defer width calculations until - page is printed, since "Page 100000" is wider than "Page 1". - Count columns, not bytes, in page headers. - Custom headers take up only the center, not the whole header. - (print_header): Use printf rather than fprintf(stdout). - - * po/Makefile.in.in (install-data-yes): Install LC_TIME locale - for all packages, not just for fileutils. - (uninstall): Remove LC_TIME locale too. - - * src/sys2.h (INT_STRLEN_BOUND): New macro. - - * tests/pr/0F, tests/pr/0FF, tests/pr/2-S_f-t_notab, - tests/pr/2-Sf-t_notab, tests/pr/2f-t_notab, - tests/pr/2s_f-t_notab, tests/pr/2s_w60f-t_nota, - tests/pr/2sf-t_notab, tests/pr/2sw60f-t_notab, - tests/pr/2w60f-t_notab, tests/pr/3-0F, tests/pr/3-5l17f-t, - tests/pr/3-FF, tests/pr/3a2l17-FF, tests/pr/3a3f-0F, - tests/pr/3a3l15-t, tests/pr/3a3l8f-t, tests/pr/3b2l17-FF, - tests/pr/3b3f-0F, tests/pr/3b3f-0FF, tests/pr/3b3f-FF, - tests/pr/3b3l15-t, tests/pr/3b3l8f-t, tests/pr/3f-0F, - tests/pr/3f-FF, tests/pr/3l17f-t, tests/pr/3l24-t, - tests/pr/3ml17f-t, tests/pr/3ml24-FF, tests/pr/3ml24-t, - tests/pr/3ml24-t-FF, tests/pr/4-7l24-FF, tests/pr/4l24-FF, - tests/pr/a2l15-FF, tests/pr/a2l17-FF, tests/pr/a3-0F, - tests/pr/a3f-0F, tests/pr/a3f-0FF, tests/pr/a3f-FF, - tests/pr/a3l15-t, tests/pr/a3l17f-lm, tests/pr/a3l8f-t, - tests/pr/b2l15-FF, tests/pr/b2l17-FF, tests/pr/b3-0F, - tests/pr/b3f-0F, tests/pr/b3f-0FF, tests/pr/b3f-FF, - tests/pr/b3l15-t, tests/pr/b3l17f-lm, tests/pr/b3l8f-t, - tests/pr/FF, tests/pr/Ja3l17f-lm, tests/pr/Jb3l17f-lm, - tests/pr/Jml17f-lm-lo, tests/pr/l17f-t, tests/pr/l24-FF, - tests/pr/l24-t, tests/pr/ml17f-0F, tests/pr/ml17f-lm-lo, - tests/pr/ml17f-t, tests/pr/ml17f-t-0F, tests/pr/ml20-FF-t, - tests/pr/ml24-FF, tests/pr/ml24-t, tests/pr/ml24-t-FF, - tests/pr/n+2-5l17f-0FF, tests/pr/n+2l17f-0FF, - tests/pr/n+2l17f-bl, tests/pr/n+3-7l24-FF, - tests/pr/n+3l17f-0FF, tests/pr/n+3l17f-bl, - tests/pr/n+3ml13f-bl-FF, tests/pr/n+3ml17f-bl-tn, - tests/pr/n+3ml17f-tn-bl, tests/pr/n+4-8a2l17-FF, - tests/pr/n+4b2l10f-0FF, tests/pr/n+5-8b3l10f-FF, - tests/pr/n+5a3l6f-0FF, tests/pr/n+6a2l17-FF, - tests/pr/n+6b3l6f-FF, tests/pr/n+7l24-FF, - tests/pr/n+8l20-FF, tests/pr/nJml17f-lmlmlo, - tests/pr/nJml17f-lmlolm, tests/pr/nl17f-bl, - tests/pr/nN1+3l17f-bl, tests/pr/nN15l17f-bl, - tests/pr/nSml13-bl-FF, tests/pr/nSml13-t-t-FF, - tests/pr/nSml13-t-tFFFF, tests/pr/nSml17-bl-FF, - tests/pr/nSml17-t-t-FF, tests/pr/nSml17-t-tFFFF, - tests/pr/o3a3l17f-tn, tests/pr/o3a3Sl17f-tn, - tests/pr/o3a3Snl17f-tn, tests/pr/o3b3l17f-tn, - tests/pr/o3b3Sl17f-tn, tests/pr/o3b3Snl17f-tn, - tests/pr/o3Jml17f-lm-lo, tests/pr/o3ml17f-bl-tn, - tests/pr/o3mSl17f-bl-tn, tests/pr/o3mSnl17fbltn, - tests/pr/Test.pm, tests/pr/W-72l17f-ll, tests/pr/W20l17f-ll, - tests/pr/W26l17f-ll, tests/pr/W27l17f-ll, - tests/pr/W28l17f-ll, tests/pr/W35a3l17f-lm, - tests/pr/W35b3l17f-lm, tests/pr/W35Ja3l17f-lm, - tests/pr/W35Jb3l17f-lm, tests/pr/W35Jml17f-lmlo, - tests/pr/W35ml17f-lm-lo, tests/pr/W72Jl17f-ll, - tests/pr/w72l17f-ll: - Adjust to minor spacing changes in pr headers. - -2001-03-11 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (die): New message arg, to describe failures - better. All callers changed. - -2001-03-11 Paul Eggert <eggert@twinsun.com> - - * src/sort.c: Decrease buffer size when only merging or checking. - (sort_size): Now the user-specified sort size. - (MIN_MERGE_BUFFER_SIZE): New macro. - (MIN_SORT_SIZE): Use it. - (merge_buffer_size): New variable. - (fillbuf): Increase merge_buffer_size if a longer line is encountered. - (checkfp, mergefps): Do not allocate a buffer smaller than - merge_buffer_size. - (sort): Use the default_sort_size if sort_size is zero. - (main): Do not set sort_size to default_sort_size. - -2001-03-06 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (sort): If all the input files are empty, create - an empty output file. - * tests/sort/Test.pm: Test for this. - -2001-03-13 Jim Meyering <meyering@lucent.com> - - * src/sort.c (merge): Move declarations of local variables into - the inner scope where they're used. - (sort): Likewise. - -2001-03-06 Paul Eggert <eggert@sic.twinsun.com> - - Avoid the need for a copy of the input file when the input and - output overlap, e.g. 'sort F -o F'. With -m, though, a copy - is still needed sometimes. - - * doc/textutils.texi: 'sort F -o F' no longer needs to copy F. - - * src/sort.c: Do not include closeout.h. - (xfopen): Use stdout if *how != 'r'. - (mergefps): Remove FPS arg. - Open all input files, and close all files when done. - If OFP is null, open the output file (but after opening input files). - All callers changed. - (first_same_file): New function. - (sort, merge): Remove arg OFP; we now open the output file as needed. - All callers changed. - (merge): New arg MAX_MERGE. All callers changed. - (sort): For "sort F -o F", close the input before opening the output. - (main): Do not use close_stdout; 'sort' and 'merge' now close stdout. - (This also fixes a close-stdout-twice bug.) - Remove test for overlapping input and output files, as 'sort' no longer - needs to worry about overlap, and 'merge' checks for overlap itself. - Use first_same_file to inform 'merge' about how much to merge at - the top level, to avoid overlap. - -2001-03-12 Jim Meyering <meyering@lucent.com> - - `fmt --prefix=S' would not work properly for any string S containing - a byte with the high bit set. - * src/fmt.c (prefix): Declare to be of type unsigned char, not `char'. - (get_prefix): Likewise for local, `p'. - Reported by François Pinard. - - Add a test for the above-fixed problem. - * tests/fmt: New directory/files. - * configure.in (AC_OUTPUT): Add tests/fmt/Makefile. - * tests/Makefile.am (SUBDIRS): Add fmt. - -2001-03-05 Andreas Schwab <schwab@suse.de> - - * src/tac.c (save_stdin): Use mkstemp to create temporary file. - -2001-03-09 Jim Meyering <meyering@lucent.com> - - * Makefile.maint (my_distdir): Define new variable, and use this - in place of most old uses of $(distdir). - - * tests/help-version: Ensure that /dev/full is a character device - (using test -c) as well as being writable, before trying to write to it. - Otherwise, the test could mistakenly append a newline to an existing, - regular, writable, /dev/full file. - Suggested by Ulrich Drepper. - -2001-03-08 Jim Meyering <meyering@lucent.com> - - * tests/sha1sum/sample-vec: Insert the `--text' argument for each test. - Reported by Matthew Smith. - -2001-03-04 Jim Meyering <meyering@lucent.com> - - * Makefile.maint (my_distdir): Define. - Use it in place of $(distdir) almost everywhere. - - * Version 2.0.12. - - * Makefile.maint (alpha): Use $(PACKAGE)-$(VERSION), not $(distdir), - since the latter now has a `$(top_distdir)/' prefix. - -2001-03-01 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (die): New function. - (create_temp_file, xfopen, xfclose, write_bytes, sort_buffer_size, - fillbuf, main): Use it to regularize error messages. The only change - in behavior is that write_bytes and the final close used to say "write - error" but now give just the output file name, which should be enough. - -2001-03-01 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (xfclose): Add FILE arg, and report the file name - on error. All callers changed. - -2001-03-01 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (main): When fclose (stdin) fails, do not mention - the output file in the error message; mention "-" instead. - -2001-02-28 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (xfopen): Set have_read_stdin to 1 only if file is "-". - Use fopen_safer, not fopen, to avoid subtle bugs when fopen returns - stdin, stdout, or stderr. - (xfclose): stdout is no longer a special case. - (main): Close output file, don't just flush it; there might be - an error on the close. - -2001-02-27 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (initbuf): If the desired size cannot be - allocated, repeatedly halve it until allocation succeeds. - Reported by Solar Designer. - -2001-02-26 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (parse_field_count): Comment fix. - -2001-02-25 Paul Eggert <eggert@twinsun.com> - - * src/sort.c: Tune allocation and comparison of nodes - representing temp files. This improved CPU performance of - 'sort -S 1 *.[ch]' by 17% on my host. - - (struct tempnode): name member now uses struct hack. - (temphead): Now a pointer, not a structure. All uses changed. - (create_temp_file): Allocate node using struct hack. - (zaptemp): Free node using struct hack. Use pointer comparison, not - string comparison. - -2001-02-25 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (eolchar, trim_trailing_blanks): Now static. - -2001-02-25 Paul Eggert <eggert@twinsun.com> - - 'sort' race condition fixes. - - Defend against a DoS attack where someone else creates a - temporary file with the same name as ours. Use mkstemp to do - this, supplying our own mkstemp if the system doesn't have one. - - Also, fix a race condition during cleanup on hosts without - sigaction. - - * src/sort.c (NAME_MAX_IN_DIR): Remove. - (sigprocmask, sigset_t): New macros, defined only on older hosts. - (caught_signals): New var. - (xtmpfopen, tempname): Removed. - (create_temp_file): New function, combining the functions of the old - xtmpfopen and tempname. All callers changed. - Use mkstemp to create the file. - (sighandler): On hosts without sigaction, ignore signals while - cleaning up, instead of letting them interrupt cleanup. - (main): Initialize caught_signals. On hosts with sigaction, block all - caught signals while handling one. Remove duplicate code. - -2001-02-22 Jim Meyering <meyering@lucent.com> - - * src/sort.c (keycompare): Move declarations of locals, lena and lenb, - into the inner scope where they are used. - -2001-02-19 Jim Meyering <meyering@lucent.com> - - * src/sort.c (AUTHORS): Add Paul Eggert. - - * src/wc.c (wc): Rename innermost `buf' to avoid shadowing warning. - (wc): Rename local `wc' to avoid shadowing function name. - -2001-02-18 Paul Eggert <eggert@twinsun.com> - - Fix a race condition: freed storage accessed during a signal handler. - - * src/sort.c (struct tempnode.next): Now volatile. - (zaptemp): Free the file name after removing it from the temp list, - not before, because a signal can arrive between the two actions - and cleanup () traverses the list. - -2001-02-18 Paul Eggert <eggert@twinsun.com> - - Check for input size, and do not overallocate memory. - Also check for memory quotas. - - Revamp storage management so that line tables and character data are - taken from the same buffer. Line tables are now in reverse order, - since they grow down while the character data grow up. - - * src/sort.c: - (<sys/resource.h>): Include if HAVE_SYS_RESOURCE_H. - (struct rlimit, getrlimit): Define a replacement if RLIMIT_DATA - is not defined. - (RLIMIT_AS): Define to RLIMIT_DATA if not defined. - (struct lines): Remove. - (struct buffer): New members nlines, line_bytes, eof. - Remove member newline_free; no longer needed, since the code no longer - runs out of line table space. - (SORTALLOC_MIN, SORTALLOC_DEFAULT_MIN): Remove. - (sort_size): Renamed from sortalloc; now applies to the sum of the - character data and the line table, not just the character data. - (MIN_SORT_SIZE, INPUT_FILE_SIZE_GUESS): New macros. - (linelength): remove. - (specify_sort_size): Don't worry about the distinction between the - character data and the line table; that is now the caller's - responsibility. - (default_sort_size): Return the value, instead of being executed for - side effect. Return half of available memory, or 1/16 of total memory, - whichever is greater; except do not exceed 1/2 of quota. - (sort_buffer_size): New function. - (initbuf): New arg LINE_BYTES. Ensure that the line array is properly - aligned. Initialize the new set of struct buffer members. - (buffer_linelim): New function. - (fillbuf): Return int, not size_t, since the callers merely care - whether the result is nonzero. New arg FILE so that error messages - can report the file name. Keep track of eof. Initialize the line - table too, taking its memory from the input buffer's memory; this - subsumes the old findlines function and removes the need for worrying - about running out of line table entries. - (checkfp, mergefps, sortlines, merge, sort): Adjust to the new storage - management regime, in particular the fact that line tables are now - filled in by fillbuf and are in reverse order. - (checkfp): Now takes char *, not const char *, since subroutines - require that now. Rewrite to avoid lint and duplicate code. - If line length alloc calculation overflows, - simply allocate enough memory to hold the line. - (mergefps): New arg FILES, used for buffer size calculation and error - messages. Rewrite to avoid lint. Do not loop if savealloc*2 - overflows. - (mergefps, merge): Zap temporary files eagerly rather than lazily; - this is needed because we now pass FILES to mergefps. - (sortlines): Args now point at end of arrays, not at beginnings. - (sort): Do not allocate temporary line array for sortlines; - instead, take the space from the same buffer. - (main): Adjust to sort_size and default_sort_size changes. - -2001-02-18 Jim Meyering <meyering@lucent.com> - - Rename test input files to avoid conflicts on case-insensitive - file systems. - * tests/pr/2-Sf-t_notab: Rename from 2Sf-t_notab. - * tests/pr/2-S_f-t_notab: Rename from 2S_f-t_notab. - * tests/pr/W-72l17f-ll: Rename from W72l17f-ll. - * tests/pr/Test.pm: Update file names to reflect renamings. - Reported by Matthew Smith. - -2001-01-20 Jim Meyering <meyering@lucent.com> - - * configure.in: Remove jm_CHECK_ALL_TYPES. - Now it's invoked by jm_MACROS. - -2001-01-17 Jim Meyering <meyering@lucent.com> - - * src/cksum.c (main): Use PACKAGE, not GNU_PACKAGE. - * src/tsort.c (main): Likewise. - * src/sort.c (main): Likewise. - (usage): Convert each TAB in --help output to a sequence of 8 spaces. - -2001-01-07 Jim Meyering <meyering@lucent.com> - - * src/tail.c (usage): Split a string that was longer than 2048 bytes. - -2001-01-03 Jim Meyering <meyering@lucent.com> - - * src/sort.c (main): Remove embedded \n from diagnostic. - -2001-01-02 Jim Meyering <meyering@lucent.com> - - * src/od.c (ulonglong_t): Define place-holder type to avoid some #if - directives. - (LONGEST_INTEGRAL_TYPE): Remove definition. - (MAX_INTEGRAL_TYPE_SIZE): Use ulonglong_t instead of - LONGEST_INTEGRAL_TYPE. - (print_long_long): Compile this function even on systems without - long long support. - (decode_one_format): Remove #if directive. - - * src/od.c (decode_one_format): Guard use of print_long_long with - `#if HAVE_UNSIGNED_LONG_LONG'. From Darren Salt. - Change all `#ifdef HAVE_UNSIGNED_LONG_LONG' to use `#if' instead. - -2000-12-23 Jim Meyering <meyering@lucent.com> - - * src/sys2.h [HAVE_INTTYPES_H]: Include <inttypes.h>. - -2000-12-19 Jim Meyering <meyering@lucent.com> - - * Version 2.0.11. - -2000-12-18 Paul Eggert <eggert@twinsun.com> - - * NEWS, doc/textutils.texi: New "sort" option -S SIZE. - - * src/sys2.h (UINTMAX_MAX): New macro, taken from C99. - - * src/sort.c: Include physmem.h. - (SORTALLOC, mergealloc, LINEALLOC): Remove. - (sortalloc): Default to zero at program startup. - (SORTALLOC_MIN, SORTALLOC_DEFAULT_MIN): New macros. - (usage, main): Add support for new -S SIZE option. - (specify_sort_size, default_sort_size): New functions. - (initlines): Do not let alloc exceed limit. - (findlines): Likewise. - (checkfp, mergefps, sort): Use sortalloc to size everything - else, instead of relying on precomputed sizes. - -2000-12-17 Jim Meyering <meyering@lucent.com> - - * doc/texinfo.tex: Update from master repository. - * config.sub: Likewise. - * config.guess: Likewise. - -2000-12-11 Jim Meyering <meyering@lucent.com> - - * Version 2.0.10. - -2000-12-07 Jim Meyering <meyering@lucent.com> - - * src/od.c (address_base): Declare to be static. - -2000-12-06 Paul Eggert <eggert@twinsun.com> - - * src/od.c (address_base, address_pad_len): New var. - (output_address_fmt_string, address_fmt_buffer, address_pad): Remove. - (flag_pseudo_start): Now int, not long int. - (pseudo_offset): Now off_t, not long int. - (n_specs, n_specs_allocated): Now size_t, not unsigned int. - (format_address, format_address_none, format_address_std, - format_address_label): Now accepts an extra char argument (an extra - char to print if nonzero), and prints instead of returning a string. - All callers changed. - (bytes_per_block): Now size_t, not int. - (format_address_none): Do not even print the extra char argument. - This simplifies the callers. - (format_address_std, format_address_label): Print off_t ourself - instead of trying to use autoconfigured format. This is faster and - more portable. - (format_address_paren): New function. - (dump): Remove unnecessary cast. - (expand_address_fmt): Remove. - (main): Use size_t, off_t, etc. instead of builtin types where this is - advisable. Adjust to above changes. Remove unnecessary cast. - -2000-12-03 Jim Meyering <meyering@lucent.com> - - * src/tail.c (tail_file): Initialize ignore, dev, and ino members, - when tailing forever and the open failed. Otherwise, we could get - uninitialized memory references of those fields in recheck. - * tests/tail-2/Makefile.am (TESTS): Add assert-2. - * tests/tail-2/assert-2: New file. - - * Version 2.0.9. - - Make od print valid addresses for offsets of 2^32 and larger, and - allow byte offset (-j) and byte count (-N) to be 2^32 and larger. - - * src/od.c (MAX_ADDRESS_LENGTH): Don't hard-code as a literal. - Rather, define in terms of the type, off_t. - (string_min): Declare to be of type size_t. - (flag_dump_strings): Declare to be of type int. - (print_s_char): Declare the n_bytes parameter and the local, `i', - to be of type off_t. - (print_char): Likewise. - (print_s_short): Likewise. - (print_short): Likewise. - (print_int): Likewise. - (print_long): Likewise. - (print_long_long): Likewise. - (print_float): Likewise. - (print_double): Likewise. - (print_long_double): Likewise. - (dump_hexl_mode_trailer): Likewise. - (print_named_ascii): Likewise. - (print_ascii): Likewise. - (write_block): Likewise. - (print_ascii): Declare local, `print_function' with a prototype. - Change a few `>' comparisons to the equivalent `<' form. - (parse_options): Declare `tmp' to be of type uintmax_t. - Use xstrtoumax, not xstrtoul. - Fail if the specified offset if larger than OFF_T_MAX. - (dump_strings): Declare local `i' to be of type size_t. - Remove the now-unnecessary cast-to-off_t. - (main) [IF_LINT]: Initialize desired_width to avoid a warning. - Declare `tmp' to be of type uintmax_t. - Use xstrtoumax, not xstrtoul. - Fail if minimum string length is larger than SIZE_MAX. - Fail if specified width is larger than ULONG_MAX. - - * src/od.c (format_address): Use off_t, not long unsigned_int as the - parameter type. - (format_address_none): Likewise. Mark parameter as unused. - (format_address_std): Likewise. - (format_address_label): Likewise. - (print_ascii): Mark format string parameter as unused. - (write_block): Use off_t, not long unsigned_int as offset type. - (expand_address_fmt): New function. - (main): Use it to expand each address format string template. - Reported by Mark Nudelman, via Andreas Jaeger. - - * src/sys2.h (OFF_T_MIN): Define here instead. - (OFF_T_MAX): Likewise. - (CHAR_BIT): Define. - - * src/tail.c (parse_options): Use xstrtoumax to parse the byte and line - offset. Give a better diagnostic when the requested offset is still - representable but larger than OFF_T_MAX. - (OFF_T_MIN): Remove definition. - (OFF_T_MAX): Likewise. - -2000-12-02 Jim Meyering <meyering@lucent.com> - - * src/sort.c (checkfp): Rename local `buf' to avoid shadowing previous - declaration. - - * src/sort.c (NONZERO): Define and use it to make the code a tiny - bit more readable. - - * doc/textutils.texi (sort invocation): Clarify how -t works - when a sort key specifies a range of fields. From Karl O. Pinc. - -2000-11-26 Paul Eggert <eggert@twinsun.com> - - * src/od.c (skip): Use lseek instead of worrying about fseeko or fseek. - This should be portable, as we seek before doing any I/O. - (fseeko): Remove; no longer used. - -2000-11-30 Jim Meyering <meyering@lucent.com> - - * src/sort.c: s/SIZE_T_MAX/SIZE_MAX/. - -2000-11-30 Paul Eggert <eggert@twinsun.com> - - * src/sys2.h: Include <stdint.h> if HAVE_STDINT_H. - (SIZE_MAX): Renamed from SIZE_T_MAX, as C99 uses SIZE_MAX. - All uses changed. - -2000-11-30 Jim Meyering <meyering@lucent.com> + * configure.ac: Require automake-1.8. - * src/sort.c: SIZE_MAX is not defined, so s/SIZE_MAX/SIZE_T_MAX/, and... - * src/sys2.h (SIZE_T_MAX): ... define. +2003-12-12 Jim Meyering <jim@meyering.net> -2000-11-29 Paul Eggert <eggert@twinsun.com> + * Use automake-1.8. Regenerate dependent files. - Port GNU "sort" to hosts where sizes don't fit in "int", - e.g. 64-bit Solaris (sparc). +2003-12-08 Jim Meyering <jim@meyering.net> - * src/sort.c ("human.h", "xstrtol.h"): Include. - (struct line): length member is now size_t, not int. - (struct lines): Likewise for used, alloc, limit members. - (struct buffer): Likewise for used, alloc, left, newline_free members. - (struct keyfield): Likewise for sword, schar, eword, echar members. - (sortalloc, mergealloc, linelength): Now size_t, not int. + * Makefile.maint (news-date-check): New rule. + (alpha beta major): Depend on it. - (initbuf, fillbuf, initlines, begfield, limfield, findlines, - numcompare, getmonth, keycompare, compare, checkfp, mergefps, - sortlines, sort): Accept, return, and use size_t for sizes, not int. +2003-12-03 Paul Eggert <eggert@twinsun.com> - (fillbuf, initlines, findlines, checkfp, sort): Check for overflow - when computing buffer sizes. + * NEWS: ls -l (and similar options) now adjust all columns to + fit the data. Generalized from a suggestion by Leah Q for file sizes. + * src/ls.c (INODE_DIGITS, LOGIN_NAME_MAX, ID_LENGTH_MAX): Remove. + (format_user_width, format_group_width, unsigned_file_size, + format_group): New functions. + (block_size_width): Renamed from block_size_size. + (inode_number_width, nlink_width, owner_width, group_width, + author_width, major_device_number_width, minor_device_number_width, + file_size_width): New vars. + (clear_files): Initialize them. + (gobble_file): Set them. Don't ceiling block_size_width to 7. + (print_long_file): Use them. + (gobble_file): Use a new local variable 'f' to make the code + smaller and more consistent with other functions. + (format_user): Output to stdout, not to a buffer, so that we + don't have to worry about buffer overrun. Update dired_pos. + (print_long_file): Don't put owner, group, author into buffer; + just print them directly. Don't assume link counts and + major and minor numbers fit into unsigned long int. + * tests/cp/same-file, tests/mv/part-symlink: Don't assume that + 'ls' output is fixed-width. - (begfield, limfield): Do not index past end of array. +2003-12-02 Jim Meyering <jim@meyering.net> - (checkfp): Return a boolean, not a line number, as the line - number may not fit in int. All callers changed. Use - uintmax_t for line numbers, not int. + * src/md5sum.c: Include sha1.h (reflect renaming: sha.h -> sha1.h. - (sort): Don't allocate tmp until we need it (and know the right size). +2003-11-27 Jim Meyering <jim@meyering.net> - (parse_field_count): New function. + * Use automake-1.7f. Regenerate dependent files. - (main): Use it to check for overflow in field counts. - "outfile" is now a pointer to const. +2003-11-24 Paul Eggert <eggert@twinsun.com> -2000-11-27 Jim Meyering <meyering@lucent.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). - * src/checksum.h: Don't include system.h here. - * src/md5.c: Include config.h, stdio.h, sys/types.h. and system.h here - instead. - * src/sha1sum.c: Likewise. + * src/printf.c: Remove decls of strtod, strtol, strtoul; no longer + needed now that we assume C89. Include "c-strtod.h". + (xstrtod): Call c_strtod, not strtod. + * src/sleep.c: Include "c-strtod.h". + (main): Update xstrtod call to include new argument, c_strtod. + * src/seq.c (scan_double_arg): Likewise. + * src/tail.c (parse_options): Likewise. -2000-11-18 Paul Eggert <eggert@twinsun.com> +2003-11-24 Jim Meyering <jim@meyering.net> - * src/pr.c (main): Do not assume EOF == -1. - Handle the case correctly when digits options immediately precede a - non-option. + * tests/rm/fail-2eperm: Handle another errno variant (HPUX, EPERM). + Reported by Mark Conty. -2000-11-18 Jim Meyering <meyering@lucent.com> +2003-11-22 Jim Meyering <jim@meyering.net> - * doc/textutils.texi: Change GNU to @sc{gnu} in many places. - Update to use the Free Documentation Licence. + * Makefile.maint (sc_xalloc_h_in_src): Remove rule. Subsumed by... + (sc_system_h_headers): Do this test only if sys2.h exists. - * configure, config.h.in, Makefile.in, etc.: Regenerate using the - very latest version (in CVS) of autoconf. +2003-11-20 Jim Meyering <jim@meyering.net> -2000-11-17 Jim Meyering <meyering@lucent.com> + * tests/help-version: Ensure that the bug-reporting address is + included in the --help output for every program. + * tests/Makefile.am (TESTS_ENVIRONMENT): Add $PACKAGE_BUGREPORT. - * GNUmakefile (.NOTPARALLEL): New target. Prevent unwanted parallelism. - Suggestion from Ulrich Drepper. + * src/ptx.c (usage): Output bug-reporting address. + Reported by Dan Jacobson. -2000-11-16 John David Anglin <dave@hiauly1.hia.nrc.ca> +2003-11-19 Jim Meyering <jim@meyering.net> - * tsort.c: Include sys/types.h before system.h. + * src/join.c (usage): Mention that FILE1 and FILE2 must be sorted + on the join fields. Suggestion from Bruce Robertson. -2000-11-16 Jim Meyering <meyering@lucent.com> +2003-11-18 Jim Meyering <jim@meyering.net> - * src/join.c: Declare global `tab' to be of type *unsigned* char, - so join works with 8-bit delimiter characters. - Reported by Antonio Rendas. - * tests/join/Test.pm (8-bit-t): New test for the above fix. + `od -c -w9999999' could segfault + * src/od.c (dump): Use xnmalloc/free, not alloca. -2000-11-13 Paul Eggert <eggert@twinsun.com> +2003-11-16 Jim Meyering <jim@meyering.net> - * src/sys2.h (ST_TIME_CMP_NS): Fix typo: ST_MTIM_NSEC should - be tested with #ifdef, not with #if. + * Use autoconf-2.59. Regenerate dependent files. -2000-11-11 Jim Meyering <meyering@lucent.com> + * tests/du/hard-link: Minor tweak: use mkdir -p. - * doc/textutils.texi: More minor rewording and grammar correction. - From Brian Youmans. + Fix read-from-free'd-buffer error detected by valgrind. + * src/csplit.c (remove_line): Don't return a pointer to data in + a freed buffer. Instead, arrange to free the buffer on the + subsequent call. -2000-11-06 Paul Eggert <eggert@twinsun.com> + * tests/misc/csplit: New test for above fix. - * src/od.c (skip): st_size is not defined for directories. +2003-11-11 Jim Meyering <jim@meyering.net> -2000-11-03 Jim Meyering <meyering@lucent.com> + * src/ls.c (extract_dirs_from_files): Avoid useless copy operations. + This avoids a warning from valgrind about memcpy with overlapping + source and destination. - * tests/sha1sum/sample-vec: New file, with tests derived from - http://csrc.nist.gov/cryptval/shs/sha1-vectors.zip - * tests/sha1sum/Makefile.am (TESTS): Add sample-vec. + * configure.ac: Require automake-1.7.8. -2000-10-30 Jim Meyering <meyering@lucent.com> +2003-11-09 Jim Meyering <jim@meyering.net> - * configure, config.h.in, Makefile.in, etc.: Regenerate using the - very latest version (in CVS) of autoconf. + * Use automake-1.7.9. Regenerate dependent files. - * src/wc.c: Include "system.h" after wctype.h (not before) - to avoid a compilation error on Solaris 5.5.1 systems. - Reported by Vin Shelton. + * src/rm.c: Support new options: --preserve-root and --no-preserve-root. + * src/chown.c: Likewise. -2000-10-23 Jim Meyering <meyering@lucent.com> + * src/chown-core.c: Include "root-dev-ino.h". + (chopt_init): Initialize new member. + (change_file_owner): Support rm's new --preserve-root option. - * Makefile.maint: Clean up version-related variables. + * src/remove.c: Include "root-dev-ino.h". + (remove_cwd_entries): Remove now-obsolete FIXME comment. + (remove_dir): Support rm's new --preserve-root option. - * Version 2.0.8. + * src/chown.c: Include "root-dev-ino.h". + Add new options: --preserve-root and --no-preserve-root. - * Makefile.am (EXTRA_DIST): Add .prev-version. + * src/chmod.c: Include "root-dev-ino.h". + (process_file): Use newly-factored-out ROOT_DEV_INO_CHECK and + ROOT_DEV_INO_WARN macros. + (get_root_dev_ino): Remove function definition, now that it's + been moved to a separate file. + (usage): Describe new options. -2000-10-22 Jim Meyering <meyering@lucent.com> + * src/mv.c (rm_option_init): Initialized new member. - * tests/Makefile.am (SUBDIRS): Add sha1sum. - * tests/sha1sum/basic-1: New file. - * configure.in (AC_OUTPUT): Add tests/sha1sum/Makefile. + * src/remove.h: Include "dev-ino.h". + (struct rm_options): Add new member: root_dev_ino. + * src/chown-core.h: Include "dev-ino.h". + (struct Chown_option): Add new member: root_dev_ino. - * src/Makefile.am (bin_PROGRAMS): Add sha1sum. - (md5sum_SOURCES): Define. - (sha1sum_SOURCES): Define. - (noinst_HEADERS): Add checksum.h. +2003-11-06 Jim Meyering <jim@meyering.net> - * src/md5sum.c: Factor out the differences between MD5 and SHA1, - and parameterize so this code may be used by both md5sum and the new - program, sha1sum. Loosely based on a patch from Scott Miller. - * src/checksum.h: New file. - * src/md5.c: New file that simply defines `algorithm'. - * src/sha1sum.c: Likewise. + * src/paste.c (paste_parallel): Use `sizeof *var' rather than + hard-coding `sizeof FILE*'. - * man/Makefile.am (man_MANS): Add sha1sum.1. - * man/sha1sum.x: New file. +2003-11-05 Dennis Smit <ds@nerds-incorporated.org> - Support 8-byte integers, assuming they're printable with e.g., %lld. - * src/od.c: Add support for printing data as unsigned - long long integers. + * src/wc.c (main): Free `fstatus' so there is no confusion about + whether it's leaked or not. + * src/who.c (who): Likewise for `utmp_buf'. -2000-10-21 Jim Meyering <meyering@lucent.com> +2003-11-05 Paul Eggert <eggert@twinsun.com> - The command, `yes ''|./cat -n' would stop printing after INT_MAX lines. - * src/cat.c (cat): Never let `newlines' exceed 3. + Fix 'cut' problems with size_t overflow and unsigned int. + More generally, resize integer variables to fit use more precisely. + * src/cut.c (ADD_RANGE_PAIR): Remove unnecessary parens. + (struct range_pair): Make members to be of type size_t, not unsigned. + (max_range_endpoint, eol_range_start): Now size_t, not unsigned. + (suppress_non_delimited, output_delimiter_specified, + have_read_stdin, print_kth, set_fields): Now bool, nt int. + (delim): Now unsigned char, not int. + (mark_printable_field, is_printable_field, is_range_start_index, + set_fields, set_fields, cut_bytes, cut_fields): + Use size_t, not unsigned, for field and byte counts. + (hash_int): Use uintptr_t, not unsigned, for pointers converted + to integers. This squeezes more info out of them. + (set_fields, cut_bytes, cut_fields, main): + Use bool, not int, for booleans. + (set_fields): Allocate zeroed byte array with xzalloc, not xcalloc. -2000-10-21 Jim Meyering <meyering@lucent.com> +2003-11-05 Paul Eggert <eggert@twinsun.com> - Prevent a counter buffer overrun when numbering lines and when - processing 100 billion lines (or more) of input. - * src/cat.c (LINE_COUNTER_BUF_LEN): Define to allow numbering as - many as 10^18 - 1 lines (the old limit was 10^11 - 1, and could - be exceeded without too much trouble). Use this symbol rather - than hard-coding the constant everywhere. - (next_line_num): Rather than overrunning for input with more lines, - mark the line number by putting a `>' in the leftmost slot. - Patch by Jan Nieuwenhuizen. + * man/Makefile.am (check-programs-vs-x): + Work even if $(programs) contains '$'. + Work even if 'missing=1' in environment. + Don't report an error simply because $(programs) outputs nothing. - * src/sort.c (SORT_OUT_OF_ORDER): Define. - (main): Use it instead of hard-coding the `1'. +2003-11-05 Jim Meyering <jim@meyering.net> -2000-10-10 Jim Meyering <meyering@lucent.com> + * Use autoconf-2.58. Regenerate dependent files. - * src/sort.c (main): Use EXIT_SUCCESS rather than 0. - Fail when checking (-c) with more than one file argument, - rather than simply ignoring the extra arguments. + * src/tr.c (spec_init): Fix typo in last change. -2000-09-07 Jim Meyering <meyering@lucent.com> + * src/sys2.h (case_GETOPT_VERSION_CHAR): Cast NULL to `(char *)' in + call to variadic version_etc function, so that it works even on systems + for which sizeof char* != sizeof int. + * src/true.c (main): Likewise. + * basename.c, chroot.c, cksum.c, dd.c, dirname.c, echo.c, expr.c: + * factor.c, hostid.c, hostname.c, link.c, logname.c, nice.c, nohup.c: + * pathchk.c, printenv.c, printf.c, pwd.c, setuidgid.c, sleep.c, stty.c: + * sync.c, test.c, tsort.c, unlink.c, uptime.c, users.c, whoami.c, yes.c: + Similarly, cast NULL to `(char *)' in call to variadic function, + parse_long_options, so that it works even on systems for which + sizeof char* != sizeof int. + A similar problem was reported by Harti Brandt in + http://mail.gnu.org/archive/html/bug-gnu-utils/2003-10/msg00320.html. - * src/cut.c: Remove obsolete comment block. - (usage): Note that when using -f, lines with no delimiters are - also printed. - * doc/textutils.texi (cut invocation): Likewise. + * src/users.c (users): Free `utmp_buf' explicitly so that people + don't mistake this for a real leak. + Patch by Dennis Smit <ds@nerds-incorporated.org. -2000-08-23 Jim Meyering <meyering@lucent.com> +2003-11-04 Paul Eggert <eggert@twinsun.com> + + * README: Document _POSIX2_VERSION. - * src/md5sum.c: Include <config.h> unconditionally, to be consistent - with all the other programs in this directory. - * src/tsort.c: Likewise. - -2000-08-19 Jim Meyering <meyering@lucent.com> - - * src/comm.c (writeline): Correct comments. From Bruno Haible. - -2000-08-11 Paul Eggert <eggert@twinsun.com> - - * doc/textutils.texi: - - Portable shell scripts should specify global options before - key fields. - - Move global LC_CTYPE remark to each sort option that depends - on LC_CTYPE. - - sort -g depends on LC_NUMERIC. - - Add @vindex where it's missing. - - "radix character" -> "decimal-point character", to match Standard C - terminology, which is easier for most people to follow. - - "comm" does not consider trailing newlines to be significant. - -2000-08-10 Paul Eggert <eggert@twinsun.com> - - * doc/textutils.texi: Recommend against the System V syntax - for tr ranges, and don't use it in examples. Use POSIX - classes rather than ranges, for portability. - * src/tr.c (usage): Don't describe System V syntax, as it - doesn't always work. - - * src/sort.c (usage): Describe -d and -i in a locale-independent way. - - * doc/Makefile.am (constants.texi): Use the C locale so that - [A-Z] works as expected. - -2000-08-07 Paul Eggert <eggert@twinsun.com> - - * src/cut.c (cut_fields): Invoke xalloc_die instead of printing - our own message. - (cut_fields): Check for I/O error as well as end-of-file - -2000-08-06 Bruno Haible <haible@clisp.cons.org> +2003-11-04 Jim Meyering <jim@meyering.net> + + * src/tac.c (memrchr): Remove #if-0'd function. + (tac_stdin_to_mem): Clean up #if-0'd code. + + * src/od.c (decode_format_string): Remove unnecessary casts. + Use more maintainable `sizeof *var'. + (main): Call decode_format_string rather than decode_one_format, + now that `spec' may be NULL. + + * src/chmod.c (AUTHORS): Add my name. + + * src/split.c (next_file_name): Use `sizeof *var' rather than + hard-coding `sizeof size_t'. + + * src/sort.c (new_key): Use xzalloc, not xcalloc (1, ...). + + * src/cut.c (ADD_RANGE_PAIR): Use x2nrealloc rather than xrealloc, + to avoid potential overflow in pointer arithmetic. + (set_fields): Use not `1', but rather `sizeof *printable_field' as + second argument to xcalloc. + * src/od.c (decode_format_string, dump_strings): Use x2nrealloc + rather than xrealloc. + * src/date.c (show_date): Likewise. + * src/join.c (ADD_FIELD, initseq, getseq): Likewise. + * src/pr.c (store_char): Likewise. + * src/fold.c (fold_file): Likewise. + + * src/copy.c (triple_hash, triple_hash_no_name): Adjust to reflect + type changes (unsigned int -> size_t) in hash.c. + * src/cp-hash.c (src_to_dest_hash): Likewise. + * src/du.c (entry_hash): Likewise. + * src/ls.c (dev_ino_hash): Likewise. + * src/cut.c (hash_int): Likewise. Declare function as static. + +2003-11-03 Jim Meyering <jim@meyering.net> + + * tests/misc/Makefile.am (TESTS_ENVIRONMENT): Define PACKAGE_VERSION. + * tests/misc/fold: Fail the test immediately if we're not running + the expected version of fold. + +2003-11-02 Jim Meyering <jim@meyering.net> + + * src/tr.c (append_normal_char, append_range, append_char_class) + (append_repeated_char, append_equiv_class, spec_init): Use `sizeof *var' + rather than `sizeof EXPLICIT_TYPE'. The former is more maintainable + and usually shorter. + * src/copy.c (copy_internal): Likewise. + * src/join.c (initseq, add_field, make_blank): Likewise. + * src/od.c (main): Likewise. + * src/cp.c (make_path_private): Likewise. + * src/tsort.c (new_item, record_relation): Likewise. - * src/wc.c: Add support for multi-byte locales. - (iswprint, mbrtowc, wcwidth): Provide default definitions. - (total_bytes): New variable. - (print_bytes): New variable. - (longopts): Change abbreviation for --chars from 'c' to 'm'. + * src/df.c (add_fs_type, add_excluded_fs_type, main): Likewise. + (main): Also remove anachronistic cast of xmalloc return value. + * src/ptx.c (alloc_and_compile_regex, main): Likewise. + (main): Also remove anachronistic cast of xmalloc return value. + * src/sort.c (inittables): Likewise. + (sort): Also Split a long line. + +2003-10-25 Jim Meyering <jim@meyering.net> + + * src/copy.c (triple_hash, triple_hash_no_name): Adjust to reflect + type changes (unsigned int -> size_t) in hash.c. + * src/cp-hash.c (src_to_dest_hash): Likewise. + * src/du.c (entry_hash): Likewise. + * src/ls.c (dev_ino_hash): Likewise. + * src/cut.c (hash_int): Likewise. Declare function as static. + +2003-10-21 Jim Meyering <jim@meyering.net> + + Don't fail when run with VERBOSE=yes. + * tests/chgrp/basic: Do `set +x' before starting the subshell + from which we invoke chgrp. Otherwise, the output from the + VERBOSE=yes-induced `set -x' would result in spurious differences. + Reported by Russel Coker via Michael Stone. + +2003-10-19 Jim Meyering <jim@meyering.net> + + chmod now uses fts to perform a directory traversal when -R is + specified. Before, it operated on full path names, and as such + would encounter the PATH_MAX (often 4096) limit. + + * src/chmod.c: Include "xfts.h". + (process_file): Rename from change_file_mode. + Adapt to be used with fts. + (process_files): New function. + +2003-10-18 Jim Meyering <jim@meyering.net> + + * tests/du/deref-args: Ensure that du -D now dereferences all + symlinks specified on the command line, not just those that + reference directories. + + * basename.c, cat.c, chroot.c, cksum.c, comm.c, cp.c, csplit.c, cut.c: + * dd.c, df.c, dirname.c, du.c, echo.c, env.c, expr.c, factor.c, head.c: + * hostid.c, hostname.c, id.c, link.c, ln.c, logname.c, ls.c, md5sum.c: + * mv.c, nice.c, nl.c, nohup.c, paste.c, pathchk.c, pinky.c, pr.c: + * printenv.c, printf.c, pwd.c, rm.c, setuidgid.c, sleep.c, sort.c: + * split.c, stty.c, sum.c, sync.c, tac.c, tail.c, tee.c, test.c: + * touch.c, tsort.c, uniq.c, unlink.c, uptime.c, users.c, wc.c: + * who.c, whoami.c, yes.c (AUTHORS): Revert the WRITTEN_BY/AUTHORS change + of 2003-09-19. Now, AUTHORS is a comma-separated list of strings. + Update the call to parse_long_options so that `AUTHORS, NULL' are the + last parameters. + * src/true.c (main): Append NULL to version_etc argument list. + * src/sys2.h (case_GETOPT_VERSION_CHAR): Likewise. + +2003-10-17 Andreas Schwab <schwab@suse.de> + + * tests/mk-script: Get $srcdir from first parameter instead of + hardcoding it. + (main): Update usage. + + * tests/Makefile.am.in ($(srcdir)/$x-tests): Pass $(srcdir) as + first argument of mk-script. + ($(srcdir)/Makefile.am): Likewise. Prepend $(srcdir) to target. + +2003-10-17 Jim Meyering <jim@meyering.net> + + * src/mv.c (usage): Tweak descriptions of -i and -f so that the + generated `man' page is more readable. Suggestion from Dan Jacobson. + + * src/chown-core.c (change_file_owner): Handle the cases in + which fts_info indicates an error with the given entry. + + * src/du.c (main): Simply assign to bit_flags. + Don't bother with bit arithmetic. + + * tests/chmod/no-x: New file. + * tests/chgrp/no-x: New file. + * tests/chmod/Makefile.am (TESTS): Add no-x. + * tests/chgrp/Makefile.am (TESTS): Likewise. + + * src/du.c: Include "xfts.h". + (du_files): Use xfts_open, rather than fts_open. + * src/chown-core.c (chown_files): Likewise. + +2003-10-16 Jim Meyering <jim@meyering.net> + + * src/chgrp.c (main): Simply assign to bit_flags. + Don't bother with bit arithmetic. + * src/chown.c (main): Likewise. + Rename a couple of local variables. + Remove unnecessary casts. + + * src/tail.c (start_bytes): Rename local, remainder, to avoid + gcc's warning about shadowing a global. + +2003-10-15 Jim Meyering <jim@meyering.net> + + chown and chgrp now accept POSIX-mandated -H, -L, -P options and + use fts to perform a directory traversal when -R is specified. + Before, they operated on full path names, and as such would + encounter the PATH_MAX (often 4096) limit. + They are more efficient. For example, before, chgrp -R would + take almost 5 seconds to change about 2000 directories and fail + (with `File name too long'), while now it succeeds on a hierarchy + of depth 20,000 in 1/10 the time. + + * src/chown.c: Include "userspec.h" and "fts_.h". + (WRITTEN_BY): Add my name. + (getpwnam, getgrnam, getgrgid): Remove declarations. + (endpwent): Remove definition. (usage): Update. - (write_counts): Add `bytes' argument. - (wc): New variables `bytes', `count_bytes', `count_chars', - `count_complicated'. The old code determines `bytes', not `chars'. - New case for MB_CUR_MAX > 1. A non-printable non-space character does - not increment the line position or start a word. Update `total_bytes'. - (main): Initialize `print_bytes' and `total_bytes' to 0. Accept 'm' - option. Pass `total_bytes' to write_counts. - * doc/textutils.texi (wc invocation): Update accordingly. - -2000-08-06 Bruno Haible <haible@clisp.cons.org> - - * src/head.c (head): Call write_header here. - (head_file): ... not here. - - * src/cat.c (closeout_func): Remove variable. - (close_stdout_wrapper): Remove unused function. - (main): Remove assignment to closeout_func. - - * src/fold.c (fold_file): Remove ferror(stdout) check, already done - in close_stdout. - -2000-08-06 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (usage): Warn more succinctly about the effects of - the locale on sort order. - -2000-08-06 Jim Meyering <meyering@lucent.com> - - * Version 2.0g. - - * src/tail.c (pipe_lines): Declare local `cp' to be const. - -2000-08-04 Greg McGary <greg@mcgary.org> - - * src/tail.c (pipe_lines): Add variable `nbytes' so we can free - `tmp' immediately after read loop. Don't process an empty file. - [This fixes a buffer-underrun error -- detected thanks to - bounded pointers -jmm] - -2000-08-05 Jim Meyering <meyering@lucent.com> - - Fix buffer-overrun error. - * src/pr.c (init_header): Allocated buffer was sometimes too small. - Reported by Greg McGary (who found this bug using his - bounded-pointers-enabled gcc). - (init_header): Move declarations of several variables into the - inner scope where they are used. - * tests/pr/Test.pm (narrow-1): New test, for the above. - - * src/csplit.c (MAX): Remove definition (It's in sys2.h). - -2000-08-04 Jim Meyering <meyering@lucent.com> - - * src/sort.c (main): Rename local `t' to `tmp_dir' to avoid shadowing - a previous local by that name. - (usage): Warn that GNU sort is now locale-aware, and suggest - people put LC_ALL=POSIX in their environment. - - * src/pr.c (store_columns): Remove conjunct that would dereference - an out-of-bounds pointer. Reported by Greg McGary (who found this - bug using his bounded-pointers-enabled gcc). - -2000-08-03 Jim Meyering <meyering@lucent.com> - - * tests/Makefile.am.in ($(srcdir)/$x-tests): Use -I$(srcdir), not `-I.'. - (Makefile.am): Likewise. Reported by Greg McGary. - -2000-08-01 Jim Meyering <meyering@lucent.com> - - * doc/textutils.texi (tr invocation): Note that ranges are not portable. - Update examples not to use ranges. - -2000-07-31 Jim Meyering <meyering@lucent.com> - - * src/cut.c (cut_fields): Use `virtual memory exhausted', - not `Memory exhausted'. + (main): Handle new options. + Call new function, chown_files rather than change_file_owner. -2000-07-30 Jim Meyering <meyering@lucent.com> - - * src/help-version: Remove file. Move it to ... - * tests/help-version: ...here - * tests/Makefile.am (TESTS): Set to help-version. - (TESTS_ENVIRONMENT): Define. - (EXTRA_DIST): Add $(TESTS). - * src/Makefile.am (EXTRA_DIST): Remove help-version. - (TESTS): Remove definition. - (TESTS_ENVIRONMENT): Remove definition. - -2000-07-28 Paul Eggert <eggert@twinsun.com> - - sort's -T option can now appear multiple times. - Thanks to Charles Randall for suggesting this idea. - - * doc/textutils.texi, NEWS: Document this. - - * src/sort.c (temp_dir): Remove. - (temp_dirs, temp_dir_count, temp_dir_alloc): New vars. - (process_id): New var. - (usage): Describe new use of -T. - (add_temp_dir): New function. - (tempname): Use new temp_dirs array. - Do not discard information from the process-id or sequence - number, unless we have short file names. - (sighandle): Use process_id instead of getpid. - (main): Initialize process_id. - Add support for the new use of -T. - -2000-07-23 Jim Meyering <meyering@lucent.com> - - * tests/head/Test.pm: Rename tests (and hence files) to have a short - enough prefix so that they're not truncated on 8+3 file systems. - Reported by Eli Zaretskii. - -2000-07-09 Jim Meyering <meyering@lucent.com> - - * config.guess: Update from FSF. - * config.sub: Likewise. - -2000-07-02 Jim Meyering <meyering@lucent.com> - - * Version 2.0f. + * src/chgrp.c: Include "fts_.h". + (WRITTEN_BY): Add my name. + (MAXUID, MAXGID): Remove definitions. Use GID_T_MAX instead of + the latter. + (usage): Update. + (main): Handle new options. + Call new function, chown_files rather than change_file_owner. + + Rewrite to iterate through hierarchies using fts rather than + via explicit recursion. + * src/chown-core.c: Include "fts_.h" + (change_file_owner): Rewrite to use FTS* and FTSENT* and to operate + on a single file at a time. + (chown_files): New function. + * src/chown-core.h [enum Dereference_symlink]: Remove declaration. + [struct Chown_option] (recurse, force_silent): Change type to `bool'. + [struct Chown_option] (dereference): Remove member with ambiguous name. + [struct Chown_option] (affect_symlink_referent): New member. + (chown_files): New prototype. + + * tests/chgrp/recurse: Update tests accordingly. + * tests/chgrp/posix-H: New tests for the above. + * tests/chgrp/Makefile.am (TESTS): Add posix-H. + + * src/ln.c (usage): Clarify that --directory, -d, -F probably won't + work even for superuser. Suggestion from Dan Jacobson. + +2003-10-14 Paul Eggert <eggert@twinsun.com> + + Fix some number-parsing bugs, e.g., "head -n 100k@" wasn't + properly diagnosed. + * lib/human.c, lib/xstrtoimax.c, lib/xstrtol.c, lib/xstrtol.h, + lib/xstrtoul.c, lib/xstrtoumax.c: Sync with gnulib. + * src/sort.c (parse_field_count): Handle the case where overflow + and invalid suffix char are both reported. + +2003-10-14 Jim Meyering <jim@meyering.net> + + * src/ls.c (decode_switches) [TIOCGWINSZ]: Comment out the + warning-inducing test, ws.ws_col <= SIZE_MAX, since it was always + true on Linux. + +2003-10-13 Paul Eggert <eggert@twinsun.com> + + Fix to avoid a denial-of-service attack if the display width is + enormous. Also, clean up the code a bit by removing duplicate code. + + * src/ls.c (init_column_info): Remove forward decl; no longer needed. + (calculate_columns): New function, that contains code that used + to be common to print_many_per_line and print_horizontal. + (print_many_per_line, print_horizontal): Use it. + (decode_switches): Set max_idx here, not in calculate_columns. + (print_current_files): Don't call init_column_info; calculate_columns + now does that. + (init_column_info): Don't allocate a lot more space than is needed + to represent the current set of files. Allocate all the new + size_t cells in one call to xnmalloc, rather than a row at a time. + +2003-10-13 Jim Meyering <jim@meyering.net> + + * src/ls.c (init_column_info): Add another FIXME comment. + +2003-10-13 Paul Eggert <eggert@twinsun.com> + + Fix address-arithmetic bug in 'ls', reported by Georgi Guninski. + Remove several arbitrary limits on hosts where int cannot represent + all size_t values. + + * src/ls.c (struct bin_str.len, length_of_file_name_and_frills, indent, + nfiles, files_index, tabsize, line_length, struct column_info.line_len, + struct column_info.col_arr[0], max_idx): + Now size_t, not int. + (get_funky_string): Return bool indicating success, instead of + a negative count to indicate failure. Store number of columns + through new parameter OUTPUT_COUNT; that way, they can never + go negative. Change equals_end from int to bool. All uses + changed. + (struct column_info.valid_len): Now bool, not int. All uses changed. + (dired_dump_obstack, get_funky_string, clear_files, + extract_dirs_from_files, print_current_files, + print_many_per_line, print_horizontal, init_column_info, + put_indicator, length_of_file_name_and_frills, + print_with_commas): Use size_t, not int, for local variables + that count sizes. + (decode_switches): Decode sizes using xstrtoul, not xstrtol. + Check for TIOCGWINSZ returing negative values (or values greater + than SIZE_MAX!). + (visit_dir, main, parse_ls_color, queue_directory, add_ignore_pattern, + init_column_info): + Use xmalloc and xnmalloc, not XMALLOC. + (gobble_file): Use xnrealloc, not XREALLOC. + (print_color_indicator): Remove now-unnecessary cast to size_t. + +2003-10-12 Paul Eggert <eggert@twinsun.com> + + * tests/du/no-x: Change wording of diagnostic to match latest du.c. + * tests/sort/sort-tests: Remove from CVS; assume that people + brave enough to check coreutils out from CVS can rebuild it. + +2003-10-12 Jim Meyering <jim@meyering.net> + + New options: --preserve-root and --no-preserve-root. + * src/chmod.c (change_file_mode): Honor new option. + (change_file_mode): Strip trailing slashes on directory + argument passed to change_dir_mode. + (get_root_dev_ino): New function. + (main): Initialize global, root_dev_ino. + + * src/copy.c (copy_internal): Don't #ifdef-out simple uses of + S_ISLNK or S_ISSOCK. The S_IS* macros are guaranteed to be defined + via system.h. + * src/chmod.c (change_file_mode): Likewise. + +2003-10-08 Jim Meyering <jim@meyering.net> + + * src/csplit.c (main): Remove obsolete FIXME. + +2003-10-07 Jim Meyering <jim@meyering.net> + + * Use automake-1.7.8. Regenerate dependent files. + +2003-09-29 Paul Eggert <eggert@twinsun.com> + + csplit cleanup. + + * doc/coreutils.texi (csplit invocation): + The regexp offset need not have a sign; POSIX requires support + for signless offets. + + Be more careful about int widths. For example, remove some + arbitrary limits by replacing 'unsigned' with 'size_t', + 'uintmax_t', etc. Use standard bool rather than a homegrown type. + * lib/Makefile.am (libfetish_a_SOURCES): Add xstrtoimax.c. + * src/csplit.c (FALSE, TRUE, boolean): Remove. All uses changed + to <stdbool.h> usage. + (struct control): offset is now intmax_t, not int. + repeat_forever is now bool, not int. + (struct cstring): len is now size_t, not unsigned int. + (struct buffer_record): bytes_alloc, bytes_used, num_lines are now + size_t, not unsigned. start_line, first_available are now + uintmax_t, not unsigned. + (hold_count, control_used): Now size_t, not unsigned. + (last_line_number, current_line, bytes_written): + Now uintmax_t, not unsigned. + (save_to_hold_area, red_input, keep_new_line, record_line_starts, + create_new_buffer, get_new_buffer, load_buffer, find_line, + process_regexp, split_file, new_control_record, extract_regexp, + get_format_width, get_format_prec, max_out): + size args, locals, and returned values are now size_t, not unsigned + or int. + (get_first_line_in_buffer, find_line, write_to_file, + handle_line_error, process_line_count, regexp_error, process_regexp, + split_file): + File line, byte, and repetition counts are now uintmax_t, not unsigned. + (check_for_offset): Don't require a sign before the offset. + Use xstrtoimax to do the real work. + (extract_regexp): Remove harmful cast of size to unsigned. + 256 -> 1<<CHAR_BIT, for clarity. + (get_format_flags): Return at most 3, to avoid worries about overflow. + + (bytes_to_octal_digits): Remove. + + (cleanup): Don't check whether output_stream is NULL, since + close_output_file does that for us. + + (new_line_control, create_new_buffer): Use "foo *p = xmalloc + (sizeof *p);" instead of the more long-winded alternatives. + + (get_new_buffer): Use O(1) algorithm for resizing a buffer + to a much larger size, instead of an O(N) algorithm. + + (process_regexp): Use plain NULL rather than casted 0. + + (make_filename): Use %u, not %d, to format unsigned file number. + + (new_control_record): Use xrealloc exclusively, since it handles + NULL reliably. -2000-07-01 Jim Meyering <meyering@lucent.com> + (extract_regexp): Change misspelled word in diagnostic. - * src/cut.c: Change type of global, field_1_bufsize, from int to size_t. + (get_format_width): Even if a minimum field width is specified, + allow room for enough octal digits to represent the value of + the maximum representible integer. This fixes a potential + buffer overrun. Calculate this room at compile-time, not + at run-time; this removes the need for bytes_to_octal_digits. + Check for overflow; this removes a FIXME. -2000-06-29 Jim Meyering <meyering@lucent.com> + (get_format_prec): Don't allow precision to be signed; it's + not ANSI. Check for overflow. Remove hardcoded "11" as + default precision; this fixes a potential buffer overrun + on hosts with wider size_t. - * src/tr.c (find_bracketed_repeat): Add a cast to suppress a warning. - Reported by Gerhard Poul. + (get_format_conv_type): Change local variable to be of type + unsigned char, not int; this removes a potential subscript + violation on hosts where char is signed. - * src/tail.c (enum): Remove comma from end of enumerator list. - From Gerhard Poul. + (max_out): Replace "for (;*p;)" with more-standard "while (*p)". + Allow "%%" in format. Don't overflow when + counting lots of percents. -2000-06-25 Jim Meyering <meyering@lucent.com> + (usage): Default sprintf format is %02u, not %d. - * configure.in (ALL_LINGUAS): Add Danish (da). +2003-10-05 Jim Meyering <jim@meyering.net> -2000-06-24 Jim Meyering <meyering@lucent.com> + * src/chown-core.c (change_file_owner): Remove set-but-not-used local. - * doc/textutils.texi: Lots of minor rewording and grammar correction. - From Brian Youmans. + * src/du.c (du_files): Mark diagnostic for translation. - * tests/sum/basic-1: New file. - * tests/sum/Makefile.am: New file. - * configure.in (AC_OUTPUT): Add tests/md5sum/Makefile. - * tests/Makefile.am (SUBDIRS): Add sum. +2003-10-04 Jim Meyering <jim@meyering.net> -2000-06-22 Bruno Haible <haible@clisp.cons.org> + * src/du.c (du_files): Ignore any failure of fts_close. + Give better diagnostics for failed fts_open. - * src/sum.c (sysv_sum_file): Avoid overflowing 32-bit accumulator - on files whose bytes sum to 2^32 or larger. The smallest such file - contains 16,843,010 bytes, nearly all of which have the value 0xff. + * src/du.c (MAX_N_DESCRIPTORS): Remove now-unused definition. -2000-06-22 Bruno Haible <haible@clisp.cons.org> + Deprecate existing use of -H (aka --si). + * src/du.c (enum) [HUMAN_SI_OPTION]: New member. + [long_options]: Use HUMAN_SI_OPTION, not 'H'. + (main): Warn that the meaning of -H will soon change to be + POSIX compliant. - * src/cat.c (main): Correct a comment. +2003-10-03 Jim Meyering <jim@meyering.net> -2000-06-21 Jim Meyering <meyering@lucent.com> + * src/du.c: Accept --no-dereference (-P). - * src/cut.c (getstr): Remove private (and out of date) version of - this function. - (cut_fields): Adjust caller to use the just-extended one in ../lib. - Reported by Paul Sauer. +2003-10-02 Jim Meyering <jim@meyering.net> -2000-06-20 Jim Meyering <meyering@lucent.com> + * tests/du/trailing-slash: Adjust for slightly different output. - * src/uniq.c (main): Fix off-by-argc test, so +N-style options are - recognized once again. Reported by Geoff Keunning. - Fix typo in diagnostic: s/compare/skip/. + Rewrite du.c to use fts. + * src/du.c: Include "fts_.h", not ftw.h. + (opt_dereference_arguments, arg_length, suffix_length): Remove globals. + (IS_FTW_DIR_TYPE): Remove definition. + (IS_DIR_TYPE): Define. + (is_symlink_to_dir): Remove now-unnecessary function. + (process_file, du_files): Rewrite to use fts. -2000-05-27 Jim Meyering <meyering@lucent.com> + * tests/du/inaccessible-cwd: Ensure that even when run from an + inaccessible directory, du can still operate on accessible + directories elsewhere. + * tests/du/Makefile.am (TESTS): Add inaccessible-cwd. - * src/tail.c: Arrange to call close_stdout upon exit. - Don't close stdout explicitly. - (usage): Add missing backslash at end of line. - (write_header): Remove now-unused COMMENT parameter. - Update all callers. + * tests/rm/deep-1: Ensure that du can process a hierarchy + of depth 400 while using no more than 50KB of stack space. -2000-05-24 Jim Meyering <meyering@lucent.com> +2003-10-01 Akim Demaille <akim@epita.fr> - * src/head.c (head_file): Use STDIN_FILENO in place of `0'. - (main): Likewise. + * announce-gen (print_news_deltas): New function, extracted from main. + (main): Make `news_file' an array. + Use '...=s' => \@var for --news and --url-directory specs. + Before there were a couple of portability problems. -2000-05-20 Jim Meyering <meyering@lucent.com> +2003-09-28 Jim Meyering <jim@meyering.net> - * src/cat.c: Arrange to call close_stdout upon exit. - Don't close stdout explicitly. Replace uses of global constant, - output_desc, with uses of STDOUT_FILENO. + * Makefile.maint (sc_cast_of_alloca_return_value): New rule. + (syntax-check-rules): Add it. - Arrange to call close_stdout upon exit. Don't close stdout explicitly. - * src/cksum.c: Likewise. - * src/comm.c: Likewise. - * src/csplit.c: Likewise. - * src/cut.c: Likewise. - * src/expand.c: Likewise. - * src/fmt.c: Likewise. - * src/fold.c: Likewise. - * src/head.c: Likewise. + * src/copy.c: Remove unnecessary cast of alloca, since now it's + guaranteed to be (void *). + * src/cp.c: Likewise. * src/join.c: Likewise. - * src/md5sum.c: Likewise. - * src/nl.c: Likewise. + * src/ln.c: Likewise. + * src/ls.c: Likewise. * src/od.c: Likewise. - * src/paste.c: Likewise. - * src/pr.c: Likewise. - * src/ptx.c: Likewise. - * src/sort.c: Likewise. (but set exit status and file name, too) - * src/split.c: Likewise. - * src/sum.c: Likewise. - * src/tac.c: Likewise. - * src/tr.c: Likewise. - * src/tsort.c: Likewise. - * src/unexpand.c: Likewise. - * src/uniq.c: Likewise. - * src/wc.c:: Likewise. - -2000-05-13 Jim Meyering <meyering@lucent.com> - - * src/help-version: Run each program successfully at least once. - -2000-05-12 Jim Meyering <meyering@lucent.com> - - * src/head.c (string_to_integer): Restrict base to 10. - Reported by Joseph S. Myers. - * tests/head/Test.pm: Add a few tests for this. - - New option: --first-only - * src/unexpand.c (anonymous enum) [CONVERT_FIRST_ONLY_OPTION]: Define. - (long_options): Add `first-only'. - (main): Handle new option. - -2000-05-11 Jim Meyering <meyering@lucent.com> + * src/sys2.h (ASSIGN_STRDUPA): Likewise. - * tests/unexpand/basic-1: New tests. +2003-09-27 Jim Meyering <jim@meyering.net> -2000-04-17 Bruno Haible <haible@clisp.cons.org> + Don't exhaust virtual memory when processing large inputs. + Fix this by removing csplit's internal free-list management; + instead rely on malloc for that. - * src/system.h [__BEOS__]: Ignore O_BINARY and O_TEXT. + * src/csplit.c (free_list): Remove global. + (clear_all_line_control): Remove function. + (get_new_buffer): Always use create_new_buffer to obtain a + new buffer, rather than searching free_list. + (free_buffer): Just call free. + Reported by Nikola Milutinovic. -2000-04-16 Jim Meyering <meyering@lucent.com> +2003-09-26 Jim Meyering <jim@meyering.net> - * src/tail.c: Prepare to remove option: --max-consecutive-size-changes. - Doesn't seem useful. - (usage): Remove description. - * doc/textutils.texi (tail invocation): Remove description. + * man/rm.x: Also list `chattr' in SEE ALSO section. + Suggestion from Mark Hubbart. -2000-04-12 Jim Meyering <meyering@lucent.com> +2003-09-25 Jim Meyering <jim@meyering.net> - * src/tail.c (usage): Tweak --help output. Suggestions from Karl Berry. + * configure.ac: Don't invoke AC_AIX or AC_MINIX explicitly, now + that we use gl_USE_SYSTEM_EXTENSIONS, since it AC_REQUIREs them. - Move some macros into m4/. - * configure.in (_GNU_SOURCE): Don't define here. - (AC_SYS_LARGEFILE): Don't use here. - (AM_C_PROTOTYPES): Don't use here. - * acconfig.h: Remove now-unused file. + * Use autoconf-2.57d. Regenerate dependent files. -2000-04-09 Jim Meyering <meyering@lucent.com> +2003-09-24 Jim Meyering <jim@meyering.net> - * doc/textutils.texi: Include constants.texi. - (tail invocation): Use `@value's instead of referring to the - output of `tail --help' for defaults. - * doc/Makefile.am (constants.texi): New rule. - (EXTRA_DIST): Add constants.texi. - (MAINTAINERCLEANFILES): Add it here, too. - (textutils.dvi, textutils.info): Depend on constants.texi. + Minor efficiency tweak. + * src/ln.c (PATH_BASENAME_CONCAT): Use memcpy rather than strcpy. + (do_link): Likewise. - * src/tail.c (usage): Clarify descriptions of the --max-* options. - From Karl Berry. +2003-09-23 Jim Meyering <jim@meyering.net> -2000-04-03 Jim Meyering <meyering@lucent.com> + * src/paste.c (paste_serial): Save errno after input error, + to report proper errno value. + Based on a patch from Paul Eggert. - * configure.in (AC_CHECK_HEADERS): Remove langinfo.h. Now it's in m4/. - (AC_CHECK_FUNCS): Remove nl_langinfo. Now it's in m4/. + * src/tee.c (tee): Adjust fwrite arguments so that the return + value is the number of bytes written. -2000-03-17 Jim Meyering <meyering@lucent.com> +2003-09-16 Paul Eggert <eggert@twinsun.com> - * configure.in (ALL_LINGUAS): Add Slovenian (sl). + Don't assume ferror sets errno. Bug reported by Bruno Haible. -2000-03-12 Jim Meyering <meyering@lucent.com> + * src/comm.c (compare_files): Save errno after input error, + to report proper errno value. + * src/fold.c (fold_file): Likewise. + * src/od.c (check_and_close, skip, read_char, read_block): Likewise. + * src/unexpand.c (unexpand): Likewise. - Merge from fileutils. - * src/system.h "pathmax.h": Include. - <sys/time.h>: Include if appropriate. - <time.h>: Likewise. - <sys/mkdev.h>: Likewise. - <sys/sysmacros.h>: Likewise. - <utime.h>: Likewise. - (major, minor, makedev): Define if needed. - (struct utimbuf): Declare if missing. - (ST_BLKSIZE, ST_NBLOCKS, ST_NBLOCKSIZE): Define. + * src/csplit.c (close_output_file): Don't report bogus errno value + after ferror discovers an output error. We don't know the proper + errno value, since it might have been caused by any of a whole + bunch of calls, and it might have been trashed in the meantime. + Fixing this problem will require much more extensive changes; + in the meantime just say "write error". + * src/od.c (check_and_close, dump, dump_strings): Likewise. + * src/uniq.c (check_file): Likewise. - * src/cksum.c (usage): Correct --help output. - Prompted by a report from Gregory Leblanc. + * src/join.c (get_line): Report error right away if I/O fails, + so that the proper errno value is used. + * src/tac.c (tac_seekable, tac_file, save_stdin): Likewise. + * src/tee.c (tee): Likewise. + * src/uniq.c (check_file): Likewise. -2000-03-05 Paul Eggert <eggert@twinsun.com> + * src/od.c (skip): If a read fails, don't retry it later, so + that we report the proper errno. - * src/sort.c (struct buffer.newline_free): New member. - (initbuf, findlines): Set it. - (fillbuf): Do not double the size of a full buffer to append a newline - unless the buffer is known to be newline free. + * src/tac.c (tac_mem): Don't return a value; nobody uses it. -2000-03-05 Jim Meyering <meyering@lucent.com> + * src/tee.c (tee): Once a write failure has occurred, don't bother + writing anything more to that stream. - * Version 2.0e. + * src/uniq.c (check_file): Check for ferror (stdout) even if + ostream == stdout. -2000-03-04 Jim Meyering <meyering@lucent.com> + * src/yes.c (UNROLL): Remove. + (main): Exit immediately when write failure is detected. + Simplify code by assigning to argv when argc == 1. - Don't get failed assertion for `tail -f directory'. - * src/tail.c: Revert most of 1999-10-20 change. Instead, ... - (IS_TAILABLE_FILE_TYPE): Define to produce similar result. - (recheck): Use it here. - (tail_file): Use it here. - Reported by François Pinard. +2003-09-21 Paul Eggert <eggert@twinsun.com> - Once we encounter a file that is not of IS_TAILABLE_FILE_TYPE, - marke it as such and ignore it forever after. - * src/tail.c (struct File_spec): New member. - (recheck): Initialize new member. - (tail_file): Likewise. - (tail_forever): Skip the file if it's marked as ignorable. + * src/ptx.c: Switch encoding from Latin-1 to UTF-8. + (WRITTEN_BY): Change "Franc,ois" (actually using + c-with-cedilla in Latin-1) to "F.", so that it's ASCII, as + xgettext requires. -2000-03-03 Jim Meyering <meyering@lucent.com> +2003-09-19 Jim Meyering <jim@meyering.net> - * src/sort.c (fillbuf): Move declaration of local, cc, into scope of - `while' loop where it's used. + `du -D symlink-to-dir' would mistakenly omit the slash in + lines like this: 24 symlink-to-dir/subdir + * src/du.c (process_file): Fix offset calculation. + Reported by Jeff Sheinberg as Debian bug #211591; + http://bugs.debian.org/205251 -2000-03-02 Paul Eggert <eggert@set.twinsun.com> + * tests/du/deref-args: New file/test for the above. + * tests/du/Makefile.am (TESTS): Add deref-args. - Big performance improvement when sorting many small files, - building on a suggestion by Charles Randall. + * src/du.c (process_file): Remove useless disjunct. - * src/sort.c (fillbuf): Skip memmove if it would be a no-op, - as many memmove implementations are slow in that case. - Don't examine leftover bytes for eolchar, since they may be left - over from a previous file, and we want to read from this file. + * src/sys2.h (case_GETOPT_VERSION_CHAR): Rename parameter, Authors, + to Written_by. + * nearly all src/*.c files (WRITTEN_BY): Rename from AUTHORS. + Begin each WRITTEN_BY string with `Written by ' and end it with `.'. + Mark each WRITTEN_BY string as translatable. - (sort): At end of file, if there is more input and buffer room, - concatenate the next input file. + * basename.c, cat.c, chroot.c, cksum.c, comm.c, cp.c, csplit.c, cut.c: + * dd.c, df.c, dirname.c, du.c, echo.c, env.c, expr.c, factor.c, head.c: + * hostid.c, hostname.c, id.c, link.c, ln.c, logname.c, ls.c, md5sum.c: + * mv.c, nice.c, nl.c, nohup.c, paste.c, pathchk.c, pinky.c, pr.c: + * printenv.c, printf.c, pwd.c, rm.c, setuidgid.c, sleep.c, sort.c: + * split.c, stty.c, sum.c, sync.c, tac.c, tail.c, tee.c, test.c: + * touch.c, tsort.c, uniq.c, unlink.c, uptime.c, users.c, wc.c: + * who.c, whoami.c, yes.c: Revert yesterday's changes. + Instead, a subsequent change will embed `Written by ' in + each string along with the author names. -2000-02-29 Jim Meyering <meyering@lucent.com> + * src/true.c: Revert yesterday's changes. + * src/sys2.h: Likewise. - * src/join.c (make_blank): Add an explicit cast to `unsigned char *' - to placate HPUX's C compiler. Reported by Bob Proulx. +2003-09-18 Jim Meyering <jim@meyering.net> -2000-01-30 Jim Meyering <meyering@lucent.com> + * basename.c, cat.c, chroot.c, cksum.c, comm.c, cp.c, csplit.c, cut.c: + * dd.c, df.c, dirname.c, du.c, echo.c, env.c, expr.c, factor.c, head.c: + * hostid.c, hostname.c, id.c, link.c, ln.c, logname.c, ls.c, md5sum.c: + * mv.c, nice.c, nl.c, nohup.c, paste.c, pathchk.c, pinky.c, pr.c: + * printenv.c, printf.c, pwd.c, rm.c, setuidgid.c, sleep.c, sort.c: + * split.c, stty.c, sum.c, sync.c, tac.c, tail.c, tee.c, test.c: + * touch.c, tsort.c, uniq.c, unlink.c, uptime.c, users.c, wc.c: + * who.c, whoami.c, yes.c: Update AUTHORS definition to be a + comma-separated list of strings and/or update the call to + parse_long_options so that `AUTHORS, NULL' are the last parameters. + * src/true.c (main): Append NULL to version_etc argument list. + * src/sys2.h (case_GETOPT_VERSION_CHAR): Likewise. - * Version 2.0d. + * src/sort.c (numcompare): Rename local, logb, to log_b to avoid + shadowing the math function name. Also rename loga to log_a. - * Makefile.maint (my-distcheck): Depend on po-check, so I'll be warned - about any required changes at `make distcheck' time rather than at - `make alpha' time. - (writable-files): New target. - (my-distcheck): Depend on it. - (alpha): Likewise. +2003-09-14 Jim Meyering <jim@meyering.net> - * po/POTFILES.in: Add these: lib/makepath.c, lib/rpmatch.c, - and lib/same.c + * src/factor.c (print_factors): Give a separate diagnostic + for numbers that are too large, but otherwise valid. + Reported by Dániel Varga. -2000-01-29 Jim Meyering <meyering@lucent.com> +2003-09-10 Jim Meyering <jim@meyering.net> - * configure.in: Remove lib-check for cposix now that we use - m4/isc-posix.m4. - (jm_LIB_CHECK): Use this even though the library checks aren't - required for this patchage (so all three lib/Makefile.in files - will be the same). + * Use automake-1.7.7. Regenerate dependent files. -2000-01-24 Mark Kettenis <kettenis@gnu.org> + * tests/Makefile.am (all_programs): Use ../src/tr -s ' ' '\n' in place + of `fmt -1'. Using the just-built tr is a little cleaner. + Christian Krackowizer reported that HPUX 10.20 doesn't have fmt. + * man/Makefile.am (programs, check-x-vs-1): Likewise. - * src/tsort.c (exit_status): New variable. - (loop): New varibale. - (count_items, scan_zeroes): Change return type to int. - (detect_loop): Complete rewrite to correctly implement detection - of loops. Also change return type to int. - (recurse_tree): Stop if ACTION returns non-zero. This involves - changing the return type of this function and ACTION to int. - (walk_tree): Change return type of ACTION to int. - (tsort): Continue sort after a loop has been detected (and - broken). Set exit_status to 1 if a loop was detected. - (main): Use exit_status to determine exit code. - * tests/tsort/basic-1: Change expected output for cycle-1 and - cycle-2 tests. +2003-09-09 Jim Meyering <jim@meyering.net> -2000-01-23 Jim Meyering <meyering@lucent.com> + * src/copy.c: Alphabetize includes. + Remove duplicate inclusion of "same.h". - * configure.in (AM_FUNC_STRTOD): Move to m4/. - (AC_SUBST(POW_LIBM)): Likewise. +2003-09-08 Jim Meyering <jim@meyering.net> -2000-01-22 Jim Meyering <meyering@lucent.com> + * Makefile.maint (GZIP_ENV): Remove --rsyncable. + Didn't give enough of a benefit, mainly because it's not yet + in wide enough use. - * src/sort.c (keycompare): Use global, hard_LC_COLLATE in place of - local that is sometimes undeclared. + * Version 5.0.91. - * configure.in (ALL_LINGUAS): Add Brazilian Portuguese (pt_BR). - (AC_CHECK_HEADERS): Move these checks into m4/. + * man/Makefile.am (programs): Use ../src, not $(srcdir)/../src. + (check-programs-vs-x): Fail if $(programs) is empty. - * src/tr.c ("xstrtol.h"): Include. - (Filter): Rename from PFL. - (non_neg_strtol): Remove function. - (find_bracketed_repeat): Use xstrtoul instead of non_neg_strtol. - (squeeze_filter, set_initialize, main): Use size_t and ssize_t in - place of long and int in several decls. - (read_and_delete, read_and_xlate): Likewise, and remove assertion. - * tests/tr/Test.pm (o-rep-1, o-rep-2): New tests. + * src/remove.c: Add a comment. - * src/cut.c: Correct copying notice to use GPL, per author's request. - * src/paste.c: Likewise. - (AUTHORS): Add djm. +2003-09-07 Jim Meyering <jim@meyering.net> -1999-09-19 Bruno Haible <haible@clisp.cons.org> + * src/remove.c (D_INO, ENABLE_CYCLE_CHECK) [D_INO_IN_DIRENT]: + Don't define. These symbols are no longer used. - * src/tr.c (PFI): Return `long', not `int'. - (PFL): Rename from PFI now that it returns long. - (squeeze_filter): Declare as `long': i, nr, out_len. + * tests/misc/tty-eof: Write ^D as \cD. + Complete the change of 2003-08-02. -2000-01-17 Paul Eggert <eggert@twinsun.com> + * Makefile.maint (po-check): Use cvsu, so that a temporary source + file in lib/ or src/ doesn't induce an unwarranted failure. + Add a kludge to filter out the sole generated source file that + also has translatable messages: src/false.c. - Tweak sort performance. +2003-09-06 Jim Meyering <jim@meyering.net> - * src/sort.c (hard_LC_CTYPE): Remove. - (keylist): Renamed from keyhead. Now a pointer, not a - mostly-unused struct. All uses changed. - (findlines, keycompare, CMP_WITH_IGNORE, compare, checkfp, mergefps, - sort): Tune and use a more consistent style for reallocation. - (keycompare, main): Don't worry about LC_CTYPE; - it's buggy with multibyte chars anyway. - (compare): Invoke alloca (0) after each call to keycompare, - not just the ones that return nonzero. This avoids a memory - leak on architectures without builtin alloca that occurs - sometimes when a file contains all duplicate lines. + * src/tail.c (enum): Add ALLOW_MISSING_OPTION. + (parse_options): Give a diagnostic for (but still accept) the + deprecated --allow-missing option. -2000-01-17 Paul Eggert <eggert@twinsun.com> +2003-09-04 Paul Eggert <eggert@twinsun.com> - * src/csplit.c (interrupt_handler, main): - Don't use SA_INTERRUPT to decide whether to call sigaction, as - POSIX.1 doesn't require SA_INTERRUPT and some systems - (e.g. Solaris 7) don't define it. Use SA_NOCLDSTOP instead; - it's been part of POSIX.1 since day 1 (in 1988). - * src/sort.c (sighandler, main): Likewise. + Don't ignore -S if input is a pipe. Bug report by Michael McFarland in + <http://mail.gnu.org/archive/html/bug-coreutils/2003-09/msg00008.html>. -2000-01-16 Jim Meyering <meyering@lucent.com> + * src/sort.c (sort_buffer_size): Omit SIZE_BOUND arg. Compute the + size_bound ourselves. if an input file is a pipe and the user + specified a size, use that size instead of trying to guess the + pipe size. This has the beneficial side effect of avoiding the + overhead of default_sort_size in that case. All callers changed. + (sort): Remove static var size; now done by sort_buffer_size. - * lib/Makefile.am: Merge with fileutils/lib/Makefile.am. +2003-09-05 Jim Meyering <jim@meyering.net> - * configure.in: Remove AM_FUNC_ERROR_AT_LINE, jm_FUNC_STRFTIME, - AC_FUNC_VPRINTF, and AC_FUNC_ALLOCA. Now they're in m4/. + * Use automake-1.7.6b and autoconf-2.57b. Regenerate dependent files. -2000-01-15 Jim Meyering <meyering@lucent.com> + * tests/tail-2/tail-n0f: Wait .5 seconds for backgrounded process + to start, rather than just .1. Upon failure, print unexpected state. - * configure.in (AC_REPLACE_FUNCS): Remove these: memcpy memset stpcpy - strpbrk strtol strtoul. Now that's in m4/. +2003-09-04 Paul Eggert <eggert@twinsun.com> - unexpand could infloop - * src/unexpand.c (TAB_STOP_SENTINEL): Define. - (unexpand): Use it instead of INT_MAX. - Declare column and pending to be `unsigned'. - Increment pending and column counters only if column is smaller - than TAB_STOP_SENTINEL. - * tests/Makefile.am (SUBDIRS): Add unexpand. - * tests/unexpand/basic-1: New tests for the above-fixed bug. - * configure.in (AC_OUTPUT): Add tests/unexpand/Makefile. - Reported by John Kodis. + * src/head.c (elide_tail_lines_pipe): Don't assign 0 or + SAFE_READ_ERROR to tmp->nbytes. + * src/tail.c (pipe_lines, pipe_bytes): Likewise. -2000-01-12 Paul Eggert <eggert@twinsun.com> + * src/head.c (struct linebuffer): Change nbytes and nlines + from unsigned int to size_t. unsigned int is safe (after the + 2003-09-03 patch) but size_t is cleaner. + * src/tail.c (struct linebuffer, struct charbuffer): Likewise. + (pipe_bytes): Likewise for local variable 'i', which was 'int'. - * src/sort.c (fillbuf): Avoid quadratic behavior with long lines. - Also, stop worrying about ancient memchr bug (misbehavior when - size is zero), since other code doesn't worry either. + Standardize on BUFSIZ as opposed to other macro names and values. + * src/head.c (BUFSIZE): Remove. All uses changed to BUFSIZ. + * src/tail.c (BUFSIZ) [!defined BUFSIZ]: Remove. + stdio.h has always defined it, + and other code already assumes it's defined. + * src/tr.c (BUFSIZ) [!defined BUFSIZ]: Likewise. + (IO_BUF_SIZE): Remove; replace all uses with sizeof io_buf. + (io_buf): IO_BUF_SIZE -> BUFSIZ. -2000-01-11 Jim Meyering <meyering@lucent.com> +2003-09-04 Paul Eggert <eggert@twinsun.com> - Sync lib/ directories of sh-utils, and textutils. + * src/seq.c (step): Default to 1. + (print_numbers): Allow the output to be empty. + (main): The default step is 1, even if LAST < FIRST; + as per documentation. + * tests/seq/basic (onearg-2): Output should be empty. - * lib/Makefile.am (libfetish_a_SOURCES): Add getdate.y, posixtm.c, - basename.c, canon-host.c, readutmp.c, stripslash.c, xgetcwd.c, - xgethostname.c. - (noinst_HEADERS): Add getdate.h, group-member.h, posixtm.h, - pathmax.h, readutmp.h +2003-09-05 Jim Meyering <jim@meyering.net> - * lib/Makefile.am: s/tu/fetish/ - * src/Makefile.am: s/libtu/libfetish/ + * Makefile.cfg (wget_files): Temporarily disable, until master + versions are restored to ftp.gnu.org. -2000-01-10 Jim Meyering <meyering@lucent.com> + * configure.ac (AM_INIT_AUTOMAKE): Specify automake-1.7.6. - * Version 2.0c. + Make seq's --width (-w) option work properly even when the + endpoint requiring the larger width is negative and smaller than + the other endpoint. + * src/seq.c (get_width_format): Include `-' in the set of bytes + allowed in a `simple' number (no decimal point, no exponent). + Reported by Patrick Mauritz. - * Makefile.maint (announcement): Include URLs for xdelta files. - (alpha): Use scp, not ncftp. +2003-09-02 Paul Eggert <eggert@twinsun.com> - * lib/Makefile.am (noinst_HEADERS): Add nanosleep.h. + * NEWS: sort -t '\0' now uses a NUL tab. + sort option order no longer matters, unless POSIX requires it. + * src/sort.c (usage): Say "blanks" instead of "whitespace", + Similar fixes for many comments. + (TAB_DEFAULT): New constant, so that we can support NUL as + the field separator. + (tab): Now int, not char. Initialize to TAB_DEFAULT. + (specify_sort_size): If multiple sizes are specified, use the largest. + (begfield, limfield): Support NUL tab char. + (set_ordering): Do not let -i override -d. + (main): Report an error if incompatible -o or -t options are given. + Report an error for "-t ''". Allow "-t '\0'" to specify a NUL tab. -2000-01-08 Jim Meyering <meyering@ascend.com> +2003-09-05 Jim Meyering <jim@meyering.net> - * Version 2.0b. + * tests/sort/Test.pm [o2, nul-tab]: New tests for the above. - More nits. - * src/cut.c (OUTPUT_DELIMITER_OPTION): Define this and use it - instead of `CHAR_MAX + n'. - * src/pr.c (PAGES_OPTION, COLUMNS_OPTION): Likewise. +2003-09-03 Andreas Schwab <schwab@suse.de> -2000-01-07 Jim Meyering <meyering@ascend.com> + Bug report and patch here: + <http://mail.gnu.org/archive/html/bug-coreutils/2003-09/msg00009.html> + * src/tail.c (pipe_lines): Don't truncate return value from safe_read. + * src/head.c (elide_tail_lines_pipe): Likewise. - * tests/tsort/Makefile.am (TESTS_ENVIRONMENT): Add `pwd`/ prefix - to exported PATH value (though not strictly necessary, here). - * tests/md5sum/Makefile.am: Likewise. - - Nits. - * lib/memcasecmp.c: Use `#if' instead of `#ifdef' for `HAVE_CONFIG_H'. - Capitalize all macro parameters. - (memcasecmp): Ansideclify. - Don't cast away `const'ness of parameters. - * lib/strpbrk.c (strpbrk): Ansideclify. - Use `#if' instead of `#ifdef' for `HAVE_CONFIG_H'. - Suggestions from François Pinard. - -2000-01-06 Jim Meyering <meyering@ascend.com> - - * tests/tail-2/assert: Tell the user just before sleeping for 7 seconds. - - * tests/tail-2/Makefile.am (TESTS): Remove fflush test. It didn't - test the losing behavior, and left a stray tail process to boot. - -2000-01-01 Jim Meyering <meyering@ascend.com> - - * Version 2.0a. - - * lib/Makefile.am (lstat.c): Adapt rule to handle new parts of xstat.in. - -1999-12-12 Jim Meyering <meyering@ascend.com> - - Move 120+ lines of stat.h-related macros from system.h (not shared) - to sys2.h, which is shared between fileutils, sh-utils, textutils. - * src/system.h: Move them from here... - * src/sys2.h: ... to here. +2003-09-03 Jim Meyering <jim@meyering.net> -1999-12-09 Jim Meyering <meyering@ascend.com> + * src/du.c (AUTHORS): Remove Larry McVoy's name, since the relatively + small amount of code from him was first moved to lib/human.c, and was + subsequently rewritten entirely. + * src/df.c (AUTHORS): Likewise. - * configure.in (ALL_LINGUAS): Add Galician (gl). +2003-08-22 Lawrence Teo <lcteo@uncc.edu> -1999-12-06 Jim Meyering <meyering@ascend.com> + * src/md5sum.c (split_3): Accept the BSD format for generic + message digest modes. Currently works with BSD's MD5 and SHA1 + formats since these are the two algorithms presently used in + coreutils. Updated comments to reflect this change. + (bsd_split_3): Updated comments. - * tests/tail-2/fflush: New test for latest change. - * tests/tail-2/Makefile.am (TESTS): Add fflush. + * tests/md5sum/basic-1: New test to make sure that + `md5sum --check' doesn't accept the BSD SHA1 format (adapted + from `check-bsd' test in tests/sha1sum/basic-1). -1999-10-26 Marc Boucher <marc@mbsi.ca> + * tests/sha1sum/basic-1 (check-bsd2, check-bsd3): New tests for + --check exit status and BSD SHA1 format (adapted from tests + in tests/md5sum/basic-1). - * src/tail.c (main): Flush stdout before switching to unbuffered mode - and calling tail_forever. Required only on Solaris2.7 -- on other - systems, using setvbuf to switch to unbufferd mode does the flush. +2003-08-30 Jim Meyering <jim@meyering.net> -1999-11-22 Jim Meyering <meyering@ascend.com> + * src/ln.c (do_link): Use SAME_INODE rather than open-coding it. - * lib/Makefile.am (DISTCLEANFILES): Put $(BUILT_SOURCES) here rather - than in $(MAINTAINERCLEANFILES). + When source and destination arguments refer to the same file, reside + on a partition (e.g. VFAT) on which distinct names may refer to the + same directory entry (often due to variations in case), and when the + link count for the file is 1, mv no longer unlinks the file. Instead, + it gives the expected diagnostic that the source and destination are + the same. WARNING: this is an incomplete fix. If the file happens + to have a link count of 2 or greater, such an erroneous mv command + will still unlink it. + Although that is not possible on vfat or umsdos, it is possible on + other file system types, e.g., ntfs, and hpfs. + * src/copy.c (same_file_ok): Invoke same_name (which might still + return false for names that refer to the same directory entry) + only if the link count is 2 or more. + * tests/mv/vfat: Show how to demonstrate the above problem. + This test is not run. + * tests/mv/Makefile.am (EXTRA_DIST): Add vfat. - * src/tail.c (recheck): Handle a race condition (including <dev,inode> - reuse) that would lead to a failed assertion. - Reported by Ken Pizzini. - (tail_forever): Record errno before using it in call to `error' - which might change it. - (tail_file): Likewise. +2003-08-27 Jim Meyering <jim@meyering.net> - New test for the above. - * tests/tail-2/assert: New file. - * tests/tail-2/Makefile.am: New file. - * tests/tail-2: New directory. - * tests/Makefile.am (SUBDIRS): Add tail-2. - * configure.in (AC_OUTPUT): Add tests/tail-2/Makefile. + * src/who.c: Change meaning of -l from --lookup to --login, per POSIX. + who's -l option has been eliciting an unconditional warning about + this impending change since sh-utils-2.0.12 (April 2002). -1999-11-05 Jim Meyering <meyering@ascend.com> + * src/paste.c (paste_parallel): Don't output `EOF' (aka -1) as a `char'. + This would happen for nonempty files not ending with a newline. + Reported by Dan Jacobson. + * tests/misc/paste-no-nl: New file. Test for above-fixed bug. + * tests/misc/Makefile.am (TESTS): Add paste-no-nl. - * src/system.h: Use HAVE_STRUCT_STAT_ST_BLKSIZE not HAVE_ST_BLKSIZE. + * src/stat.c (print_it): Avoid buffer overrun that would + occur when the user-specified format string ends with `%'. + Patch by Tommi Kyntola. + * tests/misc/stat-fmt: New file. Test for above-fixed bug. + * tests/misc/Makefile.am (TESTS): Add stat-fmt. - * configure.in: Move some type/header/member tests into - m4/jm-macros.m4 (jm_CHECK_ALL_TYPES) so they are shared by all of - fileutils, textutils, and sh-utils. +2003-08-26 Jim Meyering <jim@meyering.net> -1999-11-04 Paul Eggert <eggert@twinsun.com> + Apply changes from bison. + * GNUmakefile (SHELL): Define to `sh', if necessary. + Add copyright. + * Makefile.maint (WGETFLAGS): Define to `-C off'. + Update all uses of $(WGET). - * src/sort.c (SORTALLOC): New macro. - (sortalloc, mergealloc, LINEALLOC): Use it. - (sortalloc, mergealloc, linelength): Now const. - (sortalloc): Increase from 0.5 to 8 MB. - (mergealloc): Increase from 16 to 256 kB. - (LINEALLOC): Increase from 0.25 to 4 MB. +2003-08-22 Akim Demaille <akim@epita.fr> -1999-11-03 Paul Eggert <eggert@twinsun.com> + * Makefile.cfg (local-checks-to-skip): New. + * Makefile.maint (local-check): Rename as... + (local-checks-available): this. + (local-check): New. - * NEWS, doc/textutils.texi: - Do not consider newline to be part of a line when comparing lines - in `sort' and `comm'. POSIX.2 requires that we consider newline, - but this is a bug in the spec and the bug will likely be fixed. - * src/comm.c (compare_files): Likewise. - * src/sort.c (begfield, limfield, findlines, keycompare, compare): - Likewise. - * tests/sort/Test.pm: Update tests `use-nl' and `11d' to reflect - this change. +2003-08-26 Akim Demaille <akim@epita.fr> - * lib/linebuffer.c (readline): Do not leave room for an extra - byte after the newline; it's no longer needed. - * src/sort.c (sortalloc, mergealloc, fillbuf, checkfp, mergefps): - Likewise. + * announce-gen (print_changelog_deltas): Neutralize "<#" as + "<\#" to avoid magic from Gnus when posting parts of this script. - * lib/memcoll.c (memcoll): The two arguments cannot be - adjacent any more, so remove the alloca/copy workaround for - that case. +2003-08-25 Jim Meyering <jim@meyering.net> -1999-11-03 Jim Meyering <meyering@ascend.com> + * src/stat.c (main): Warn about use of deprecated `-l' option. - Fix so that `tail -fn 2 file' works again. - * src/tail.c (anonymous enum) [LONG_FOLLOW_OPTION]: Define. - (long_options): Use LONG_FOLLOW_OPTION here, instead of 'f'. - (main): Remove the `::' after the `f' in getopt_long string. - Add `case LONG_FOLLOW_OPTION' after `case 'f':'. - Based on a patch from Tim Waugh. - - * src/tail.c (anonymous enum) [RETRY_OPTION]: Define. - [MAX_UNCHANGED_STATS_OPTION]: Likewise. - [MAX_CONSECUTIVE_SIZE_CHANGES_OPTION]: Likewise. - [PID_OPTION]: Likewise. - (long_options): Use *_OPTION instead of CHAR_MAX + N. - (main): Likewise. - -1999-11-02 Jim Meyering <meyering@ascend.com> - - * man/help2man: Import version 1.018. - * man/Makefile.maint ($(man_MANS)): Remove use of --name=... option. - * man/*.x: Include one-line summary in [NAME] section. - * man/Makefile.summ (cat-summary): Remove now-unused file. - * man/Makefile.am (EXTRA_DIST): Remove Makefile.summ. - * man/Makefile.maint: Include Makefile.summ with leading `-'. - This file is shared by fileutils and sh-utils, both of which still - have the file (albeit nearly empty now). - Suggestion for clean-up from Akim Demaille. +2003-08-22 Jim Meyering <jim@meyering.net> -1999-11-01 Jim Meyering <meyering@ascend.com> + * src/stat.c (do_stat): For link count at end of line, use %h format, + instead of %-5h. The latter would make stat emit trailing spaces. + Reported by Dan Jacobson. - * lib/Makefile.am (MAINTAINERCLEANFILES): Set to $(BUILT_SOURCES). +2003-08-20 Jim Meyering <jim@meyering.net> -1999-10-20 Jim Meyering <meyering@ascend.com> + * Makefile.am (EXTRA_DIST): Add .x-sc_space_tab .x-sc_sun_os_names - * src/tail.c (recheck): Don't refuse to tail a non-regular, non-pipe. - (tail_file): Likewise. +2003-08-19 Jim Meyering <jim@meyering.net> -1999-10-07 Jim Meyering <meyering@ascend.com> + * src/system.h: Include stdlib.h unconditionally, + as we're now assuming that part of hosted C89. - * configure.in (ALL_LINGUAS): Add Japanese (ja). +2003-08-18 Jim Meyering <jim@meyering.net> -1999-10-04 Jim Meyering <meyering@ascend.com> + * src/sys2.h (textdomain, bindtextdomain) [! ENABLE_NLS]: Define away, + to avoid warnings from gcc. - * depcomp: New file, for automake's new dependency support. - * missing: New version, from automake's user-dep-gen-branch. +2003-08-17 Jim Meyering <jim@meyering.net> -1999-09-28 Jim Meyering <meyering@ascend.com> + Avoid unnecessary and sometimes time-consuming hostname lookups. + * src/who.c (print_user): Use strchr, not strrchr. + * src/pinky.c (print_entry): Likewise. + Patch by Michael Stone. + This fixes a typo I introduced in who-users.c on 1996-02-23. - * src/system.h: Update from the system.h from fileutils. + * Makefile.maint (makefile-check): Add 0-9 to the range of characters + disallowed between `@...@'. - * lib/error.c (error_at_line): Use strerror portably here, too, - just as was done in error. +2003-08-16 Paul Eggert <eggert@twinsun.com> -1999-09-02 Jim Meyering <meyering@ascend.com> + * configure.ac (fu_cv_sys_truncating_statfs): Remove; now + done by gnulib .m4 files. + (jm_DUMMY_1): Require gl_READUTMP, not jm_PREREQ_READUTMP. + * src/sys2.h (strtoull): Remove unused declaration. - * src/cut.c: Remove xstrdup declaration. - * src/sort.c: Likewise. - * src/tsort.c: Likewise. - -1999-08-22 Jim Meyering <meyering@ascend.com> - - * src/tsort.c (detect_loop): There's no loop if k->top is NULL. - Niklas Edmundsson showed how to make tsort segfault. +2003-08-16 Jim Meyering <jim@meyering.net> - * tests/tsort/Makefile.am: Rewrite to use Fetish.pm-based framework. - * tests/tsort/basic-1: New file. - Add a few more tests. - * tests/tsort/Test.pm: Remove. + * man/Makefile.am (.x.1): Ensure that generated PROGRAM.1 files + are read-only. - * man/help2man: Escape backslashes so tr's manual comes out right. - Reported by Andreas Schwab. + * src/tail.c (tail_lines): Fix a potential (but very hard to exercise) + race condition bug. The bug would be triggered when tailing a file + with file pointer not at beginning of file, and where the file was + truncated to have a length of less than the initial offset at just + the right moment (between the two lseek calls in this function). - * src/tsort.c (usage): Correct address for bug reports. - (tsort): Remove trailing `\n' in error format. + An invalid initial value for *read_pos would result in + `tail -n0 -f FILE' and `tail -c0 -f FILE' doing what amounted to a + busy-wait rather than sleeping between iterations. The bug manifests + itself only when tailing regular files that are initially nonempty. + * src/tail.c (tail_bytes): Set *read_pos to new file offset after + each xlseek call. + (tail_lines): Likewise, after lseek calls. + Reported by Nick Estes. See http://bugs.debian.org/205251 for details. + * tests/tail-2/tail-n0f: New file. Test for above fix. + * tests/tail-2/Makefile.am (TESTS): Add tail-n0f. - * src/md5sum.c (md5_check): Remove trailing `\n' in error format. +2003-08-15 Jim Meyering <jim@meyering.net> - * src/sys2.h (IF_LINT): Define new macro. - * src/od.c (dump): Use IF_LINT macro instead of #ifdef lint... - (main): Likewise. - * src/paste.c (paste_parallel): Likewise. - * src/pr.c (read_line): Likewise. - * src/sort.c (checkfp): Likewise. - (mergefps): Likewise. + * Makefile.maint (sc_space_tab): Use exclusion list in separate file. + (sc_sun_os_names): Likewise. + * .x-sc_space_tab, .x-sc_sun_os_names: New files. - * src/cksum.c (cksum): Constify a char*. - * src/comm.c (writeline): Likewise. + * man/help2man: Remove some SPACEs before TAB. - * src/uniq.c (check_file): Move declarations of local variables - into the scopes where they're used. - (min): Remove macro definition. - (different): Use MIN, not min. - (SWAP_LINES): New macro. - (check_file): Use it here. +2003-08-14 Paul Eggert <eggert@twinsun.com> - * src/uniq.c (check_file): Generate each line of output earlier, - when possible. It is possible when using none of these options: - --count, -repeated, --all-repeated, --unique. - Based on a patch from Ian Turner. + * Makefile.maint (LC_ALL): Set to C. + * man/Makefile.am (ASSORT): New var. + (check-x-vs-1, programs): Use it. + * src/Makefile.am (ASSORT, check-README, ../AUTHORS): Likewise. + * tests/Makefile.am (ASSORT, all_programs): Likewise. -1999-08-15 Jim Meyering <meyering@ascend.com> +2003-08-11 Jim Meyering <jim@meyering.net> - * src/tail.c (ENOSYS): Define to a bogus value if not already defined. + fold -s -wN would infloop for N < 8 with TABs in the input. + E.g., this would not terminate: printf 'a\tb' | fold -w2 -s + * src/fold.c (fold_file): Move contents of `else'-block + out of conditional so it's used also for --spaces (-s). + * tests/misc/fold: Test for the above fix. + * tests/misc/Makefile.am (TESTS): Add fold. -1999-08-13 Eli Zaretskii <eliz@is.elta.co.il> +2003-08-10 Jim Meyering <jim@meyering.net> - * src/tail.c (parse_options): Warn if --pid=PID is used and kill() - returns ENOSYS (e.g. when compiled with DJGPP). - -1999-08-13 Jim Meyering <meyering@ascend.com> - - * src/tsort.c (usage): Use consistent bug-reporting address. - - * tests/tsort/Test.pm: New file. - * tests/tsort/Makefile.am: New file. - * tests/tsort: New directory. - * tests/Makefile.am (SUBDIRS): Add tsort. - * configure.in (AC_OUTPUT): Add tests/tsort/Makefile. - -1999-08-11 Paul Eggert <eggert@twinsun.com> - - * doc/textutils.texi: Document how to ignore newline during sort. - -1999-08-07 Jim Meyering <meyering@ascend.com> - - * po/POTFILES.in: Add lots of lib/*.c files. Remove src/system.h. - -1999-08-06 Jim Meyering <meyering@ascend.com> - - * Version 2.0. - - * src/sort.c: Include file name in `write error' diagnostics. - (write_bytes): Add output_file parameter and use it. Update callers. - (mergefps): Likewise. - (merge): Likewise. - (sort): Likewise. - Reported by John Summerfield. - -1999-08-05 Jim Meyering <meyering@ascend.com> - - * src/tail.c (Follow_mode): Remove comma at end of enumerator list. - Reported by Kaveh Ghazi. - - * config.sub: Update from autoconf. - * config.guess: Update from autoconf. - -1999-08-04 Jim Meyering <meyering@ascend.com> - - * Version 1.22q. - - * configure.in: Remove inadequate getline-testing code. md5sum would - segfault on HPUX because of the getline function in their C library. - Use the AM_FUNC_GETLINE test in m4/ instead. - -1999-08-03 Jim Meyering <meyering@ascend.com> - - * src/tail.c (tail_forever): When following by name and calling recheck - because of exceeding max_n_consecutive_size_changes_between_opens, - `continue' so we don't fall through and (assuming the file finally grew) - get the erroneous `file truncated' message. This was hard to reproduce. - -1999-08-01 Jim Meyering <meyering@ascend.com> - - * Version 1.22p. - - * configure.in (AM_C_PROTOTYPES): Move test to precede a few - header tests -- merely on principle. - -1999-08-01 Paul Eggert <eggert@twinsun.com> - - * configure.in (AC_SYS_LARGEFILE): Renamed from AC_LFS. - -1999-07-16 Paul Eggert <eggert@twinsun.com> - - * lib/quotearg.c (quotearg_buffer): - Don't quote spaces if C quoting style. - -1999-07-31 Jim Meyering <meyering@ascend.com> - - * src/tail.c (tail_forever): Don't call kill if pid is 0. - Detect when `writer_is_dead' also when the writer is some other user. - From Karl Heuer. - - * src/tail.c (parse_options): Warn if --pid=PID is used without -f. - -1999-07-30 Jim Meyering <meyering@ascend.com> - - * Version 1.22o. - - * src/tail.c: New option: --pid=PID. - Include signal.h for kill prototype. - (pid): New global. - (long_options): Add `pid'. - (usage): Describe it. - (tail_forever): Implement it. - (parse_options): Handle the new option and required arg. - Suggestion and pseudo-code from Karl Heuer. - -1999-07-27 Jim Meyering <meyering@ascend.com> - - * lib/linebuffer.c: Include <sys/types.h> now that linebuffer.h uses - size_t. This is required on at least SunOS4. From Kaveh Ghazi. - -1999-07-26 Jim Meyering <meyering@ascend.com> - - * src/sys2.h (PID_T_MAX): Define. - - * src/tail.c (struct File_spec) [n_stat_calls]: Remove unused member. - -1999-07-25 Jim Meyering <meyering@ascend.com> - - * src/pr.c (usage): Remove `NEWS'-style paragraph (sorry to have - let that in, translators). - - * Version 1.22n. - -1999-06-01 Volker Borchert <bt@teknon.de> - - * tests/Makefile.am: Make envvar-check depend on check-recursive rather - than on `check' so that its tests are performed before any real tests. - -1999-07-20 Jim Meyering <meyering@ascend.com> - - * configure.in (AC_REPLACE_FUNCS) Remove memmove, now that it's - AC_REPLACE...'d in m4/jm-macros.m4. - - * src/wc.c (posixly_correct): Declare global. - (write_counts): Use it to select printf formats. - (main): Set posixly_correct from the POSIXLY_CORRECT envvar. - From Peter Moulder. - -1999-07-15 Jim Meyering <meyering@ascend.com> - - * tests/md5sum/Makefile.am: Revert the 1999-02-15 change. - * tests/md5sum/basic-1, newine-1: Add --text for each individual test. - Reported by Eli Zaretskii. - -1999-07-12 Jim Meyering <meyering@ascend.com> - - * configure.in (ALL_LINGUAS): Add Slovak (sk). - -1999-07-11 Jim Meyering <meyering@ascend.com> - - * src/tail.c (recheck): Use assert instead of unnecessary close_fd. - Remove a couple of unnecessary FIXME comments. - -1999-07-10 Jim Meyering <meyering@ascend.com> - - * doc/textutils.texi: Document new tail options. - - * src/tail.c (struct File_spec) [tailable]: Rename from `missing' and - document. Change all uses and locals like was_missing to was_tailable. - Invert expressions as appropriate. - (reopen_inaccessible_files): Rename from allow_missing. - (sleep_interval): Describe. - (--allow-missing): Deprecate. - (--retry): New option, equivalent to --allow-missing. - (usage): Document name vs. descriptor differences. - Refer to manual for descriptions of --max-unchanged-stats=N - and --max-consecutive-size-changes=N. - (valid_file_spec): New function. - (recheck): Assert valid_file_spec. - Remove dead else-if block (suggestion from Eli Zaretskii). - Adjust stmts that set f->tailable -- unlike for `missing', tailable - doesn't depend on errno == ENOENT. - (parse_options): Give a warning if --retry is used when not following - by name. - - * tests/join/Test.pm: New test case (but commented out) for - Paul's 1999-06-01 fix. - -1999-07-09 Jim Meyering <meyering@ascend.com> - - * configure.in (ALL_LINGUAS): Add Greek (el). - -1999-07-04 Jim Meyering <meyering@ascend.com> - - * tests/join/Test.pm: New test case for Paul's 1999-06-03 fix. - -1999-07-03 Eli Zaretskii <eliz@is.elta.co.il> - - * src/tail.c (struct File_spec): New member, errnum. - (recheck): Record the new value of errno in f->errnum. Don't - output an error message unless the new value of errno differs from - the old one. Output a message if previously-inaccessible file - becomes accessible. - (tail_forever): Always recheck files whose fd is negative. If the - file cannot be fstat'ed, record the errno value in f[i].errnum. - (tail_file): If the file cannot be open, record the errno value in - f->errnum. If it can be opened, initialize f->errnum to zero. If - it's a non-regular non-fifo file, initialize f->errnum to -1. - -1999-06-21 Jim Meyering <meyering@ascend.com> - - * doc/textutils.texi: Use lower case characters in sc{} context. - Reported by Eli Zaretskii. - -1999-06-03 Paul Eggert <eggert@shade.twinsun.com> - - * src/join.c (xfields): Only <blank>s separate fields, not <space>s. - -1999-06-01 Paul Eggert <eggert@twinsun.com> - - * lib/linebuffer.c (readline): Leave room for an extra byte - after the newline; comm needs this for memcoll. - -1999-06-01 Paul Eggert <eggert@twinsun.com> - - Add LC_COLLATE support to `join'. - - * doc/textutils.texi: Describe join and LC_COLLATE. - - * src/join.c: Add support for LC_COLLATE locale. - Include hard-locale.h, linebuffer.h, memcoll.h. - (struct line): New member `buf', replacing `beg' and `lim'. + * src/nice.c [!NICE_PRIORITY]: Include <sys/resource.h> after + system.h so the types from time.h and sys/time.h are available. + It appears that this is necessary for OpenBSD, NetBSD, and + Darwin 6.5 (MacOS 10.2.5). Reported by Nelson Beebe. + +2003-08-06 Paul Eggert <eggert@twinsun.com> + + * NEWS: Add support for setting file timestamps to microsecond + resolution, on hosts that support this. + * src/copy.c, src/cp.c, src/install.c, src/touch.c: Include utimens.h. + * src/copy.c (copy_internal): + Set file timestamps with utimens, not utime. + * src/cp.c (re_protect): Likewise. + * src/install.c (change_timestamps): Likewise. + * src/touch.c (newtime, touch, main): Likewise. + +2003-08-09 Jim Meyering <jim@meyering.net> + + * Makefile.maint (sc_sun_os_names): New rule based on a regexp + from Paul Eggert. + (syntax-check-rules): Add it. + + * src/tail.c (main): Tweak Solaris OS version number in comment. + * src/wc.c (wc): Likewise + * tests/tail-2/fflush: Likewise. + + * src/tail.c: Add new undocumented option, --presume-input-pipe. + (pipe_lines): Use memchr to skip lines, rather than an explicit loop. + +2003-08-08 Paul Eggert <eggert@twinsun.com> + + Use new gnulib 'extensions' module. + * configure.ac: Invoke gl_USE_SYSTEM_EXTENSIONS instead of + AC_GNU_SOURCE. + +2003-08-08 Paul Eggert <eggert@twinsun.com> + + * tests/du/basic: Ensure that a/b/F has at least 65 bytes too. + +2003-08-09 Jim Meyering <jim@meyering.net> + + * tests/misc/split-fail: Reflect that `split -a 0' is now accepted. + For tests of obsolete behavior, don't presume that unsetting + _POSIX2_VERSION is equivalent to _POSIX2_VERSION=199209. + +2003-08-07 Paul Eggert <eggert@twinsun.com> + + * doc/coreutils.texi (split invocation): + Add -d or --numeric-suffixes option to 'split'. + From a suggestion by Jesse Kornblum. + * src/split.c (suffix_alphabet): New var. + (longopts, usage, next_file_name, main): Support -d. + (next_file_name, main): Allow -a0, as POSIX requires. + (next_file_name): Don't assume ASCII-like encoding; + 'a' through 'z' are not contiguous in EBCDIC. + +2003-08-05 Paul Eggert <eggert@twinsun.com> + + Merge getline from gnulib. + * lib/getline.h, lib/getline.c, m4/getline.m4: Merge from gnulib. + * lib/getndelim2.h, lib/getndelim2.c, m4/getndelim2.m4, m4/ssize_t.m4: + New files, from gnulib. + * lib/getdelim2.c, lib/getdelim2.h: Remove. + * lib/Makefile.am (libfetish_a_SOURCES): Change getdelim2.c and + getdelim2.h to getndelim2.c and getndelim2.h. + * m4/jm-macros.m4 (jm_MACROS): Use gl_GETNDELIM2 rather than + checking for getdelim. + (jm_CHECK_ALL_TYPES): Use gt_TYPE_SSIZE_T for ssize_t rather + than rolling our own. + * src/cut.c: Include getndelim2.h rather than getdelim2.h. + (cut_fields): Invoke getndelim2 rather than getdelim2. + +2003-08-04 Jim Meyering <jim@meyering.net> + + * src/sort.c (main): Use unsigned int instead of int for `nsigs' + and for the indices to iterate through nsigs. + +2003-08-02 Paul Eggert <eggert@twinsun.com> + + * src/sort.c: Minor code cleanups, mostly to use more accurate + types and to remove unnecessary casts. + (min, max): Remove. All uses changed to MIN and MAX. + (hard_lc_collate, hard_LC_TIME, struct buffer.eof, struct + keyfield.skipsblanks, struct keyfield.skipeblanks, struct + keyfield.numeric, struct keyfield.general_numeric, struct + keyfield.month, struct keyfield.reverse, reverse, unique, + have_read_stdin): Now bool, not int. All uses changed. + (eolchar): Now char, not int. + (struct keyfield.ignore): Now bool const *, not int *. + (struct keyfield.translate): Now char const *, not char *. + (struct month.name): Likewise. + (blanks, nonprinting, nondictionary): Now bool[], not int[]. + (cleanup, inittables, keycompare, check, mergefps, first_same_file, + check, sort, main): Use const * pointers when possible. + (month_cmp): Rewrite to avoid casts. + (inittables): Initialize tables unconditionally, to avoid branches. + (fillbuf): Return bool, not int. All uses changed. + (fillbuf, keycompare, new_key, main): + Use SIZE_MAX rather than (size_t) -1. + (trailing_blanks): Renamed from trim_trailing_blanks. + Return the number of blanks to trim. All uses changed. + (getmonth): Use trailing_blanks rather than open code. + (keycompare): Do not cast char * to unsigned char *; not needed. + CMP_WITH_IGNORE converts args to UCHAR, so no need to convert it + ourselves. + (compare, main): Use | rather than || to avoid jumps. + Replace "diff = NONZERO (alen)" with "diff = 1", since alen must + be nonzero there. + (check, first_same_file, sort, main): + Use bool instead of int local vars when possible. + (check): Merge the old 'checkfp' and 'check' into a single function, + that returns a boolean (true if the file was ordered). All uses changed. - (hard_LC_COLLATE): New var. - (main): Initialize it. - (get_line): Use readline to read the line, - instead of doing it by hand. - That way, we get a buffer that we can pass to memcoll. - (keycmp): Use memcoll to compare lines if hard_LC_COLLATE is nonzero. - -1999-05-27 Volker Borchert <bt@teknon.de> - - * tests/Makefile.am: Qualify .env-warn with $(srcdir)/ prefix. - -1999-05-25 Paul Eggert <eggert@twinsun.com> - - Add LC_COLLATE support to `comm', so that `comm' is compatible - with `sort' in nontrivial locales. - - * doc/textutils.texi: Document locale-specific mode for comm. - - * lib/Makefile.am (libtu_a_SOURCES): Add hard-locale.c, memcoll.c. - (noinst_HEADERS): Add hard-locale.h, memcoll.h. - - * src/comm.c: Include hard-locale.h, memcoll.h. - (hard_LC_COLLATE): New variable. - (compare_files): Use memcoll to compare if hard_LC_COLLATE. - (main): Initialize hard_LC_COLLATE from locale. - - * src/sort.c: Include hard-locale.h, memcoll.h. - (hard_LC_COLLATE, hard_LC_CTYPE, hard_LC_TIME): New variables, - replacing `need_locale'. - (memcoll): Move to lib/memcoll.c. - (keycompare): No need to alloc (0), since our caller now does it. - (compare): alloca (0) before returning. - (my_setlocale): Remove; hard_locale now dows this. - (main): Invoke setlocale, bindtextdomain, and textdomain before - invoking anything that might print an error. - Use hard_locale to determine which locales are hard. - - * lib/hard-locale.c, lib/hard-locale.h, lib/memcoll.c, lib/memcoll.h: - New files. - -1999-05-25 Paul Eggert <eggert@shade.twinsun.com> - - * lib/linebuffer.c (readline): - Append trailing newline to line. - * lib/linebuffer.h - [struct linebuffer] (size): Declare to be of type size_t, not long. - [struct linebuffer] (length): Likewise. - * src/comm.c, (writeline): Lines now contain trailing newline. - * src/uniq.c (find_field, different): Use size_t, not int, for lengths. - (writeline): Lines now contain trailing newline. - (check_file): Use size_t, not int, for lengths. - * src/nl.c (proc_text, check_section, main): More of the same. - - * lib/linebuffer.h (struct linebuffer): Use size_t for sizes. - src/nl.c (header_del_len, body_del_len, footer_del_len, main): - Likewise. - src/uniq.c (find_field, different, check_file): Likewise. - - * lib/linebuffer.c (readline): Silently append trailing - newline if needed. Do not bother setting buffer length to 0 - at EOF, since it's not part of the spec and nobody relies on - it. Do not compute the difference between unrelated pointers. - -1999-05-25 Paul Eggert <eggert@twinsun.com> - - * src/tac.c (memrchr): Ifdef out this unused function. - -1999-05-25 Jim Meyering <meyering@ascend.com> - - * doc/textutils.texi (Squeezing): Remove misleading square brackets - from SET1 in the one-word-per-line example. - -1999-05-22 Jim Meyering <meyering@ascend.com> - - * lib/Makefile.am (libtu_a_SOURCES): Remove memchr.c. - From Ulrich Drepper. - - * Version 1.22m. - -1999-05-22 Paul Eggert <eggert@twinsun.com> - - * doc/textutils.texi: Document locale-specific changes to `sort', - as well as the new, POSIX-compliant definition of line comparison, - and -g's more careful treatment of NaNs, infinities and zeros. - - * src/sort.c (general_numcompare): Put exceptional cases - first, not last, to be consistent with -M. - -1999-05-21 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (strtod): Declare if STDC_HEADERS is not defined. - (general_numcompare): Use strtod, not xstrtod. - Do not consider partial conversions to be errors. - Put -infinity at the start, and +infinity at the end; - follow +infinity with NaNs (sorted by bit pattern), - and finally by conversion errors. - -1999-05-21 Jim Meyering <meyering@ascend.com> - - * tests/sort/Test.pm (11d): Reverse lines in expected output - to reflect latest change. - (use-nl): New test from Paul Eggert. - -1999-05-20 Paul Eggert <eggert@twinsun.com> - - * src/sort.c: Treat the trailing newline as part of the line, - as required by POSIX.2. - - (struct line, findlines, compare, checkfp, mergefps, sort): - A line now includes its trailing newline. - (findlines): Do not replace newline with NUL. - (memcoll, keycompare): Work even if the data to be compared are - adjacent strings; this is possible now that lines contain the - trailing newline. - (fillbuf): Always have an unused byte at the end of the buffer, - since memcoll and keycompare want to modify a byte after the last line. - (sortalloc, mergealloc): Increase by 1, for trailing byte. - -1999-05-20 Jim Meyering <meyering@ascend.com> - - * tests/sort/Test.pm: Add test case from Paul Eggert. - -1999-05-20 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (keycompare): Ignore any length difference if the - localized comparison says the strings are equal. - - * src/sort.c (memcoll, keycompare, compare): Handle NUL - characters properly when comparing with LC_COLLATE semantics. - (NLS_MEMCMP): Remove. - (memcoll): Renamed from strncoll. - Take separate lengths for each string. - This function is now invoked only when need_locale. - (keycompare): Don't copy strings when ignore and translate - are both NULL. - -1999-05-18 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (MONTHTAB_CONST): Renamed from NLS_CONST; the use - is also changed. Define to const also if !HAVE_NL_LANGINFO. - - (usage): `,' -> `;' (English typo). - -1999-05-17 Eli Zaretskii <eliz@is.elta.co.il> - - * src/cat.c (main): When stdout is in binary mode, make sure all - input files are also read in binary mode. - -1999-05-16 Jim Meyering <meyering@ascend.com> - - * Version 1.22l. - -1999-05-11 Paul Eggert <eggert@twinsun.com> - - * src/sort.c: Don't autodetect the locale of numbers and - months, as this conflicts with POSIX.2 and is tricky to boot. - - (FLOATING_COMMA, NLS_STRNCMP, NLS_MAX_GROUPS, - NLS_ONE_CHARACTER_STRING): Remove macros no longer used. - - (nls_grouping, nls_fraction_found, nls_month_found, nos_monthtab, - nls_months_collide, nls_keyhead, us_monthtab): Remove variables no - longer used. - - (struct nls_keyfield): Remove types no longer used. - - (strncoll_s2_readonly, nls_set_fraction, look_for_fraction, - nls_month_is_either_locale, nls_numeric_format): Remove functions no - longer used. - - (monthtab): Now has the role that us_monthtab had, but it's const only - if ENABLE_NLS is not defined. - - (C_DECIMAL_POINT): Renamed from FLOATING_POINT. All uses changed. - (MONTHS_PER_YEAR): Renamed from NLS_NUM_MONTHS. All uses changed. - (struct_month_cmp): Renamed from nls_sort_month_comp. All uses changed. - Use strcmp, not strcoll, since the user doesn't care about collating - here. - - (inittables): Read locale data into monthtab, rather than modifying a - separate month table and futzing with indirection. Do not worry about - colliding months, since we no longer autodetect month locale. - - (fraccompare): Don't set no-longer-used variable nls_fraction_found. - - (getmonth): Use strncmp to compare months, since user doesn't care - about collating here. Fix bug where code incorrectly assumed that - strlen (monthtab[lo].name) == strlen (monthtab[ix].name). - - (keycompare, main): Don't autodetect month locale. - - (compare): Don't use NLS_MEMCP in code that can't be executed if - need_locale is false, as NLS_MEMCP is equivalent to memcmp in that - case. - - (sort, insertkey, main): Don't autodetect numeric locale. - -1999-05-15 Jim Meyering <meyering@ascend.com> - - * tests/join/Test.pm (trailing-sp): New test for this fix. - * src/join.c (xfields): Don't interpret a trailing blank as a - delimiter when e.g. -t: was specified. From Tim Smithers. - -1999-05-12 Jim Meyering <meyering@ascend.com> - - * tests/Makefile.am (envvar-check): Renamed from check-local. - (check): Depend on envvar-check so the envvar check is performed - before all other tests. Reported by Volker Borchert. - * tests/.env-warn: Use `%%' place-holder that Makefile.am rule expects, - so CDPATH is mentioned in the message. Reported by Volker Borchert. - -1999-05-11 Jim Meyering <meyering@ascend.com> - - * src/sort.c (usage): Split the --help message into two pieces so that - neither is longer than 2048. For Irix4's cc. Reported by Kaveh Ghazi. - -1999-05-09 Jim Meyering <meyering@ascend.com> - - * lib/regex.c: Update from libc. - - * Version 1.22k. - - * Makefile.maint (alpha): Put the announcement in - /tmp/announce-$(distdir) - - * tests/sort/Test.pm (neg-nls): New test. - -1999-05-08 Jim Meyering <meyering@ascend.com> - - * src/system.h (CHAR_BIT, TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM, - and all the *_MIN and *_MAX symbols): Remove definitions. - * src/sys2.h: Put the definitions here instead (this file is shared - between all three *utils packages, while system.h is not). - -1999-05-06 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (fraccompare, numcompare): Merge the NLS and - non-NLS versions into a single function. - - (decimal_point): Now char, since we no longer convert to unsigned - char. - (th_sep): Now int, since we use a value out of char range to denote - the absence of a thousands separator. - (IS_THOUSANDS_SEP): New macro. - (USE_NEW_FRAC_COMPARE): Remove. - (nls_set_fraction): Arg is now char, not unsigned char. - Set th_sep to CHAR_MAX + 1 if there is no thousands separator. - (numcompare): Don't convert to unsigned char unless necessary. - (main): Turn off decimal points and thousand separators if they - are multibyte characters, as we don't support that yet. - -1999-05-06 Paul Eggert <eggert@twinsun.com> - - * src/system.h (CHAR_MIN, CHAR_MAX): New macros. - (SCHAR_MIN, SCHAR_MAX): Don't assume that char is signed. - -1999-05-06 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (numcompare): Handle comparison of two negative - numbers correctly in the ENABLE_NLS case. - -1999-05-04 Jim Meyering <meyering@ascend.com> - - * src/pr.c (usage): Break the usage message into 3 pieces instead of - only 2. The strings had grown to be longer than 2048, which evokes - errors when compiling with Irix4's cc. Reported by Kaveh Ghazi. - - * src/tsort.c (search_item): Use `1' instead of `+1'. The latter - elicits a syntax error from SunOS4's cc. From Kaveh Ghazi. - -1999-05-03 Jim Meyering <meyering@ascend.com> - - * src/ptx.c <ctype.h>: Don't include. - [!STDC_HEADERS]: Remove definitions of ctype macros. - Convert e.g., isspace to ISSPACE to use definitions from sys2.h. - Reported by Kaveh Ghazi. - - * src/sys2.h (TOLOWER): Define. - (TOUPPER): Define. - * src/join.c (TOLOWER): Remove definition. - * src/md5sum.c (TOLOWER): Remove definition. - -1999-04-30 Jim Meyering <meyering@ascend.com> - - * src/sort.c (usage): Document the differences between the - obsolescent, +POS1[-POS2] form, and the POSIX -k option. - -1999-04-24 Jim Meyering <meyering@ascend.com> - - * configure.in: Use AC_CANONICAL_HOST. - - * lib/Makefile.am (libtu_a_SOURCES): Add xstrtoumax.c - (noinst_HEADERS): Remove xstrtoul.h. - - * src/csplit.c: Include new "xstrtol.h", not "xstrtoul.h". - (struct control) [repeat]: Declare as uintmax_t, not int. - (struct control) [lines_required]: Likewise. - (handle_line_error): Use human_readable to print lines_required. - (parse_repeat_count): Parse a uintmax_t. - (parse_patterns): Parse a uintmax_t. - - * src/tail.c: Include new "xstrtol.h", not "xstrtoul.h". - * src/od.c: Likewise. - - * src/head.c: Include new "xstrtol.h", not "xstrtoul.h". - Change all U_LONG_LONG to uintmax_t. - (head_lines): Move a couple dcls into an inner scope. - (string_to_integer): Rename from string_to_ull. + (main): Use int instead of unsigned for iterating through nsigs. + Rename local var "posix_pedantic" to "posixly_correct". -1999-04-19 Jim Meyering <meyering@ascend.com> +2003-08-02 Jim Meyering <jim@meyering.net> - * Makefile.maint (b_host): Remove /pub suffix. + * src/nice.c [!NICE_PRIORITY]: Include <time.h> before <sys/resource.h> + to avoid compilation error on Ultrix. Reported by Christian Krackowizer. -1999-04-18 Jim Meyering <meyering@ascend.com> + * src/cut.c (cut_fields): Don't read again after encountering an + initial EOF. E.g., `cut -f2' would do so. + * tests/misc/tty-eof: Add a test for the above fix. - * Version 1.22j. - - * Makefile.maint (my-distcheck): Use AMTAR, not TAR. - - * src/sort.c (usage): s/DIRECT/DIRECTORY/g - Rename global: s/temp_file_prefix/temp_dir/. - (NAME_MAX_IN_DIR): Rename from PATH_MAX_IN_DIR. Use _POSIX_NAME_MAX, - not _POSIX_PATH_MAX. Guard with #if HAVE_PATHCONF rather than - #if HAVE_UNISTD_H. - (tempname): Wrap after 99999 only for length-impaired file systems. - -1999-04-17 Jim Meyering <meyering@ascend.com> - - * src/tail.c (file_lines): Fix serious bug introduced with last changes. - From Andreas Schwab. - -1999-04-15 Jim Meyering <meyering@ascend.com> - - * tests/Makefile.am (EXTRA_DIST): Rename .posix-warn to .env-warn. - (check-local): Warn about CDPATH in the same way - we warn about POSIXLY_CORRECT, since the cp/same-file test fails at - least when using bash with CDPATH set. Reported by Mark Hewitt. - - * src/pr.c Add comments. - (init_header): Tweak white space in Date/Time header. - * tests/pr/Test.pm: Updated all tests to reflect the big - 1999-02-13 change. From Roland Huebner. - -1999-04-12 Jim Meyering <meyering@ascend.com> - - * src/cat.c (main): Declare out_dev to be of type dev_t, not `int'. - Declare out_ino to be of type ino_t, not `int'. - From John Bley. - - * src/od.c (MIN, MAX): Remove definitions. - * src/sys2.h (MIN, MAX): Define here instead. - Reported by John Bley. - -1999-04-11 Jim Meyering <meyering@ascend.com> - - * Version 1.22i. - - * tests/pr/Test.pm (test_vector): Disable all tests while I wait for - an updated suite. - - Fix the problem whereby `yes > k & sleep 1; tail -2c k' would infloop. - * src/tail.c (COPY_TO_EOF): Define. - (dump_remainder): Add parameter, n_bytes, and rewrite to use it. - Update callers. - (file_lines): Rename parameter. - (tail_bytes): Remove obsolete comment. - - Fix the problem whereby `yes > k & sleep 1; tail -1 k' would infloop. - * src/tail.c (dump_remainder): Move this function to precede the - new use in file_lines. - (tail_lines): Don't call dump_remainder here. - (file_lines): Call dump_remainder here instead. - Reported by Lehti Rami. - - * lib/readtokens.c (readtoken, readtokens): Protoize. - -1999-04-10 Jim Meyering <meyering@ascend.com> - - * src/tail.c (xwrite): Use STDOUT_FILENO instead of literal `1'. - -1999-04-04 Jim Meyering <meyering@ascend.com> - - * src/cat.c: Standardize --help and --version processing. - * src/comm.c: Likewise. - * src/csplit.c: Likewise. - * src/cut.c: Likewise. - * src/expand.c: Likewise. - * src/fmt.c: Likewise. - * src/fold.c: Likewise. - * src/head.c: Likewise. - * src/join.c: Likewise. - * src/md5sum.c: Likewise. - * src/nl.c: Likewise. - * src/od.c: Likewise. - * src/paste.c: Likewise. - * src/pr.c: Likewise. - * src/ptx.c: Likewise. - * src/split.c: Likewise. - * src/sum.c: Likewise. - * src/tac.c: Likewise. - * src/tail.c: Likewise. - * src/tr.c: Likewise. - * src/unexpand.c: Likewise. - * src/uniq.c: Likewise. - * src/wc.c: Likewise. - -1999-03-29 Jim Meyering <meyering@ascend.com> - - * configure.in (GNU_PACKAGE): Remove related code -- now it's in - the catch-all for shared autoconf code, m4/jm-macros.m4. - (jm_CHECK_ALL_TYPES): Remove explicit AC_TYPE_* macros and use - this instead. - -1999-03-26 Jim Meyering <meyering@ascend.com> - - * lib/Makefile.am (libfu_a_SOURCES): Add version-etc.c. - (noinst_HEADERS): Add version-etc.h. - -1999-03-25 Jim Meyering <meyering@ascend.com> - - * src/tail.c (recheck): Factor out a block of duplicated code. - Set f->size to 0 upon encountering a new file so we read it from - the beginning rather than from the end of the first line or - block. Otherwise, after a log rotation, tail would omit the first - line or block of the new file. Reported by Ed Avis. - -1999-03-20 Jim Meyering <meyering@ascend.com> - - * tests/Makefile.am (SUBDIRS): Temporarily remove pr. - -1999-03-13 Jim Meyering <meyering@ascend.com> - - * src/tac.c (tac_mem): `#if-0'-out this unused function. - (tac_stdin_to_mem): Likewise. - - * doc/textutils.texi (cut invocation): Describe --output-delimiter. - -1999-03-12 Jim Meyering <meyering@ascend.com> - - * src/sys2.h (SETVBUF): Define new macro. - * src/tail.c (dump_remainder): Don't fflush stdout here. - (main) [if forever]: Make stdout unbuffered, instead. - Akim Demaille pointed out that when running `echo x>a; tail -f a>>a' , - the file `a' didn't grow longer than two lines. Now it grows - without bound. - -1999-03-07 Jim Meyering <meyering@ascend.com> - - * tests/md5sum/newline-1: Test for the actual feature. - With help from Eli Zaretskii. - - * src/pr.c (usage): Add missing \n\. - - The newline test would always fail on MSDOS/Windows systems -- - so move it to a separate file where we can test for that. - * tests/md5sum/basic-1: Remove newline test. - * tests/md5sum/newline-1: New file. - * tests/md5sum/Makefile.am (TESTS): Add newline-1. - Pointed out by Eli Zaretskii. - - 1999-02-13 Roland Huebner <rh@pelikan.cologne.de> - * src/pr.c - (main): Redefine options -s, -w to be POSIX compliant; introduce - new options -J, -S, -W to disentangle -s and -w when used together - with the three column options; - (add_line_number): Make POSIX compliant; use default number - separator TAB with single column output. - (add_line_number): Make POSIX compliant; with multicolumn output - now prefer `text columns of equal width' rather than a consequent - use of `default n-separator TAB'. - (add_line_number): Change line number cut-off from lower-oder to - higher-oder digit to avoid loss of information; no consequent - handling exists in different utilities and other UNIXes. - (char_to_clump): Expand input text tabs to 8 spaces, if - input_tab_char doesn't equal TAB (adapted to other UNIXes). - (usage): Update POSIX compliant options -s, -w; add new options -J, - -S, -W. - (main): Update the source internal documentation. - Some smaller BUGFIXES (print_sep_string, init_header, skip_to_page, - reset_status, print_header). - - * tests/md5sum/basic-1 (backslash): Use .\foo instead of \.foo so we - don't tramp on root directory in MSDOS/Windows. - Suggestion from Eli Zaretskii. - - 1999-02-15 Eli Zaretskii <eliz@is.elta.co.il> - - * tests/md5sum/Makefile.am (TESTS_ENVIRONMENT): Run md5sum with the - --text option (for MSDOS). - -1999-03-06 Jim Meyering <meyering@ascend.com> - - * src/cut.c (getstr): Change type of `delim' parameter from char to int. - (cut_fields): Cast to `unsigned char' before comparing. - (main): Cast to `unsigned char' before assigning. - From Arne Juul. - * tests/cut/Test.pm: Add a test to exercise the bug. - - * src/ptx.c (swallow_file_in_memory): Use a `%s' format in error call, - in case the argument string contains a `%'. - (main): Likewise. - * src/fmt.c (main): Likewise. - * src/sort.c (main): Likewise. - - 1999-02-13 Eli Zaretskii <eliz@is.elta.co.il> - - * src/sys2.h [__DJGPP__]: Include <io.h> and <sys/exceptn.h>. - - * src/ptx.c (swallow_file_in_memory): Slurp up the whole file at - once on MSDOS as well, but we have to relax the test for whether - reading it succeeded. - -1999-03-03 Jim Meyering <meyering@ascend.com> - - * src/cat.c: Include long-options.h - [long_options]: Remove the "help" and "version" entries. - Remove declarations of show_help and show_version. - (main): Use parse_long_options, including author name(s). - Remove the show_version and show_help blocks. - * src/cksum.c: Likewise. - * src/comm.c: Likewise. - * src/csplit.c: Likewise. - * src/cut.c: Likewise. - * src/expand.c: Likewise. - * src/fmt.c: Likewise. - * src/fold.c: Likewise. - * src/head.c: Likewise. - * src/nl.c: Likewise. - * src/od.c: Likewise. - * src/paste.c: Likewise. - * src/pr.c: Likewise. - * src/split.c: Likewise. - * src/sum.c: Likewise. - * src/tac.c: Likewise. - * src/tail.c: Likewise. - * src/tr.c: Likewise. - * src/unexpand.c: Likewise. - * src/uniq.c: Likewise. - * src/wc.c: Likewise. - - * src/ptx.c: Include long-options.h - [long_options]: Remove the "help" and "version" entries. - Remove declarations of show_help and show_version. - (main): Remove `const' attribute from dcl of argv parameter. - Call bindtextdomain and textdomain. - Use parse_long_options, including author name(s). - Remove the show_version and show_help blocks. - - * src/join.c (main): Include author name argument in call to - parse_long_options. - * src/md5sum.c (main): Likewise. - * src/sort.c (main): Likewise. - * src/tsort.c (main): Likewise. - -1999-02-07 Jim Meyering <meyering@ascend.com> - - * Version 1.22h. - - * Makefile.maint (my-distcheck): Don't depend on dist, now that this - is hooked up to the distcheck rule. - * Makefile.am (distcheck-hook): New target and rule -- link to shared - rule, my-distcheck, in Makefile.maint. - -1999-01-31 Jim Meyering <meyering@ascend.com> - - * doc/textutils.texi: Wrap the @top node in @ifnottex instead of - @ifinfo so `makeinfo --html ...' works. From Karl Berry. - -1999-01-30 Jim Meyering <meyering@ascend.com> - - * acconfig.h: Remove lots of `#undef's, now that we use the - 3-argument forms of AC_DEFINE* macros. - - * configure.in: Require autoconf 2.13. - Use 3-argument form of AC_DEFINE*. - -1999-01-24 Jim Meyering <meyering@ascend.com> - - * src/tac.c (DONT_UNLINK_WHILE_OPEN) [__MSDOS__ || _WIN32]: Define. - - * lib/quotearg.c (quotearg_n_options): Revert type of parameter `n' - (and hence that of the local `n1', too) to `int' at Paul's request. - -1999-01-18 Akim Demaille <demaille@inf.enst.fr> - - * doc/textutils.texi: Harmonization of @samp use for options. - -1999-01-17 Jim Meyering <meyering@ascend.com> - - * Makefile.am (SUBDIRS): Add djgpp. - * configure.in (AC_OUTPUT): Add djgpp/Makefile. - * djgpp/: New directory. - - * man/Makefile.maint ($(man_MANS)): Don't remove the target (the - man page) until after we've created its replacement. - -1999-01-16 Eli Zaretskii <eliz@is.elta.co.il> - - * GNUmakefile: Add SHELL = /bin/sh. - * man/GNUmakefile: Likewise. - -1999-01-16 Jim Meyering <meyering@ascend.com> - - * acconfig.h: Remove @BOTTOM@ section. - Instead, add the define and decl via m4/jm-macros.m4. - - * lib/argmatch.h (XARGMATCH): Define to return a value once again. - (XARGCASEMATCH): Likewise. - - * lib/argmatch.c (EXIT_FAILURE): Define. - (ARGMATCH_DIE): Provide default. - (__xargmatch_internal): New function. - s/rogram_name/program_name. - From Akim Demaille. - -1999-01-14 Jim Meyering <meyering@ascend.com> - - * tests/md5sum/basic-1: Use `f', not `x' as temp. file name to avoid - warnings from perl5.004. - Reported by Volker Borchert. - - * lib/long-options.c (parse_long_options): Rename `usage' parameter - to avoid shadowing globally scoped function. - -1999-01-14 Akim Demaille <demaille@inf.enst.fr> - - * acconfig.h: Add a @BOTTOM@ section. - (ARGMATCH_DIE) [@BOTTOM@]: Define to usage(1). - Declare usage. - * src/*.c: Don't prototype usage as static. - -1999-01-10 Jim Meyering <meyering@ascend.com> - - * Version 1.22g. - - All of the following new code is protected by - `#if DONT_UNLINK_WHILE_OPEN' - * src/tac.c (file_to_remove): New global. - (fp_to_close): New global. - (unlink_tempfile): New function. - (record_tempfile): New function. - (save_stdin): Call record_tempfile. - Use SET_BINARY. - (main): Use SET_BINARY and SET_BINARY2. - From Eli Zaretskii. - -1999-01-09 Jim Meyering <meyering@ascend.com> - - * tests/uniq/Test.pm: Add tests from Jochen Hein. - * src/uniq.c: New option: --all-repeated (-D). - (output_all_repeated) [output_mode]: New enum value. - (usage): Describe it. - (writeline): Test for new mode. - (check_file): Likewise. - Based on patches from Jochen Hein and Florin Iucha. - (main): Diagnose `too many arguments'. - - * tests/head/Test.pm (null-1): Add test from Jochen Hein. - - * src/tail.c (parse_obsolescent_option): Interpret `number' as decimal. - (parse_options): Likewise. - Reported by Kamal Paul Nigam. - - * src/tail.c: New option: --max-unchanged-stats=N. - New option: --max-n-consecutive-size-changes=N. - -1999-01-03 Jim Meyering <meyering@ascend.com> - - * src/md5sum.c (usage): Remove third program_name argument -- there - were only two `%s' in the format string. - -1999-01-02 Jim Meyering <meyering@ascend.com> - - * src/tsort.c (tsort): Use a single call to error instead of two - to fprintf. - (main): Remove `%s: ' prefix on format string. - - * src/tail.c (parse_options): Use XARGMATCH in place of argmatch. - - * src/ptx.c (format_vals): New array. - (main): Use XARGMATCH in place of argmatch. - - * lib/argmatch.h (XARGMATCH): Don't return a value; instead, - modify a parameter. Add a `Die_stmt' parameter. - Add parentheses. - * lib/argmatch.c (__xargmatch_internal): Remove now-unused function. - (argmatch_to_argument): Add `const' attribute to first parameter. - -1999-01-01 Jim Meyering <meyering@ascend.com> - - * src/tsort.c: Move inclusion of assert.h to follow that of stdio.h. - Some losing systems require this. - Use STREQ macro instead of strcmp in a few places. - - * po/POTFILES.in: Add tsort.c. - - * man/Makefile.maint ($(man_MANS)): `exit 1' if any of help2man, - chmod, or mv fails. Otherwise, the failure could go unnoticed. - - * man/Makefile.summ: Add entries for ptx and tsort. - - * src/tsort.c: Include readtokens.h. - (zeros): Rename global from `rr'. - (getstr): Remove function. - (tsort) Use readtoken instead of getstr. - - * lib/readtokens.c: New file. - * lib/readtokens.h: New file. - * lib/Makefile.am (libtu_a_SOURCES): Add readtokens.c. - (noinst_HEADERS): Add readtokens.h. - - * man/Makefile.am (man_MANS): Add ptx.1. - * man/ptx.x: New file. - - * src/tail.c (parse_options): Use XARGMATCH in place of argmatch. - - * man/Makefile.am (man_MANS): Add tsort.1. - * man/tsort.x: New (essentially empty) file. - - * src/tsort.c: Rename globals N and R so they don't shadow locals. - (tsort): Rename from `sort'. - - 1998-11-07 Mark Kettenis <kettenis@phys.uva.nl> - * src/Makefile.am (bin_PROGRAMS): Add tsort. - * src/tsort.c: New program. - - * lib/Makefile.am (libtu_a_SOURCES): Add quotearg.c. - (noinst_HEADERS): Add quotearg.h. - - ============================ - All of the following are from: - 1998-04-17 Eli Zaretskii <eliz@is.elta.co.il> - - * src/system.h (SET_BINARY, SET_BINARY2, fileno, setmode): New - macros. - - * src/cat.c (usage) [O_BINARY]: Describe -B,--binary option. - (main) [O_BINARY]: binary_files, binary_output, file_open_mode: - new variables. Add --binary to long_options[]. Switch stdin and - stdout to binary mode unless file contents are not important - anyway. Open files in binary mode when required. - - * src/cksum.c (cksum) [O_BINARY]: Read redirected stdin in binary - mode. - - * src/expand.c (expand): Use binary I/O where appropriate. - - * src/head.c (head_bytes, head_lines) [O_BINARY]: Use binary I/O. - - * src/md5sum.c (OPENOPTS) [O_BINARY]: Use binary I/O when non-zero - argument. - (md5_file) [O_BINARY]: Switch redirected stdin to binary mode. - (main) [O_BINARY]: Use binary reads by default on those systems - which care about the difference. - - * src/od.c (skip, read_char, read_block) [O_BINARY]: Switch input - stream to binary mode. - - * src/sort.c (PATH_MAX_IN_DIR) [HAVE_UNISTD_H]: New macro, for max - file name characters in a given directory. - (tempname): Make sure the temp file name is unique even if long - file names aren't supported. - - * src/split.c (cwrite) [O_BINARY]: Write output in binary mode. - (main) [O_BINARY]: Read input in binary mode. - - * src/sum.c (bsd_sum_file, sysv_sum_file) [O_BINARY]: Read input - in binary mode. - - * src/tac.c (record_tempfile, unlink_tempfile) - [DONT_UNLINK_WHILE_OPEN]: New functions, for systems where a file - cannot be removed before it is closed. - (save_stdin) [DONT_UNLINK_WHILE_OPEN]: Record the temporary file, - to be removed before exit. - (tac_file, save_stdin, main): Use binary I/O when appropriate. - - * src/tail.c (tail_lines, tail_bytes) [O_BINARY]: Use binary I/O - when appropriate. - - * src/tr.c (main) [O_BINARY]: Use binary I/O when appropriate. - - * src/unexpand.c (unexpand): Use binary I/O where appropriate. - - * src/wc.c (wc): Use binary mode for input. - - * doc/textutil.texi: Add comments about peculiarities of Textutils - operation on MS-DOS/MS-Windows. - -1998-12-22 Jim Meyering <meyering@ascend.com> - - * configure.in (ALL_LINGUAS): Add chinese (zh). - -1998-12-17 Jim Meyering <meyering@ascend.com> - - New options for tail: - --follow=name, --follow=descriptor, --allow-missing - * src/tail.c (Follow_mode): New enum. - (n_live_files): New function. - (tail_forever): Avoid starvation with --follow=name and a - continually-growing unlinked or renamed file. - -1998-12-13 Jim Meyering <meyering@ascend.com> - - * tests/uniq/Test.pm: New file. - * tests/uniq/Makefile.am: New file. - * tests/uniq: New directory. - * tests/Makefile.am (SUBDIRS): Add uniq. - * configure.in (AC_OUTPUT): Add tests/uniq/Makefile. - From Jochen Hein. + * src/sort.c (sortlines): Add description and references. + From Paul Eggert. - * lib/Makefile.am (lstat.c): Add rule to generate this from xstat.in. - (stat.c): Likewise. - (EXTRA_DIST): Add xstat.in. - * lib/stat.c: Remove file. - * lib/lstat.c: Remove file. - * lib/xstat.in (xstat@): New file. + * tests/Makefile.am (TESTS_ENVIRONMENT): Set PATH so that + the tests in help-version will use the just-built binaries. + Reported by Christian Krackowizer. - * configure.in (ALL_LINGUAS): Add Russian (ru). +2003-07-31 Paul Eggert <eggert@twinsun.com> -1998-10-31 Jim Meyering <meyering@ascend.com> + * NEWS: Add --rfc-2822 option to GNU date. + * doc/coreutils.texi (Time directives, Options for date, Examples + of date): Likewise. + * src/date.c (long_options, usage, main): Likewise. + * doc/getdate.texi (General date syntax): Likewise. + * doc/coreutils.texi (Options for date): Fix a typo in format: + it's now %d not %_d. Add URLs. - * acconfig.h (stat): New #undef. +2003-08-01 Jim Meyering <jim@meyering.net> -1998-10-22 Jim Meyering <meyering@ascend.com> + * tests/shred/remove: Ensure that $? is 0 for the final `exit 0'. + Otherwise, with at least the /bin/sh from HPUX 10.20, + the trap code would end up converting that to exit 1 and thus an + unexpected test failure. Reported by Christian Krackowizer. - * src/fold.c (usage): Add mention of --version and --help. - Reported by Matej Vela <mvela@public.srce.hr>. +2003-07-31 Paul Eggert <eggert@twinsun.com> -1998-10-04 Jim Meyering <meyering@ascend.com> + * src/ptx.c: Do not include bumpalloc.h. + (WORD_TABLE): New member alloc. + (ALLOC_NEW_WORD): Remove. + (occurs_alloc): New var. + (digest_word_file, find_occurs_in_text): Check for arithmetic + overflow when computing table size. Use xrealloc rather than + bumpalloc primitives. - * lib/fnmatch.h: New file. (unused) - * lib/fnmatch.c: New file. (unused) - * lib/Makefile.am (noinst_HEADERS): Add fnmatch.h. +2003-07-29 Jim Meyering <jim@meyering.net> -1998-10-03 Jim Meyering <meyering@ascend.com> + * Version 5.0.90. - * man/Makefile.am: Switch to using help2man. - (EXTRA_DIST): Add Makefile.summ. + * README: When running tests as root, suggest using + sudo with NON_ROOT_USERNAME=$USER. - * man/help2man: Invoke program with --manhelp option only if - --name=STRING not specified. Otherwise, this would fail with `yes'. - * man/Makefile.summ: New file. - * man/Makefile.maint: Include it. - * man/help2man: New file. - * man/GNUmakefile: New file. - * man/Makefile.maint: New file. - * man/*.x: New files. - * man/*.1: Remove files. + * tests/Makefile.am (all_programs): Makefile is in ../src, not + $(srcdir)/../src. - * src/md5sum.c (split_3): Rename local variable, to `escaped_filename'. - (main): Output the leading backslash not just when there's a newline - in the file name, but also when there's a backslash. - Reported by Jim Dennis. +2003-07-28 Jim Meyering <jim@meyering.net> - * tests/md5sum/basic-1: Add tests with filenames containing newline - and backslash characters. (for the bug fixed above) + * Makefile.maint (GZIP_ENV): Try Debian/gzip's new --rsyncable option. - * tests/Makefile.am (EXTRA_DIST): Add Fetish.pm. - * tests/Fetish.pm: New file. +2003-07-28 Paul Eggert <eggert@twinsun.com> - * tests/md5sum/basic-1: New file: rewrite of old tests to use Fetish.pm. - * tests/md5sum/Test.pm: Remove file. - * tests/md5sum/Makefile.am: Rewrite. + * lib/stdbool.hin (_Bool): Make it signed char, instead of + an enum type, so that it's guaranteed to promote to int. + * src/sort.c (sortlines_temp): Undo previous change. -1998-09-19 Jim Meyering <meyering@ascend.com> +2003-07-28 Jim Meyering <jim@meyering.net> - * src/ptx.c (program_name): Declare *not* to be const. + * src/sort.c (sortlines_temp): Declare local `swap' to be `int', not + `bool'. Otherwise, at least one buggy compiler (alpha gcc-2.95.4) + would cause lines[-1 - swap] (with swap = false) to evaluate to + lines[4294967295]. -1998-08-29 Jim Meyering <meyering@ascend.com> +2003-07-27 Jim Meyering <jim@meyering.net> - * src/cut.c: Don't assume ASCII. - * src/pr.c: Likewise. - * src/tail.c: Likewise. + * tests/priv-check (my_uid): Use `!', not `^' in case pattern `[!0-9]', + since /bin/sh of at least NetBSD 1.6 and OpenBSD 3.2 don't accept `^'. -1998-08-15 Jim Meyering <meyering@ascend.com> + * src/remove.c (prompt) [! recursive]: Don't prompt about unwritable + directories, as required by POSIX. Reported by Karl Berry. + * tests/rm/dir-no-w: New file. Test for the above fix. + * tests/rm/Makefile.am (TESTS): Add dir-no-w. - * src/pr.c (usage): Reformat. + * tests/mk-script: Emit `$xx', not its expansion. - * src/ptx.c: Add braces to suppress warning about ambiguous `else'. - * lib/bumpalloc.h: Likewise. +2003-07-27 Paul Eggert <eggert@twinsun.com> -1998-08-13 François Pinard <pinard@iro.umontreal.ca> + This change was inspired by a similar proposal by Stepan Kasal. + * src/sort.c (mergelines, sortlines_temp): New functions. + (sortlines): Use them, to reduce the number of times that + we need to copy 'struct line' values. This improved CPU + performance by about 30% on one 18 MB test. + (sort): Don't invoke sortlines unless we have 2 or more lines. - * src/ptx.c: New file. - * src/Makefile.am (bin_PROGRAMS): Add ptx. - * lib/bumpalloc.h, lib/diacrit.h, lib/diacrit.c: New files. - * lib/Makefile.am (libtu_a_SOURCES): Add diacrit.c. - (noinst_HEADERS): Add bumpalloc.h and diacrit.h. +2003-07-26 Stepan Kasal <kasal@ucw.cz> -1998-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + * src/sort.c (sort): Don't require two `struct line's per text line, + the new sort algorithm requires just 1.5. - * src/pr.c (long_options): Add long names for all options. - (usage): Update help string. - (main): Handle the special options --pages and --columns. +2003-07-27 Jim Meyering <jim@meyering.net> -1998-08-02 Jim Meyering <meyering@ascend.com> + * src/pathchk.c (validate_path): Use %lu, not %ld. + From Paul Eggert. + * src/cut.c (is_printable_field): Simplify bit arithmetic. + From Paul Eggert. + * src/ls.c (sort_files): Put `volatile' in the right place. + From Paul Eggert. - * lib/linebuffer.c (readline): Return zero upon error as well as upon - end of file. From James Youngman. - Ansideclify. +2003-07-26 Jim Meyering <jim@meyering.net> -1998-08-01 Jim Meyering <meyering@ascend.com> + Use only one bit per field/offset in array, not one `int'. + * src/cut.c (printable_field): Change type to `unsigned char'. + (mark_printable_field, is_printable_field): New functions. + Use them in place of all direct accesses of `printable_field'. - * src/sort.c (my_setlocale): Guard definition within #ifdef ENABLE_NLS. - From Manfred Hollstein. + * src/expand.c (parse_tabstops): Detect overflow properly. + * src/cut.c (set_fields): Likewise. -1998-07-30 Jim Meyering <meyering@ascend.com> + * src/rm.c: Include "dirname.h". + (usage): Use base_name (program_name) in body of --help output. + This lets me... + * man/Makefile.am (.x.1): ...back out the kludge of 2003-07-22. + Idea from Brendan O'Dea, who suggested using + `program_name = basename (argv[0]);' everywhere -- + can't do that, but using base_name works just fine here. - * tests/cut/Test.pm: Avoid broken pipe message for tests that fail - with usage errors. + * src/Makefile.am (AM_INSTALLCHECK_STD_OPTIONS_EXEMPT): Exempt test. - * src/sort.c (usage): Add angle brackets to make `Report bugs...' - message consistent with all the rest. +2003-07-24 Paul Eggert <eggert@twinsun.com> -1998-07-28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + Fix some POSIX-compliance problems with 'test'. This makes + 'test' more compatible with Bash. - * tests/cut/Test.pm: Avoid broken pipe for 'y' and 'z' tests. + * NEWS, doc/coreutils.texi: Document the following. + * src/test.c: Include exitfail.h. + (TEST_FAILURE): New constant, used for exit status if 'test' fails. + (test-syntax_error): Use it. + (binary_operator): Now takes bool arg specifying whether left operand + is -l ARG, so that caller determines this rather than us. + All uses changed. + (term): Use posixtest to evaluate parenthesized subexpressions. + (unary_operator, one_argument): Remove support for -t without operand. + (one_argument): Take argument from argv[pos]. + (one_argument, two_arguments, three_arguments): Advance pos. + All callers changed. + (three_arguments): Look for binary ops before "!". Then look + for parenthesized one_argument expressions, instead of trusting + expr () to do the right thing. + (posixtest): Now takes number of args. All callers changed. + Treat "( A B )" like "A B". + (main): Set exit_failure to TEST_FAILURE. Don't depend on + POSIXLY_CORRECT, as we now conform to POSIX by default. + (main) [!LBRACKET]: Do not recognize "--help" or "--verbose" unless. + * tests/test/Test.pm (test_vector): Add several tests to check + the above. Syntax errors now exit with status 2, not 1. + * man/Makefile.am (mapped_name): Use `../src/[' binary to create test.1. - * src/sort.c (NEGATION_SIGN): Renamed from NEGATIVE_SIGN to avoid - clash with <langinfo.h>. All uses changed. +2003-07-26 Jim Meyering <jim@meyering.net> -1998-07-26 Jim Meyering <meyering@ascend.com> + * tests/help-version: Adjust for above change in test behavior: + `[' exits with 2, not 1, and test doesn't accept --help or --version. - * intl/localealias.c (read_alias_file): Avoid mixing `char*' and - `unsigned char*' variables. Again for irix4. - Mostly from Kaveh Ghazi. + * Makefile.maint (ME): Don't use trick suggested in Make manual. + It doesn't work for make-3.79.1. Reported by Christian Krackowizer. - * src/join.c: Convert some char* dcls to `unsigned char*' and remove - a cast -- to placate irix4's cc. - * src/fmt.c (check_punctuation): Add cast to placate irix4's cc. - Reported by Kaveh Ghazi. + * Makefile.maint (sc_system_h_headers): Another syntax check. + (syntax-check-rules): Add it to the list. - * src/md5sum.c (split_3): Add cast to placate irix4's cc. - From Kaveh Ghazi. + * src/pathchk.c (validate_path): Cast strlen value to `unsigned long' + so it matches `%ld' format even on 32-bit systems. -1998-07-25 Jim Meyering <meyering@ascend.com> + * src/fmt.c (flush_paragraph): Cast field width to `int' to + avoid warning on 64-bit systems. - * Version 1.22f. + * src/ls.c (sort_files): Make `func' volatile, so it can't be + clobbered by a `longjmp' into this function. - * tests/cut/Test.pm: Add tests for new --output-delimiter option, - as well as for NUL input delimiter (--delimiter=''). - * src/cut.c (cut_fields): Honor new --output-delimiter option. - (main): Fix handling of --delimiter='' (-d ''). Until now, it has - never worked as advertised. I guess no one tried it. +2003-07-25 Jim Meyering <jim@meyering.net> - * tests/sort/Test.pm: Add two tests relating to this. - * src/sort.c (main): Stat all non-`-' input file files (and fail if a - stat fails) when an output file is specified by `-o' but doesn't exist. - Reported by Will Edgington. + * src/pathchk.c (validate_path): Use %ld format (not %d) for size_t + value. - * tests/sort/Test.pm: New tests of -o. + * tests/misc/split-fail: Disable the --line-bytes=$_4gb test, + because it'd evoke spurious failure on 64-bit systems. -1998-07-16 Jim Meyering <meyering@ascend.com> +2003-07-24 Jim Meyering <jim@meyering.net> - * lib/Makefile.am (noinst_HEADERS): Add lchown.h. - * lib/lchown.h: New file, just to define ENOSYS on systems that lack it. - * lib/lchown.c: Include lchown.h. + * src/dd.c (usage): Document the fact that SIGUSR1 makes dd + output its current record counts. Reported by Jurriaan. -1998-07-04 Jim Meyering <meyering@ascend.com> + * tests/wc/Test.pm (test_vector): Disable the `PIPE' tests when running + `wc' with no options. This goes along with the change of 2003-07-20. - * configure.in (AM_WITH_REGEX): Remove. Now the replacement - macro, jm_WITH_REGEX, is bundled with the rest in jm_MACROS. - * acconfig.h (WITH_REGEX): Remove undef. - * src/csplit.c: Remove #ifdef around <regex.h> inclusion. - * src/nl.c: Likewise. - * src/tac.c: Likewise. - * src/csplit.c (extract_regexp): Remove #if !WITH_REGEX...#endif block. - * lib/Makefile.am (noinst_HEADERS): Remove rx.h. - * lib/rx.c: Remove file. - * lib/rx.h: Remove file. +2003-07-23 Jim Meyering <jim@meyering.net> -1998-06-29 Jim Meyering <meyering@ascend.com> + Don't include headers already included by system.h: + * src/tr.c: Don't include errno.h. + * src/true.c: Don't include version-etc.h. + * src/test.c: Don't include limits.h or error.h. + * src/stat.c: Don't include unistd.h or time.h. + * src/readlink.c: Don't include stdlib.h, unistd.h, or limits.h. + * src/pr.c: Don't include time.h. + * src/pathchk.c: Don't include errno.h. + * src/nice.c: Don't include sys/time.h. + * src/ls.c: Don't include stdlib.h. - * src/wc.c: Update calls to human_readable -- now there's one fewer arg. + * basename.c, cat.c, chroot.c, cksum.c, comm.c, csplit.c, cut.c, date.c: + * dd.c, dirname.c, echo.c, env.c, expand.c, expr.c, factor.c, fmt.c: + * fold.c, head.c, hostid.c, hostname.c, id.c, join.c, kill.c, logname.c: + * md5sum.c, nice.c, nl.c, nohup.c, od.c, paste.c, pathchk.c, pinky.c: + * pr.c, printenv.c, printf.c, ptx.c, pwd.c, seq.c, setuidgid.c, shred.c: + * sleep.c, sort.c, split.c, stat.c, stty.c, su.c, sum.c, tac.c, tail.c: + * tee.c, test.c, tr.c, true.c, tsort.c, tty.c, uname.c, unexpand.c: + * uniq.c, uptime.c, users.c, wc.c, who.c, whoami.c, yes.c: + Don't include closeout.h. - * lib/Makefile.am (libtu_a_SOURCES): Add argmatch.c. - (noinst_HEADERS): Add argmatch.h. + * tests/rm/fail-2eperm: Add a check for whether $NON_ROOT_USERNAME + can access the required version of rm. + * tests/rm/Makefile.am (TESTS_ENVIRONMENT): Define PACKAGE_VERSION. -1998-06-28 Jim Meyering <meyering@ascend.com> + * tests/cut/Test.pm (out-delim3a): New test. - * src/sys2.h: Add macro definitions for GNU libc *_unlocked wrappers. + * man/help2man: Update to version 1.33. -1998-06-27 Jim Meyering <meyering@ascend.com> + * src/expand.c (parse_tabstops): Detect overflow in tabstop sizes. - * tests/pr/Test.pm: Add two tests for double spacing. - * src/pr.c (print_page): If cols_ready_to_print is zero, - break out of loop just before the double-space test. - Reported by Michael Stutz. + * src/dircolors.c: Include xstrndup.h. + (xstrndup): Remove function, now that it's been factored out into + it's own file. -1998-06-18 Jim Meyering <meyering@ascend.com> +2003-07-22 Paul Eggert <eggert@twinsun.com> - * tests/Makefile.am.in (check): Depend on $(maint_gen) so - `make maintainer-clean; ./configure; make check' works. + * src/wc.c (wc): Fix typo in computation of file from file_x, + which caused the former to be used uninitialized if file_x was + nonzero. -1998-05-25 Jim Meyering <meyering@ascend.com> +2003-07-22 Jim Meyering <jim@meyering.net> - * configure.in (_GNU_SOURCE): AC_DEFINE it here. - * acconfig.h (_GNU_SOURCE): Remove definition from @TOP@ section. - [!_GNU_SOURCE]: Add #undef instead. + * src/cut.c (set_fields): Use xcalloc in place of xmalloc+memset. -1998-05-16 Jim Meyering <meyering@ascend.com> + * man/Makefile.am (.x.1): Substitute 's,$t/$*,$*,' on output of + help2man, to avoid having `rm.td/rm' appear in rm.1. Reported by + Thomas Luzat. See http://bugs.debian.org/202413 for details. - * configure.in (jm_MACROS): New wrapper macro. - Remove uses of most jm_* macros. + * src/cut.c (main) [lint]: Initialize spec_list_string to avoid warning. - * src/tac.c (tac_seekable): Fix error in handling regex separators. - * tests/tac/Test.pm (opt-b, opt-s, opt_sb, opt_r): New tests. - (opt_br): New test -- exercises above-fixed bug. + * src/hostid.c: Don't include <unistd.h>. system.h already does that. - * lib/Makefile.am (EXTRA_DIST): Remove. Automake groks the `LIBOBJS=' - lines from the m4/*.m4 macros, so the hack of including some - custom-replaced C source file names here is no longer needed. + * src/cut.c (set_fields): Mark all selected indices before trying to + determine range endpoints. + * tests/cut/Test.pm: New test for the above fix. - * acconfig.h (chown): Add undef. - (D_INO_IN_DIRENT): Likewise. - (D_TYPE_IN_DIRENT): Likewise. - (ssize_t): Likewise. + Begin to address this comment: What if someone wants to + extract the 1,000,000-th field of some huge input file? + The first step is to rearrange things so that the values + in the printable_field array are all 0/1 rather than 0/1/2. + * src/cut.c (RANGE_START_SENTINEL): Remove. + Store range-start indices in a hash table, rather than + overloading the `printable_field' array. + (range_start_ht): New global. + (hash_int, hash_compare_ints, is_range_start_index): New functions. + (print_kth): Use is_range_start_index; don't test printable_field. + (set_fields): Detect overflow. + (set_fields): Insert each range-start index into range_start_ht. + (main): Call set_fields only once, and only after + output_delimiter_specified and (if required) range_start_ht have + been defined. -1998-05-09 Jim Meyering <meyering@ascend.com> +2003-07-20 Paul Eggert <eggert@twinsun.com> - * src/tac.c (tac_seekable): Rename from tac_stream. - Change `FILE *in' parameter to `int input_fd'. Adjust callers. + * src/wc.c (get_input_fstatus): Fix typo: `stat' was being + invoked with a null pointer when there were no file arguments. -1998-05-03 Jim Meyering <meyering@ascend.com> +2003-07-20 Jim Meyering <jim@meyering.net> - * po/: Update from gettext-0.10.35. - * intl/: Likewise. - * configure.in: Remove use of AC_LINK_FILES. - (AC_OUTPUT): Remove po/Makefile-generating sed command. + * Makefile.maint (sc_changelog): Add another nit-picky check. -1998-04-26 Jim Meyering <meyering@ascend.com> + * src/wc.c (write_counts): Add a comment. + (wc): Rename `file' parameter. + Set new local, `file', to be the file name, or (when it's NULL) + _("standard output") so that all uses of `file' use the proper value. + Use STREQ, not strcmp. - * tests/tail/Test.pm: Disable test f-1, now that it fails. +2003-07-20 Paul Eggert <eggert@twinsun.com> - * src/sort.c (keycompare) (CMP_WITH_IGNORE): Don't return 0 from inside - the keyspec-iterating loop. With this change, test 22a passes. - Reported by Zvi Har'El. - (strncoll): Remove bogus assertion. - * tests/sort/Test.pm: Add tests for the above fix. + 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. - * configure.in: Use jm_ASSERT. - * acconfig.h: Add NDEBUG. + 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. - * src/cut.c: Don't define NDEBUG. - * src/csplit.c: Likewise. - * src/join.c: Likewise. - * src/sort.c: Likewise. - * src/tr.c: Likewise. - - * src/cut.c: Don't define _GNU_SOURCE (now it's in config.h). - * src/expand.c: Likewise. - * src/fold.c: Likewise. - * src/join.c: Likewise. + * NEWS: Document this. + * doc/coreutils.texi (wc invocation): Likewise. + + * src/wc.c (number_width): New var. + (posixly_correct): Remove. + (struct fstatus): New struct. + (write_counts): Output fields of width number_width. + Do not worry about POSIXLY_CORRECT. + Use null file, not empty-string file, to denote stdin, + since "" is a valid file name on some hosts. + (wc, wc_file): New arg fstatus. Use it to avoid invoking fstat + if possible. + (wc): Avoid problems if end_pos - current_pos overflows. + Do not print odd message if stdin has a read error. + (get_input_fstatus, compute_number_width): New functions. + (main): Use them to implement the new behavior. + Ignore POSIXLY_CORRECT. + + * tests/wc/Test.pm: Adjust to the new output widths. + +2003-07-19 Jim Meyering <jim@meyering.net> + + * tests/rm/fail-eperm: Don't create temporary directory -- + we don't use it. + + * tests/shred/remove: Don't open-code test for UID != 0. + Use priv-check's require-non-root instead. + Update to use newer framework. + + * tests/help-version (expected_failure_status_expr): Record that + expr exits with status of 3 for e.g., a write error. + + * tests/priv-check: Use `id -u' to see if we're running as root, + rather than trying go write to an write-protected file. + When running as root, ensure $NON_ROOT_USERNAME is valid. + When running as root with `require-non-root', ensure that `.' + is writable by $NON_ROOT_USERNAME, then reinvoke $0 set-user-ID + to $NON_ROOT_USERNAME. If `.' is not writable, then skip the test. + + * src/printenv.c: Include "exitfail.h". + (main): Set exit_failure rather than calling close_stdout_set_status. + * src/date.c: Likewise. * src/sort.c: Likewise. - * src/tr.c: Likewise. - * src/unexpand.c: Likewise. - * src/uniq.c: Likewise. - - * src/tail.c (close_fd): New function -- converted from macro. - [struct File_spec] (n_stat_calls): New member. - [struct File_spec] (n_unchanged_stats): New member. - (max_n_unchanged_stats): New global. - Initialize new members. - (xwrite): New function -- converted from macro. - [struct File_spec] (pretty_name): Remove member. - (pretty_name): New function. - - * src/md5sum.c (md5_check): Declare local, `md5num' as _unsigned_ char*. - (hex_digits): Declare parameter `s' as _unsigned_ char*. - (split_3): Declare parameter `u' as _unsigned_ char**. - -1998-04-17 Jim Meyering <meyering@ascend.com> - - * src/fmt.c (check_punctuation): Used unsigned char* pointers to avoid - new warning. - * src/join.c (xfields): Likewise. - -1998-04-12 Jim Meyering <meyering@ascend.com> - - * src/cat.c: Use STREQ macro rather than strcmp. - * src/cksum.c: Likewise. - * src/comm.c: Likewise. - * src/csplit.c: Likewise. - * src/cut.c: Likewise. - * src/fmt.c: Likewise. - * src/fold.c: Likewise. - * src/head.c: Likewise. - * src/join.c: Likewise. - * src/md5sum.c: Likewise. - * src/nl.c: Likewise. - * src/paste.c: Likewise. - * src/pr.c: Likewise. - * src/split.c: Likewise. - * src/sum.c: Likewise. - * src/tac.c: Likewise. - * src/uniq.c: Likewise. - * src/wc.c: Likewise. - -1998-04-11 Jim Meyering <meyering@ascend.com> - - * lib/safe-read.h: New file. - * lib/safe-read.c: Include it. - * src/cat.c: Include it instead of merely declaring safe_read. - * src/csplit.c: Likewise. - * src/head.c: Likewise. - * src/split.c: Likewise. - * src/sum.c: Likewise. - * src/tac.c: Likewise. - * src/tail.c: Likewise. - * src/tr.c: Likewise. - * src/wc.c: Likewise. - - * lib/Makefile.am (noinst_HEADERS): Add safe-read.h. - - * src/wc.c [HAVE_INTTYPES_H]: Include inttypes.h. - Declare counters to be of type uintmax_t. - (write_counts): Use human_readable to format potentially-long-long - numbers. Suggestion from Rogier Wolff. - (wc): Declare per-file counters to be of type uintmax_t. - Declare bytes_read to be ssize_t. - * lib/Makefile.am (libtu_a_SOURCES): Add human.c. - (noinst_HEADERS): Add human.h. - - * lib/human.c: New file. - * lib/human.h: New file. - -1998-04-04 Jim Meyering <meyering@eng.ascend.com> - - * configure.in (jm_AC_HEADER_INTTYPES_H): Use it. - (jm_AC_TYPE_UINTMAX_T): Use it. - (jm_PREREQ): Use it. - - * Makefile.am (ACLOCAL_AMFLAGS): Define this, so automake/aclocal - know about the m4/ subdirectory. - * Makefile.maint (aclocal-files): Remove now-unnecessary (with - automake-1.2h and the above change) aclocal-related rules and includes. - -1998-04-03 Jim Meyering <meyering@eng.ascend.com> - - * lib/closeout.c: New file. - * lib/closeout.h: New file. - * lib/Makefile.am (libtu_a_SOURCES): Add closeout.c. - (noinst_HEADERS): Add closeout.h. - -1998-03-31 Jim Meyering <meyering@eng.ascend.com> - - * lib/xstrtol.c: Merge with the version from fileutils. - -1998-03-27 Jim Meyering <meyering@eng.ascend.com> - - * Makefile.am (AUTOMAKE_OPTIONS): Require 1.2h. - -1998-03-23 Jim Meyering <meyering@eng.ascend.com> + * src/tty.c: Likewise. + +2003-07-18 Jim Meyering <jim@meyering.net> + + * tests/touch/not-owner: Update to use newer framework. + + * tests/rm/fail-eperm: Use $srcdir/../priv-check, create a temporary + directory, and remove Perl-coded `you may not run as root' test. + * tests/cp/fail-perm: Use $srcdir/../priv-check, rather than + hard-coding something not quite equivalent. + Paul Jarc reported the inconsistent diagnostics. + + * src/sort.c (main): Use close_stdout via atexit. + Now `sort --version' and `sort --help' fail, as they should + when their output is redirected to /dev/full. - * acconfig.h: Remove HAVE_INTTYPES_H, now that m4/inttypes_h.m4 - automatically handles it. + * src/su.c (usage): Don't call close_stdout here. + (main): Use close_stdout via atexit. + Now `su --version > /dev/full' fails, as it should. + Somehow, the change of 2000-05-07 that purports to fix this + was not checked in. -1998-03-19 Jim Meyering <meyering@eng.ascend.com> + * tests/help-version (--help/--version vs. /dev/full): Special-case + `[' to protect it from expected_failure_status-`eval'. - * src/system.h (SCHAR_MIN): Define. - (SHRT_MIN): Define. - od.c needs these when compiling with NCR's R2.0c C compiler. - (TYPE_MAXIMUM): Cast result to `(t)' so this macro works with - `unsigned char'. - From Greg Wooledge. - -1998-03-15 Jim Meyering <meyering@eng.ascend.com> - - * src/tail.c (tail_file): Merge largely-duplicated blocks of code. - -1998-03-03 Paul Eggert <eggert@twinsun.com> - - * src/sort.c (xtmpfopen): Open temporary file exclusively, to - foil a common denial-of-service attack. - * src/tac.c (save_stdin): Likewise. - -1998-02-16 Jim Meyering <meyering@eng.ascend.com> - - * configure.in (jm_FUNC_LSTAT): Use it. - (jm_FUNC_STAT): Use it. - * lib/Makefile.am (EXTRA_DIST): Add lstat.c and stat.c. - -1998-02-06 Jim Meyering <meyering@eng.ascend.com> - - * configure.in: Don't use AM_MAINTAINER_MODE or - AC_PATH_PROG(PERL, perl). - (jm_PERL): Use this. - -1998-02-04 Jim Meyering <meyering@eng.ascend.com> - - * tests/Makefile.am.in (EXTRA_DIST): Remove mk-script.pl. - (mk_script): Set to ../mk-script. - (x-tests): Use `$(PERL) -w -- $(mk_script)', not ./mk-script. - Remove @MAINT@ cruft. - (Makefile.am): Likewise. - Remove @MAINT@ cruft. Now `missing' will explain the failure - when people don't have Perl yet modify a file whose rebuilding - would lead to the use of Perl. - - * tests/Makefile.am (EXTRA_DIST): Add mk-script. - * tests/*/mk-script.pl: Remove files. - - * GNUmakefile: New file. - * Makefile.am (EXTRA_DIST): Add GNUmakefile. - Don't include Makefile.maint from here. It's included from GNUmakefile. - -1998-01-30 Paul Eggert <eggert@twinsun.com> - - * configure.in (AC_LFS): Put before anything that can affect or use - CPPFLAGS, LDFLAGS, or LIBS. - -1998-01-25 Jim Meyering <meyering@na-net.ornl.gov> - - * Makefile.maint: New file. - * Makefile.am: Move rules common to textutils, fileutils, sh-utils - into Makefile.maint. - Include Makefile.maint. - (EXTRA_DIST): Add Makefile.maint. - - * src/cat.c (cat): Convert comma-expressions to pairs of - semicolon-terminated stmts. - Add braces around compound if/else stmts. - -1998-01-24 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tail.c (parse_obsolescent_option): Do not interpret `-f -n 1 ...' - as obsolescent options. - Accept new option: --sleep-interval=SECONDS (-s). - (parse_options): Recognize it. - (usage): Describe it. - (tail_forever): Use it. - (dump_remainder): Use it. - * tests/tail/Test.pm (f-1): Add test for option-processing of `-f -n 1'. - - * tests/cut/: Rename directory to remove `-test' suffix. - * tests/join/: Likewise. - * tests/md5sum/: Likewise. - * tests/pr/: Likewise. - * tests/sort/: Likewise. - * tests/tr/: Likewise. - * configure.in (AC_OUTPUT): Reflect renamings in tests/. - * tests/Makefile.am (SUBDIRS): Reflect renamings in tests/. + * src/uniq.c (writeline): Use a SPACE, not a TAB between the + count and the corresponding line, as required by POSIX. + Reported by Clement Wang. + * tests/uniq/Test.pm (101, 102): Update tests of -c accordingly. - * src/system.h (TYPE_MINIMUM): Add extra outer cast to work around - bug in Cray C 5.0.3.0 when T == time_t. + * tests/expr/basic: Add tests for when exit status is 2. -1998-01-18 Jim Meyering <meyering@na-net.ornl.gov> + * src/nohup.c (NOHUP_FOUND_BUT_CANNOT_INVOKE, NOHUP_FAILURE): + Use an anonymous `enum', rather than #define. - * src/sort.c (strncoll, strncoll_s2_readonly, look_for_fraction, - numcompare): Remove the `unsigned' from some `unsigned char*' - parameter types. Add casts via UCHAR where necessary to avoid - problems with unwanted sign extension. Based on a patch from - Kaveh Ghazi to appease Irix4's cc compiler. +2003-07-17 Paul Eggert <eggert@twinsun.com> -1998-01-17 Jim Meyering <meyering@na-net.ornl.gov> + * src/expr.c: Include "exitfail.h", "quotearg.h". + (EXPR_INVALID, EXPR_ERROR): New constants. + (nomoreargs, null, toarith, nextarg): Return bool, not int. + (syntax_error): New function, exiting with status 2. Use it + insteading of printing "syntax error" ourselves. + (main): Initialize exit_failure to EXPR_ERROR. + Exit with EXPR_INVALID on syntax error (too few arguments). + (nextarg): Use strcmp, not strcoll; strcoll might return + an undesirable 0, or might fail. + (docolon, eval4, eval3): Exit with status 3 on invalid argument type + or other such error. + (eval2): Report an error if strcoll fails in a string comparison. + * src/sort.c: Include "exitfail.h". + (main): Set exit_failure, not xalloc_exit_failure and + xmemcoll_exit_failure. + * tests/expr/basic: Invalid value exits with status 3, not 2. - * src/split.c (next_file_name): Rewrite. This removes an artificial - limit (albeit already high, at INT_MAX :-) on the number of files - split could create. Reported by Ralf W. Stephan. +2003-07-16 Jim Meyering <jim@meyering.net> -1998-01-16 Jim Meyering <meyering@na-net.ornl.gov> + * configure.ac (AC_INIT): Use 5.0.90 as the version, rather than 5.0.2, + per GNU maintainer guidelines. The next non-beta release will be 5.1. - * src/sort.c (mergefps): Add braces to avoid ambiguous `else' stmt. - (nls_set_fraction): Likewise. + This script would have caught at least two recent bugs: + those in [ and kill. + * tests/help-version: Revive this script. + It wasn't doing anything useful, since $all_programs wasn't being + defined by the invoking Makefile.am. + Reflect that nohup is no longer a script, so don't exclude it. + Add framework to handle the programs added since it was last run: + kill, stat, unlink, [, link, readlink. + Fix path-related problems deriving from the move of this script + from src/ to its present location. + * tests/Makefile.am (all_programs): Define. + (TESTS_ENVIRONMENT): Use it. - * src/sort.c: Guard inclusion of langinfo.h also with HAVE_LANGINFO_H, - for Irix-4.0.5. From Kaveh Ghazi. - * configure.in: Check for langinfo.h. + * src/kill.c (main): Fix bug introduced on 2003-05-10 (for 5.0.1) + whereby kill would always attempt to operate on argv[0] and fail. - * lib/getline.c: Make PARAMS-defining conditionals consistent. - * lib/linebuffer.h: Likewise. - * lib/long-options.h: Likewise. - * lib/memcasecmp.h: Likewise. - * lib/xstrtod.h: Likewise. - * lib/xstrtol.h: Likewise. - Suggestion from Kaveh Ghazi. + * src/test.c (integer_expected_error): Improve diagnostic -- now, + it also matches the one from bash's builtin test. + (binary_operator): Add \n at end of diagnostic. - * tests/head/Test.pm (fail-0): Disable test. It depends on - sizeof(long) being 32 bits. Reported by Kaveh Ghazi. + * tests/rm/fail-2eperm: Remove setuidgid-related code. Move it to ... + * tests/priv-check: Move setuidgid-related and + NON_ROOT_USERNAME-checking code to this file. -1998-01-10 Jim Meyering <meyering@na-net.ornl.gov> + * README: Update section on testing as `root'. + Suggestion from Paul Jarc. + + * src/test.c (AUTHORS): Replace 3-letter usernames with the actual + names of authors that I just found in bash's builtins/test.def. + + Running `[' with no arguments would evoke a segfault. + * src/test.c (main) [LBRACKET]: Move initialization of argv to + precede potential use via test_syntax_error. + + * src/Makefile.am (AM_CPPFLAGS): Rename from `INCLUDES', to avoid + warning from automake -Wall. + +2003-07-15 Jim Meyering <jim@meyering.net> + + * Version 5.0.1. + + * Makefile.maint (%.asc): Remove target first, so gpg doesn't + prompt us about it. + + * announce-gen (print_changelog_deltas): Relax tests for matching + version-number line in NEWS. + Change the .sig suffix to .asc here, too. + +2003-07-14 Jim Meyering <jim@meyering.net> + + * Makefile.maint (%.asc): Renamed from %.sig. + Generate and use ascii-armored signatures. + Use gpg's -o option. + +2003-07-13 Jim Meyering <jim@meyering.net> + + * src/nohup.c (NOHUP_FAILURE, NOHUP_FOUND_BUT_CANNOT_INVOKE): Define. + (main): Use them. + + * Makefile.maint (syntax-check): Move each individual check into + its own target. + (syntax-check-rules): This is the list of syntax-check targets. + (sc_unmarked_diagnostics, sc_cast_of_argument_to_free): + (sc_cast_of_x_alloc_return_value, sc_space_tab): + (sc_error_exit_success, sc_xalloc_h_in_src): New targets. + +2003-07-12 Jim Meyering <jim@meyering.net> + + * configure.ac: Remove uses of OPTIONAL_BIN_ZCRIPTS and last + traces of the nohup script. + + * src/Makefile.am (bin_SCRIPTS): Remove use of just-removed + $(OPTIONAL_BIN_ZCRIPTS). + + * src/Makefile.am (localedir.h): Put the `2>&1' after the redirect + target, not before the `>'. + + * src/remove.c (remove_dir): Give a diagnostic upon failed save_cwd, + now that that function no longer calls `error'. + + * src/df.c (find_mount_point): Emit a diagnostic for each + failed syscall, rather than relying on caller to do that. + The caller couldn't do a good job, anyhow -- too many different + ways to fail (each with a different referent). + Give a diagnostic upon failed save_cwd, now that that function + no longer calls `error'. + (show_point): Don't diagnose find_mount_point's errors, now that + it handles them itself. - * Version 1.22d. + * src/df.c (find_mount_point): Don't let free clobber errno upon + failed chdir. - * src/system.h [HAVE_LIMITS_H]: Include limits.h - (TYPE_SIGNED): Define. - (TYPE_MINIMUM): Define. - (TYPE_MAXIMUM): Define. - (CHAR_BIT): Define. - (SCHAR_MAX): Define. - (UCHAR_MAX): Define. - (SHRT_MAX): Define. - (INT_MAX): Define. - (UINT_MAX): Define. - (LONG_MAX): Define. - (ULONG_MAX): Define. - * src/*.c: Remove definitions of those symbols. + * src/sys2.h: Remove alloca-related block. + * src/system.h: Include <alloca.h> here, instead. - * src/csplit.c: Move inclusion of regex.h/rx.h to follow system.h - since it now includes limit.h which defines RE_DUP_MAX. - * src/nl.c: Likewise. - * src/tac.c: Likewise. + It appears that the `#pragma alloca' included via "system.h" is + adequate, since join.c uses alloca, yet lacked an in-file #pragma. + * src/copy.c, src/cp.c, src/df.c, src/install.c, src/ln.c: + * src/ls.c, src/mv.c, src/remove.c: Remove `#pragma alloca'. - * lib/xstrtol.c (bkm_scale): Renamed from BKM_SCALE. - Rewrite macro as function. Return a value. Update caller. - Cast __ZLONG_MAX `__unsigned long int' before casting to double to - avoid SunOS /bin/cc compiler bug. + * src/chown-core.c (change_file_owner): Do not restore any special + permission bits (e.g., set-user-ID, set-group-ID) that are reset + by chown(2) on some systems. Suggestion and insistence :-) from + Michael Stone. -1998-01-08 Jim Meyering <meyering@na-net.ornl.gov> + * tests/input-tty: Also check `test -t 1'. + This is necessary on linux-2.4.21. Otherwise, the stty/basic-1 + test would block when run in the background. - * src/tac-pipe.c: New file. But not yet used. - * src/Makefile.am (EXTRA_DIST): Add tac-pipe.c. +2003-07-11 Jim Meyering <jim@meyering.net> - * src/tac.c (tac_stream): Don't perform arithmetic on now-void* pointer - result of xrealloc (until recently it was char*). + * tests/sample-test: Also fail if cat-to-create-expected-output + fails. Otherwise, if both `exp' and `out' were to end up empty + because of e.g., a full disk, they would mistakenly compare equal. - * configure.in (AC_CHECK_FUNCS): Add nl_langinfo. - * src/sort.c (inittables): Add && HAVE_NL_LANGINFO to the #if-test - guarding the nls month-checking code. - (nls_numeric_format): Remove unnecessary (and error-evoking w/SunOS' cc) - `unsigned' from dcls of text and lim. - (main): Cast lconvp->grouping to `unsigned char*' to appease SunOS's cc. + * src/nohup.c: New file. Rewrite of nohup.sh in C. + This solves a portability problem: on at least Solaris systems, + when nohup.sh used the vendor /bin/sh, it would exit with status + of `1' rather than the required 126 or 127 upon failure to exec + the specified program. -1998-01-03 Jim Meyering <meyering@na-net.ornl.gov> + * src/Makefile.am (EXTRA_SCRIPTS): Remove definition. + (bin_PROGRAMS): Add nohup. + (EXTRA_DIST): Remove nohup.sh. + (all_programs): Remove use of $(EXTRA_SCRIPTS). + * src/nohup.sh: Remove file. + * man/Makefile.am (nohup.1): Depend on nohup.c, rather than nohup.sh. - * lib/Makefile.am (AUTOMAKE_OPTIONS): Define to ../src/ansi2knr. + * tests/misc/nohup: Tests for the above. + * tests/misc/Makefile.am (TESTS): Add nohup. - * configure.in: Convert the .o suffix on files in LIBOBJS to $U.o so - those files will be built via the ANSI2KNR-filtering rules if necessary. - -1997-12-25 Jim Meyering <meyering@na-net.ornl.gov> - - * configure.in: Remove AC_DEFINE of _GNU_SOURCE. - * acconfig.h (_GNU_SOURCE): Define if not already defined. - Put this code in @TOP@ section. - (_GNU_SOURCE): Remove #undef. - -1997-12-22 Jim Meyering <meyering@na-net.ornl.gov> - - * configure.in: AC_DEFINE _GNU_SOURCE. - * acconfig.h: Add _GNU_SOURCE. - -1997-12-21 Jim Meyering <meyering@na-net.ornl.gov> - - * configure.in (AC_CHECK_HEADERS): Add stdlib.h. - - * src/system.h: Merge in things from fileutils' version of this file. - * src/csplit.c: s/__P/PARAMS/. - * src/fmt.c: s/__P/PARAMS/. - * src/od.c: s/__P/PARAMS/. - * src/pr.c: s/__P/PARAMS/. - -1997-12-14 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sys2.h: s/HAVE_DECLARATION_/HAVE_DECL_/g. - -1997-12-13 Jim Meyering <meyering@na-net.ornl.gov> - - * src/fmt.c (main): Add some braces. - Check return code from fclose of each input file. - Close stdout and check for errors. - - * src/csplit.c (close_output_file): Check ferror before calling fclose. - (main): Close stdout and check for errors. - -1997-11-15 Jim Meyering <meyering@na-net.ornl.gov> - - * acconfig.h: Add mktime. - * configure.in (jm_FUNC_MKTIME): Use it. - * lib/mktime.c: New file. - * lib/Makefile.am (EXTRA_DIST): Add mktime.c - - * intl/Makefile.in (distclean): Don't remove libintl.h here. - * Makefile.am (DISTCLEANFILES): Remove it here instead. - -1997-11-13 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/strftime.c: Update from FSF. - * m4/strftime.m4: Check for POSIX.2's %f format spec. - -1997-11-12 Jim Meyering <meyering@na-net.ornl.gov> - - * src/system.h [!HAVE_MEMPCPY] (mempcpy): Define. - * configure.in (AC_CHECK_FUNCS): Add mempcpy. - -1997-11-09 Jim Meyering <meyering@na-net.ornl.gov> - - * configure.in (jm_FUNC_STRFTIME): Use it. - * m4/jm-mktime.m4 (jm_FUNC_MKTIME): Check for localtime_r. - * m4/strftime.m4 (jm_STRFTIME_PREREQS): Check for localtime_r. - (jm_FUNC_GNU_STRFTIME): Use new macro. - (jm_FUNC_STRFTIME): New macro. Likewise. - Reported by Noel Cragg. - -1997-11-08 Jim Meyering <meyering@na-net.ornl.gov> - - * m4/lfs.m4 (AC_LFS): New file/macro. - * m4/Makefile.am (EXTRA_DIST): Add lfs.m4. - * configure.in (AC_LFS): Use it. - (AC_CHECK_FUNCS): Add fseeko. - * src/od.c (fseeko): Define a stub if ! HAVE_FSEEKO. - (skip): Use fseeko if available. Don't use lseek; it causes - the stdio stream to become out of sync with respect to the - underyling file descriptor. - From Paul Eggert. - -1997-10-16 Paul Eggert <eggert@twinsun.com> - - * configure.in (AC_CHECK_FUNCS): Add fseeko. - - * src/od.c (skip): Use fseeko. Don't use lseek; it causes - the stdio stream to become out of sync with respect to the - underyling file descriptor. - -1997-11-06 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sort.c (getmonth): Remove HAVE_ALLOCA #ifdefs. - We always have alloca. - (keycompare): Don't use variable size arrays (it's a gcc-extension). - Rewrite code that increments new lengths when not `ignoring'. - -1997-11-02 Jim Meyering <meyering@na-net.ornl.gov> - - * acconfig.h: Add malloc and realloc. - - * src/wc.c (main): New option, --max-line-length (-L). - (wc, write_counts): Implement it. - From Bruno Haible. - -1997-10-26 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/memcasecmp.c: Convert to upper case before comparing. - This makes join -i work with sort -f. - Reported by Arthur Pool. - -1997-10-25 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/xmalloc.c (xalloc_fail): Renamed from fixup_null_alloc. - (xcalloc): #ifdef-out unused function. - (xrealloc): Remove code to work around deficient versions of realloc. - Now we have an autoconf-enabled replacement version. - (xmalloc): Remove code to work around deficient versions of malloc. - Now we have an autoconf-enabled replacement version. - - * lib/memcmp.c (rpl_memcmp): Rename from memcmp. - - * src/sort.c (NLS_STRNCMP) [!ENABLE_NLS]: s/strcmp/strncmp/. - - * lib/xmalloc.c (xalloc_fail_func): Initialize to 0, not NULL. - - * configure.in (jm_FUNC_MALLOC): Use it. - (jm_FUNC_REALLOC): Use it. - - * lib/Makefile.am (EXTRA_DIST): Add malloc.c. - * lib/malloc.c: New file. - * m4/malloc.m4: New file. - * m4/Makefile.am (EXTRA_DIST): Add malloc.m4. - - * lib/Makefile.am (noinst_HEADERS): Add xalloc.h. - (EXTRA_DIST): Add realloc.c. - (EXTRA_DIST): Add malloc.c. - - * src/system.h: Include xalloc.h. - Remove dcls of xmalloc, xcalloc and xrealloc. - - * lib/xalloc.h: New file. - - * lib/xmalloc.c: Include xalloc.h. - Change VOID to void. - (xalloc_exit_failure): Renamed extern. - (xalloc_msg_memory_exhausted): New extern. - (xalloc_fail_func): New extern. - (fixup_null_alloc): Use new variables. - -1997-10-24 Jim Meyering <meyering@na-net.ornl.gov> - - * src/unexpand.c: Remove old-style xmalloc and xrealloc decls. - (add_tabstop): Cast first arg of xrealloc to char*. - - * src/sort.c: Include xalloc.h. - (xmalloc): Remove function. - (xrealloc): Remove function. - (main): Set xalloc_fail_func to cleanup. - Set xalloc_exit_failure SORT_FAILURE. - - * src/paste.c: Remove old-style xmalloc and xrealloc decls. - (paste_parallel): Cast first arg of xrealloc to char*. - - * src/od.c: Remove old-style xmalloc and xrealloc decls. - (decode_format_string): Cast first arg of xrealloc to char*. - - * src/expand.c: Remove old-style xmalloc and xrealloc decls. - (add_tabstop): Cast first arg of xrealloc to char*. - - * lib/xalloc.h: New file. - - * src/cut.c (ADD_RANGE_PAIR): Cast first arg of xrealloc to char*. - (getstr): Cast xmalloc return value to char*. - - * src/csplit.c: Include xalloc.h. - (xmalloc): Remove function. - (xrealloc): Remove function. - (main): Set xalloc_fail_func to cleanup. - - * src/*.c: Remove old-style xmalloc and xrealloc decls. - * src/system.h: Add prototyped xcalloc, xmalloc and xrealloc decls. - Suggestion from Achim Blumensath. - -1997-10-23 Jim Meyering <meyering@na-net.ornl.gov> - - * Makefile.am (aclocal-files): Also depend on m4/Makefile.am. - - * src/system.h [!HAVE_DECLARATION_FREE]: Declare free. - [!HAVE_DECLARATION_MALLOC]: Declare malloc. - [!HAVE_DECLARATION_REALLOC]: Declare realloc. - [!HAVE_DECLARATION_STPCPY]: Declare stpcpy. - [!HAVE_DECLARATION_STRSTR]: Declare strstr. - * src/cat.c: Remove stpcpy dcl. - * src/csplit.c: Remove malloc and realloc dcls. - * src/sort.c: Remove free, malloc, and realloc dcls. - * src/tac.c: Remove malloc, and realloc dcls. - * src/tr.c: Remove stpcpy dcl. - On some systems, strstr and stpcpy are macros, so declaring them - unconditionally gets syntax errors. - Reported by Mark M. Kettenis. - - * configure.in: Use jm_CHECK_DECLS. - * m4/Makefile.am (EXTRA_DIST): Add decl.m4 and check-decl.m4. - -1997-10-22 Jim Meyering <meyering@na-net.ornl.gov> - - * m4/decl.m4: New file. - * m4/check-decl.m4: New file. New macro, jm_CHECK_DECLS. - -1997-10-16 Paul Eggert <eggert@twinsun.com> - - * src/od.c (LONG_MAX): Define if not defined. - -1997-10-16 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sort.c (look_for_fraction): Patch from Ørn Hansen. - (getmonth): Compare the two month names only to the length of the - string in the month table. Patch from Ørn Hansen. - (NLS_STRNCMP): New macro. - (strncoll_s2_readonly): New function. - (inittables): Don't use temporary `comp' to hide type of - comparator function. - (nls_sort_month_comp): Declare parameters to be void* to match - comparator function type required for qsort. - (getmonth): Use NLS_STRNCMP rather than #ifdef. - Use do-while, rather than while-loop. - -1997-10-14 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sort.c (_NL_ITEM) [!defined]: Define. - From from Ørn E. Hansen. - - * src/sort.c: Use STREQ in place of most uses of strcmp. - (NLS_STRCMP): Define. - (getmonth): Remove ifdef and use NLS_STRCMP instead. - Use HAVE_ALLOCA, not _HAVE_ALLOCA. - (zaptemp): Make parameter `const'. - - * tests/sort-test/Test.pm: Add tests to exercise new fraccompare. - - * src/sort.c (CHARS_IN_ABM): Remove definition - (inittables): Remove assumption that all abbreviated month names have - length 3. - (getmonth): Likewise. - (main): Add #if's for more efficient code when using the GNU C library. - From Ulrich Drepper. - - * src/sort.c (strncoll): Rename parameter to LEN. - (keycompare): Move assignment out of if-expression. - - * lib/xstrdup.c: New file. - * lib/Makefile.am (libtu_a_SOURCES): Add xstrdup.c - - * src/sort.c: Declare xstrdup. - (my_setlocale): New function. - (main): Guard against failure of strdup (use xstrdup) and setlocale. - - * src/system.h (STREQ): Define. - * src/od.c (STREQ): Remove definition. - - * src/sort.c (look_for_fraction): Eliminate arbitrary limit on - number of `groups'. Declare as void, not int. - Patch from Ørn E. Hansen. - (main): When determining whether we're in the C or POSIX locale, - don't rely on the form of the string returned by setlocale. - Suggestion from Ulrich Drepper. - -1997-10-12 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sort.c: Apply big patch from Ørn E. Hansen. - Clean up, indent. - (NLS_MEMCMP): Define. - (keycompare): Use it instead of open-coded #ifdefs. - (compare): Likewise. - (NLS_MAP): Remove unused definitions. - Replace with uses of UCHAR. - (nls_locale_map): Remove dcl of unused file-scope array. - -1997-10-10 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/sort-test/Test.pm: Add a test. - From William Lewis. - -1997-10-07 Jim Meyering <meyering@na-net.ornl.gov> - - * src/*.c: Update bug-reporting address. - * src/cat.c: Indent cpp directives to reflect nesting. - * src/cksum.c: Likewise. - * src/csplit.c: Likewise. - * src/fmt.c: Likewise. - * src/nl.c: Likewise. - * src/paste.c: Likewise. - -1997-09-27 Jim Meyering <meyering@na-net.ornl.gov> - - * m4/memcmp.m4: Integrate test to detect bug in memcmp from the - Next x86 OpenStep C library. Test program from William Lewis. - -1997-09-21 Jim Meyering <meyering@na-net.ornl.gov> - - * src/od.c [struct tspec] (hexl_mode_trailer): Rename from `trailer.' - (dump_hexl_mode_trailer): Rename from dump_string_trailer. - Use fputs and putchar instead of trivial or %-less printfs. - (decode_one_format): Parenthesize each field_width assignment in an - argument list to make the side effect a little more apparent. - (write_block): Use fputs and putchar instead of trivial or %-less - printfs. - (dump_strings): Cast string_min to off_t to avoid long-standing warning. - - * src/od.c: Implement new `z' (hexl-mode) modifier. - [struct tspec] (trailer): New field. - (field_width): Likewise. - (dump_string_trailer): New function. - (decode_one_format): Save each field_width in the tspec. - Patch from John Kodis. - -1997-09-14 Jim Meyering <meyering@na-net.ornl.gov> - - * src/od.c (main) [--traditional]: Don't give diagnostic about there - being more than three arguments if there are *no* arguments specified. - Reported by Jochen Hein. - -1997-09-13 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/sort-test/Test.pm: Add tests 19a and 19b. - -1997-07-21 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tail.c (parse_obsolescent_option): #ifdef-out portability warning. - -1997-07-19 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sort.c (checkfp): Print the `disorder' message. Include both - the number and the contents of the first out-of-order line, in addition - to the file name. Change meaning of return value. - (check): Don't print disorder message here. - Adjust test of checkfp's return value. - Feature suggestion from Karl Heuer. - -1997-07-13 Jim Meyering <meyering@na-net.ornl.gov> - - * doc/Makefile.am (EXTRA_DIST): Remove explicit mention of texinfo.texi. - Now, automake includes it automatically. - - * src/head.c: Include xstrtoul.h. - Remove global variable, unit_size. - (atou): Remove now-unused function. - (parse_unit): Likewise. - (string_to_ull): New function. - (head): Take new parameter, count_lines. Use it instead of unit_size. - Update callers. + * src/head.c (diagnose_copy_fd_failure): New function, renamed from + the macro, COPY_FD_DIAGNOSE. + (diagnose_copy_fd_failure): Enclose diagnostic in _(...). (head_file): Likewise. - (main): Use string_to_ull, not atou/parse_unit. - The problem was that overflow wasn't detected, so `head -c 4096m' - was treated just like `head -c 0'. - Reported by Jerome Abela. - - * tests/wc: New directory. - * tests/head: New directory. - * tests/Makefile.am (SUBDIRS): Add head and wc. - * configure.in (AC_OUTPUT): Add tests/head/Makefile and - tests/wc/Makefile. - -1997-07-05 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tail.c (parse_obsolescent_option): If POSIXLY_CORRECT is set, give - a diagnostic and fail when there are two or more non-option arguments. - -1997-07-04 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/tac/mk-script.pl: Redirect output of cmp to /dev/null. - - * configure.in (ALL_LINGUAS): Add Norwegian (no). - - * Makefile.am (aclocal-files): Look in source directory, not build dir. - From Andreas Schwab. - -Sun Jun 15 06:36:41 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/pr.c (init_header) [T_BUF_FMT]: Output the 4-digit year (not the - 2-digit abbreviation) in each page header. Reported by Noah Friedman. - -Sat Jun 14 12:29:12 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/cut.c (cut_fields): Detect when the input is empty and handle - that special case. Before `cut -f1 < /dev/null' would improperly - output a single newline. Reported by Phil Richards. - -Sun Apr 27 15:10:58 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * man/Makefile.am (DISTFILES): Add $(man_MANS). - - * configure.in (ALL_LINGUAS): Add Czech (cs) and Swedish (sv). - -Thu Apr 3 21:14:02 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * m4/Makefile.am (EXTRA_DIST): Update file list. - - * tests/cut-test/Test.pm: Add test from Phil Richards. - -Sat Mar 22 20:29:10 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * missing: New file -- from the automake-1.1m distribution. - -Fri Mar 21 23:56:41 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * Makefile.am (AUTOMAKE_OPTIONS): Require automake-1.1l. - (aclocal.m4): Use aclocal's new -I option. - -Thu Mar 13 21:46:04 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tr.c (main): Make sure c1 is not -1 before using it as an - array index. Patch from Greg McGary. Although this is truly a - bug, I believe it would not cause tr to misbehave on most systems. - I could not construct a test case with which this bug causes tr - to generate invalid output. - - * tests/pr-test/Test.pm: Add test that -o 0 works. - - * src/pr.c (main): Allow use of 0 (zero) as the margin offset - argument to the -o option. Patch from Gary Anderson. - -Fri Feb 28 22:32:51 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/uniq.c (usage): Fix typo in --help output. From Andreas Schwab. - -Tue Feb 25 20:34:51 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/Makefile.am (noinst_HEADERS): Add obstack.h. - (libtu_a_SOURCES): Add obstack.c. - -Sun Feb 16 08:30:29 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/Makefile.am (SUBDIRS): Add tac. - * tests/tac: New directory. - * configure.in (AC_OUTPUT): Add tests/tac/Makefile. - - * tests/pr-test/{tt-0FF, tt-bl, tta3-0FF, ttb3-0FF, tt-FF, tt-t, - tta3-FF, ttb3-FF}: New files. Renamed (s/T/tt/) to avoid name clashes - on case-independent filesystems. - * tests/pr-test/Test.pm (Tests '7.*'): Reflect file-renaming. - - * src/tail.c (parse_obsolescent_option): Reverse order of args in - diagnostic. Remove `' quotes in diagnostic. - (parse_options): Remove `' quotes in diagnostic. - -Sat Feb 8 22:43:45 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tail.c (parse_obsolescent_option): Give warning diagnostic for - (but now accept) obsolescent usage with more than one file argument. - -Sun Feb 2 23:06:59 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/join.c: Move alloca-related preprocessor code into system.h. - * src/od.c: Remove alloca-related preprocessor code. - * src/system.h: Add alloca-related preprocessor code. - -Sat Feb 1 07:21:43 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/pr-test/*: Rename files to avoid exceeding 14-character limit. - * tests/pr-test/Test.pm: Reflect renamings. - - * tests/pr-test/mk-script.pl (spec_to_list): Warn about all filenames - that exceed max-length before dying. - - * src/pr.c (init_parameters): For compatibility: use default - separator `TAB' with full length lines. From Roland Huebner. - -Fri Jan 31 19:53:54 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tac.c: Rename globals buffer and buffer_size to have G_ prefix - to avoid shadowing local variables. - - * lib/long-options.c (parse_long_options): Compare getopt_long return - value against -1, not EOF. Use NULL, not `(int *) 0' as last parameter - in getopt_long call. - - * src/pr.c (add_line_number): Rename from `number' to avoid shadowing - local variables. - - * src/*.c: Compare getopt_long return value against -1, not EOF. - Use NULL, not `(int *) 0' as last parameter in getopt_long call. - (usage): Bracket bug-reporting address with <> and append a period. - -Wed Jan 29 20:54:24 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/tr-test/Test.pm: Do each test twice: get input via REDIR - and PIPE. - - * tests/tail/Test.pm (test_vector): Do each (non-stdin-requiring) - test three times. - - * tests/pr-test/Test.pm: Remove common_option_prefix flag. - (test_vector): Prepend the common option here instead. - - * tests/md5sum-test/Test.pm: Remove input_via_stdin flag. - Do each test twice: get input via REDIR and PIPE. - - * tests/cut-test/Test.pm: Do each test three times. - - * tests/cut-test/mk-script.pl: Allow each test to be run any or all - of three different ways. Program input may be specified via a file - or files listed on the command line, via input redirection (if there's - only one file), or via a pipe. - -Tue Jan 28 20:54:06 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/cut-test/mk-script.pl: Remove `t' prefix on all generated - test file names. - Change suffixes from (.in, .exp, .out, .err) to (.I, .X, .O, .E). - Ensure that no test file (generated or maintainer-supplied) has a - name longer than 14 characters. - -Sun Jan 26 12:49:50 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * Version 1.22. - - * src/tail.c (parse_options): Add quotes to make messages identical. - -Sat Jan 25 00:12:29 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tail.c (parse_obsolescent_option): Comment. - (parse_options): Remove unnecessary goto and label. - - * tests/sort-test/mk-script.pl: Interpret `input arg is a hash - reference' as meaning that the tested program will read no input. - Most of the tests for the date program use this feature. - Also for date, the generated script now reflects specification - (in Test.pm) of default and per-test environment settings. - - * src/csplit.c: Reflect changes to xstrtol and xstrtoul interfaces. - * src/fold.c: Likewise. - * src/head.c: Likewise. - * src/join.c: Likewise. - * src/nl.c: Likewise. - * src/od.c: Likewise. - * src/pr.c: Likewise. - * src/uniq.c: Likewise. - - * lib/xstrtoul.h (XSTRTOL_H): Undefine it. - - * lib/xstrtol.h [!_STRTOL_ERROR]: Define the type `enum strtol_error' - only if it hasn't already been defined. - (_STRTOL_ERROR): Undefine. - - * lib/xstrtol.c (__xstrtol): Change interpretation of - VALID_SUFFIXES == NULL vs VALID_SUFFIXES == "". Use the former - when any suffix is valid, the later when no suffix is allowed. -Fri Jan 24 23:36:00 1997 Jim Meyering <meyering@na-net.ornl.gov> + * src/date.c: Include "quote.h". + (batch_convert): Use the quote function rather than using literal `...' + in a diagnostic. - * lib/long-options.c (parse_long_options): Reset optind to zero - before just returning so that getopt internals get initialized from - the probably-new parameters when/if getopt is called later. - From Ulrich Drepper. - -Thu Jan 23 19:17:03 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tail.c (parse_obsolescent_option): Recognize and fail for - more malformed obsolescent options. Makes for better diagnostics. - -Wed Jan 22 21:34:50 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/Makefile.am (SUBDIRS): Add tail. - * tests/tail: New directory. - * configure.in (AC_OUTPUT): Add tests/tail/Makefile. - - * src/tail.c (parse_options): New function. - (parse_obsolescent_option): New function. - (main): Use the new functions instead of open-coding them. - This better fixes the bug in handling obsolescent `+Nc' options. - General cleanup. - -Tue Jan 21 22:49:00 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tail.c (main): Properly handle what the POSIX spec calls - the `obsolescent' usage (e.g., tail +2c). It didn't work. - Reported by Karl Heuer. - -Sun Jan 12 22:13:27 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/tr-test/Test.pm: Rename tests so that the associated files - have names that are distinct even on filesystems on which file - names are case insensitive. - Reported by Fred Fish. - * tests/cut-test/Test.pm: Likewise. - - * tests/tr-test/Makefile.am: Regenerated to reflect renamed tests. - * tests/cut-test/Makefile.am: Likewise. - -Wed Jan 8 16:38:24 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * Version 1.21. - - * lib/getopt.c (_getopt_internal): Use `_', rather than the - (sometimes-)expansion `gettext'. - -Tue Jan 7 22:50:13 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/getopt.c: New (more POSIX compliant) version from GNU libc. - [_]: Define to gettext also if ENABLE_NLS is defined. - This is temporary. - -Thu Jan 2 21:17:50 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * src/pr.c (init_fps): Initialize lines_stored field in three places. - This avoids uninitialized memory reads in close_file. - -Wed Jan 1 17:32:18 1997 Jim Meyering <meyering@na-net.ornl.gov> - - * configure.in (AC_ARG_PROGRAM): Remove explicit use. - It's implicit in AM_INIT_AUTOMAKE. From Wayne Stewart. - -Sun Dec 29 23:42:57 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/pr.c (init_header): Plug a small memory leak by using stack - rather than heap for a 15-byte temporary buffer. - -Sat Dec 28 00:03:23 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/pr.c (TAB_WIDTH): Parenthesize uses of parameters and renamed - from tab_width. - (POS_AFTER_TAB): Renamed from pos_after_tab. Define in terms of - TAB_WIDTH rather than duplicating the expression. - -Fri Dec 27 17:29:02 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/join-test/mk-script.pl: Fix a couple of thinkos and typos. - Now it works with pr's tests, too. - - * tests/pr-test/Makefile.am (explicit): Regenerate list of files, - this time with duplicates removed. - - * src/pr.c (usage): Break long string literal into two separate - printf statements to accomodate default maximum of 2048 characters - for Irix-4.0.5. Reported by Kaveh Ghazi. - - * Makefile.am (aclocal.m4): No longer depend on acinclude.m4. - - * tests/Makefile.am (SUBDIRS): Add pr-test. - - * configure.in: AC_REQUIRE version 2.12 of autoconf. - AC_OUTPUT: Add tests/pr-test/Makefile. - -Sun Dec 22 08:11:27 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * acinclude.m4: Move macros to individual files in new directory, m4/. - See ChangeLog entries in sh-utils for the details. - - * configure.in: Increment version to 1.20a. - - * tests/md5sum-test/Makefile.am: Use same framework as other tests. - * tests/md5sum-test/Test.pm: New file. - -Sat Dec 21 20:32:58 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/Makefile.am (EXTRA_DIST): Add README and Makefile.am.in. - - * tests/Makefile.am.in: New file. - - * tests/sort-test/Makefile.am: Clone the Makefile.am from join-test. - Replace only the definition of $x and the auto-generated lists of - test files. - * tests/cut-test/Makefile.am: Likewise. - * tests/tr-test/Makefile.am: Likewise. - - * tests/join-test/Makefile.am: Add @MAINT@-protected rule for - verifying that Makefile.am is consistent with Test.pm. - -Fri Dec 20 00:08:36 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/join-test/Makefile.am (MAINTAINERCLEANFILES): Use $(in1) - and $(in2), not $(in). - - * tests/join-test/mk-script.pl: New option: --list. - Generate lists of files used/generated. - -Thu Dec 19 23:28:41 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/join-test/mk-script.pl: Rewrite to be more general -- so - it can be used for join, cut, sort, tr, and soon, pr test suites. - * tests/tr-test/mk-script.pl: Symlink through CVS repo to join's - mk-script.pl. - * tests/sort-test/mk-script.pl: Likewise. - * tests/cut-test/mk-script.pl: Likewise. - - * tests/tr-test/Test.pm: Adapted for new mk-script.pl. - * tests/join-test/Test.pm: Likewise. - -Tue Dec 17 16:48:51 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/join-test/Makefile.am (.pl): Make generated file read-only so - I don't accidentally modify it instead of the one with the .pl suffix. - - * acinclude.m4 (jm_SYS_PROC_UPTIME): Require AC_PROG_CC, rather than - now-obsolete AC_C_CROSS. - (jm_FUNC_MKTIME): When redefining, use rpl_ prefix, not gnu_ one - since there's nothing GNU-specific about the replacement. Contrast - with gnu_ prefix added to strftime. - (jm_FUNC_MEMCMP): New macro. - * configure.in: Use jm_FUNC_MEMCMP instead of AM_FUNC_MEMCMP. - * acconfig.h: Add memcmp. - * README: Remove warning about memcmp. The new macro handles it. - -Mon Dec 16 23:03:27 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/Makefile.am (pkgdata_DATA): Remove unnecessary assignment. - From Eric Backus. - (AUTOMAKE_OPTIONS): Likewise. - -Sat Dec 14 14:51:50 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * acinclude.m4 (jm_SYS_PROC_UPTIME): Fix typo in cache variable - name for cross compiling. - Remove definitions of gettext-related macros. The gettext - installation procedure installs corresponding .m4 files so that - aclocal will use them. - -1996-12-12 Paul Eggert <eggert@twinsun.com> - - * system.h (ISDIGIT): Replace with smaller, faster edition - that yields nonzero only on ASCII digits. - (ISDIGIT_LOCALE): New macro, with same meaning that ISDIGIT - used to have. - - * tr.c (is_char_class_member): Use ISDIGIT_LOCALE instead of - ISDIGIT to test for characters in CC_DIGIT class. - - * sort.c (digits): Remove; subsumed by new ISDIGIT. - (inittables): Remove initialization of `digits'. - (fraccompare, numcompare, main): Use ISDIGIT (x) instead of digits[x]. - (fraccompare, numcompare): Avoid casts to unsigned char that are no - longer needed. - - * csplit.c (get_format_width, get_format_prec): Avoid - unnecessary comparison of digit to '\0'. - -Thu Dec 12 23:42:51 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sort.c (usage): Clarify description of -u option. - From Karl Berry. - -Wed Dec 11 19:32:18 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * Version 1.20. - -Tue Dec 10 00:15:50 1996 Jim Meyering <meyering@na-net.ornl.gov> - - The file name, `build-script.pl' is longer than 14 characters. - Rename it. - * tests/cut-test/mk-script.pl: Rename from build-script.pl. - * tests/cut-test/Makefile.am: Reflect renaming. - * tests/tr-test/mk-script.pl: Rename from build-script.pl. - * tests/tr-test/Makefile.am: Reflect renaming. - * tests/sort-test/mk-script.pl: Rename from build-script.pl. - * tests/sort-test/Makefile.am: Reflect renaming. - * tests/join-test/mk-script.pl: Rename from build-script.pl. - * tests/join-test/Makefile.am: Reflect renaming. - Reported by Karl Heuer. - - * configure.in (VERSION): Bump to 1.19r. - (AC_ISC_POSIX): Remove kludgy macro. - Use this test instead: - (LIBS): Add -lcposix if it contains strerror. - Patch from Karl Heuer. - -Sun Dec 8 07:22:38 1996 Jim Meyering <meyering@na-net.ornl.gov> - - =========== Update for automake-1.1k. - * Makefile.am (AUTOMAKE_OPTIONS): Require 1.1k. - * configure.in (AM_CONFIG_HEADER): Use it. - (AC_OUTPUT): Remove stamp-h timestamping statement. - Now, AM_CONFIG_HEADER does it automatically. - * lib/Makefile.am (noinst_LIBRARIES): Rename to libtu.a as per - new automake requirement. - Rename tu_* variables to libtu_a_*. - -Wed Dec 4 21:03:18 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/pr.c: Apply big patch from Roland Huebner. - - * src/tr.c (main) [!POSIXLY_CORRECT]: Allow the identity mappings: - [:upper:] to [:upper:] and [:lower:] to [:lower:]. - (main) [POSIXLY_CORRECT]: Give a more specific diagnostic for - the invalid identity mappings [:upper:] to [:upper:] and [:lower:] - to [:lower:]. - (class_ok): Update table to reflect that tr now allows these - identity mappings. Suggestion from Risto Kankkunen. - -Thu Nov 28 00:31:18 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * configure.in (AM_GNU_GETTEXT): Renamed from ud_GNU_GETTEXT - for gettext-0.10.25. - -Tue Nov 26 23:05:14 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sort.c (fraccompare): Add explicit `int' in `register' dcls, - to avoid new warning from gcc. - -Sun Nov 24 21:02:15 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * tests/sort-test/Makefile.am (t): Add names of those 5 tests. - - * tests/sort-test/Test.pm: Add 5 tests to exercize just-fixed code. - - * src/sort.c (set_ordering): Revert 1994-05-04 change to this function - so that blanks are not unconditionally ignored when computing start - and end positions for numeric keys with explicit character offsets. - Reported by Markus Demleitner. - -Sat Nov 23 16:07:08 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * cat.c (usage): Alphabetize option descriptions the way sort -f would. - * fmt.c (usage): Likewise. - * join.c (usage): Likewise. - * md5sum.c (usage): Likewise. - * od.c (usage): Likewise. - * pr.c (usage): Likewise. - * sort.c (usage): Likewise. - * split.c (usage): Likewise. - * wc.c (usage): Likewise. - From Karl Berry. - -Fri Nov 22 20:20:37 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/csplit.c (process_regexp): Update CURRENT_LINE only if - the new value would be larger. This avoids the infinite loop - otherwise provoked by situations like this: - printf "\na\n" | csplit - '/a/-1' '{*}' - From Jens Schmidt. - -Tue Nov 19 23:16:57 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * configure.in (AM_SANITY_CHECK_CC): Remove it. Autoconf-2.11 - has this built-in. - -Sat Nov 2 08:50:01 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * doc/Makefile.am (MAKEINFO): Set to makeinfo --no-split. - Otherwise, the generated info files have names longer than - the 14-byte max of some old systems. - Reported by Karl Heuer. - -Fri Nov 1 21:33:16 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/strtol.c: Update from GNU libc. - - * tests/sort-test/Test.pm: Add a test to exercize this fix. - - * src/sort.c [!ENABLE_ASSERTIONS]: Guard NDEBUG definition. - (checkfp): Fix off-by-one error that resulted in writing one byte - beyond the end of a malloc'd buffer. It caused `sort -c' to segfault - on Linux systems having a relatively recent libc. Before, running - the command, perl -e "print 'x' x 30, \"\n\";"|sort -c - would provoke the memory overrun (though not necessarily the failure). - Add an assertion. - Reported by Risto Kankkunen. - -Thu Oct 31 17:48:24 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/sort.c (key_init): New function. - (main): Use key_init in the two places where it was open-coded. - This fixes a UMR of the general_numeric field. - - * src/join.c (decode_field_spec): Always give FIELD_INDEX a value. - This avoids a spurious UMR report from purify. - (prjoin): Add an assertion. - (add_field): Update assertion. - - * src/tr.c (es_free): New function. - (parse_str): Use it to plug a small memory leak. - -Wed Oct 23 22:02:24 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/md5.c: Update from GNU libc. - * lib/md5.h: Update from GNU libc. - -Mon Oct 21 16:48:12 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tr.c (validate): Remove TAB from diagnostic, for consistency. - -Sun Oct 20 13:44:07 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/Makefile.am (INCLUDES): Add -I../intl. Reported by Eric Backus. - - * Makefile.am (AUTOMAKE_OPTIONS): Set to `gnits' - (EXTRA_DIST): Remove. - - * configure.in: Remove README_ALPHA related code. Automake takes - care of it automatically now when in gnits mode. - - * lib/md5.c (md5_process_bytes): Cast void* pointer to char* before - doing arithmetic with it. - -Sat Oct 19 23:13:54 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * lib/md5.c: Update from GNU libc. - * lib/md5.h: Update from GNU libc. - -Fri Oct 18 00:08:04 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * configure.in (AC_OUTPUT): Add tests/join-test/Makefile. - - * tests/Makefile.am (SUBDIRS): Add join-test. - -Tue Oct 15 23:25:31 1996 Jim Meyering <meyering@na-net.ornl.gov> - - * src/tr.c (get_next): Rewrite to treat lower/upper mapping as a - special case. - (main): Write separate loops to initialize mapping for lower->upper - and upper->lower conversion. - Reported by Arne Henrik Juul. - -Sun Oct 13 12:52:42 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/setuidgid.c (main): Enclose diagnostic in _(...). + * src/fmt.c (main): Likewise. + * src/mknod.c (main): Likewise. + * src/tac.c (tac_seekable): Likewise. + * src/yes.c (main): Likewise. + * src/od.c (main): Likewise. + * src/install.c (change_attributes): Likewise. - * lib/xstrtol.c (__xstrtol): Return an error for invalid suffix. - Before, e.g., `split -b 1M' would be silently accepted and treated - like `split -b 1'. Reported by Franc,ois. +2003-07-10 Jim Meyering <jim@meyering.net> - * src/split.c (usage): Remove parameter, REASON. - (main): Update callers to use combination of error (0, 0, ... and - usage (EXIT_FAILURE). - (main): When a string operand cannot be converted to a number of - bytes or lines, include that string in the diagnostic. + * src/head.c (usage): Use 1024*1024 in place of 1048576. + * src/tail.c (usage): Likewise. -Sat Oct 12 00:05:11 1996 Jim Meyering <meyering@na-net.ornl.gov> + * tests/rm/fail-2eperm: Now that we have setuidgid, use it in + place of the kludge in this test. Suggestion from Paul Jarc. - * configure.in (AC_REPLACE_FUNCS): Add strpbrk and strtol. + * src/Makefile.am (noinst_PROGRAMS): Define to setuidgid. + * src/setuidgid.c: New program, solely for testing (not installed). - * lib/Makefile.am (EXTRA_DIST): Remove. + * src/chown-core.c (change_file_owner): Don't leak file descriptors + when dereferencing symlinks. -Thu Oct 10 23:41:36 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-07-09 Jim Meyering <jim@meyering.net> - * lib/md5.c (md5_stream): Apply fix from Ralph Loader - <loader@maths.ox.ac.uk> via Ulrich Drepper. + * tests/du/slash: New file/test for today's lib/ftw.c fix. + * tests/du/Makefile.am (TESTS): Add slash -Wed Oct 9 07:26:40 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/tail.c (xlseek): Avoid warning about ``return without value + from function returning non-void''. - * lib/Makefile.am (tu_DEPENDENCIES): Depend on $(tu_LIBADD). +2003-07-08 Jim Meyering <jim@meyering.net> -Tue Oct 8 21:32:17 1996 Jim Meyering <meyering@na-net.ornl.gov> + * man/help2man: Update to version 1.29. - * lib/error.c: Include error.h to align with libit -- - under protest, François :-). + * man/help2man: Add END handler to close STDOUT and check for errors. -Sun Oct 6 08:02:28 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-30 Paul Eggert <eggert@twinsun.com> - * acinclude.m4 (AC_HEADER_SYS_TIME_H, AM_FUNC_MKTIME, - AM_FUNC_ERROR_AT_LINE, AM_FUNC_OBSTACK): Remove definitions. - They're included in automake-1.1f. + Add support for a "[" that conforms to the GNU coding standards, + i.e., that does not depend on its name. + * src/lbracket.c: New file. + * README: Add "[". + * man/Makefile.am (programs): Ignore "[", since it doesn't have + a separate man page. + * src/Makefile.am (bin_PROGRAMS): Add "[". + (__SOURCES): New var. + * src/test.c (LBRACKET): Define to 0 if not defined. + (main): Use LBRACKET rather than argv[0]. - * configure.in (AM_FUNC_ERROR_AT_LINE): Use it instead of - open-coding it. + * src/test.c (one_argument): Do not check for -t if POSIXLY_CORRECT. + Reported by Paul Jarc and Dan Jacobson. -Sat Oct 5 12:40:22 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/test.c (main): Do not recognize --help or --version if + POSIXLY_CORRECT, when invoked as "test". Handle "[ ]" correctly. + Do not bother testing that margv[margc] is non-null. - * lib/memcpy.c [HAVE_CONFIG_H]: Include config.h. - From Karl Berry. +2003-07-04 Jim Meyering <jim@meyering.net> -Fri Oct 4 07:20:37 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/who.c (print_line): Rewrite to use asprintf, in order to be + able to avoid emitting trailing spaces. Reported by Dan Jacobson. - * configure.in (GNU_PACKAGE): New variable. - (PACKAGE_VERSION): Remove it. + * tests/misc/head-elide-tail: Add tests of head's new --lines=-N + option, and perform the +1600 invocations of head IFF the envvar + RUN_EXPENSIVE_TESTS is set. - * acconfig.h (GNU_PACKAGE): New variable. - (PACKAGE_VERSION): Remove now-unused variable. +2003-07-03 Jim Meyering <jim@meyering.net> - * lib/long-options.c (parse_long_options): Separate package name - and version number to accomodate new --version output requirement. - * lib/long-options.h: Update prototype. + * src/cp.c (do_copy): Give a better diagnostic when failing due + to nonexistent destination directory. Reported by Dmitry Rutsky. + See http://bugs.debian.org/199730 for details. -Thu Oct 3 23:27:31 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-27 Jim Meyering <jim@meyering.net> - * src/md5sum.c (main): Remove dead code that used to print --version - output. + split's --verbose option did nothing [broken in 4.5.10 and 5.0] + * src/split.c (longopts): Use `1', not `0' as the value for + for &verbose. Reported by Keith Thompson. -Tue Oct 1 06:54:22 1996 Jim Meyering <meyering@na-net.ornl.gov> + Test for the above fix. + * tests/misc/split-a: Also use --verbose and compare stderr + output with what we'd expect. - * configure.in: Use result of AM_FUNC_STRTOD to set POW_LIBM. - * src/Makefile.am (sort_LDADD): Use any library (-lm) that - gets substituted for @POW_LIBM@. +2003-06-20 Jim Meyering <jim@meyering.net> - * tests/md5sum-test/md5-rfc (md5sum): Use ../../src/md5sum. + * src/copy.c (copy_internal) [HAVE_STRUCT_STAT_ST_AUTHOR]: + Use `error_t' (rather than int) as type for local `err'. + From Alfred M. Szmidt. -Mon Sep 30 23:35:46 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-19 Marcus Brinkmann <marcus@gnu.org> - * tests/md5sum-test/md5-rfc (md5sum): Set to $srcdir/md5sum. + * src/copy.c (copy_internal) [HAVE_STRUCT_STAT_ST_AUTHOR]: + Fix author preservation code. - * acinclude.m4: Update definitions from gettext-0.24. +2003-06-19 Jim Meyering <jim@meyering.net> -Sun Sep 29 20:04:53 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/ln.c (ENABLE_HARD_LINK_TO_SYMLINK_WARNING): Define to 0. + (do_link): Don't warn about hard link to symlink. - * tests/sort-test/build-script.pl: Die if close fails. - * tests/tr-test/build-script.pl: Likewise. +2003-06-18 Jim Meyering <jim@meyering.net> - * configure.in (AC_OUTPUT): Add tests/cut-test/Makefile. - * tests/Makefile.am (SUBDIRS): Add cut-test. - * tests/cut-test: New directory. + * src/cut.c: Include "getdelim2.h", not "getstr.h". + Reflect renaming: getstr -> getdelim2. -Fri Sep 27 22:22:09 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/comm.c, src/join.c, src/nl.c, src/uniq.c: Reflect renaming: + readline -> readlinebuffer. - * configure.in (ALL_LINGUAS): Add spanish (es). +2003-06-09 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> -Thu Sep 26 21:02:54 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/readlink.c: Include <sys/types.h> before system.h (because + the latter includes <sys/stat.h>). Required on Ultrix 4.3. - * src/md5sum.c (usage): Remove references in --help output to - the now-deprecated --string option. Support for it will be - removed soon. Using this option can provoke a memory access - violation on some systems because of (unavoidable in an efficient - implementation) alignment assumptions made by functions in md5.c. - md5sum.c could leave the option in and accomodate the alignment - restriction, but this option was intended solely for testing, and - the tests are now all file-oriented, so it's not necessary. +2003-06-17 Jim Meyering <jim@meyering.net> - * tests/md5sum-test/md5-rfc: Rewrite to avoid use of --string option. + * src/system.h (initialize_main): Define. + Use it in every `main'. Applied via this: + p='initialize_main (&argc, &argv);' + perl -ni -e '/program_name.=.argv.0/ and print " '"$p"'\n"; print' \ + $(grep -l program_name.=.argv.0 *.c) + test.c uses margc/margv, so I made the change manually for that file. + Based on a patch from Bernard Giroud. -Wed Sep 25 21:43:10 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-09 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> - * tests/sort-test/Makefile.am (t): Factor out .in suffix. - Include new test: t16a. - * tests/tr-test/Makefile.am (t): Likewise. + Fix for build failure on Ultrix 4.3. + * src/stat.c: Include sys/statvfs.h in preference to sys/vfs.h. + Include sys/param.h and sys/mount.h on ultrix. - * src/Makefile.am (EXTRA_DIST): Remove md5-test.rfc. +2003-06-16 Jim Meyering <jim@meyering.net> -Mon Sep 23 10:00:50 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/touch.c (O_NDELAY, O_NONBLOCK, O_NOCTTY, EISDIR): Remove + definitions. + * src/system.h (O_NDELAY, O_NONBLOCK, O_NOCTTY, EISDIR): Define + them here instead, but with one change: define EISDIR to -1, not 0. - * tests/md5sum-test/Makefile.am (EXTRA_DIST): Distribute $(TESTS). + * src/cat.c (cat): Remove `#ifndef ENOSYS', now that it's + guaranteed to be defined. + * src/system.h (ENOSYS, ENOTSUP): Define to -1 if not defined. -Sun Sep 22 09:24:22 1996 Jim Meyering <meyering@na-net.ornl.gov> + * README: Mention the CVS repository. + Encourage addition of test cases. - * src/sort.c (keycompare): Declare translate to be unsigned char *. - Otherwise, sign extension caused misordering when using e.g. -f. - Reported by Erick Branderhorst. - * tests/sort-test/Test.pm: Add Erick's test for that fix. +2003-06-12 Jim Meyering <jim@meyering.net> - * tests/Makefile.am (SUBDIRS): Add md5sum-test. + * src/touch.c (touch): Call close only if necessary. + From Bruno Haible. -Sat Sep 21 13:34:59 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/wc.c (usage): Correct wording: wc prints counts in the order + `newline, word, byte'. Reported by Keith M. Briggs. + * man/wc.x: Fix it here, too. And change `lines' to `newlines'. - * src/Makefile.am (check): Remove tests for md5sum. - * tests/md5sum-test: New directory. Put them here instead. - * configure.in (AC_OUTPUT): Add tests/md5sum-test/Makefile. +2003-06-10 Jim Meyering <jim@meyering.net> -Thu Sep 19 08:54:05 1996 Jim Meyering <meyering@na-net.ornl.gov> + * tests/date/Test.pm: Add a test for the new format, e.g., May-23-2003. - * tests/: Rename from checks. - * Makefile.am (SUBDIRS): Change `checks' to `tests'. - * configure.in (AC_OUTPUT): Likewise. +2003-06-07 Jim Meyering <jim@meyering.net> - * configure.in ($PACKAGE, $VERSION): Don't AC_DEFINE_UNQUOTED these. - AM_INIT_AUTOMAKE now does it (as of automake-1.1e). + * Makefile.maint (syntax-check): Add commented-out (over-aggressive) + rule. -Sun Sep 15 23:08:48 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-06 Jim Meyering <jim@meyering.net> - * Makefile.am (EXTRA_DIST): Remove acinclude.m4. + * src/extract-magic (main): Avoid newer 3-arg form of open, + so this script works also with e.g., perl5.005_03. + Patch by John David Anglin. -Thu Sep 12 17:05:23 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-04 Paul Eggert <eggert@twinsun.com> - * lib/Makefile.am (EXTRA_DIST): Add getline.c. - (tu_SOURCES): Remove getline.c - From Kaveh Ghazi. + * src/system.h: Include <stdbool.h> unconditionally. -Sun Sep 8 13:55:18 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-04 Jim Meyering <jim@meyering.net> - * checks/sort-test/build-script.pl: Prefix $in with \$srcdir/ - so make check works with VPATH build. From Uli Drepper. + * man/Makefile.am (check-programs-vs-x): Rename target + from check-programs-vs-1. Adjust rule to check for the + primary (.x) file, not the generated one (.1). -Sat Sep 7 12:25:42 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-03 Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu> - * src/system.h: Add comments justifying IS* versions of ctype.h macros. + * man/kill.x: New file. + * man/Makefile.am (dist_man_MANS): Add kill.1. + (kill.1): New rule. - * src/fmt.c (check_punctuation): Use ISPUNCT instead of ispunct. - (get_line): Use ISSPACE instead of isspace. From Bruno Haible. +2003-06-04 Jim Meyering <jim@meyering.net> -Mon Sep 2 10:34:46 1996 Jim Meyering <meyering@na-net.ornl.gov> + Ensure that the .x file for a new program is never forgotten again. + * man/Makefile.am (programs): Define. + (check-programs-vs-1): New phony target. + (check-local): Depend on it. - * src/*.c (usage): Tell where to report bugs. +2003-06-03 Jim Meyering <jim@meyering.net> -Sun Aug 25 22:50:47 1996 Jim Meyering <meyering@na-net.ornl.gov> + Avoid unnecessary copying of environment. + * src/env.c (main): Rather than clearing the environment and -- + unless told to ignore environment -- copying all settings from + the saved, original environment, clear the environment only when + that is requested. Suggested by Jens Elkner. - * checks/sort-test/Makefile.am (EXTRA_DIST): Add $x-tests. - ($x-tests): Guard dependencies with @MAINT@. - * checks/tr-test/Makefile.am: Likewise. +2003-06-02 Jim Meyering <jim@meyering.net> -Sat Aug 24 14:25:41 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/system.h: Always include <string.h>, since we assume C89. + Include <limits.h> without checking for HAVE_LIMITS_H. - * src/cat.c (cat): Cast first arg to stpcpy to char* to avoid warnings. + * src/test.c [!TEST_STANDALONE]: Remove #if-0'd block. + (STREQ, S_IXUGO): Remove redundant (in system.h) definitions. -Wed Aug 21 22:28:26 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-06-01 Jim Meyering <jim@meyering.net> - * configure.in (ALL_LINGUAS): Add polish (pl). + Avoid a race condition in `tail -f' described by Ken Raeburn in + http://mail.gnu.org/archive/html/bug-textutils/2003-05/msg00007.html + * src/tail.c (file_lines): Add new parameter, *read_pos, and set it. + (pipe_lines, pipe_bytes, start_bytes, start_lines): Likewise. + (tail_bytes, tail_lines, tail): Likewise. + (tail_file): Use the new `read_pos' value as the size, + rather than stats.st_size from the fstat call. -Sun Aug 18 09:34:42 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-05-28 Jim Meyering <jim@meyering.net> - * configure.in (AC_OUTPUT): Add checks/sort-test/Makefile. - * checks/Makefile.am (SUBDIRS): Add sort-test. + * src/extract-magic: Allow expansion of `$file' in the here- + document corresponding to the comment at the top of fs.h. -Sat Aug 17 18:57:17 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-05-26 Jim Meyering <jim@meyering.net> - * Makefile.am (EXTRA_DIST): Add acinclude.m4. + * src/stat.c: Fix portability problem on FreeBSD5.0: don't include + <sys/statvfs.h> on systems without HAVE_STRUCT_STATVFS_F_BASETYPE. + Use #if/#elif/... cascade so we get only one set of include files. + Reported by Nelson Beebe. -Tue Aug 13 21:47:23 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-05-24 Jim Meyering <jim@meyering.net> - * src/Makefile.am (EXTRA_DIST): Remove ansi2knr.1 and ansi2knr.c. - Automake includes them automatically. + * src/md5sum.c (split_3): Accept the BSD format only when in MD5 mode. + * tests/sha1sum/basic-1: Make sure `sha1sum --check' doesn't + accept the BSD format. - * configure.in (AM_INIT_AUTOMAKE): Use it. - (AM_PROG_INSTALL): Remove. AM_INIT_AUTOMAKE does this. - (AC_PROG_MAKE_SET): Likewise. +2003-03-28 Joe Orton <jorton@redhat.com> -Sun Aug 11 20:49:21 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/md5sum.c (bsd_split_3): New function. + (split_3): Detect checksums from BSD 'md5' command and handle them + using bsd_split_3. - * configure.in: Rename a few macros for automake-1.1c. - (AC_REPLACE_GNU_GETOPT): Remove. - (AC_PATH_PROG): Find perl -- needed only for checks if you - change or remove things with e.g. make maintainerclean. + * tests/md5sum/basic-1: New tests for --check exit status, and for + BSD-style checksum files. +2003-05-21 Jim Meyering <jim@meyering.net> - * lib/Makefile.am (tu_LIBADD): Remove @REGEXOBJ@. New AM_WITH_REGEX - adds .o files to @LIBOBJ@. - (tu_SOURCES): Add getopt.c and getopt1.c. - (EXTRA_DIST): Remove getopt.c and getopt1.c. + * src/head.c (elide_tail_lines_pipe): Fix a thinko. + This sort of thing is why it'd be *Really Good* to factor + out the common code used here and in tail.c. - * acinclude.m4: New file -- derived from aclocal.m4. - * aclocal.m4: This file is now generated by the aclocal program - (which comes with the automake package.) +2003-05-14 Jim Meyering <jim@meyering.net> -Sun Aug 4 10:50:46 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/head.c (usage): Document new feature: --bytes=-N and --lines=-N. - * checks/: New directory. - * checks/Makefile.am: New file. - * configure.in (AC_OUTPUT): Add new directories: checks, - checks/tr-test. - * Makefile.am (SUBDIRS): Likewise. + * tests/du/slink: Skip this test if `.' is on an XFS file system. -Sat Jul 27 17:22:14 1996 Jim Meyering <meyering@na-net.ornl.gov> + * tests/du/fd-leak: New file. Test for the bug in du that + was fixed by the 2003-05-12 change to lib/ftw.c. + * tests/du/Makefile.am (TESTS): Add fd-leak. - * src/system.h (bindtextdomain) [!ENABLE_NLS]: Undefine to avoid - redefinition warnings on solaris. - (textdomain) [!ENABLE_NLS]: Likewise. + * src/head.c (AUTHORS): Enclose string in N_(...), now that it + includes a translatable word, `and'. -Thu Jul 25 23:06:35 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/dd.c (usage): Don't use `,' as the thousands separator + in e.g. 1,000,000 and 1,048,576. Instead, do this: + `SIZE may be ..., MB 1000*1000, M 1024*1024 and so on...' + * src/df.c (usage): Likewise. + * src/du.c (usage): Likewise. + * src/ls.c (usage): Likewise. - * src/unexpand.c (unexpand): Move EOF check to follow code that - processes and generates output for pending spaces. Before - `printf ' ' |unexpand -t 1,2' generated no output. + * Makefile.maint (syntax-check): Add another check. - * src/md5sum.c (md5_check): Remove parameter, BINARY. - Rename local TYPE_FLAG to BINARY, so md5_file uses the binary mode - from the input stream rather than the one from the command line. - (main): Fail with a diagnostic if --binary or --text is specified - when verifying checksums. - Reported by Eli Zaretskii <eliz@is.elta.co.il>. +2003-05-13 Paul Eggert <eggert@twinsun.com> -Sun Jul 21 11:58:48 1996 Jim Meyering <meyering@na-net.ornl.gov> + Fix uniq to conform to POSIX, which requires that "uniq -d -u" + must output nothing. Problem reported by Josh Hyman. - * configure.in: Add check for error_at_line so systems with - GNU libc don't compile and link with distributed error.c. - * lib/Makefile.am (tu_SOURCES): Remove error.c. - (EXTRA_DIST): Add error.c. + * src/uniq.c (enum output_mode, mode): Remove, replacing with: + (output_unique, output_first_repeated, output_later_repeated): + New vars. All uses of "mode" changed to use these variables, + which are not mutually exclusive as "mode" was. + (writeline): New arg "match", used to control whether to + obey output_first_repeated or output_later_repeated. + All callers changed. + (check_file, main): Adjust to above changes. + + * tests/uniq/Test.pm: Test that 'uniq -d -u' outputs nothing. + +2003-05-14 Jim Meyering <jim@meyering.net> + + * tests/rm/rm3: Use tr's \n notation rather than \012. + This package can afford to do that, since its tests are guaranteed use + GNU tr, which has accepted the more modern notation for 10 years. + * tests/rm/rm5: Likewise. + * tests/cp/same-file: Likewise. + * tests/stty/row-col-1: Likewise. + * tests/stty/basic-1: Likewise. + * tests/rm/deep-1: Likewise. + * tests/mv/part-symlink: Likewise. + * tests/mkdir/perm: Likewise. + * tests/misc/nice: Likewise. + +2003-05-13 Jim Meyering <jim@meyering.net> + + * src/copy.c (struct F_triple) [name]: Remove const attribute. + (triple_free): Don't apply cast to argument of free. + (seen_file): Add cast here instead. + + * src/cp-hash.c (struct Src_to_dest) [name]: Remove const attribute. + (src_to_dest_free): Don't apply cast to argument of free. + + * src/sort.c (zaptemp): Don't apply cast to argument of free. + * src/pr.c (init_fps, init_store_cols): Likewise. + * src/join.c (delseq, freeline): Likewise. + * src/expr.c (OLD): Likewise. + * src/sort.c (sort): Likewise. + * src/head.c (elide_tail_lines_pipe): Likewise. + + * src/tail.c: Include "quote.h". + Use quote in diagnostics. Change many error format strings + from just `%s' to e.g., `error reading %s'. + (pipe_lines): Change type of parameter, n_lines, to uintmax_t. + Rewrite newline-counting loop to use memchr. + + * src/head.c (elide_tail_lines_pipe): Use `if', not assert. + Now that assert is no longer used, don't include <assert.h>. + +2003-05-12 Jim Meyering <jim@meyering.net> + + * src/head.c: Include <assert.h>. + (AUTHORS): Add my name. + (elide_tail_lines_pipe): New function. + +2003-05-10 Jim Meyering <jim@meyering.net> + + * Makefile.maint (syntax-check): Check for `error (EXIT_SUCCESS,'. + + * src/readlink.c (main): Set program_name before first use. + Remove that (redundant) first use. + Don't exit successfully just because --verbose was specified. + Pass 0, not EXIT_SUCCESS, as first argument to error; when that + parameter is 0, error does not exit. + + * src/uname.c (main): When failing due to too many arguments, also say + that, rather than just "Try `uname --help' for more information.". + * src/comm.c (main): Likewise, but for too few arguments. + * src/logname.c: Include error.h. + (main): Say why we're failing. + + * src/uniq.c (main): Don't segfault when argc < optind. + * src/who.c (main): Handle argc < optind. + * src/df.c (main): Likewise. + * src/install.c (main): Likewise. + * src/mv.c (main): Likewise. + * src/pwd.c (main): Likewise. + * src/tty.c (main): Likewise. + * src/chroot.c (main): Likewise. + * src/hostname.c: Likewise. + * src/du.c (main): Likewise. + * src/expand.c (main): Likewise. + * src/env.c (main): Likewise. + * src/unexpand.c (main): Likewise. + * src/printenv.c (main): Likewise. + * src/sync.c (main): Handle argc == 0. + * src/expr.c (main): Likewise. + * src/printf.c (main): Likewise. + * src/basename.c (main): Likewise. + * src/ln.c (main): Test for `missing argument' before computing n_files. + * src/tail.c (main): Test for the case of no arguments before + computing n_files. + + * src/kill.c (send_signals): Don't check command line arguments here. + (main): Check them here instead. Handle argc < optind. + + * src/logname.c (main): Use error, rather than fprintf, for the sake + of consistency. + + * src/rm.c (main): Don't overrun array bound if argc is 0. + +2003-05-09 Jim Meyering <jim@meyering.net> + + * src/sort.c (main): Don't overrun array bound if argc is 0. + That would happen when invoked via: execl ("/usr/bin/sort", NULL); + Reported by Wartan Hachaturow. + +2003-05-07 Jim Meyering <jim@meyering.net> + + Implement support so that `head --lines=-N' works on seekable files. + * src/head.c (enum Copy_fd_status): Define. + (COPY_FD_DIAGNOSE): New macro. + (elide_tail_lines_seekable): New funtion. + (elide_tail_lines_file): Call it here. + +2003-05-06 Jim Meyering <jim@meyering.net> + + * src/sys2.h (CHAR_BIT): Remove duplicate definition. + +2003-05-04 Jim Meyering <jim@meyering.net> + + * tests/head/Test.pm: Remove tests of --bytes=-N; using that framework + caused the addition of thousands of small files to the tar archive. + * tests/misc/head-elide-tail: New file. Add them here instead. + * tests/misc/Makefile.am (TESTS): Add head-elide-tail. + +2003-05-04 Paul Eggert <eggert@twinsun.com> + + * src/remove.c (HAVE_WORKING_READDIR): Define to 0 if not defined. + (IF_READDIR_NEEDS_REWINDDIR): Remove. + (remove_cwd_entries): Rewrite to avoid IF_READDIR_NEEDS_REWINDDIR, + which was a bit weird because it couldn't be emulated by a function. + +2003-05-03 Jim Meyering <jim@meyering.net> + + Extend head to accept --lines=-N (--bytes=-N) and to print all + but the N lines (bytes) at the end of the file. + * src/head.c: Include full-write.h, full-read.h, inttostr.h, quote.h. + Use quote() in diagnostics, rather than literal `' marks. + (copy_fd, elide_tail_bytes_pipe, elide_tail_bytes_file): + New functions. + (elide_tail_lines_pipe, elide_tail_lines_file): New functions. + (head_file): Reorganize so as to call head from only one place. + (main): Likewise, for head_file. + Handle new, undocumented option, --presume-input-pipe. + Handle negative line and byte counts. + * tests/head/Test.pm: Add lots of tests to exercise --bytes=-N. + + * tests/du/8gb: Skip test if the file system of `.' doesn't support + sparse files -- otherwise it'd create a file of size 8GB. + +2003-05-02 Jim Meyering <jim@meyering.net> + + * src/fmt.c (usage): Don't mention obsolescent -WIDTH option. + Instead explain about `-' and standard input. + (main): Give a proper diagnostic for e.g., `fmt -c -72'. + Reported by Keith Thompson. + * tests/fmt/basic: Add test for the above fix. - * configure.in (AC_REPLACE_FUNCS): Replace getline.c. - Add related check for the getdelim function. - From Ulrich Drepper -- as done in gettext. + * src/fmt.c: Include "quote.h". + Use quote() in diagnostics, rather than literal `' marks. + (main): Exit nonzero when unable to open an input file. + * tests/fmt/basic: Add test for the above fix. -Sat Jul 20 15:59:36 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/fmt.c (main): Diagnose invalid suffix on obsolescent width + specifications like `-72x'. + * tests/fmt/basic: Add test for the above fix. - * configure.in (PACKAGE_VERSION): Use space instead of hyphen to - separate PACKAGE and VERSION. + Work around nasty readdir bug on Darwin6.5. + * src/remove.c (IF_READDIR_NEEDS_REWINDDIR): Define. + [! HAVE_WORKING_READDIR] (remove_cwd_entries): If readdir has just + returned NULL and there has been at least one successful unlink or + rmdir call since the opendir or previous rewinddir, then call + rewinddir and reiterate the loop. - * aclocal.m4 (AM_SANITY_CHECK_CC): New macro. Derived from - macros from Bruno Haible and from Cygnus. - * configure.in (AM_SANITY_CHECK_CC): Use it. + Factor out common code. + * src/remove.c (readdir_ignoring_dotdirs): New function. + (is_empty_dir): Use it here. + (remove_cwd_entries): Use it here. -Wed Jul 17 00:30:28 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-05-01 Jim Meyering <jim@meyering.net> - * install-sh: Get version with MIT copyright. + * tests/rm/r-3: Create 500 rather than just 300 files. + There's a bug in Darwin6.5's readdir that shows up only with + 338 or more files. + Fix a bug in this test: `cd $pwd' (not to `..'), now that $tmp + has two components. -Tue Jul 16 00:09:37 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/tail.c: + Change type of n_units, n_bytes, n_lines to be `uintmax_t'. + (dump_remainder): Move two declarations `down' into the scope + where they are used. + (xlseek): Return the resulting offset. + (file_lines): Rename parameter, file_length, to end_pos. + (pipe_lines): Don't coerce safe_read return value to `int'. + Adapt tests accordingly. + (pipe_bytes) [struct charbuffer] (nbytes): Change type from `int' + to `unsigned int'. + Change type of `total_bytes' from `int' to `size_t', + since the former wouldn't always be wide enough. + Don't coerce safe_read return value to `int', + and adapt tests accordingly. + Now that testing for a read error no longer involves + using `tmp', handle that case *after* freeing `tmp'. + (start_bytes): Clean up. + (tail_bytes): Now that `n_bytes' may be larger than + OFF_T_MAX, test for that condition and, if it's true, don't + use lseek optimizations. + (parse_options): Don't fail just because N_UNITS is larger than + the maximum size of a file -- tail may be applied to an input + stream (e.g., a pipe) with more data than that. - * aclocal.m4 (fp_C_PROTOTYPES): Improved version from - François Pinard. - Update all other macros to reference $fp_cv_prog_cc_stdc, rather - than $ac_cv_prog_cc_stdc. + * Makefile.maint (syntax-check): Rename from alloc-check. + Also check for SPACE-TAB sequences. + Also check for malloc/calloc/realloc casts. - * src/od.c (OFF_T_MAX): Remove definition. - (main): Compare against LONG_MAX rather than OFF_T_MAX. +2003-05-01 Jim Meyering <jim@meyering.net> + + * src/tail.c (start_lines): Rewrite to use memchr. Clean up. + +2003-04-28 Jim Meyering <jim@meyering.net> + + * tests/misc/tty-eof: Send two tokens, not just one, so we don't + make the now-more-picky tsort fail. + +2003-04-24 Jim Meyering <jim@meyering.net> + + * src/tsort.c (tsort): Remove unnecessary test of have_read_stdin. + (main): Minor syntactic clean-up. + + * src/tsort.c (tsort): Fail if the input contains an odd number of + tokens. Reported by junkio@cox.net. + + * tests/tsort/basic-1: Test for the above fix. + +2003-04-21 Jim Meyering <jim@meyering.net> + + * tests/misc/printf: Add tests for the printf fixes below. + + * Makefile.cfg (cvs_files): Add $(srcdir)/config/depcomp to the list. -Mon Jul 15 23:42:57 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-04-20 Paul Eggert <eggert@twinsun.com> - * Many files: Update FSF address. + 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, + \0NNN in the %b operand. + * src/printf.c (usage): Likewise. + (print_esc): New arg OCTAL0 to specify whether \0NNN or \NNN + is desired. All uses changed. Behave like Bash printf if %b + operand uses \NNN where the initial N is not 0. -Sun Jul 14 16:53:50 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-04-17 Jim Meyering <jim@meyering.net> - * src/unexpand.c (unexpand): Fix bug that contributed to endless loop - when invoking `echo ' ' |unexpand -t 1,2': use print_tab_index, not - tab_index in inner flush_pend: while loop. From Keith Owens - <kaos@audio.apana.org.au>. + * src/stty.c: Remove uses of PROTOTYPE macro. - * src/unexpand.c [HAVE_LIMITS_H]: Include limits.h for INT_MAX. - [!INT_MAX]: Define it. - (main): Append INT_MAX to command-line-specified tab list to - ensure termination in unexpand's inner loop. - Derived from a patch from Keith Owens. +2003-04-15 Jim Meyering <jim@meyering.net> -Thu Jul 11 22:04:36 1996 Jim Meyering <meyering@na-net.ornl.gov> + * Makefile.maint: Remove (or replace-with-TAB(s) to retain alignment) + each sequence of spaces before a TAB character. - * Version 1.19. +2003-04-13 Jim Meyering <jim@meyering.net> - * configure.in (VERSION): Bump to 1.19. + * src/remove.c (is_empty_dir): Don't closedir (NULL). -Wed Jul 10 22:57:29 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-04-12 Jim Meyering <jim@meyering.net> - * aclocal.m4 (fp_PROG_CC_STDC): Include sys/stat.h in test program - so that DYNIX/ptx V4.1.3 doesn't use `-Xc -D__EXTENSIONS__' -- with - those options on that system, sys/stat.h gets compile errors. - With help from Marcus Daniels. + Giving nl an invalid STYLE argument (in --header-numbering=STYLE (-h), + --body-numbering=STYLE (-b), or --footer-numbering=STYLE (-f)) or + FORMAT (--number-format=FORMAT (-n)) would not give a useful diagnostic. + * src/nl.c (main): Fix those problems and remove literal quote marks + (e.g., "`%s'") from format string; instead use "%s" in each format + string and `quote (optarg)' as the corresponding argument. + Also, diagnose all invalid command line options before failing. - * getopt.c: Update from gettext-0.10.23. - * getopt1.c: Likewise. - * getopt.h: Likewise. + * src/nl.c (proc_text): Fix a bug that would make nl output extra + newlines in some cases. Details here: http://bugs.debian.org/177256. + This bug was introduced on 2001-11-10 for textutils-2.0.17. + * tests/misc/nl: Add test for the above-fixed bug. -Tue Jul 9 18:07:23 1996 Jim Meyering <meyering@na-net.ornl.gov> + * tests/misc/readlink: New file. Test the --canonicalize option. + * tests/misc/Makefile.am (TESTS): Add readlink. - * src/fmt.c (MAXCOST): Use `(unsigned long)1' rather than `(COST)1' - so the left operand of the << isn't signed. - From Kjetil Torgrim Homme. +2003-04-11 Jim Meyering <jim@meyering.net> - * po/Makefile.in.in (install-data): Don't install NLS files when - they're not requested. From Ulrich Drepper. Reported by - Kjetil Torgrim Homme <kjetilho@ifi.uio.no>. + Clean up. + * src/chown.c, src/cp.c, src/dircolors.hin, src/du.c, src/ln.c: + * src/mkfifo.c, src/ptx.c, src/spline.c, src/stty.c, src/tail.c: + * src/test.c, src/unexpand.c: Remove (or replace-with-TAB(s) to + retain alignment) each sequence of spaces before a TAB character. -Fri Jul 5 21:55:58 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/ls.c: Include <stdlib.h> unconditionally. - * po/Makefile.in.in ($(PACKAGE).pot): Merge from gettext-0.10.23. - * ABOUT-NLS: Likewise. - * intl/*: Likewise. - * aclocal.m4: Likewise. + * Makefile.maint (xalloc-check): Rename from header-check. -Thu Jul 4 07:24:54 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/yes.c: Include error.h after system.h, not before. - * src/uniq.c (usage): Remove space before newline in usage message. + Clean up. + * src/copy.c, src/cp-hash.c, src/cp.c, src/csplit.c, src/cut.c: + * src/date.c, src/df.c, src/du.c, src/expand.c, src/expr.c, src/id.c: + * src/join.c, src/md5sum.c, src/nl.c, src/od.c, src/paste.c, src/pr.c: + * src/ptx.c, src/sort.c, src/split.c, src/su.c, src/tail.c, src/tee.c: + * src/tr.c: * src/unexpand.c, src/users.c: + Remove anachronistic casts of xmalloc, xrealloc, and xcalloc + return values and of xrealloc's first argument. + Fix the former with this: + perl -pi -e 's/\([^(]*?\*\) *(x(m|c|re)alloc)\b/$1/' - * src/md5sum.c (MIN_DIGEST_LINE_LENGTH): New macro. - [NEWLINE_REPLACEMENT_STRING*]: Remove macros. - (main): Output a leading backslash for a line describing a file - whose name contains a newline. Then translate each NEWLINE byte - in the file name to the string, "\\n", and each backslash to "\\\\". - File names that don't contain NEWLINE aren't translated. - (split_3): Rewrite to handle file names with embedded newlines. - Miles Bader and Jim Blandy suggested this new encoding scheme. +2003-04-10 Jim Meyering <jim@meyering.net> - * src/md5sum.c (md5_file): Replace obsolete comment with a description - of the function. - (md5_check): Don't use "s"-adding trick to form the plural of - `checksum.' That doesn't work well with translation. - Suggestions from Ulrich Drepper. - (split_3): Add missing semicolon so it compiles. From Jim Blandy. + * src/stty.c (wrapf): Declare with format attribute. -Wed Jul 3 23:21:09 1996 Jim Meyering <meyering@na-net.ornl.gov> + The S_MAGIC_... names shouldn't be maintained in two places (prior + to this change, one would have to keep stat.c and fs.h in sync). + This change makes it so those names and the corresponding + hexadecimal constants all reside in stat.c. fs.h is now generated. + * src/Makefile.am (fs.h): New rule to generate fs.h from stat.c. + (BUILT_SOURCES): Add fs.h, now that it's generated. + (EXTRA_DIST): Add extract-magic. + * src/extract-magic: New script to extract fs.h definitions from stat.c. + * src/stat.c (human_fstype) [__linux__]: Append each hex constant from + fs.h in a comment after the corresponding `case S_MAGIC_...:' statement. - * src/md5sum.c (split_3): Correct test for 35-byte line to accomodate - fact that leading blanks may be stripped. + * tests/tail-2/big-4gb: Skip this test (don't fail) if creating a + file with nominal length > 4GB fails. Reported by Michael Deutschmann. -Tue Jul 2 21:51:40 1996 Jim Meyering <meyering@na-net.ornl.gov> + * man/unexpand.x: Add `SEE ALSO' reference to expand. + * man/expand.x: Add `SEE ALSO' reference to unexpand. + Suggestion from Dan Jacobson. - * configure.in (ALL_LINGUAS): Add dutch (nl). +2003-04-10 Maciej W. Rozycki <macro@ds2.pg.gda.pl> -Mon Jul 1 23:50:19 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/fs.h (S_MAGIC_DEVPTS): New magic for Linux's devpts. + * src/stat.c (human_fstype): Handle Linux's devpts. - * src/md5sum.c [NEWLINE_REPLACEMENT_STRING]: Define. - (split_3): Translate NL bytes not to NUL, but to - NEWLINE_REPLACEMENT_STRING. - Suggested by Ulrich Drepper. - (main): Translate back to NL-containing filename. +2003-04-09 Paul Eggert <eggert@twinsun.com> -Sun Jun 30 22:42:17 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/split.c (line_bytes_split): Arg is of type size_t, since + that's all that is supported for now. + (main): Check for overflow in obsolescent line count option. - * src/md5sum.c (split_3): Take an additional parameter, S_LEN. - Adapt caller. - Map translated NEWLINE-containing filename back into the original - NEWLINE-containing name. - (md5_check): Translate NEWLINE bytes to NUL bytes in filename. +2003-04-09 Jim Meyering <jim@meyering.net> -Sat Jun 29 18:59:07 1996 Jim Meyering <meyering@na-net.ornl.gov> + * tests/misc/split-fail: Add a new test for the above fix. - * configure.in (PACKAGE_VERSION): Add `GNU ' prefix so it - appears in the output of --version. Reported by RMS. + * src/split.c (bytes_split): Use size_t temporary (rather than + uintmax_t original) in remaining computations. From Paul Eggert. -Wed Jun 26 21:35:10 1996 Jim Meyering <meyering@na-net.ornl.gov> + Handle command line option arguments larger than 2^31. + This allows e.g., splitting into files of size 2GB and larger, + and running split --lines=N with N=2^31 or more. + But for --line-bytes=N, the restriction that N <= SIZE_MAX + remains (for now), due to the way it is implemented. - * src/Makefile.am (LDADD): Remove sort-specific hack to link - with -lm. - * aclocal.m4 (AM_FUNC_STRTOD): New macro. - * configure.in (AM_FUNC_STRTOD): Use it. - (AC_REPLACE_FUNCS): Remove strtod. - Suggested by Tom Tromey. + * src/split.c: Include "inttostr.h". + (bytes_split, lines_split, line_bytes_split, main): + Use uintmax_t, not size_t, for file sizes. + (main): Give a better diagnostic for option arguments == 0. + Use umaxtostr to print file sizes. + Reported by Luke Hassell. - * po/Makefile.in.in (install-data): Add `else true;' to avoid - letting failing if-condition cause make failure. - From Fred Fish (fnf@ninemoons.com). +2003-04-08 Jim Meyering <jim@meyering.net> -Tue Jun 25 21:55:18 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/rm.c (usage): Mention that --directory (-d) works only + on some systems. Suggestion from Samuel Tardieu. - * Version 1.18a. + * tests/basename/basic: Run $PERL to see if it is available, + rather than testing its value. + * tests/sum/sysv, tests/tsort/basic-1, tests/unexpand/basic-1: + * tests/basename/basic, tests/dd/skip-seek, tests/dircolors/simple: + * tests/expr/basic, tests/factor/basic, tests/fmt/basic: + * tests/ls-2/tests, tests/md5sum/basic-1, tests/md5sum/newline-1: + * tests/misc/sort, tests/misc/tty-eof, tests/mv/i-1: + * tests/rm/empty-name, tests/rm/fail-eperm, tests/rm/unreadable: + * tests/seq/basic, tests/sha1sum/basic-1, tests/sha1sum/sample-vec: + * tests/sum/basic-1, tests/seq/basic: Likewise. -Tue Jun 18 20:43:20 1996 Jim Meyering <meyering@na-net.ornl.gov> + * tests/misc/Makefile.am (TESTS): Add split-fail. + * tests/misc/split-fail: New file. - * aclocal.m4: Update from gettext-0.10.20. - * ABOUT-NLS: Likewise. - * intl/*: Likewise. + * src/split.c: Rename local variables: nchars -> n_bytes. + (lines_split): Rename local, nlines -> n_lines. + (main): Rename local variable: s/accum/n_units/. + (main): Use STDIN_FILENO, not literal `0'. -Thu Jun 13 22:31:39 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-04-07 Jim Meyering <jim@meyering.net> - * configure.in (VERSION): Bump to 1.18a. + * src/stat.c: Add #include directives for Ultrix 4.4. + Based on a suggested change from Bert Deknuydt. - * po/Makefile.in.in ($(PACKAGE).pot): Reapply change of May 30. - Depend on POTFILES only when using maintainer mode. +2003-04-06 Jim Meyering <jim@meyering.net> - * intl/*: Update from gettext-0.10.18. + * Makefile.maint (makefile-check): New rule. + (local-check): Add it. -Tue Jun 11 23:32:10 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-04-05 Jim Meyering <jim@meyering.net> - * Version 1.18. + * Makefile.am (nearly all of them): + Use $(VAR) rather than @VAR@, now that we can rely on automake to + emit a definition for each substituted variable. + * tests/Makefile.am.in: Likewise. - * po/Makefile.in.in: Update from gettext-0.10.17. - * intl/*: Likewise. - * ABOUT-NLS: Likewise. + * tests/rm/rm5: Add a comment explaining why this test fails when + using Tru64's broken sed. + * tests/rm/rm3: Likewise. -Mon Jun 10 18:22:29 1996 Jim Meyering <meyering@na-net.ornl.gov> + Make `kill -t' output signal descriptions (not `?') on Tru64. + * src/kill.c (sys_siglist): Also check for __sys_siglist. + Patch by Tony Leneis. + * configure.ac: Also check for declaration of __sys_siglist. + Required for Tru64 4.0D, 4.0F, and 5.1. + Reported by Tony Leneis. - * Makefile.am (cvs-dist): Use -c option in cvs tag command. +2003-04-04 Jim Meyering <jim@meyering.net> -Fri Jun 7 22:06:46 1996 Jim Meyering <meyering@na-net.ornl.gov> + * src/Makefile.am (PERL): Remove unnecessary definition. - * configure.in (VERSION): Set to 1.18. + Because of inappropriate (but POSIX-mandated) behavior of rename, + `mv a b' would not remove `a' in some unusual cases. Work around + this by unlinking `a' when necessary. - * src/Makefile.am (sort_LDADD): Set this to -lm to get pow when using - the strtod supplied with this package. Otherwise, linking failed on - Solaris-2.4 systems. Reported by Wayne Stewart <wstewa@atl.com>. + * src/copy.c (same_file_ok): Add an output parameter. + Set it in the offending case. + (copy_internal): When necessary, unlink SRC_PATH and inform caller. + Reported by Ed Avis. + * tests/mv/hard-4: New test for the above. + * tests/mv/Makefile.am (TESTS): Add hard-4. -Thu Jun 6 21:57:08 1996 Jim Meyering <meyering@na-net.ornl.gov> + Clean up rules for automatically generated sources: + * src/Makefile.am (dircolors.h, wheel-size.h, wheel.h, false.c): + Make each generated file be read-only. + Add each file name to BUILT_SOURCES separately. + (MAINTAINERCLEANFILES): Set to $(BUILT_SOURCES). - * po/Makefile.in.in: Update from gettext-0.10.16. - * intl/*: Likewise. - * ABOUT-NLS: Likewise. - * aclocal.m4 (AC_REPLACE_GNU_GETOPT): Move definition to precede - gettext-related ones. - Update from gettext-0.10.16. + Put LOCALEDIR macro definition in new file: localedir.h. + * src/Makefile.am (DEFS): Remove definition. + (localedir.h): New rule. + (BUILT_SOURCES, DISTCLEANFILES): Add localedir.h. + * src/system.h: Include "localedir.h". -Fri May 31 22:04:51 1996 Jim Meyering <meyering@na-net.ornl.gov> +2003-04-02 Jim Meyering <jim@meyering.net> - * Version 1.17. + * Version 5.0. - * Makefile.am (EXTRA_DIST): Set to texinfo.tex so that file is - distributed. + * tests/misc/Makefile.am (TESTS): Add false. -Thu May 30 00:07:48 1996 Jim Meyering <meyering@na-net.ornl.gov> + * Makefile.maint (TMPDIR): Make sure it's defined. + (my-distcheck): Build in $(TMPDIR), not `.'. - * Version 1.16. + * src/Makefile.am (false.c): Change all occurrences of + `(EXIT_SUCCESS)' to `(EXIT_FAILURE)' so that false exits + unsuccessfully also with --help. Reported by Paul Jarc, + * tests/misc/false: New test for the above. - * tail.c (main): Interpret the old-style +VALUE and -VALUE options - like -c VALUE and -c +VALUE (resp) when VALUE has one of the [bkm] - suffix multipliers. This makes the code consistent with --help - output. Reported by Karl Heuer. +2003-03-30 Jim Meyering <jim@meyering.net> - * sort.c (limfield): #ifdef-out a block of code that makes - GNU sort incompatible with Unix sort when a key-end spec refers - to the N'th character in a field that has fewer than N characters. - The POSIX spec doesn't appear to specify behavior for this case. - From Karl Heuer. + * NEWS: Note the location of older NEWS files. - * po/Makefile.in.in (stamp-cat-id): Avoid using temp filename - longer than 14 characters. - (mostlyclean): Likewise. - From Karl Heuer. + * src/remove.c (is_empty_dir): Don't let a failing closedir + clobber errno. Spotted by Arnold Robbins. - * po/Makefile.in.in ($(PACKAGE).pot): Depend on POTFILES only - when using maintainer mode. Reported by Karl Heuer. + * src/env.c: Fix typo in comment. From Arnold Robbins. - * po/Makefile.in.in (.po.mo): Reenable dependency and rule. - It is required when using native NLS, e.g. on Solaris. - From Marcus Daniels. +2003-03-29 Jim Meyering <jim@meyering.net> - * od.c (decode_one_format): Use %lu (not %d) printf format - corresponding to unsigned long, SIZE. + * Version 4.5.12. - * Version 1.15. + * README: Note to expect build problems for stat.c on Ultrix 4.3. + Note that there are some harmless test failures when running + `make check' as root on some systems. - * intl/Makefile.in (installcheck): New target. - * po/Makefile.in.in (installcheck): New target. +2003-03-28 Jim Meyering <jim@meyering.net> - * od.c (decode_one_format): Take another parameter. - Give a specific diagnostic for invalid format spec here rather - than an overly general one from caller's caller. - (decode_format_string): Update caller. - (main): Don't give diagnostic here when decode_format_string fails. - Remove assertions that could fail on some Crays because they don't - have a two-byte type. - Johan Danielsson (joda@pdc.kth.se) reported the failed assertions. + * tests/stty/row-col-1: Skip this test if stty can't get window size. + This happens when connecting to sparc-solaris5.7 via ssh from within + emacs. Reported by Karl Berry. -Mon May 27 17:43:31 1996 Jim Meyering <meyering@na-net.ornl.gov> + * tests/du/basic: Use seq, not `yes' to generate 4KB of data. + Otherwise, on systems (DJGPP) that emulate pipes using files, + this test would never complete, waiting for `yes' to terminate. + * tests/du/slink: As above, use seq, not `yes' to generate link target. + * tests/rm/hash: As above, use seq, not `yes' to generate dir name. + Reported by Rich Dawe. - * cat.c (main): Use STDIN_FILENO and STDOUT_FILENO instead of - less portable fileno (stdin) and fileno (stdout). - * sort.c (main): Use STDIN_FILENO instead of less portable - fileno (stdin). +2003-03-27 Jim Meyering <jim@meyering.net> -Mon May 20 21:50:23 1996 Jim Meyering (meyering@na-net.ornl.gov) + * src/id.c: Remove Arnold Robbins' obsolete e-mail address + from `written by...' comment, at his request. - * Makefile.am (distcheck): Remove target and rule -- automake-0.33 - adds it automatically. +2003-03-24 Paul Eggert <eggert@twinsun.com> -Sun May 19 13:15:49 1996 Jim Meyering (meyering@na-net.ornl.gov) + Fix buffer overrun problem reported by TAKAI Kousuke, along + with some other POSIX incompatibilities. - * configure.in (LINGUAS): Add ko. - * Makefile.am (distcheck): Remove @MAINT@ prefix from first command. + * src/printf.c (print_esc): Do not treat \x specially if + POSIXLY_CORRECT. Avoid buffer overrun if the format ends + in backslash. Treat incomplete escape sequences as strings + of characters, as POSIX requires. + (print_formatted): Allow multiple flags. Avoid buffer overrun + if the format is incomplete. -Thu May 16 22:18:41 1996 Jim Meyering (meyering@na-net.ornl.gov) +2003-03-24 Jim Meyering <jim@meyering.net> - * Makefile.am (distcheck): New target. From Gord Matzigkeit. + * tests/misc/printf: Add tests for the above fixes and changes. -Fri May 10 20:46:13 1996 Jim Meyering (meyering@na-net.ornl.gov) +2003-03-26 Jim Meyering <jim@meyering.net> - * po/Makefile.in.in (all-yes): Always depend on CATALOGS. Otherwise - they won't be built and install could fail. From Ulrich Drepper. - (.po.mo): Disable dependency and rule when not in maintainer mode. + * src/copy.h (struct cp_options): Add a comment. - * aclocal.m4 (ud_WITH_NLS): Make DATADIRNAME and CATOBJEXT depend - on whether we're using GNU gettext. From Ulrich Drepper. +2003-03-23 Jim Meyering <jim@meyering.net> -Wed May 8 21:10:43 1996 Jim Meyering (meyering@na-net.ornl.gov) + * README: Describe problem with 64-bit mode on HPUX 11.x, + with patch for /usr/include/inttypes.h. + * TODO: Plan to add an autoconf test to work around the bug. - * intl/Makefile.in (distdir): Renamed from dist. For compatibility - with automake-0.32. - * po/Makefile.in.in (distdir): Likewise. +2003-03-22 Jim Meyering <jim@meyering.net> - * po/Makefile.in.in (all-yes): Depend on GMOFILES. - Depend on CATALOGS and GMOFILES files only in maintainer mode. + * src/stat.c: Don't include <sys/sysmacros.h>. + That is already done via system.h. Otherwise, the multiple + inclusion would evoke redefinition warnings from Cray's /bin/cc, + aka Cray Standard C Version 4.0.3 (057126) Mar 22 2003 22:02:28. + (human_fstype): Factor some directives `up', out of this function. + Cast away `const' to avoid error from Cray's /bin/cc. -Tue May 7 22:10:20 1996 Jim Meyering (meyering@na-net.ornl.gov) +2003-03-20 Jim Meyering <jim@meyering.net> - * configure.in: Require autoconf-2.10. + * announce-gen (print_changelog_deltas): Ensure that a newline + precedes each row of `*'s. - * aclocal.m4 (jm_MAINTAINER_MODE): New macro. - * configure.in (jm_MAINTAINER_MODE): Use it. +2003-03-20 Jim Meyering <jim@meyering.net> -Sat May 4 20:40:01 1996 Jim Meyering (meyering@na-net.ornl.gov) + * Version 4.5.11. - * configure.in (LINGUAS): Add de. - * po/de.po: New file. + * src/seq.c (valid_format): Also accept ` ' and `'' as valid + format flag characters. + Do not require that a field width be specified. + Do not fail when given a field width of `0'. + Reported by Dan Jacobson. + * tests/seq/basic: Add new tests for the above-fixed bug. - * memcasecmp.c [IN_CTYPE_DOMAIN]: Rename from ISASCII. - * regex.c [IN_CTYPE_DOMAIN]: Likewise. - * system.h [IN_CTYPE_DOMAIN]: Likewise. + * src/Makefile.am (all-local): Append $(EXEEXT) to use of `su' + (install-root): Likewise. + (install-exec-local): Likewise. + Based on a patch from Richard Dawe. -Sun Apr 28 17:10:03 1996 Jim Meyering (meyering@na-net.ornl.gov) +2003-03-19 Jim Meyering <jim@meyering.net> - * fmt.c (copy_rest): Don't copy past end of prefix. Output - trailing spaces if the prefix had any. Before, fmt would - improperly output NUL bytes. The command - perl -e 'print "| S";' |fmt -p' | '|tr '\0' @ - output `|@S'. Reported by François Pinard. + * man/Makefile.am (.x.1): Use $(LN_S) instead of 'ln -s', + because the DJGPP 2.03 port of 'ln -s' doesn't work. + Include $(EXEEXT) in program names. + Since $(LN_S) may degenerate to `cp -p', be careful + to invoke it from the destination directory. + Mostly from Richard Dawe. + * configure.ac: Use AC_PROG_LN_S. - * sort.c (main): Give a better diagnostic for `sort -0'. + * tests/mv/part-symlink: Unset CDPATH. Otherwise, having the + CDPATH shell variable set could cause this test to fail. Reported by Karl Berry. - * configure.in: Make fp_C_PROTOTYPES precede AC_C_INLINE. - Otherwise, some systems lose because the value AC_C_INLINE choses - with plain `cc' is different from that chosen when using the ANSI-mode - C compiler. From Kaveh Ghazi. - -Tue Apr 23 22:05:35 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * aclocal.m4 (AC_REPLACE_GNU_GETOPT): New macro. - * configure.in: Use it. - * lib/Makefile.am (tu_SOURCES): Remove getopt.c and getopt1.c. - (EXTRA_DIST): Add getopt.c and getopt1.c - - * src/*.c, src/*.h: Update Copyright years to include 1996. - -Sun Apr 21 08:04:51 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * getline.c: New version from gettext-0.10.12. - * getline.h: Likewise. - * configure.in (AC_CHECK_FUNCS): Add getdelim. - Suggested by Ulrich Drepper. - - * md5sum.c (md5_check): Remove spurious newline at end of error - format string. - - * od.c (decode_one_format): Use printf's L modifier for long doubles, - not `l'. From Eric Backus. - - * Makefile.am (LDADD): Put @INTLLIBS@ before package library. - - * od.c: Include <values.h>. - [!BITSPERBYTE]: Define. - [OFF_T_MAX]: Use BITSPERBYTE, not 8, and cast the result to off_t. - * configure.in (AC_CHECK_HEADERS): Add values.h. - -Fri Apr 19 23:48:53 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * Makefile.am (cvs-dist): New rule. Based on the one from - Tom Tromey's automake. - -Thu Apr 18 22:13:14 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * tail.c (main): Make code clearer: use new variable `n_files' in - place of `argc - optind'. Use `file' instead of `argv + optind'. - -Sat Apr 13 13:08:29 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * lib/Makefile.am (noinst_HEADERS): Include memcasecmp.h, - not memcasecmp.c. - - * memcasecmp.c: Unprotoize. - [ISASCII]: Define. - [ISUPPER]: Define. - - * join.c (decode_field_spec): Rename local variable `valid' - to invalid (and reverse sense) to avoid conflict with the - macro definition in /usr/include/locale.h on SunOS 4.1.3. - -Tue Apr 9 22:43:57 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * uniq.c: Add new option --ignore-case (-i). - Include memcasecmp.h. - (different): Compare with memcasecmp if ignoring case. - (main): Handle 'i'. - - * join.c (memcasecmp): Remove static definition of function. - Include memcasecmp.h instead. - - * memcasecmp.c: New file. - * memcasecmp.h: New file. - * lib/Makefile.am (tu_SOURCES): Add memcasecmp.c. - (noinst_HEADERS): Add memcasecmp.h. - -Thu Apr 4 17:05:33 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * tr.c: The following commands all failed unnecessarily. - tr -cs '[:upper:]' '[X*]' - tr -dcs '[:lower:]' n-rs-z - tr -ds '[:xdigit:]' [:alnum:]' - tr -dcs '[:alnum:]' [:digit:]' - tr -dc '[:upper:]' - Reported by Ross Ridge (ross@worf.mks.com). - (validate): Add missing conjunct (translating) in test for - `translating and complementing character classes' error. Before, - valid uses of tr could fail. E.g. `tr -dcs '[:cntrl:]' '[:alnum:]''. - (homogeneous_spec_list): New function. - (validate): Use it to relax the old (overly restrictive) restriction - that prohibited use of complemented character classes when translating. - Now, that is allowed as long as the translation maps many to one. - (get_spec_stats): Rename and redefine global has_char_class from - has_upper_or_lower. - -Wed Apr 3 07:08:57 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * aclocal.m4: Update NLS macros from gettext-0.10.11. - - * src/Makefile.am (INCLUDES): Add -I$(srcdir) to get system.h - when srcdir != builddir. From Kaveh Ghazi. - -Wed Mar 27 23:33:36 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * cksum.c (cksum): Use format "%lu %ld" (instead of "%10lu %8ld") - to be POSIX compliant. From Stephen Gildea <gildea@x.org>. - -Sun Mar 24 08:47:40 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * join.c (main): Use EXIT_FAILURE, not 2, as exit code in error call. - * od.c (skip, main): Likewise. - * tr.c (main): Likewise. - - * cat.c cksum.c comm.c csplit.c cut.c expand.c fmt.c fold.c head.c - join.c md5sum.c nl.c od.c paste.c pr.c split.c sum.c tac.c tail.c - tr.c unexpand.c uniq.c wc.c: Exit with status EXIT_SUCCESS or - EXIT_FAILURE, rather than 0 or 1. - -Sat Mar 23 23:14:40 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * system.h [EXIT_FAILURE]: Undefine and define to 1 also if it - is defined to zero. Suggested by Paul Eggert. - - * sort.c [SORT_FAILURE]: New macro. - Be careful to exit with 1 only when -c is used and the - input is not properly sorted. In all other cases, use - SORT_FAILURE as required by POSIX. - (main): Change some `error (1, ...' to use SORT_FAILURE. - Upon successful termination, exit with EXIT_SUCCESS instead of `0'. - Replace all uses of `2' (as exit code) with SORT_FAILURE. - -Thu Mar 21 22:47:50 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * csplit.c: Include assert.h, but disable assertions. - (process_line_count): Replace if-abort with a slightly relaxed - assertion. Before, `echo |csplit - 1 1' would abort. - Reported by Samuli.Karkkainen@hut.fi. - (parse_patterns): Disallow uses like `csplit FILE 0' with zero - line number, `csplit FILE 2 1' with decreasing line numbers, and - warn about uses like `csplit FILE 3 3' that have equal line numbers. - - * sort.c (main): Declare to be of type int, not void. - From Peter Seebach <seebs@taniemarie.solon.com>. - * cat.c cksum.c comm.c csplit.c cut.c expand.c fold.c head.c join.c - nl.c paste.c pr.c split.c sum.c tac.c tail.c tr.c unexpand.c uniq.c - wc.c (main): Likewise. - -Sat Mar 16 16:30:07 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * configure.in (PACKAGE_VERSION): New macro. - * acconfig.h (PACKAGE_VERSION): Add it. - * src/Makefile.am: Remove rules for generating version.c. - Remove references to version.o, version.h, and stamp-v. - * version.c: Remove file. - * version.h: Remove file. - * cat.c cksum.c comm.c csplit.c cut.c expand.c fmt.c fold.c - head.c join.c md5sum.c nl.c od.c paste.c pr.c sort.c split.c - sum.c tac.c tail.c tr.c unexpand.c uniq.c wc.c: Don't include - version.h. - (main): Use PACKAGE_VERSION instead of version_string. - -Mon Mar 11 16:07:08 CST 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * sort.c (write_bytes): Renamed from xfwrite. - Remove SIZE parameter. It was always 1. Update all callers. - Rename NELEM parameter to N_BYTES and change its type to size_t. - -Sat Mar 9 13:30:12 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * cat.c cksum.c comm.c csplit.c cut.c expand.c fmt.c - fold.c head.c join.c md5sum.c nl.c od.c paste.c pr.c sort.c - split.c sum.c tac.c tail.c tr.c unexpand.c uniq.c wc.c (main): - Initialize for internationalized message support: call setlocale, - bindtextdomain, and textdomain. - * system.h: Add definitions and includes for NLS. - * Makefile.am (SUBDIRS): Add intl and po. - * src/Makefile.am (datadir): Define. - (localedir): Define. - (DEFS): Add LOCALEDIR definition. - (LDADD): Add @INTLLIBS@. - * aclocal.m4: Add NLS-related macro definitions from - gettext distribution. - * acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_LC_MESSAGES, - HAVE_STPCPY): New macros. - Add PACKAGE and VERSION. - * configure.in (PACKAGE): Define with AC_DEFINE_UNQUOTED. - (VERSION): Likewise. - (ALL_LINGUAS): Define. - (AC_CHECK_HEADERS): Add float.h. - (ud_GNU_GETTEXT): Use it. - Link an nls file. - (AC_OUTPUT): Reflect addition of two new directories, intl and po. - Create po/Makefile. - From François Pinard. - - * tr.c (star_digits_closebracket): Declare formal param, IDX, - and local I to be of type size_t (rather than int) to avoid - warnings from gcc -Wall. - -Wed Feb 28 20:32:48 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * src/Makefile.am: Adapt for automake-0.30. - (noinst_HEADERS): Rename from HEADERS. - (INCLUDES): Remove -I.. and -I$(srcdir). automake-0.30 adds these - to DEFS automatically. - * lib/Makefile.am (noinst_HEADERS): Rename from HEADERS. - -Wed Feb 21 18:56:27 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * join.c (xfields) [without -t]: Ignore leading blanks. - From David Dyck (dcd@tc.fluke.COM). - -Sun Feb 18 12:07:27 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * join.c [TOLOWER]: Define. - (usage): Briefly describe new --ignore-case (-i) option. - (memcasecmp): New function. - (main): Set IGNORE_CASE for -i. - (keycmp): Compare with memcasecmp if IGNORE_CASE is set. - Suggestion and an initial patch from Alberto Accomazzi - <alberto@cfa0.harvard.edu>. - -Sat Feb 17 18:54:40 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * sort.c: Add -z option. Change all occurrences of '\n' to `eolchar'. - (usage): Describe it. - (main): Set eolchar to 0 for -z. - From Mark W. Eichin <eichin@cygnus.com>. - -Fri Feb 16 21:44:14 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * join.c (main): Mark two strings for translation. - * md5sum.c (md5_check): Mark a string for translation. - From François Pinard. - -Mon Feb 12 21:12:28 1996 Jim Meyering (meyering@na-net.ornl.gov) - - Update for automake-0.29. - * Makefile.am (CONFIG_HEADER): Don't define. Automake now does it. - * src/Makefile.am: Likewise. - * lib/Makefile.am: Likewise. - * doc/Makefile.am (info_TEXINFOS): Renamed from TEXINFOS. - * man/Makefile.am (man_MANS): Renamed from MANS. - - * fmt.c [TRUE]: Undefine before defining to avoid warning on NeXT. - [FALSE]: Likewise. - From Derek Clegg (dclegg@next.com). - -Sat Feb 3 16:20:40 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * Version 1.14. - -Wed Jan 31 23:26:13 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * tail.c (dump_remainder): Flush stdout when tailing-forever on - multiple files. From Carlos Canau <Carlos.Canau@relay.puug.pt>. - -Fri Jan 5 18:30:28 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * aclocal.m4: For SVR4 systems, use -Xc -D_POSIX_C_SOURCE in CFLAGS, - not just -Xc. From François Pinard. - - * doc/Makefile.am (DIST_OTHER): Don't set to mdate-sh. mdate-sh is - distributed automatically. From Tom Tromey. - -Thu Jan 4 20:32:52 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * nl.c: Include rx.h after limit.h (not before) to avoid warning - about the redeclaration of RE_DUP_MAX in limit.h. rx.h protects - its definition. From Kaveh Ghazi. - - * src/Makefile.am (DIST_OTHER): Include md5-test.rfc so make check - works again. Reported by François Pinard and Kaveh Ghazi. - - * rx.c [SYNTAX]: Rename from SYNTAX_TABLE. - [SYNTAX_TABLE]: Remove extern dcl of re_syntax_table. - (RE_SEARCH_2_FN): Cast string1 and string2 to avoid pointer type - mismatch errors from e.g. SunOS's /bin/cc. - Reported by Kaveh Ghazi. - -Wed Jan 3 23:34:39 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * configure.in (VERSION): Set variable directly rather than from - a separate file. - * Makefile.am (DIST_OTHER): Remove VERSION. - * src/Makefile.am (version.c): Depend on Makefile, not ../VERSION. - (stamp-v): New target; depend on Makefile. - (DISTCLEANFILES): Add stamp-v, version.c. - -Tue Jan 2 00:08:08 1996 Jim Meyering (meyering@na-net.ornl.gov) - - * sort.c (keycompare): Rewrite cases handling ignored characters - so that they really are ignored. Reported by Carl Johnson - <carlj@cjlinux.home.org>. - -Fri Dec 22 21:34:55 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> +2003-03-18 Jim Meyering <jim@meyering.net> - * configure.in: Touch stamp-h only if config.h is remade. + * src/fmt.c [struct Word] (paren, period, punct, final): Change the + type of each member from bool <MEMBER>:1 to unsigned int <MEMBER>:1. + AIX 5.1's xlc could not compile the former. + Patch by Petter Reinholdtsen. Also reported by Mike Jetzer. - * csplit.c (extract_regexp) [!WITH_REGEX]: Intialize - syntax_parens field. +2003-03-17 Richard Dawe <rich@phekda.freeserve.co.uk> -Mon Dec 18 21:42:44 1995 Jim Meyering (meyering@comco.com) + * configure.ac: Include $(EXEEXT) in OPTIONAL_BIN_PROGS' + program names, since automake only adds $(EXEEXT) to programs + in its *_PROGRAMS. - Use automake to generate Makefile.in files. - * Makefile.am: New file. - * doc/Makefile.am: New file. - * lib/Makefile.am: New file. - * man/Makefile.am: New file. - * src/Makefile.am: New file. +2003-03-16 Jim Meyering <jim@meyering.net> -Thu Dec 14 21:13:22 1995 Jim Meyering (meyering@comco.com) + * src/remove.c (rm): Put two local variables in static storage, + so they can't be clobbered by the potential longjmp. - * fmt.c (main): Use xstrtol instead of atoi. +2003-03-15 Jim Meyering <jim@meyering.net> - * fold.c (main): Use xstrtol instead of atoi. - (fold_file): Make a couple locals `int', not size_t, and cast - fwrite's third parameter to size_t. + * Makefile.cfg (gnu_rel_host): Fix code to match the comment + so that a version number with a two-digit component can still count + as an alpha release. Reported by Richard A Downing. + (gnu_rel_host): Define in terms of $(RELEASE_TYPE) instead. - * nl.c (main): Use xstrtol instead of atoi. - Rename misleading --first-page=N option to --starting-line-number=N. - (usage): Update. - - * uniq.c (main): Use xstrtol instead of atoi. - -Fri Dec 8 20:48:00 1995 Jim Meyering (meyering@comco.com) - - * aclocal.m4 (fp_C_PROTOTYPES): Set ANSI2KNR to ./ansi2knr. - -Thu Dec 7 19:55:03 1995 Jim Meyering (meyering@comco.com) - - * aclocal.m4 (ud_WITH_REGEX): New macro. - * configure.in: Use it. - * rx.c, rx.h: New files. - * lib/Makefile.in (REGEX): Set to @REGEXOBJ@, not regex.o. - (SOURCES, DISTFILES): Add rx.c, rx.h. - * acconfig.h (WITH_REGEX): Add it. - * csplit.c [!WITH_REGEX]: Include rx.h. - * nl.c [!WITH_REGEX]: Likewise. - * tac.c [!WITH_REGEX]: Likewise. - From Ulrich Drepper and François Pinard. - -Tue Dec 5 17:49:53 1995 Jim Meyering (meyering@comco.com) - - * sort.c (main): Diagnose invalid arguments to -k, then fail. - - * sort.c (numcompare): Properly handle all cases in which signs differ. - From Karl Heuer. - - * Makefile.in (mandir): @mandir@ is just $(prefix)/man. - Append `/man1'. Reported by Karl Heuer. - - * sum.c (bsd_sum_file): Remove misleading comment. From Karl Heuer. - - * src/Makefile.in [.c._o]: Don't create $<-tmp. From Kaveh Ghazi. - -Fri Dec 1 01:02:36 1995 Jim Meyering (meyering@comco.com) - - * lib/Makefile.in (default): New target. - - * sort.c (numcompare): Properly order `-' and valid integers; - treat `-' as if it were zero. Reported by Ross Alexander - <r.alexander@auckland.ac.nz>. - - * Makefile.in (DISTFILES): Remove unused mkdep-Makefile. - (.PHONY): Depend on default. - -Wed Nov 29 21:50:53 1995 Jim Meyering (meyering@comco.com) - - * aclocal.m4 (jm_PROG_C_MKDEP): Remove, for now. - (jm_AUTODEPS): Likewise. - (jm_WITH_GNU_MAKE): Likewise. - * configure.in (jm_AUTODEPS): Remove. - - * sort.c (begfield): Replace loop with equivalent if-else. - (limfield): Fix bug that made field specs like -k1.5 return a - pointer into LINE beyond the first field. - Don't try to trim trailing blanks here; it's not - possible because we don't know where the field begins. - Replace loop with equivalent if-else. - (trim_trailing_blanks): New function. - (findlines): Call it. - (keycompare): Likewise. - (main): Don't decrement T2 corresponding to `x' in field - specs like -ku.v,w.x. - -Sun Nov 26 15:50:23 1995 Jim Meyering (meyering@comco.com) - - * csplit.c [!UINT_MAX]: Define. - [!INT_MAX]: Define. - Include xstrtoul.h. - (string_to_number): Remove function. - (check_for_offset): Use xstrtoul instead of string_to_number. - (parse_repeat_count): Likewise. - (parse_patterns): Likewise. - (main): Likewise. - -Wed Nov 22 23:12:47 1995 Jim Meyering (meyering@comco.com) - - * Makefile.in (all et. al.): If make was invoked with -k and a - sub-make fails, fail after the loop rather than exiting right away. - Otherwise, make's -k option could be ineffective. - -Sat Nov 18 12:04:30 1995 Jim Meyering (meyering@comco.com) - - * src/Makefile.in (version.c): Depend on ../VERSION, not Makefile. - - Update for autoconf-2.5: - * src/Makefile.in (libdir): Set to @libdir@. - (bindir): Set to @bindir@. - * doc/Makefile.in (infodir): Set to @infodir@. - * man/Makefile.in (exec_prefix): Remove it. - (mandir): Set to @mandir@. - (bindir): Remove it. - -Thu Nov 16 21:25:45 1995 Jim Meyering (meyering@comco.com) - - * Makefile.in (default): New default target. Depend on `all' to - work around bug in AIX-3.2.5's /bin/make. Reported by Andreas Luik - <luik@isa.de>. - -Wed Nov 15 23:48:31 1995 Jim Meyering (meyering@comco.com) - - * mkdep-Makefile (.deps/empty.P): Depend on BUILT-HEADERS. - - * aclocal.m4 (jm_PROG_C_MKDEP): Rename from jm_PROG_MKDEP. - * src/Makefile.in (C_MKDEP): Rename from MKDEP. - * lib/Makefile.in (C_MKDEP): Likewise. - * mkdep-Makefile (C_MKDEP): Likewise. - Add comments. - - * csplit.c [__P]: Don't define it here. - * pr.c [__P]: Don't define it here. - * fmt.c [__P]: Don't define it here. - * system.h [__P]: Define it here. - - * aclocal.m4 (jm_AUTODEPS): Rename from jm_WITH_AUTODEPS. - Revamp, with suggestions from Franc,ois Pinard. - (jm_WITH_GNU_MAKE): New macro. - (jm_PROG_MKDEP): New macro. - * configure.in (jm_PROG_MKDEP): Use it. - * src/Makefile.in (MKDEP): Set it. - * lib/Makefile.in (MKDEP): Likewise. - * mkdep-Makefile: Use MKDEP, not DEP_CC. - (DEP_CFLAGS): Remove it. - -Tue Nov 14 23:10:54 1995 Jim Meyering (meyering@comco.com) - - * sort.c: Add support for sorting numbers in scientific notation. - Include xstrtod.h. - (struct keyfield): Add field: general_numeric. - (usage): Describe -g option. - (general_numcompare): New function. - (keycompare): Use new comparison function when general_numeric - flag is set. - (set_ordering): Honor `g' flag. - (main): Initialize and use new field. - From Marcus Daniels <marcus@sysc.pdx.edu>. - - * configure.in (AC_REPLACE_FUNCS): Add strtod. - * lib/Makefile.in (SOURCES): Add xstrtod.c. - (OBJECTS): Add xstrtod.o. - (DISTFILES): Add xstrtod.h. - - * csplit.c (cleanup): Don't exit. - (interrupt_handler): Rewrite to reset default signal handler - then repost caught signal. - (xmalloc, xrealloc, read_input, write_to_file, handle_line_error, - process_line_count, process_regexp, create_output_file, - close_output_file): Call cleanup_fatal, not cleanup. - Add const attribute to lots of parameters. - (cleanup_fatal): Renamed from cleanup. Call cleanup, then exit. - Update callers. - - * tac.c (cleanup): Don't exit. - (cleanup_fatal): New function. Call cleanup, then exit. - (sighandler): New function. - (cleanup_fatal): Renamed from cleanup. Call cleanup, then exit. - Update callers. - (tac_stdin): Set up sighandler as signal handler, not `cleanup'. - -Sat Nov 11 15:46:02 1995 Jim Meyering (meyering@comco.com) - - * od.c (skip): Cast fseek's offset argument to `long'. - Erik Bennett <bennett@cvo.oneworld.com> reported that this is - necessary on BSDI systems. And if offset doesn't fit in a long, - then try using lseek instead. - - * sort.c (xmalloc): Declare static. - (xrealloc): Likewise. - - * tac.c (cleanup): Add signal number parameter. - Update callers. - - * cat.c (main): Don't die when dev/ino of input and output are - the same and the file descriptors correspond to stdin and stdout. - This is necessary on at least Digital UNIX (aka OSF1) 3.2C. - Otherwise, running `cat << X > $$' would fail with `cat: -: input - file is output file'. From Jarkko Hietaniemi <jhi@epsilon.hut.fi>. - - * Makefile.in (DISTFILES): Add @README_ALPHA@. - (config.status) Depend on VERSION. - * configure.in: Set README_ALPHA if the version number ends in [a-z]. - -Fri Nov 10 21:13:42 1995 Jim Meyering (meyering@comco.com) - - * fold.c (usage): Clarify meaning of --spaces. From Karl Berry. - - src/Makefile.in (.c._c): Don't redirect directly to $@. - (._c._o, .c._o): Remove temporary src file. - -Tue Nov 7 23:55:24 1995 Jim Meyering (meyering@comco.com) - - * VERSION: New file. - * configure.in (VERSION): New variable. - (PACKAGE): New variable. - - * Makefile.in (DISTFILES): Add VERSION. - (distdir): Use @PACKAGE@-@VERSION@, not distname. - Remove all references to distname. - * src/Makefile.in (version.c): Generate it. - (SOURCES): Remove now-generated version.c. - (distclean): Delete version.c. - * doc/Makefile.in (version.texi): Use @PACKAGE@-@VERSION@, - not version.c - - * */Makefile.in (distdir): Use @PACKAGE@-@VERSION@, not distname. - Remove all references to distname. - - * split.c: New option: --verbose. - (main): Recognize it. - (usage): Document it. - From Marty Leisner <leisner@sdsp.mc.xerox.com>. - -Sun Nov 5 06:59:27 1995 Jim Meyering (meyering@comco.com) - - * src/Makefile.in: Reflect protoization of csplit.c, fmt.c, pr.c, - and unexpand.c. - - * pr.c: Protoize. - (store_columns): Remove spurious 2nd argument in call to read_line. - [__P]: Define. Use it in prototyped forward decls. - - * csplit.c: Move prototypes after struct declarations. - Remove prototypes for xmalloc, xrealloc. - Protect prototypes with __P. - (new_control_record): Cast arg 1 to realloc. - - * fmt.c [__P]: Test PROTOTYPES, not __STDC__. - Protoize. - -Sat Nov 4 23:51:30 1995 Jim Meyering (meyering@comco.com) - - * csplit.c (close_output_file): Set output_stream to NULL so we - don't recurse endlessly between this function and cleanup. - - * unexpand.c: Reorder functions to obviate forward dcls. Remove - forward dcls. Protoize. Add `const' attribute to some parameters. - -Mon Oct 30 23:15:56 1995 Jim Meyering (meyering@comco.com) - - * wc.c: Reorder functions to obviate forward dcls. Remove - forward dcls. Protoize. Add `const' attribute to some parameters. - * uniq.c: Likewise. - * split.c: Likewise. - - * split.c (isdigits, convint): Remove these. - (main): Use xstrtol instead. +2003-03-14 Jim Meyering <jim@meyering.net> -Sun Oct 29 14:04:36 1995 Jim Meyering (meyering@comco.com) + * src/ansi2knr.c: Remove no-longer-used file. + * src/ansi2knr.1: Likewise. - * paste.c (main): Move function body to end of file. - Remove forward dcls and protoize. - * sum.c (main): Likewise. - * nl.c: Protoize. Reorder functions to obviate forward dcls. - Remove forward dcls. - * tac.c: Likewise. - * src/Makefile.in (OBJECTS): Reflect that all of the above - now use prototypes. + * Makefile.maint (prev_version_file): Don't use ?= for this particular + assignment, since it causes trouble with old versions of GNU make + (e.g. 3.76.1). The other uses of `?=' are inoffensive. Details here. + http://mail.gnu.org/archive/html/bug-coreutils/2003-03/msg00028.html + Patch from Alexandre Duret-Lutz. - * sum.c (bsd_sum_file): Give file name parameter const attribute. - (sysv_sum_file): Likewise. + * Use patched automake-1.7.3. Regenerate Makefile.in files in + subdirectories so that each includes a definition of ACLOCAL_M4. - * tac.c (xwrite): Give output buffer parameter const attribute. - (output): Likewise for both parameters. - (tac): Likewise for file name parameter. - (tac_file): Likewise. + * announce-gen (main): Label the compressed source URLs. -Sat Oct 28 16:02:39 1995 Jim Meyering (meyering@comco.com) + * Version 4.5.10. - * md5sum.c (md5_check): Use the same message format when there is - a single file and it gets a read error or checksum mismatch as when - there are more. Write that warning to standard error, not standard - output. Suggestions from Greg Troxel (gdt@b-sgi.bbn.com). + * tests/du/slink: Relax the test for the `local'ness of a file system, + so that now it works also for tmpfs. -Thu Oct 26 00:11:35 1995 Jim Meyering (meyering@comco.com) + * tests/du/hard-link: Transform output from first du, so that this + test doesn't fail on file systems like tmpfs that order directory + entries differently. - * sort.c (xtmpfopen): New function to set proper permissions on - temporary files. Use it instead of xfopen. Reported by Erik Corry - (erik@kroete2.freinet.de). +2003-03-13 Jim Meyering <jim@meyering.net> -Mon Oct 23 23:17:04 1995 Jim Meyering (meyering@comco.com) + * tests/du/8gb: Work around what appears to be an NFS failure that + would make this test fail on some systems. - * aclocal.m4 (jm_WITH_AUTODEPS): New directive. - * configure.in: Use it. +2003-03-11 Jim Meyering <jim@meyering.net> - * lib/Makefile.in (INCLUDE, COMPILE): New variables. - (.c.o): Rewrite to be more like src/Makefile.in. + * tests/du/basic: Make the test file exactly 4k bytes long. - * src/Makefile.in (distclean): Remove .deps. - Include @top_srcdir@/mkdep-Makefile. + * src/split.c (longopts): Don't hard-code `2' here. + Instead, just specify `&verbose', and ... + (main): ... remove the `case 2:' block for --verbose. - * mkdep.Makefile: New file. - * Makefile.in (DISTFILES): Add mkdep-Makefile. - * doc/Makefile.in (mostlyclean): Also remove *.info. + * tests/du/basic: Make the test file larger than 64 bytes, so that + we don't immediately disqualify file systems (e.g., NetApp) on which + smaller files take up zero disk blocks. Reported by Vin Shelton. -Thu Oct 19 17:38:28 1995 Jim Meyering (meyering@comco.com) +2003-03-10 Jim Meyering <jim@meyering.net> - * od.c: Indent cpp directives. + Don't segfault for a negative field width or precision in format string. + Note that this is just a stopgap fix. The longer term solution may + involve adapting bash's builtins/printf.def. - * tr.c (BEGIN_STATE): Use INT_MAX - 1 so as not to interfere - with large repeat counts. - (struct E_string): New struct. - (find_closing_delim): Take E_string arg rather than char* and length. - (find_bracketed_repeat): Likewise. - (star_digits_closebracket): New function. - (append_char_class): No longer give diagnostic. - (append_equiv_class): Likewise. - (build_spec_list): Give them here instead, allowing string1 like - [:*][:upper:] that got errors before. - Take E_string arg rather than char*. - Convert switch stmts into if-then so as to use ES_MATCH. + * src/printf.c: (UNSPECIFIED): Define. + (print_direc): Use the special value, UNSPECIFIED, to indicate + that field_width or precision has not been specified. + (print_formatted): Fail if field_width or precision is the + special value, UNSPECIFIED. + Reported by Oliver Kiddle <okiddle@yahoo.co.uk> -Tue Oct 17 22:48:00 1995 Jim Meyering (meyering@comco.com) + * src/sys2.h (INT_MIN): Define, if necessary. + * tests/misc/printf: Add a test for the above-fixed bug. - * cat.c: Protoize. Reorder functions to obviate forward dcls. - Remove forward dcls. - * expand.c: Likewise. - * fold.c: Likewise. - * head.c: Likewise. - * od.c: Likewise. - * sort.c: Likewise. - * tail.c: Likewise. +2003-03-09 Jim Meyering <jim@meyering.net> - * src/Makefile.in (OBJECTS): Reflect that all of the above - now use prototypes. + * src/remove.c (AD_stack_pop): Cast sizeof... to int before + changing its sign. This avoids a warning from gcc on 64-bit systems. + Reported by Bob Proulx. + (pop_dir): Reverse order of sign change and cast, to be consistent + with the above. - * head.c: Add `const' attribute to dcls of lots of formals. +2003-03-08 Jim Meyering <jim@meyering.net> - * sort.c: Add `const' attribute to dcls of lots of formals. - Move struct dcls to precede dcls of file-scope variables. - (monthtab, keyhead): Separate variable dcls from type dcls. + * tests/Makefile.am (evar-check): Check for POSIXLY_CORRECT not as a + shell variable, but only in the environment. With /bin/sh->bash, the + shell variable is set to `y', and that would cause a spurious warning. + Reported by Bob Proulx. -Fri Oct 13 20:38:39 1995 Jim Meyering (meyering@comco.com) + * tests/Makefile.am (check-root): Remove touch/fifo. + It doesn't appear to have to be run as root. - * join.c (add_field_list): Allow SPACE and TAB as well as `,' as - list item separators, per POSIX spec. - (prjoin): Rewrite loop that iterates over field specs. - Handle case in which file spec is 0. + * tests/rm/fail-2eperm: Rather than simply using the first non-root + user name, make sure that the selected user name has a usable shell. + Reported by Paul Jarc. -Sun Oct 8 22:41:15 1995 Jim Meyering (meyering@comco.com) + Before, when using shred on a device, one had to specify --exact, + or be careful to choose a size that would not be rounded up and + exceed the maximum value; that could result in a failure of + the final write. + * src/shred.c (do_wipefd): --exact is now the default for non-regular + files. Suggestion from Ben Elliston. + (usage): Say it. - * strpbrk.c: New file. - * lib/Makefile.in (SOURCES): Add strpbrk.c. - Remove bcopy.c. + * tests/misc/tty-eof: Require at least version 1.11 of Expect.pm. + Old versions of Expect.pm (e.g., 1.07) lack the log_user function. + Patch by Bob Proulx. -Sat Oct 7 22:27:01 1995 Jim Meyering (meyering@comco.com) + * src/Makefile.am (check-misc): Check for use of `defined' in + #define directives. + Change to $(srcdir) before running grep. - * join.c (add_field): No longer return a value. - (decode_field_spec): New function. - (add_field_list): Rewrite to be more strict. - Before, `,1.2' was accepted as valid. - (main): Use xstrtol instead atoi. - Combine nearly identical -a and -v cases. - Close input files. + * src/sleep.c: Remove now-unused #include and #define directives. -Fri Oct 6 23:10:01 1995 Jim Meyering (meyering@comco.com) + * src/du.c (process_file): If a file's size is not being counted + e.g., because it's a hard link to a file we've already counted, + then don't print a line for it. - * join.c (main): Report `too few/many non-option arguments' - then print --help output rather than just the latter. - Properly interpret obsolescent usage like `join -o 2.1 2.1 2.2'. - (usage): Describe POSIX -1, -2 options and deprecate -j* ones + * tests/du/hard-link: New test for the above-fixed bug. + * tests/du/Makefile.am (TESTS): Add hard-link. - * join.c (usage): Move to precede all other functions. + `du -S' didn't work + * src/du.c: Revert most of the `reorganization' change of 2003-02-20, + and make the two-array approach work. - * join.c: Protoize. + * tests/du/basic: Correct/add tests for the above fix. + Set LC_ALL, etc., now that we use sort. + Check the block/size of a small file, too. + Correct expected results for simple dir1/dir2/file case. + Add another test of du -S. -Tue Oct 3 22:44:05 1995 Jim Meyering (meyering@comco.com) +2003-03-07 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> - * csplit.c, sort.c, tac.c: Test SA_INTERRUPT, not _POSIX_VERSION, - to determine whether `sigaction' functions are available. - Reported by Paul Nevai <nevai@ops.mps.ohio-state.edu>. - Fix suggested by Karl Berry. + Avoid build failure with gcc on hppa1.1-hp-hpux10.20 (see GCC PR + middle-end/9986). As one of GCC's optimizations, it transforms a + fputs_unlocked call to a fputc_unlocked call when the string is + one character long. However, hpux doesn't have fputc_unlocked. - * md5sum.c (main): Declare counter, N_STRINGS, to be an integral - type, not `char'. + * expr.c (usage): Use putchar, not fputs, to output a single character. + * ls.c (dired_dump_obstack): Likewise. + * ptx.c (output_one_tex_line, output_one_dumb_line): Likewise. + * stat.c (print_it): Likewise. - * cut.c: Convert many declarations using `int' to use `unsigned int' - to avoid warnings from `gcc -Wall' about comparing signed and - unsigned types. - (set_fields): Use memset (not open coded loop) to initialize array. +2003-03-07 Jim Meyering <jim@meyering.net> -Thu Sep 28 23:16:05 1995 Jim Meyering (meyering@comco.com) + * src/cp.c: Remove everything associated with mmap-stack.c. + This reverts the two changes of 2003-02-21. + * src/du.c: Remove everything associated with mmap-stack.c. + This reverts the change of 2003-02-19. - * Version 1.13. +2003-03-06 Jim Meyering <jim@meyering.net> - * Makefile.in (DISTFILES): Remove README.alpha for major release. - - * od.c (decode_one_format): Remove spurious semicolon. - From John Kodis. - -Tue Sep 26 23:05:01 1995 Jim Meyering (meyering@comco.com) - - * man/Makefile.in (install-data, uninstall): Use sed not basename. - The GNU Coding Standard suggests that only a select set of - relatively standard utilities be used in Makefiles. basename is - not among them. Suggested by Ulrich Drepper. - -Sun Sep 24 08:36:47 1995 Jim Meyering (meyering@comco.com) - - * cksum.c: Protoize. - * cut.c: Protoize. - - * src/Makefile.in (OBJECTS): Reflect that cksum.c and cut.c use - prototypes. - (cksum): Depend on cksum$O. - (cut): Depend on cut$O. - -Sat Sep 23 15:43:46 1995 Jim Meyering (meyering@comco.com) - - * Version 1.12.2. - - * Makefile.in (DISTFILES): Add README.alpha. - - * lib/Makfile.in (GETOPT, MEMCHR, REGEX): New variables. - (OBJECTS): Use them instead of hard-coding object file names. - Suggested by Ulrich Drepper. - - * md5sum.c (md5_check): Distinguish between open/read failure - and checksum mismatch. - -Mon Sep 18 23:15:05 1995 Jim Meyering (meyering@comco.com) - - * md5sum.c: Protoize. - * src/Makefile.in (OBJECTS): Change md5sum.o to md5sum$O. - (join.o, md5sum$O, sort.o) Depend on ../lib/long-options.h. - (md5sum): Depend on md5sum$O. + * tests/cp/same-file: Unset CDPATH. Otherwise, having the + CDPATH shell variable set could cause this test to fail. + Reported by Karl Berry. - * md5sum.c (main, usage): Remove -h, -s, -v short options. - Rename --verbose to --warn, --quiet to --status. - (main): Handle --help and --version using parse_long_options. - (md5_check): Check ferror. +2003-03-05 Jim Meyering <jim@meyering.net> - * sort.c (tempname): Replace `16' with a more readable expansion. - Make sure that counter never exceeds 99999. - (checkfp): Rearrange loop to avoid duplicate test. - Move a couple dcls from function scope into inner block. + * Version 4.5.9. -Tue Aug 8 21:49:27 1995 Jim Meyering (meyering@comco.com) + * src/printf.c (print_esc): Remove pointless comparison of unsigned + integer with zero, to avoid a warning from Intel's ecc. + Reported by Nelson Beebe. - * md5sum.c (main): Fail if either --verbose or --quiet is specified - when not verifying checksums. + * src/du.c (process_file): Sizes must all be of type uintmax_t. + Otherwise, for files or totals that are too big, numbers would + be truncated. Patch mostly by Michael Stone. + Reported by Ingo Saitz as Debian bug #183210. - * md5sum.c (md5_check): Fail if no valid line is found. - Don't use the word `fail' unless there were failures -- - instead, say `all N tests passed.' + * tests/du/8gb: New test for the above-fixed bug. + * tests/du/Makefile.am (TESTS): Add 8gb. - * md5sum.c (main) [handling --string option]: Don't output - nonstandard `b' binary flag. From Greg Troxel (gdt@bbn.com). - * md5-test.rfc: Remove now-inconsistant `b' marker. - (usage): Clarify help message. With suggestions from Greg Troxel. + * src/du.c (MAX_N_DESCRIPTORS): Use 3 * UTILS_OPEN_MAX / 4 + rather than UTILS_OPEN_MAX - 10. -Mon Aug 7 23:27:54 1995 Jim Meyering (meyering@comco.com) +2003-03-04 Jim Meyering <jim@meyering.net> - * sort.c (mergefps) [lint]: Initialize SAVEALLOC to avoid spurious - compiler warning. From Ulrich Drepper. + * README: Refer new feature discussion to bug-coreutils@gnu.org, + rather than bug-gnu-utils, now that the former is better known. + Suggestion from Göran Uddeborg. - * pr.c (read_line) [lint]: Initialize CHARS to avoid spurious - compiler warning. From Ulrich Drepper. + * src/stat.c (usage): Capitalize consistently. + Reported by Göran Uddeborg. - * Makefile.in (DISTFILES): Don't distribute unneeded COPYING.LIB. - From Franc,ois. + * Makefile.maint (rel-files): Include $(signatures), so that + those files are also copied into $(release_archive_dir). -Mon Aug 7 00:02:59 1995 Jim Meyering (meyering@comco.com) + * src/df.c (find_mount_point): Call error here, now that restore_cwd + no longer does it. + * src/remove.c (AD_pop_and_chdir): Likewise. - * system.h (_): Define macro -- as empty for now. - * src/*.c: Annotate localizable strings with _(...). From Franc,ois. + * tests/Makefile.am (check-root): Add fail-2eperm. -Sat Aug 5 23:51:25 1995 Jim Meyering (meyering@comco.com) +2003-03-03 Jim Meyering <jim@meyering.net> - * Version 1.12.1. + * src/remove.c (remove_cwd_entries): Include the full filename of + the offending file, not just the basename. - * configure.in: Add fp_C_PROTOTYPES. + * tests/misc/tty-eof: Set $ME properly. -Fri Aug 4 23:21:46 1995 Jim Meyering (meyering@comco.com) + * Makefile.maint (THIS_VERSION_REGEXP, PREV_VERSION_REGEXP): + Remove now-unused variables. + (tag-prev-version, prev-cvs-tag): Likewise. - * src/Makefile.in (DISTFILES): Include ansi2knr.c and ansi2knr.1. - Add suffixes, dependencies, and rules to convert ANSI source to K&R - when required. Mark tr.o and comm.o as the only such files (for now). + * src/remove.c (remove_cwd_entries) [!ROOT_CAN_UNLINK_DIRS]: Give an + accurate diagnostic when failing to remove a file owned by some other + user. Reported by Ivo Timmermans via Michael Stone. + This fixes Debian bug# 178471. - * tr.c: Protoize. - * comm.c: Protoize. + * tests/rm/Makefile.am (TESTS): Add fail-2eperm. + * tests/rm/fail-2eperm: New test, for the above-fixed bug. + Based on a report from Ivo Timmermans. - * Makefile.in (DISTFILES): Add aclocal.m4 and acconfig.h. - (configure): Depend on aclocal.m4. - (stamp.h.in): Depend on aclocal.m4 and acconfig.h. +2003-03-02 Jim Meyering <jim@meyering.net> -Sun Jul 30 00:01:58 1995 Jim Meyering (meyering@comco.com) + * src/copy.c (copy_internal) [un_backup]: When recovering from a + failure to create a hard link, do not remove the entry associating + the source dev/ino with the destination file name. + * tests/mv/Makefile.am (TESTS): Add hard-3. + * tests/mv/hard-3: New test, for the above-fixed bug. + Inspired by a report from Iida Yosiaki. - * md5sum.c (md5_check): Use getline instead of fgets. +2003-03-01 Jim Meyering <jim@meyering.net> - * lib/Makefile.in (SOURCES): Add getline.c. - (OBJECTS): Add getline.o. - (DISTFILES): Add getline.h. - (getline.o): Depend on getline.h. + * src/df.c (print_header): Don't embed spaces in a separate `Type' + header string. Instead, put `Filesystem' and `Type' headers in the + same string, so translators can use horizontal space as needed. + Reported by Jean Charles Delepine. - * md5.c [memcpy]: Define to bcopy if needed. - (md5_buffer): Explicitely cast SWAP expressions to unsigned - to avoid warning. +2003-02-28 Jim Meyering <jim@meyering.net> - * lib/Makefile.in (strtoul.o): Depend on strtol.c. + * src/copy.c (copy_internal): When link fails because of an + existing destination file, unlink that file and try again. + Reported by Iida Yosiaki. - * sort.c (check): Print `disorder on...' message on standard error, - not stdout. This is a minor concession to POSIX which says - `no output shall be produced...'. + * tests/mv/Makefile.am (TESTS): Add hard-2. + * tests/mv/hard-2: New test for the above-fixed bug. + Based on a test case from Iida Yosiaki. - * sort.c (main): Fix -k so it works. -k 2,3 was being treated - like -k 2. Reported by Marcus Daniels <marcus@sysc.pdx.edu>. +2003-02-26 Jim Meyering <jim@meyering.net> -Wed Jul 26 22:54:48 1995 Jim Meyering (meyering@comco.com) + * tests/du/basic: Don't test du's -b option here. Directory byte + counts are smaller (512 rather than 4096) on at least OSF/1 5.1 + and IBM AIX 4.2. Reported by Nelson Beebe. - * man/Makefile.in (install, uninstall): Strip off `.1', not just `1' - before applying $(transform) to manual name. From Karl Berry. +2003-02-25 Jim Meyering <jim@meyering.net> - * md5sum.c (have_read_stdin): New global variable. - (md5_file, md5_check): Set it. + * Makefile.maint (announcement): Now that ChangeLog entries + are output by announce-gen, don't do it here. + * announce-gen (print_changelog_deltas): New function. (main): Use it. - * md5sum.c [OPENOPTS]: Depend explicitly on BINARY. - (md5_file): Take a new parameter, MD5_RESULT, and no longer - generate output. - (md5_check): Invoke md5_file instead of calling fopen directly. - When giving a diagnostic for a line with invalid format, also report - the line number. - (main): Generate output after a successful md5_file call. - [in many places]: Upon detection of an error, rather than exiting - immediately, issue a diagnostic, note that an error occurred and - exit later. - -Mon Jul 24 21:48:26 1995 Jim Meyering (meyering@comco.com) - - * tail.c (tail_bytes) [from_start]: For regular files, seek - relative to the initial input file pointer position, not - necessarily from the beginning of the file. - [!from_start]: Don't back up past the initial position of the - input file pointer. - (tail_lines): Call file_lines only if FD refers to a regular file - with its file pointer positioned at beginning of file. Otherwise, - call pipe_lines. This is a kludge. Once there's a decent test - suite, fix this properly. - Before, (echo 1; echo 2) > k; sh -c 'read x; tail' < k - would output both lines of the input file even though the first had - already been read. Reported by John Roll (john@panic.harvard.edu). - - * md5sum.c [_LIBC || STDC_HEADERS] (TOLOWER): Define to tolower. - - * csplit.c (main): When too few arguments are given, don't just - issue the usage message; also report why. - -Sat Jul 22 00:16:01 1995 Jim Meyering (meyering@comco.com) - - * md5sum.c (md5_check): New function -- extracted from main. - -Fri Jul 21 01:21:49 1995 Jim Meyering (meyering@comco.com) - - * md5sum.c (md5_file): New function -- extracted from main. - (main): Call the new function instead of doing all that in an - if-stmt. Always use "%s" format rather than raw filename as - format argument in printf-style functions like error. Otherwise, - filenames containing `%' are likely to lose. - Remove all mention of `old format'. - (split_3): No longer parse the `new format.' There is only one - valid format now: the compatible one. - - * lib/Makefile.in (SOURCES): Add md5.c. - (OBJECTS): Add md5.o. - (DISTFILES): Add md5.h. - (md5.o): Depend on md5.h. - - * system.h [!EXIT_FAILURE, !EXIT_SUCCESS]: Define them. - * lib/md5.c (md5_stream): Check for read failure and return - indication of success rather than second argument. - * lib/md5.h (md5_stream): Update prototype. - [__P]: Define macro. - * md5sum.c: Use EXIT_FAILURE and EXIT_SUCCESS. - (main): Report an error if md5_stream fails. Otherwise, running - `md5sum dir-on-mounted-filesystem' always reported the checksum - for an empty file. Now it gets the `is a directory' error. - Greg McGary (gkm@magilla.cichlid.com) reported that the released - version got stuck in an infinite loop with such arguments. - - * lib/md5.c: New file. - * lib/md5.h: New file. - * md5sum.c: Rewritten to use library interface. - From Ulrich Drepper. - -Sun Jul 16 18:42:34 1995 Jim Meyering (meyering@comco.com) - - * configure.in: Add AC_C_INLINE: md5sum.c uses inline keyword. - -Tue Jul 11 21:56:02 1995 Jim Meyering (meyering@comco.com) - - * md5sum.c Add #else block after #ifdef VMS. - (main): Rename local variable. - Detect and report failed fclose calls on stdout and checkfile_stream. - - * tr.c (unqote): Comment out unreachable break stmts. - (append_range): Declare FIRST and LAST parameters to be unsigned int, - not size_t. - (find_closing_delim): Clean up interface, separating boolean success - indicator and index. - (find_bracketed_repeat): Likewise. - (build_spec_list): Adapt to use new interfaces. - Declare CLOSING_DELIM_IDX and CLOSING_BRACKET_IDX to be of - type size_t, not int. - (main): Declare NR and CHARS_READ to be of type long, not int. - - * sort.c (main): Comment out unreachable break stmt. - - * tail.c (tail): Explicitly cast to long the N_UNITS argumennt in - call to tail_lines. Otherwise, NetBSD lost because N_UNITS (of type - off_t, a 64-bit type on NetBSD) wasn't converted to the target type, - long. Reported by Dan Hagerty (hag@gnu.ai.it.edu). - - * comm.c: Reorder functions so main is last, so no forward dcls - are needed. - -Sun Jul 9 11:41:15 1995 Jim Meyering (meyering@comco.com) - - * sort.c (main): When using obsolescent +pos -pos syntax, allow - omission of field spec only when character offset is specified. - Otherwise, -. +. would be accepted. - -Sat Jul 8 13:48:06 1995 Jim Meyering (meyering@comco.com) - - * sort.c (main): Allow field spec, M, to be omitted in +M.N or -M.N - position specification. For compatibility with existing practice - (what vendors?), omitting M is now equivalent to specifying `0' for M, - but only when using the +pos -pos syntax, not with the -k option. - From Rick Sladkey (jrs@world.std.com). - -Thu Jul 6 23:44:20 1995 Jim Meyering (meyering@comco.com) - - * od.c (dump): Correct loop-termination criterion. - Before, running `printf 1234| ./od --width=4 --read-bytes=4' - printed output for 8 bytes -- the last four were garbage. - This happened only when the dump limit, N, was specified (with - --read-bytes=N) and N was a multiple of bytes_per_block - (usually 16, but 4 in this example). From Andreas Schwab. - -Sun Jul 2 22:12:40 1995 Jim Meyering (meyering@comco.com) - - * lib/Makefile.in (check): Depend on libtu.a. - - * md5sum.c (split_3): Rewrite to parse Plumb/Lankester format as well. - (main): Print each sum line in (de facto) standard Plumb/Lankester - format. - New option: --quiet. - Check option no longer takes an argument. - When checking, exit status reflects success. - -Sat Jun 24 16:18:01 1995 Jim Meyering (meyering@comco.com) - - * md5sum.c [__GNUC__]: Don't conditionalize use of "inline". - Autoconf (via config.h) defines it away for compilers that don't - grok it. - - * cat.c, comm.c, join.c, sort.c, uniq.c: Undefine min/max before - defining to avoid redefinition warning on some systems. - - * csplit.c (read_input): Rename paramater MAX to MAX_N_BYTES. - This avoids potential conflict with max macro from some system's - header files when using bad pre-ANSI compilers. - - * uniq.c (usage): Fix typo in text of --help output. - From Steve McConnel <steve@acadcomp.sil.org> - - * md5sum.c [uint32]: When testing for 32-bit arithmetic type, - also check `unsigned long', as a concession to systems with - int's smaller than 32 bits. - - * configure.in (AC_REPLACE_FUNCS): Remove memcmp (again!) since - AC_FUNC_MEMCMP already handles it. This avoids warnings from - ranlib on nextstep systems. From Kaveh Ghazi. - - * csplit.c (interrupt_handler): Declare to have a single integer - parameter. Otherwise, some compilers fail with a type mismatch - error in sa_handler assignment. - - * fmt.c [word]: Redefine. Otherwise, systems (Unicos for one) with - headers that typedef `word' get syntax errors because of the - variable by the same name. - - * join.c [join]: Redefine to avoid conflict with prototype in some - system header file. Also for Unicos. - - * md5sum.c (main): Remove spurious colon in getopt spec string. - From Ken Pizzini <kenp@spry.com>. - -Tue Jun 20 06:59:16 1995 Jim Meyering (meyering@comco.com) - - * md5sum.c (md5_file): Initialize two elements of LEN portably, - rather than with ANSI aggregate initialization. Reported by - Edzer Pebesma <Edzer.Pebesma@rivm.nl>. - -Sun Jun 18 09:15:57 1995 Jim Meyering (meyering@comco.com) - - * Version 1.12. - - * md5sum.c (process_buffer): Copy values from struct into - individual local variables before performing computation on them, - then copy results back into returned struct. Solely for better - optimization by compilers that can't keep struct members in - registers. From Ulrich Drepper. - -Thu Jun 15 22:09:14 1995 Jim Meyering (meyering@comco.com) - - * md5sum.c: Remove unnecessary uses of `defined' in #if* tests. - Don't use #elif. Some older compilers don't grok it. - (split_3): New function to parse out sum, flag, and filename - when reading check file. - (hex_digits): Remove length parameter since string parameter is - now nul-terminated. - (main): Don't allocate separate arrays for filename and sum - when checking. Get pointers into line buffer with split_3 instead - of using sscanf. - (main): Treat `no file args' just like `-' when not checking - or using strings. - (hex_digits): Unprotoize. - - * md5sum.c (main): Don't use a separate loop to convert to lower - case. Suggested by Ulrich Drepper. - (CLOSE): New macro. - (md5_file): Use it. - From Ulrich Drepper. - - * md5sum.c: Don't include values.h. - [__P]: Undefine it. - - * md5sum.c: [UNIX || unix]: Also test __UNIX__, __unix__, - and _POSIX_VERSION. Reported by Arne H. Juul. +2003-02-22 Jim Meyering <jim@meyering.net> -Tue Jun 13 21:20:10 1995 Jim Meyering (meyering@comco.com) + * announce-gen: New option: --release-type=TYPE + * Makefile.maint (beta, major): New targets. Remove `release'. + Put them all together on a line. + Pass the release type (via RELEASE_TYPE envvar) to the MAKE + invocation of `announcement'. + (announcement): Invoke announce-gen with --release-type=$RELEASE_TYPE. - * tr.c [NDEBUG]: Define it to disable assertions. Some systems - have a broken <assert.h> header. - (is_char_class_member): Set a variable in each branch of switch - stmt and return that value after the switch (rather than returning - directly from every branch). - (unquote): More int->size_t changes. - (build_spec_list): More int->size_t changes. - Be very careful about comparison now that variables are unsigned: - Use i + 2 < len rather than i < len - 2. The latter didn't work - for len < 2. Caught early thanks to a thorough regression test - suite. + * announce-gen: New option: --news=NEWS_FILE. + Extract NEWS entries here, not via rules in Makefile.maint. + * Makefile.maint (announcement): Now that NEWS entries are + extracted by announce-gen, don't do it here. + (news-r1, news-r2): Remove now-unused definitions. -Mon Jun 12 23:07:59 1995 Jim Meyering (meyering@comco.com) +2003-02-21 Jim Meyering <jim@meyering.net> - * sort.c (xfclose): Don't try to flush stdin, only stdout. - Otherwise, at least Ultrix-4.3's fflush would return EOF. - Reported by Jim Blandy (jimb@cyclic.com). + * Version 4.5.8. - * tr.c (non_neg_strtol): Don't compare signed and unsigned. - [struct Spec_list] (indefinite_repeat_element): New member. - Use size_t rather than int or unsigned long where reasonable. - (get_spec_status): Make interface cleaner. - (get_s1_spec_status): New function. - (get_s2_spec_status): New function. - (validate): Use new functions instead of get_spec_status. + Merge in changes from autoconf's version of this file. + * Makefile.maint (www-gnu): Define. + (standards.texi-url_prefix): Use $(www-gnu). + (make-stds.texi-url_prefix): Likewise. -Sun Jun 11 00:39:50 1995 Jim Meyering (meyering@comco.com) + * src/cp.c: Include "mmap-stack.h". + (main): Invoke `run' through a macro that (when possible) runs it + with a large, mmap'd stack. - * md5sum.c: New file. From Ulrich Drepper. - * md5-test.rfc: New file. - * Makefile.in (PROGS): Add md5sum. - (check): Run a recursive make in each subdirectory. - * man/Makefile.in (MANFILES): Add md5sum.1. - * src/Makefile.in (SOURCES): Add md5sum.c. - (OBJECTS): Add md5sum.o. - (PROGS): Add md5sum. - (check): Add basic checks for md5sum. - (md5sum): Add dependency and link rule. - (DISTFILES): Add md5-test.rfc. + * src/cp.c (run): New function, preparing for the above. + Exit from this function, not from main + (main): Call run. - * tr.c (look_up_char_class, append_char_class, append_equiv_class): - Use const attribute when appropriate. - -Sun May 28 14:48:58 1995 Jim Meyering (meyering@comco.com) - - * join.c: Overhauled to make -a1 and -a2 options work. - Passed all tests in a fairly thorough test suite. - Reported by Michael Hasselberg (mikelh@zonta.ping.de). - -Sat May 27 00:35:47 1995 Jim Meyering (meyering@comco.com) + * src/du.c: New option: --apparent-size. + (enum) [APPARENT_SIZE_OPTION]: New member. + (long_options): Add it. + (usage): Describe it. + (main): Handle it. + ['b']: Set apparent_size. + David Eisner reported that the behavior of --bytes had changed. + Paul Eggert proposed the use of a new option, --apparent-size. - * tail.c (main): Remove dcl of and statements that set now-unused - variable. + * src/du.c (apparent_size): New global. + (print_only_size): Reflect the fact that we're printing byte counts, + not ST_NBLOCKSIZE-byte-block counts. + (print_size): Call print_only_size rather than duplicating its code. + (process_file): Accumulate byte counts, rather than block counts. - * system.h [!STDC_HEADERS && HAVE_MEMORY_H]: Include memory.h. - Without this, SunOS doesn't get type for memchr. - Reported by Kaveh Ghazi. + * src/du.c (process_file): Always reset size_to_propagate_to_parent + for --separate-dirs (-S). -Thu May 25 00:06:50 1995 Jim Meyering (meyering@comco.com) +2003-02-20 Jim Meyering <jim@meyering.net> - * tail.c (tail_lines): Change one more `long' to `off_t'. - Otherwise, tail didn't work on NetBSD. From Arne H. Juul. + * Use automake-1.7.3. Regenerate dependent files. - * csplit.c [struct control]: Change type of `repeat' to unsigned - long to avoid conversion warning. - -Sun May 21 07:50:00 1995 Jim Meyering (meyering@comco.com) - - * Makefile.in (.PHONY): TAGS is not a phony target. From Franc,ois. + * src/stat.c (print_stat): New format: %B (to print ST_NBLOCKSIZE). + This makes %b (number of ST_NBLOCKSIZE-byte blocks) more useful. + (usage) [%B]: Describe it. + [%b]: Refer to %B. - * xstrtol.c (__strtol): Remove prototype altogether. - Move inclusion of xstrtol.h back so that it follows system headers. - - * Version 1.11.2. - -Sat May 20 06:44:14 1995 Jim Meyering (meyering@comco.com) - - * join.c (ADD_FIELD): Declare in K&R style, not ANSI. - From Kaveh Ghazi. + * src/du.c (process_file): Reorganize the code to use only + one `sum' array, and change how -S works back to the way it was + before 2003-01-31. Patch by Bruno Haible. - * xstrtol.c: Define NDEBUG for systems with losing assert.h. - (__strtol): Add __unsigned to prototype and use __P. - Move inclusion of xstrtol.h to precede prototype. - From Kaveh Ghazi. + * tests/du/basic: New test. + * tests/du/Makefile.am (TESTS): Add basic. - * memmove.c: Include config.h for definition of const. - From Kaveh Ghazi. + * tests/envvar-check: Add checks for the following: + BLOCK_SIZE, DU_BLOCK_SIZE, DF_BLOCK_SIZE, LS_BLOCK_SIZE. - * All Makefile.in (install-exec, install-exec): New targets. - From Karl Berry. + * tests/Makefile.am: Rename phony target envvar-check to evar-check + so as not to conflict with the distributed file by the same name. - * tr.c (look_up_char_class): Take a string length argument -- required - because the argument is a string that is *not* NUL-terminated. - Use strncmp, not strcmp and add string lengths comparison. - (append_char_class): Update caller. Before this change, - tr '[:upper:]' '[:lower:]' read one uninitialized byte. - From Andreas Schwab. + * src/du.c (process_file): Set info->skip before any possible return. - * split.c (next_file_name): Move dcls of file-scope variables into - this function. Don't rely on arithmetic being two's complement. + Report correct usage for directories, not 0. + * src/du.c (process_file): Return for `file_type == FTW_DPRE' + _before_ recording the dev/ino of a directory. + Reported by Bruno Haible. - * paste.c [CLOSED, ENDLIST]: Don't cast constants to FILE pointers. - Instead, declare two FILE structs and use their addresses. + Now, df always displays the device file name corresponding to the + listed mount point under `Filesystem'. Before, for an unmounted + block- or character-special file argument, it would display the + command-line argument instead. + * src/df.c (show_disk): Return a value indicating whether + there was a match. Don't try to find a mount point here. + (show_entry): If show_disk doesn't find a match, call show_point. - * csplit.c (record_line_starts): Remove set-but-not-used, - file-scope variable. +2003-02-19 Jim Meyering <jim@meyering.net> -Sat May 13 08:57:20 1995 Jim Meyering (meyering@comco.com) + * src/du.c: Include "mmap-stack.h". + (du_files): Add prototype with ATTRIBUTE_NORETURN. + Exit from this function, not from... + (main): ...here. + Instead, if possible, invoke du_files through a macro that + runs it with a large, mmap'd stack. - * all source files (usage): Include one- or two-line synopsis - in --help output. From Karl Berry. + * src/join.c (usage): Change wording in --help output: + use FILENUM instead of `SIDE' and say what FILENUM means. + Reported by Bernhard Gabler. - * lib/Makefile.in [.c.o]: Remove -I. since safe-l?stat.h are no - longer used. + * src/df.c (print_header): Rather than using a hard-coded literal + string of spaces matching the length of the English `...Type' header, + output the right number of spaces to match the selected translation. + Reported by Yann Dirson and Jean Charles Delepine as Debian bug 131113. -Wed May 10 22:26:35 1995 Jim Meyering (meyering@comco.com) + * src/split.c (bytes_split): Remove unnecessary `else' after break. + (lines_split): Likewise. and correct misleading indentation. - * Version 1.11.1 + * src/split.c: Include "full-read.h". + (bytes_split, lines_split, line_bytes_split): Use full_read, + not safe_read. The way split was using the latter, a short read + could cause split to terminate before EOF. -Sun May 7 13:35:49 1995 Jim Meyering (meyering@comco.com) + * tests/misc/tty-eof: Test all programs that can read stdin, + requiring no arguments and that write to standard output. - * all Makefile.in (maintainer-clean): Renamed from realclean - per GNU Standards. + * tests/misc/tty-eof: New file. Renamed from ... + * tests/misc/cat-tty-eof: Remove file. Rename to tty-eof. + * tests/misc/Makefile.am (TESTS): Reflect renaming. -Thu May 4 23:15:58 1995 Jim Meyering (meyering@comco.com) +2003-02-18 Jim Meyering <jim@meyering.net> - * sort.c (main): Use stat, not safe_stat. The latter was unnecessary. - Don't include safe-stat.h. + cksum would perform an extra read after encountering EOF + * src/cksum.c (cksum): Exit the loop upon EOF, too. + Patch by Michael Bacarella. - * lib/Makefile.in (DISTFILES): Remove safe-xstat.hin. - Remove all associated rules. safe-l?stat.h are no longer used. + Test for the bug fixed today in cksum, md5sum, and sha1sum. + * tests/misc/cat-tty-eof: Generalize, clean-up, and test for + cat, cksum, md5sum, and sha1sum all in the same loop. - * sort.c Don't hard-code /tmp. - [DEFAULT_TMPDIR]: Use this instead. - * tac.c (save_stdin): Likewise. +2003-02-14 Jim Meyering <jim@meyering.net> - * sort.c (set_ordering): Properly parse arguments like `+x.yn'. - Reported by John Salmon (johns@mullet.anu.edu.au). - Patch from Mike Haertel. + * src/remove.c: Include "euidaccess.h". + Remove declaration of euidaccess. -Wed Apr 26 23:48:13 1995 Jim Meyering (meyering@comco.com) +2003-02-12 Jim Meyering <jim@meyering.net> - * sort.c (tempname): AND-off high bits of pid so that its decimal - string representation is no longer than five digits. - From Hans Verkuil (hans@wyst.hobby.nl). + * src/pathchk.c (portable_chars_only): Remove unnecessary `const' + in cast to avoid warning from icc. Reported by Alexandre Duret-Lutz. -Thu Apr 20 23:09:33 1995 Jim Meyering (meyering@comco.com) +2003-02-10 Jim Meyering <jim@meyering.net> - * expand.c (add_tabstop): Give correct size when reallocating - tab_list buffer. From Geoff Odhner (geoff@franklin.com). - Reproduce with expand --t=`perl -e "print join (',', (1..300));"`. + * src/test.c: Don't include group-member.h. + Include euidaccess.h. + (eaccess): Rewrite function to set the real uid and gid temporarily + to the effective uid and gid, then invoke 'access', and then set the + real uid and gid back. On systems that lack setreuid or setregid, + fall back on the kludges in euidaccess. Before, it would not work + for e.g., files with ACLs, files that were marked immutable, + or on file systems mounted read-only. Nelson Beebe raised the issue. + Paul Eggert suggested the new implementation. -Tue Apr 18 22:57:43 1995 Jim Meyering (meyering@comco.com) +2003-02-09 Jim Meyering <jim@meyering.net> - * configure.in (AC_OUTPUT): Use echo, not date, to avoid creating - unnecessary conflicts for people using version control software - like RCS and CVS. - (AC_ARG_PROGRAM): Use it. + * src/test.c (test_stat): Remove function. It's job is done (only + when necessary) by the wrapper in lib/stat.c. Adjust all uses. -Thu Apr 13 23:22:57 1995 Jim Meyering (meyering@comco.com) +2003-02-08 Jim Meyering <jim@meyering.net> - * head.c: Remove block of redundant comments describing options. - (usage): Remove reference to -l option. It's not valid. + * Version 4.5.7. - * od.c (write_block): Declare index I as unsigned int, not int. - (get_lcm): Likewise. - (dump_strings): Likewise. - (main): Likewise. - (dump): Cast BYTES_PER_BLOCK to off_t in MIN expression. - (dump_strings): Declare bufsize to be of type size_t, not int. + * tests/mv/part-symlink: Don't assume that the file owner username + length is less than 9 in ls output: instead, omit that field + altogether. Reported by, and suggested fix from, Ferdinand. - * split.c (next_file_name): Don't reuse X as an index. - Declare new variable I instead. + * tests/du/restore-wd: New test for just-fixed bug in ftw.c. + * tests/du/Makefile.am (TESTS): Add restore-wd. -Sat Mar 25 15:07:23 1995 Jim Meyering (meyering@comco.com) + * src/rm.c: Correct now-invalid comment about cycle-detection. - * csplit.c: Declare as `unsigned int' all variables that were - just `unsigned'. - (make_filename): Change type of arg to unsigned int. - (split_file): Change type of indices to unsigned int. +2003-02-06 Jim Meyering <jim@meyering.net> -Thu Mar 16 22:05:05 1995 Jim Meyering (meyering@comco.com) + * NEWS: Add entries from old/*/NEWS + from fileutils-4.1 through 4.1.11 and + from sh-utils-2.0 through 2.0.15. Suggestion from Karl Berry. - * od.c (main): Detect and fail when argument to -N is too large - to fit in an off_t. + * Version 4.5.6. -Sun Mar 12 12:02:39 1995 Jim Meyering (meyering@comco.com) + * src/du.c (process_file): Don't return early for excluded files + or for files whose dev/inode we've already seen. - * configure.in (AC_REPLACE_FUNCS): Add memcmp.c. - Remove check for sizeof long. +2003-02-05 Jim Meyering <jim@meyering.net> - * linebuffer.h: Undefine __P before defining it. - * long-options.h: Likewise. - * xstrtol.h: Likewise. + * tests/du/exclude: New file. + * tests/du/Makefile.am (TESTS): Add exclude. - * memcpy.c: New file. - * lib/Makefile.in (SOURCES): Add memcpy.c. +2003-02-04 Dmitry V. Levin <ldv@altlinux.org> -Fri Mar 10 21:14:11 1995 Jim Meyering (meyering@comco.com) + * src/who.c (print_boottime, print_deadprocs, print_runlevel): + Fix memory allocation arithmetic. - * src/*.c: Update Copyright dates. +2003-02-04 Jim Meyering <jim@meyering.net> -Sat Feb 11 07:31:08 1995 Jim Meyering (meyering@comco.com) + `df /dev/block-or-char-device-file--not-mounted' now reports + the name of the file system on which the file resides, usually `/'. + Before, it would leave the `Mounted on' field blank. + * src/df.c (show_disk): Move function to precede find_mount_point. + (show_disk): Add parameter: STATP. + If we don't find a matching device name, then resort to calling + find_mount_point. Reported by Bob Proulx. - * system.h: Remove index/rindex and bcmp/bcopy/bzero references. - Separate errno declaration from STDC_HEADERS. +2003-02-03 Andreas Schwab <schwab@suse.de> - * wc.c (wc): For efficiency, handle separately the cases in which - words need not be counted. Suggested by Karl Heuer. + * tests/rm/cycle: Require non-root. + * tests/rm/isatty: Likewise. - * wc.c (wc): Don't overcount the number of bytes when reading - from a regular file on stdin with file pointer not at BOF. - From Karl Heuer <karl@gnu.ai.mit.edu>. Before, the command - `(dd ibs=99k skip=1; wc -c) < /etc/group' made wc wrongly output - the size of the file. Now it outputs `0'. +2003-02-02 Jim Meyering <jim@meyering.net> -Sat Jan 28 07:07:23 1995 Jim Meyering (meyering@comco.com) + * Version 4.5.5. - * cat.c (cat): Use memmove rather than bcopy. - * csplit.c (load_buffer): Use memcpy rather than bcopy. - (extract_regexp): Use strrchr, not rindex. - * fmt.c (isopen, isclose, isperiod): Use strchr, not index. - (flush_paragraph): Use memmove instead of bcopy. - * fold.c (fold_file): Use memmove instead of bcopy. - * od.c (decode_format_string): Use memmove instead of bcopy. - [EQUAL_BLOCKS]: Use memcmp, not bcmp. - (parse_old_offset): Use strchr, not index. - (dump): Use memset, not bzero. - * sort.c (checkfp, mergefps): Use memcpy instead of bcopy. - (fillbuf): Use memmove instead of bcopy. - * split.c (main): Use memset, not bzero. - (line_bytes_split): Use memmove instead of bcopy. - * tac.c (tac): Use memmove instead of bcopy. - (output): Use memcpy instead of bcopy. - * tail.c (pipe_lines, pipe_bytes): Use memcpy instead of bcopy. - * tr.c (substr): Use memcpy instead of bcopy. - (card_of_complement, set_initialize): Use memset, not bzero. + * man/Makefile.am (check-x-vs-1): Use @PATH_SEPARATOR@, not `:'. - * tr.c (substr): Don't allocate a byte for trailing NUL in result - since the result needn't be NUL-terminated. Don't NUL terminate it. + Ensure that there are no offending uses of `:'. + * Makefile.maint (makefile_path_separator_check): New rule. + (local-check): Add it to the list. - * configure.in (AC_REPLACE_FUNCS): Check for memmove and memcpy, - not bcopy. - (AC_CHECK_FUNCS): Add strchr and strrchr. +2003-02-01 Jim Meyering <jim@meyering.net> - * lib/Makefile.in (SOURCES): Add memmove.c and memcpy.c. - * memmove.c: New file. - * memcpy.c: New file. + * src/du.c (MAX_N_DESCRIPTORS): Define. -Tue Jan 24 22:18:19 1995 Jim Meyering (meyering@comco.com) + * src/stat.c (G_fail): New global. + (human_time): Diagnose failed localtime, not failed nstrftime. + (main): Fail if G_fail is set. - * fmt.c (copy_rest): Replace `||' with `&&'. Before, a paragraph - not followed by a newline would be followed by data copied from - uninitialized storage. Repeat by `printf abc|fmt|od -ac'. - Reported by Franc,ois Pinard. +2003-01-31 Richard Dawe <rich@phekda.freeserve.co.uk> - * od.c: Rename macros with FP_ prefix. Use FLOAT_ instead. - AIX-2.2.1 declares a typedef, FP_DOUBLE, that conflicted. - Be careful to use off_t instead of explicit `unsigned long'. - Otherwise, systems like 4.4BSD lose on calls to fseek that - expect off_t (which is long long on that system). - (parse_old_offset): Use xstrtoul + * tests/basename/Makefile.am: Use @PATH_SEPARATOR@ instead of + hard-coding the path-separator. Also double-quote the new PATH, + to avoid problems when the path-separator is a semi-colon or when + `pwd` contains e.g. a space. + * tests/chgrp/Makefile.am: Likewise. + * tests/chmod/Makefile.am: Likewise. + * tests/chown/Makefile.am: Likewise. + * tests/cp/Makefile.am: Likewise. + * tests/dd/Makefile.am: Likewise. + * tests/dircolors/Makefile.am: Likewise. + * tests/du/Makefile.am: Likewise. + * tests/expr/Makefile.am: Likewise. + * tests/factor/Makefile.am: Likewise. + * tests/fmt/Makefile.am: Likewise. + * tests/install/Makefile.am: Likewise. + * tests/ln/Makefile.am: Likewise. + * tests/ls/Makefile.am: Likewise. + * tests/ls-2/Makefile.am: Likewise. + * tests/md5sum/Makefile.am: Likewise. + * tests/misc/Makefile.am: Likewise. + * tests/mkdir/Makefile.am: Likewise. + * tests/mv/Makefile.am: Likewise. + * tests/od/Makefile.am: Likewise. + * tests/rm/Makefile.am: Likewise. + * tests/rmdir/Makefile.am: Likewise. + * tests/seq/Makefile.am: Likewise. + * tests/sha1sum/Makefile.am: Likewise. + * tests/shred/Makefile.am: Likewise. + * tests/stty/Makefile.am: Likewise. + * tests/sum/Makefile.am: Likewise. + * tests/tail-2/Makefile.am: Likewise. + * tests/touch/Makefile.am: Likewise. + * tests/tsort/Makefile.am: Likewise. + * tests/unexpand/Makefile.am: Likewise. + +2003-01-31 Jim Meyering <jim@meyering.net> + + * src/stat.c: Include "file-type.h" + (print_human_type): Remove function. + (human_access): Rename from print_human_access. Return a string. + (human_time): Rename from print_human_time. Return a string. + (print_stat): Arrange so that field width and an alignment specifier + are honored for the %A, %F, %x, %y, and %z formats. + [%F]: Use file_type; this gives slightly different file type strings, + e.g., `directory' instead of `Directory' and `regular file' or + `regular empty file' instead of `Regular file'. + Prompted by a report from Richard Dawe that the uses of + S_IFSOCK and S_IFIFO in print_human_time were not portable + to systems using e.g., DJGPP. + +2003-01-31 Richard Dawe <rich@phekda.freeserve.co.uk> + + * src/stat.c (print_stat): Use S_ISLNK rather than an explicit + test using S_IFMT and S_IFLNK. S_IFLNK may not be defined. + +2003-01-31 Jim Meyering <jim@meyering.net> + + * src/du.c (main): Upon processing an invalid option or an invalid + --exclude-from or --max-depth option argument, don't exit right away, + in case there are others. Rather record the failure and exit after + processing other options. + + * GNUmakefile (TAR_OPTIONS): Set and export, in order to make + tar archive easier to reproduce. + + Rewrite to perform directory traversal using nftw. + + * src/du.c: Include "dirname.h", "ftw.h", and "quotearg.h". + (AUTHORS): Add self. + (opt_one_file_system): Move global into `main'. + (path, xstat, exit_status): Remove declarations. + (arg_length, suffix_length): New globals. + (G_fail): New global, sort of like the old `exit_status'. + (IS_FTW_DIR_TYPE): Define. + (print_only_size): New function. + (process_file): New function. + (str_init, ensure_space, str_copyc, str_concatc): Remove functions. + (str_trunc, pop_dir, count_entry): Likewise. + (du_files): Rewrite to use nftw. + +2003-01-30 Jim Meyering <jim@meyering.net> + + * tests/du/trailing-slash: Ensure that du/ftw follows a command-line + symlink-to-directory with -L, even without the trailing slash. + +2003-01-27 Jim Meyering <jim@meyering.net> + + * src/Makefile.am (check-misc): Check for st_blocks, too. + + * src/stat.c (print_stat): Use ST_NBLOCKS rather than `->st_blocks'. + Reported by Richard Dawe. + +2003-01-27 Andreas Schwab <schwab@suse.de> + + * src/ls.c (quote_name): Add fourth parameter, width, into which to + store the screen columns, and return the number of bytes instead. + (print_dir): Pass NULL as fourth parameter of quote_name. + (print_name_with_quoting): Likewise. + (length_of_file_name_and_frills): Get the width from the fourth + parameter of quote_name instead of return value. + +2003-01-27 Jim Meyering <jim@meyering.net> + + * src/ls.c (decode_switches): If `dired' is set without + `format == long_format', then silently reset dired. This doesn't + change the behavior of ls (all prior uses of dired were protected + by `&& format == long_format'), and lets us... + (DIRED_INDENT): ... remove the `format == long_format' conjunct. + (PUSH_CURRENT_DIRED_POS): Likewise. (main): Likewise. - * src/Makefile.in (od.o, tail.o): Depend on ../lib/strtol.h. - -Mon Dec 19 22:13:55 1994 Jim Meyering (meyering@comco.com) - - * tail.c (numerous functions): Give char* filename arguments the - const attribute. - - * lib/Makefile.in (SOURCES): Remove xwrite.c. It was no longer used. - Add xstrtol.c and xstrtoul.c. - (OBJECTS): Likewise for .o files. - (DISTFILES): Add error.h and xstrtol.h and xstrtoul.h. - - * lib/Makefile.in (DISTFILES): Remove safe-xstat.cin. - (distclean): Remove references to safe-l?stat.c. - Remove all related rules and dependencies. - - * src/Makefile.in: $(OBJECTS): Depend on ../lib/error.h. - -Thu Dec 15 23:14:04 1994 Jim Meyering (meyering@comco.com) - - * tail.c (tail_file): Fix call to error with %s in format, but - no corresponding argument. - - * src/*.c: Include "error.h" instead of simply declaring - `void error ();'. - * od.c (main): Use %lu, not %d for unsigned long. - (my_strtoul, uint_fatal_error): Remove functions. Use xstrtoul - and STRTOL_FATAL_ERROR instead. - -Sun Dec 11 17:24:09 1994 Jim Meyering (meyering@comco.com) - - * sort.c (main): Fix interpretation of field offsets when specified - via -k option. They were being interpreted as zero-indexed. POSIX - says they are 1-based indices. From Rik Faith <faith@cs.unc.edu>. - (keycompare): Don't ignore characters at the end of words when - otherwise they would compare equal. From Rik Faith. - - * tail.c (<most functions>): Change the type of n_units/n_lines/n_bytes - to off_t because n_bytes is used as the option to fseek and off_t may - be long long (e.g. on BSD4.4). The only place where a 32-bit limit is - imposed is in the string-to-integer converstion of xstrtol. - (main): Use xstrtol instead of manual string to integer conversion. - - * csplit.c (get_format_width, get_format_prec): Use ISDIGIT instead of - comparisons against '0' and '9'. - - * tr.c [!ULONGMAX]: Define it. - [!LONGMAX]: Define in terms of ULONGMAX instead of as a 32-bit constant. - - * full-write.c: Declare (or not) errno based on definedness or - errno, not STDC_HEADERS. - * safe-read.c: Likewise. - * xwrite.c: Likewise. - -Thu Nov 17 06:37:33 1994 Jim Meyering (meyering@comco.com) - - * tail.c (dump_remainder): Flush standard output just before - sleeping so that `tail -f' will output partial lines sooner. - This applies only when following the end of a single file. - From Leonard N. Zubkoff <lnz@dandelion.com>. - - * tail.c (file_lines, pipe_lines, pipe_bytes, start_bytes, - start_lines, dump_remainder): Use STDOUT_FILENO instead of `1' in - XWRITE calls. - * tac.c (output): Use STDOUT_FILENO instead of `1' in xwrite call. - * system.h (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO): Define if - not already defined. - -Wed Nov 16 07:01:38 1994 Jim Meyering (meyering@comco.com) - - * tr.c: Include <getopt.h> instead of "getopt.h". - - * sort.c (tempname): Merge two very similar sprintf stmts into one. - - * tail.c: Use BUFSIZ instead of BUFSIZE. - - * cut.c: Declare DELIM to be `int' rather than unsigned char. - - * fmt.c: Use index, not strchr -- per GNU Standards. - Reported by Kaveh Ghazi. - Always include <config.h>. - (main): Include program name in --version output. - -Sun Nov 06 00:17:21 1994 Jim Meyering (meyering@comco.com) - - * Version 1.11. - -Sat Nov 05 15:14:44 1994 Jim Meyering (meyering@comco.com) - - * memcmp.c, srtoul.c: Use up-to-date versions. - Reported by Franc,ois Pinard. - - * src/Makefile.in (DEFS): Remove -Dlint... again. - - * src/Makefile.in (PROGS): Add fmt! - Reported by Andreas Stolcke (stolcke@ICSI.Berkeley.EDU). - -Fri Nov 04 17:26:16 1994 Jim Meyering (meyering@comco.com) - - * Version 1.10. - -Thu Nov 03 23:23:08 1994 Jim Meyering (meyering@comco.com) - - * linebuffer.h: Use __P instead of _P since the latter conflicts - with a definition in some <ctype.h>. From Kaveh Ghazi. - -Wed Nov 02 17:36:34 1994 Jim Meyering (meyering@comco.com) - - * tr.c: Add const attribute where appropriate. - - * tail.c (BUFSIZ): Use definition from <stdio.h>. - -Tue Nov 01 23:54:09 1994 Jim Meyering (meyering@comco.com) - - * tail.c (XWRITE): Allow n_bytes == 0 but call fwrite only if - n_bytes is positive. Turn off assertions. `tail /dev/null' was - getting a failed assertion. Reported by Doug McLaren - (dougmc@comco.com). - - * cut.c (cut_bytes): Print at least a newline for every line of input. - (cut_fields): Print a newline even for lines whose only selected - field is empty. But print nothing when using -s without -f1. - And print nothing for empty input. Reported by - Richard_Sharman@software.mitel.com. - -Tue Nov 01 06:05:23 1994 Jim Meyering (meyering@comco.com) - - * fmt.c: Change #ifdef __STDC__ to #if defined (__STDC__) && __STDC__. - * linebuffer.h: Likewise. - -Mon Oct 31 06:53:32 1994 Jim Meyering (meyering@comco.com) - - * configure.in (AC_REPLACE_FUNCS): Remove memcmp since AC_FUNC_MEMCMP - already handles it. From Kaveh Ghazi. - - * {lib,src}/Makefile.in (DEFS): Don't use -Dlint. Some systems - get failures when it's defined. From Kaveh Ghazi. - - * cat.c (cat): Conditionalize test for errno == ENOSYS. It's not - defined on some Next and Alliant systems. From Kaveh Ghazi. - - * sort.c join.c (main): Include version.h and call parse_long_options - with the proper number of arguments. Reported by Franc,ois Pinard. - -Sun Oct 30 01:30:41 1994 Jim Meyering (meyering@comco.com) - - * (configure.in): Add AC_OFF_T and rearrange by type along the - same lines as autoscan. - - * fmt.c, fmt.1: New files. - Both from Ross Paterson (rap@doc.ic.ac.uk). - - * Makefile.in (PROGS): Add fmt. - * src/Makefile.in (SOURCES, OBJECTS): Add fmt.c and fmt.o respectively. - (fmt): Add a link rule. - * man/Makefile.in (MANFILES): Add fmt.1. - -Sat Oct 08 10:44:30 1994 Jim Meyering (meyering@comco.com) - - * Makefile.in (All of them): Update from the ones in sh-utils. - From now on, rules and definitions that are comon to the fileutils, - textutils, and sh-utils will get ChangeLog entries only in the - sh-utils. - -Tue Oct 04 20:42:46 1994 Jim Meyering (meyering@comco.com) - - * od.c (my_strtoul): Set errno to zero before calling strtoul. - Otherwise, od can fail complaining about a valid integer argument. - From Andreas Schwab. - -Sun Oct 02 17:57:09 1994 Jim Meyering (meyering@comco.com) - - * tr.c (main): Give an error and fail when squeezing repeats - and no non-options are given. Reported by Tony Robinson - (ajr@eng.cam.ac.uk). - - * sort.c (main): Temporarily copy each input file that might be - another name for the output file. When in doubt (e.g. a pipe), - copy. This allows the dangerous (historical -- in cnews) idiom - `cat file | sort -o file' to work properly. Don't rely on this - behavior in new shell scripts. From Paul Eggert (eggert@twinsun.com). - -Mon Sep 26 18:01:47 1994 David J. MacKenzie (djm@churchy.gnu.ai.mit.edu) - - * lib/xwrite.c safe-read.c memchr.c linebuffer.c full-write.c: - Remove CONFIG_BROKETS ifdef. - * src/Makefile.in lib/Makefile.in: Don't define it. - -Sat Sep 24 21:26:27 1994 Jim Meyering (meyering@comco.com) - - * full-write.c (full_write): Declare argument LEN to be size_t. - -Mon Sep 12 13:35:27 1994 Jim Meyering (meyering@comco.com) - - * tail.c (tail_file): [For multiple files only]: Report truncation - of monitored file and reset current file size. From Franc,ois Pinard. - -Sat Aug 27 16:57:20 1994 Jim Meyering (meyering@comco.com) - - * system.h [BROKEN_STAT_MACROS]: Remove unnecessary #ifdef's. - From Franc,ois Pinard. - -Tue Jul 26 11:33:53 1994 Jim Meyering (meyering@comco.com) - - * system.h: Remove `|| defined(_POSIX_VERSION)' from test that - decides whether to include <fcntl.h>. From Francois Pinard. - -Wed Jul 13 12:33:34 1994 Jim Meyering (meyering@comco.com) - - * tr.c (substr): Fix off-by-one allocation error. - -Wed Jun 22 01:02:50 1994 Jim Meyering (meyering@comco.com) - - * tac.c (tac_file): Use O_RDONLY instead of zero in call to open. - (tac): Fix typo that had `1' as arg #2 of error after failed read. - Use errno instead. From Michael I Bushnell <mib@gnu.ai.mit.edu>. - -Thu May 26 08:46:32 1994 Jim Meyering (meyering@comco.com) - - * configure.in [INSTALL]: Revert change of March 25. autoconf - has been fixed. - -Mon Apr 11 17:25:43 1994 Jim Meyering (meyering@comco.com) - - * join.c (prline): Remove unused function. Indent. - -Fri May 6 05:44:24 1994 Jim Meyering (meyering@comco.com) - - * tail.c (tail_forever): Don't print headers when asked not to. - From Karsten Thygesen <karthy@kom.auc.dk>. - - * wc.c (wc): Optimize for the case when only bytes are being counted - and the input is not a regular file. From Jeff Moore <jbm@mordor.com>. - -Sun Apr 24 10:54:08 1994 Jim Meyering (meyering@comco.com) - - * configure.in [AC_SIZEOF_TYPE]: Update for autoconf-1.9. - * memchr.c: Test SIZEOF_LONG instead of LONG_64_BITS. - -Mon Apr 11 17:55:52 1994 Jim Meyering (meyering@comco.com) - - * csplit.c (struct control): Add new field, repeat_forever. - Remove now-unneeded definition of INT_MAX. - (process_regexp): Test repeat_forever instead of comparing `repeat' - to INT_MAX. - (split_file): Don't even reference `repeat' count if repeat_forever - is set. - (new_control_record): Initialize repeat_forever field. - (parse_repeat_count): Set it instead of setting repeat count to - INT_MAX. - (process_line_count): Abort for internal error instead of calling - handle_line_error. - - * long-options.c (parse_long_options): Take a new argument indicating - the utility name (e.g. "join", not "gjoin") for version output. - Print both the utility and the package names, e.g. `join - GNU - textutils-1.9.1' instead of just the package name. - - * join.c (main): Call parse_long_options with program name arg. - * sort.c (main): Ditto. - - * All source except sort.c and join.c (main): Change --version output - to include utility name as well as package name and version info. - -Wed Mar 30 08:53:21 1994 Jim Meyering (meyering@comco.com) - - * configure.in: Use AC_SET_MAKE. - * Makefile.in: Edit MAKE assignments into @SET_MAKE@. - -Mon Mar 28 09:55:05 1994 Jim Meyering (meyering@comco.com) - - * tr.c (main): In addition to the --help usage pointer, give an - explicit error message for too many arguments. - -Fri Mar 25 18:11:19 1994 Jim Meyering (meyering@comco.com) - - * configure.in: Use AC_VERBOSE, AC_CHECKING, and AC_WARN instead - of explicit echo commands. - [INSTALL]: When AC_PROG_INSTALL resorts to setting this to - `./install.sh', make it `../install.sh' instead since that - script will be invoked only from subdirectories. - [AC_SIZEOF_TYPE]: Use this instead of deprecated AC_LONG_64_BITS. - - * cat.c (cat): The command `:|cat -s' failed on Irix5 because - ioctl (d, FIONREAD,... now returns ENOSYS for pipes -- under Irix4 - it returned EINVAL. Detect this. - (main) [lint]: Initialize variables to suppress `used before - initialized' warnings. - - * csplit.c: Change long option name from --suffix to --suffix-format. +2003-01-22 Jim Meyering <jim@meyering.net> - * od.c (skip): Correct a comment. - (main): Don't output anything to stdout if the sole input file - doesn't exist. Reported by Bauke Jan Douma <bjd@dds.hacktic.nl>. + * tests/du/no-x: New test, for functionality added to lib/ftw.c. + * tests/du/Makefile.am (TESTS): Add no-x. - * od.c (dump) [lint]: Initialize a variable to suppress `used before - initialized' warning. - (main) [lint]: Ditto. - * paste.c (paste_parallel) [lint]: Ditto. +2003-01-21 Jim Meyering <jim@meyering.net> -Fri Jan 28 11:02:21 1994 Jim Meyering (meyering@comco.com) + * src/remove.c (remove_entry) [ROOT_CAN_UNLINK_DIRS + && HAVE_STRUCT_DIRENT_D_TYPE]: If a file has d_type == DT_UNKNOWN + it may still be a directory -- or not (e.g., with FreeBSD on an + NFS-mounted file system), so resort to calling lstat to find out. + Based on a patch by Michael van Elst. - * configure.in: Don't set LDFLAGS since linking now uses both - LDFLAGS and CFLAGS. + * tests/cp/same-file: Don't assume that the file owner username + length is less than 9 in ls output: instead, omit that field + altogether. Reported by, and suggested fix from, Ferdinand. -Wed Jan 18 16:14:00 1994 Jim Meyering (meyering@comco.com) +2003-01-20 Jim Meyering <jim@meyering.net> - * unexpand.c (unexpand): Don't segfault when given a name of a - nonexistent file. - * expand.c (expand): Ditto. - Both from Bauke Jan Douma <bjd@dds.hacktic.nl>. + * tests/date/Test.pm (wide-fmt): New test to demonstrate that + large format widths no longer cause strftime to infloop. -Thu Jan 13 17:27:38 1994 Jim Meyering (meyering@comco.com) + * Makefile.maint (mail_gpg_sign_cookie): Remove now-unused definition. - * src/Makefile.in: Change all link commands to use both $(CFLAGS) - and $(LDFLAGS). +2003-01-19 Jim Meyering <jim@meyering.net> - * csplit.c (load_buffer): Rather than incrementing buffer size, - double it each time we fail to find a newline. Otherwise, csplit - would run out of memory when processing files with very long lines. + * src/readlink.c: Include "canonicalize.h". -Mon Jan 10 01:20:38 1994 Jim Meyering (meyering@comco.com) +2003-01-18 Jim Meyering <jim@meyering.net> - * man/Makefile.in (manprefix): Use binprefix as the default. + * src/ls.c (Dereference_symlink) [DEREF_COMMAND_LINE_SYMLINK_TO_DIR]: + New member. + (enum) [DEREFERENCE_COMMAND_LINE_SYMLINK_TO_DIR_OPTION]: New member. + (long_options): Add option --dereference-command-line-symlink-to-dir. + (main): Make DEREF_COMMAND_LINE_SYMLINK_TO_DIR be the default, + rather than DEREF_COMMAND_LINE_ARGUMENTS, when none of the + -d, -F, -l options is specified. + (decode_switches): Handle --dereference-command-line-symlink-to-dir. + (gobble_file): Honor DEREF_COMMAND_LINE_SYMLINK_TO_DIR. + Change --dereference-command-line (-H) to dereference *all* + command line arguments, including broken symlinks. -Sat Jan 08 22:22:45 1994 Jim Meyering (meyering@comco.com) +2003-01-15 Paul Eggert <eggert@twinsun.com> - * cat.c: Use full_write and safe_read instead of write and read resp. - * csplit.c: Ditto. - * head.c: Ditto. - * split.c: Ditto. - * tac.c: Ditto. + Change ls -H back to the way it was yesterday, since this is + compatible with FreeBSD and the POSIX spec is confusing + and somewhat contradictory. - * sum.c: Use safe_read instead of read. - * tr.c: Ditto. - * wc.c: Ditto. + * src/ls.c (DEREF_COMMAND_LINE_ARGUMENTS): Change name back + from DEREF_COMMAND_LINE_SYMLINK_TO_DIR, updating all uses. + (long_options): Change the long option name back. + (usage): Change the usage back. + (gobble_file): When -H is specified, dereference a top-level + arg even if it points to a non-directory. - * tail.c: Replace calls to xwrite with calls to fwrite. - Use fopen/fclose instead of open/close. - (write_header): Use a single call to printf instead of four to xwrite. - Use safe_read instead of read. - * head.c: Ditto. +2003-01-15 Jim Meyering <jim@meyering.net> -Tue Dec 28 15:49:32 1993 Jim Meyering (meyering@comco.com) + * src/ls.c (gobble_file): Fall back on using lstat when required: + when --dereference (-L) is not specified, and + - when operating on a dangling symlink + - when operating on command-line-symlink-to-directories + This fixes numerous problems. Here are examples: + - `ls dangling-symlink' would fail with `no such file...' + Now it prints `dangling-symlink'. + - `ls -i symlink' would mistakenly print the inode of the referent. + Now it prints the inode of the symlink. Likewise for --size (-s). + Based on a patch from Michael Stone. + Reported by Deepak Goel as Debian bug #173793. - * install.sh: New file. - Makefile.in [DISTFILES]: Add it. + Rename ls's --dereference-command-line (-H) + option to --dereference-command-line-symlink-to-dir. + * src/ls.c [enum Dereference_symlink] + (DEREF_COMMAND_LINE_SYMLINK_TO_DIR): Rename from + DEREF_COMMAND_LINE_ARGUMENTS. Update all uses. + (long_options): Rename the long option. + (usage): Say that --dereference-... changes how ls treats + only symlinks to directories specified on the command line. -Wed Dec 22 18:52:44 1993 Jim Meyering (meyering@comco.com) +2003-01-14 Jim Meyering <jim@meyering.net> - * memcmp.c: Use the latest version from the GNU C library. + * tests/ls/dangle: New file/test, for the above fix. + * tests/ls/inode: Another new file/test, for the above fix. + * tests/ls/Makefile.am (TESTS): Add dangle and inode. - * cut.c [ADD_RANGE_PAIR]: New macro. - (set_fields): Collect the list of all selected ranges before - allocating and initializing the boolean lookup table. - (cut_bytes, cut_fields): Complete rewrite. Avoid copying - into buffer whenever possible. Properly handle input without - trailing newline. - (getstr): New function. Copied from getline.c, but with minor changes. + * src/ls.c (gobble_file): Fix a bug introduced in 4.5.4 that made it + so that ls --color would no longer highlight the names of files with + the execute bit set when not specified on the command line. + Patch by Michael Stone. Reported by Stephen Depooter as + Debian bug 175135. - * sort.c (main): Properly handle -Tdir. - Before, `sort -T/var/tmp' gave `sort: unrecognized option `-v''. - Reported by Kristoffer Rose (kris@diku.dk). + * tests/ls-2/tests (color-exe): New test, for the above fix. - * cut.c (main): Give separate errors for `-s without -f' - and `-d without -f'. - (main): Now -d '' means `use the NUL byte as the delimiter'. - Before, it got an error. +2003-01-13 Jim Meyering <jim@meyering.net> -Mon Dec 20 23:29:30 1993 Jim Meyering (meyering@comco.com) + * tests/shred/exact: Also test for just fixed bug with --zero. - * configure.in [test for 8-bit clean memcmp]: Add a test to detect - losing memcmp from SunOS4.1.x. From Robert H. de Vries - <robert@and.nl>. + * src/shred.c (long_opts): --zero does not require an argument. + Patch by Michael Stone. Reported by Roland Turner as Debian bug 172019. -Sat Dec 18 01:12:24 1993 Jim Meyering (meyering@comco.com) +2003-01-12 Jim Meyering <jim@meyering.net> - * configure.in (AC_OUTPUT): Put `touch stamp-config' in second arg - so it goes in config.status. This eliminates unnecessary second run - of configure. + * Makefile.maint (cvs-update): Skip any file with local modifications. -Thu Dec 02 23:53:03 1993 Jim Meyering (meyering@comco.com) + * src/unexpand.c (usage): Document --first-only and mention that + --tabs=N (-t) enables --all (-a). Reported by wiregauze@yahoo.com. - * configure.in (AC_HAVE_FUNCS): Add isascii. - * system.h [!defined (isascii) || defined (STDC_HEADERS)]: This failed - on AIX PS/2 1.3 systems because isascii is a function and it is used - in definitions (with the necessary side effect of assigning to a - global variable) of the is* macros. Also test HAVE_ISASCII and - redefine ISASCII(c) instead of isascii. - Reported by Minh Tran-Le (tranle@intellicorp.com). +2002-12-01 Dmitry V. Levin <ldv@altlinux.org> -Fri Nov 19 22:41:48 1993 Jim Meyering (meyering@comco.com) + * src/df.c: Include "canonicalize.h". + Use canonicalize_file_name unconditionally. - * configure.in: Don't run the test for 8-bit clean memcmp if we - already know we'll be using our replacement. +2003-01-09 Jim Meyering <jim@meyering.net> -Fri Nov 12 00:44:49 1993 Jim Meyering (meyering@comco.com) + * README: Add readlink. - * Version 1.9.1. +2002-11-30 Dmitry V. Levin <ldv@altlinux.org> - * tac.c (usage): Fix typo in long usage. - * sort.c (usage): Likewise. - From Philippe.Schnoebelen@imag.fr. + * src/df.c: Include "xgetcwd.h". + * src/pwd.c: Likewise. - * cut.c [FATAL_ERROR]: New macro. - (main): Call both error and usage (2) through FATAL_ERROR in - many places. Before, only `error (2...' was called. - (invalid_list): Removed. This function is subsumed by FATAL_ERROR. +2002-11-30 Dmitry V. Levin <ldv@altlinux.org> - * cut.c (cut_fields): Properly handle input lacking a terminating - newline. Before, the command `printf "a\tb" |cut -f 1' generated - no output. + * src/shred.c: Remove declaration of xstrdup. + We already get it via xalloc.h which is included via system.h. -Tue Nov 09 17:26:25 1993 Jim Meyering (meyering@comco.com) +2002-08-27 Dmitry V. Levin <ldv@altlinux.org> - od.c (usage): Change --backward-compatible to --traditional in - the long usage message. + New program: readlink. -Sun Nov 07 00:50:05 1993 Jim Meyering (meyering@comco.com) + * src/Makefile.am (bin_PROGRAMS): Add readlink. + * src/readlink.c: New file. - * Version 1.9. + * man/readlink.x: New file. + * man/Makefile.am (dist_man_MANS): Add readlink.1. + (readlink.1): New rule. -Sat Nov 06 22:51:31 1993 Jim Meyering (meyering@comco.com) +2003-01-09 Jim Meyering <jim@meyering.net> - * cut.c (cut_fields): Revert July 27 change. Instead, strip off - trailing delimiter unless given a range of fields like `3-' that - extends to end of line. - (set_fields): Moved local `eol_range_start' to file-scope. - Reported by Arne H. Juul (arnej@solan.unit.no). + When selecting ranges of byte offsets (as opposed to ranges of fields) + and when --output-delimiter=STRING is specified, output STRING between + ranges of selected bytes. + * src/cut.c (RANGE_START_SENTINEL): Define. + (output_delimiter_specified): New global. + (print_kth): Add parameter. Adjust all callers. + (set_fields): Mark each range-start index with RANGE_START_SENTINEL. + (cut_bytes): When requested, output STRING between ranges of + selected bytes. + (main): Make a diagnostic a little clearer. + Based on a patch from Jan Nieuwenhuizen. -Tue Nov 02 00:53:41 1993 Jim Meyering (meyering@comco.com) + * tests/cut/Test.pm: New tests for the above. - * fold.c (fold_file): Don't get stuck in an endless loop when - width is smaller than 8 and there are TABs in the input. + * src/cut.c (set_fields): Make code agree with comment: + Don't merge abutting ranges like 4- and 2-3. This makes no + difference currently, but is required to support an upcoming change. -Sat Oct 30 15:31:28 1993 Jim Meyering (meyering@comco.com) +2003-01-07 Jim Meyering <jim@meyering.net> - * join.c: Remove now-unused dcls of show_help and show_version. + * src/cut.c (set_fields): Fix typo in comment. -Fri Oct 29 13:58:50 1993 Jim Meyering (meyering@comco.com) + * tests/touch/not-owner: New test, mostly extracted from fail-diag. + * tests/touch/Makefile.am (TESTS): Add not-owner. + * tests/touch/fail-diag: Remove the test for non-owner diagnostic. + Now, this tests only the nonexistent-directory diagnostic. + Suggestion from Michael Stone. - * csplit.c [INT_MAX]: Make sure it's defined. - [not HAVE_LIMITS_H]: Don't include limits.h. - From Kaveh R. Ghazi (ghazi@noc.rutgers.edu). + * tests/touch/fail-diag: Fix typo: s/ld/ls/. -Wed Oct 27 01:13:52 1993 Jim Meyering (meyering@comco.com) +2003-01-04 Jim Meyering <jim@meyering.net> - * Version 1.8.1. + * src/copy.h: Remove use of PARAMS. + * src/remove.h: Likewise. + * src/chown-core.h: Likewise. -Mon Oct 25 20:16:33 1993 Jim Meyering (meyering@comco.com) + rm could be tricked into mistakenly reporting a cycle. + * src/remove.c: [cycle_check_state]: New global. + (remove_cwd_entries): Adapt to new semantics of cycle_check. + (rm): Call cycle_check_init and cycle_check_free for each file. + * tests/rm/cycle (rm): New test, for the above fix. + * tests/rm/Makefile.am (TESTS): Add cycle. - * sort.c: Accept but ignore -y0 for compatibility with Solaris 2. - From Chuck Hedrick (hedrick@klinzhai.rutgers.edu). + When rm detects a cycle, don't abort the entire command, + but rather just the affected command line argument. + * src/remove.c: Include <setjmp.h> + (struct dirstack_state) [current_arg_jumpbuf]: New member. + (remove_cwd_entries): Call longjmp if we detect a cycle. + (rm): Call setjmp here. - * sort.c (main): Handle --help and --version options. - * Makefile.in (sort.o): Depend on long-options.h. + * src/remove.c (cycle_check, is_power_of_two): Remove functions. + Instead, include cycle-check.h and use it. -Sun Oct 24 00:31:02 1993 Jim Meyering (meyering@comco.com) + * src/remove.h (struct dev_ino): Remove declaration. - * csplit.c, cut.c, expand.c, fold.c, head.c, nl.c, od.c, paste.c, - split.c, tac.c, tail.c, unexpand.c, uniq.c: Use the preferred - `--longopt=arg' syntax in --help message rather than `--longopt arg'. - From Francois Pinard. + * src/remove.c (remove_cwd_entries): Fix typos in comment. - * tail.c: Don't include <signal.h>. It hasn't been necessary - since the Dec 12, 1992 change. + Don't include trailing /. in diagnostics about directories. + * src/remove.c (full_filename_): When FILENAME is just `.' + and there is a nonempty directory-name part, don't append `/.'. + * tests/rm/unread2: Remove trailing /. from diagnostic. + * tests/rm/rm2: Likewise. - * join.c (main): Accept `-v 1' again. Adding the --version - long option had broken it, although -v1 still worked. Call - parse_long_options instead of adding "help" and "version" - to join's longopt strct. - * Makefile.in [SOURCES, OBJECTS, DISTFILES]: Add long-options.c - and long-options.h. - * (join): Depend on and link with long-options.o. - * (join.o): Depend on long-options.h. + * src/remove.c (struct dirstack_state): Define. + To be used in place of these file-scoped globals ... + (dir_stack, len_stack, Active_dir): Remove globals. + (ds_init, ds_free): New functions. + (full_filename): Define. + (full_filename_): Rename from full_filename. - * od.c: Change --compatible (-C) to --backward-compatible (-B). + Begin to make AD_* functions more generic. + * src/remove.c (AD_push_initial): Don't set status to RM_OK here. + (AD_push): Likewise. + (AD_INIT_OTHER_MEMBERS): Define. + (remove_dir): Define the `status' member manually after each + call to AD_push or AD_push_initial. - * csplit.c: Change --abandon-null-files to --elide-empty-files. + * src/Makefile.am (check-misc): New rule, to ensure that no more + S_IS* macro definitions sneak into the code. + (check): Depend on check-misc. -Sat Oct 23 01:00:12 1993 Jim Meyering (meyering@comco.com) + * src/remove.c [S_ISLNK]: Don't define. It's already defined in sys2.h. + * src/du.c (count_entry) [S_ISLNK]: Don't define. + * src/shred.c [S_ISLNK, S_ISFIFO, S_ISSOCK]: Don't define. - * tr.c (get_next, string2_extend): Add default: label to switch stmt. +2003-01-03 Jim Meyering <jim@meyering.net> - * cat.c, cksum.c, comm.c, csplit.c, cut.c, expand.c, fold.c, head.c, - join.c, nl.c, od.c, paste.c, pr.c, split.c, sum.c, tac.c, tail.c, - tr.c, unexpand.c, uniq.c, wc.c (usage): Add long --help. - Exit successfully for --help, non-zero for usage error. - From Francois Pinard. + * src/true.c: Add copyright. + (AUTHORS): I suppose I've written it. - * configure.in: Add AC_STAT_MACROS_BROKEN. - * system.h [AC_STAT_MACROS_BROKEN]: Test it. + * src/Makefile.am (false.c): Make the generated file be read-only. -Fri Oct 22 23:26:17 1993 Jim Meyering (meyering@comco.com) +2003-01-04 Jim Meyering <jim@meyering.net> - * linebuffer.c, memchr.c [HAVE_CONFIG_H, CONFIG_BROKETS]: Include - <config.h> or "config.h". - * cat.c, cksum.c, comm.c, csplit.c, cut.c, expand.c, fold.c, head.c, - join.c, nl.c, od.c, paste.c, pr.c, sort.c, split.c, sum.c, tac.c, - tail.c, tr.c, unexpand.c, uniq.c, version.c, wc.c: Ditto. + * src/ls.c: Include "dev-ino.h". + [struct dev_ino]: Remove declaration. - * configure.in: Use AC_CONFIG_HEADER. - * Makefile.in [DIST]: Add config.h.in. +2003-01-02 Jim Meyering <jim@meyering.net> - * Makefile.in: Convert so make may be run from subdirectories. - Add dependencies on config.h. - * src/Makefile.in: Ditto. - * lib/Makefile.in: Ditto. - * man/Makefile.in: Ditto. - -Wed Oct 20 20:05:48 1993 Jim Meyering (meyering@comco.com) - - * memchr.c (memchr): Do the 32-bit assignment only if !LONG_64_BITS. - In the 64-bit assignment, be careful to cast the shift operand to - long. - Abort if sizeof (unsigned long) > 8. - -Tue Oct 19 22:37:58 1993 Jim Meyering (meyering@comco.com) - - * csplit.c: Allow repeat counts to be specified via `{*}'. - New option --suffix=format. Supercedes --digits option. - New option --abandon-null-files. - From Ronald F. Guilmette (rfg@netcom.com). - - * csplit.1: Updated. - From Ronald F. Guilmette. - - * csplit.c: Remove register keyword (replace with `int' in two cases). - - * csplit.c: [MAX]: Macro renamed from max and moved to top of file. - (bytes_to_octal_digits): New static array. - (get_format_flags): Combine '+' and ' ' cases of switch stmt. - Return count if for loop terminates. - (get_format_width): Use `bytes_to_octal_digits' instead of just 11. - (get_format_prec): Make sure is_negative is defined before used. - (get_format_conv_type): Give a different error message if there - is no conversion specifier. - Test ISPRINT (ch) instead of `ch < '~' && ch > ' ''. - (max_out): Use `%%' rather than `%' in format string. - -Sat Oct 16 10:45:17 1993 Jim Meyering (meyering@comco.com) - - * pr.c (main): When argc == 1, don't try to xmalloc (0). - -Tue Oct 12 00:53:26 1993 Jim Meyering (meyering@comco.com) - - * xwrite.c [HAVE_CONFIG_H, CONFIG_BROKETS]: Include <config.h> - or "config.h". - -Sat Oct 09 23:37:43 1993 Jim Meyering (meyering@comco.com) - - * configure.in: Remove AC_UNISTD_H; add unistd.h to AC_HAVE_HEADERS. - -Thu Sep 9 21:52:10 1993 Jim Meyering (meyering@comco.com) - - * src/*.c: Print version on standard output, not stderr. - - * configure.in: Add AC_LONG_64_BITS. - * memchr.c: Use #ifdef LONG_64_BITS instead of - `if (sizeof(longword) > 4)'. - -Tue Jul 27 22:19:39 1993 Jim Meyering (meyering@comco.com) - - * cat.c (cat): Don't fail just because ioctl (d, FIONREAD,... can't - always handle devices. Ignore errno == EINVAL and errno == ENODEV. - `cat -v /dev/null' was failing on many systems. - - * cut.c (cut_fields): Don't strip off trailing delimiter e.g. - `echo 'a:b:c:' | cut -d: -f3-' should print `c:', not just `c'. - From William Dowling <will@franklin.com>. - -Thu May 27 01:37:51 1993 Jim Meyering (meyering@comco.com) - - * Version 1.8. - - * memchr.c: De-ansify the fixed version from glibc. - It is supposed to work on systems with 64-bit long ints. - -Mon May 24 00:32:43 1993 Jim Meyering (meyering@comco.com) - - * Version 1.7. - -Sat May 22 02:13:12 1993 Jim Meyering (meyering@comco.com) - - * Version 1.6. - -Fri May 21 22:57:53 1993 Jim Meyering (meyering@comco.com) - - * pr.c (cols_ready_to_print): New function. It replaces a global - variable by the same name and computes on the fly the value that - was supposed to be maintained through that variable. This should - put to rest the `pr -2a' bug. - (main): Don't let getopt_long reorder arguments so we can - distinguish between `pr -1 -2' and `pr -12'. Rework handling of - -n and +n options. - - * fold.c: Declare xmalloc. - -Wed May 19 19:12:18 1993 Karl Berry (karl@owl.hq.ileaf.com) - - * sort.c (main): fflush before exit, so a closed stdout doesn't lose. - -Tue May 18 23:49:26 1993 Jim Meyering (meyering@comco.com) - - * mkinstalldirs: New file. - * Makefile.in (installdirs): Use it to create installation directories. - -Fri May 14 23:45:52 1993 Jim Meyering (meyering@comco.com) - - * all source: With --version, print version and exit immediately. - -Thu May 13 01:03:16 1993 Jim Meyering (meyering@comco.com) - - * Makefile.in (installdirs): New rules for creating installation - directories. (install): depend on it. - - * tail.c (main): Remove --compatible since `+1f' may be used - to get the BSD `-0f' behavior portably. - - * fold.c (main): Turn -N arguments, where N is a digit, into -wN. - From Ian Lance Taylor (ian@cygnus.com). - -Mon May 10 22:33:44 1993 Jim Meyering (meyering@comco.com) - - * tail.c (main): New option -C, --compatible to make `tail -0f' - work like `tail +1f' for compatibility with BSD tail. - -Thu May 6 23:28:56 1993 Jim Meyering (meyering@comco.com) - - * pr.c (print_page): Decrement cols_ready_to_print even when - lines_to_print == 0. The command `echo |pr -2ta' *still* didn't - terminate. Add parentheses for clarity. - -Mon May 3 23:57:47 1993 Jim Meyering (meyering@comco.com) - - * Version 1.5. - - * od.c (main): Remove set-but-not-used variable, `usage_error'. - - * split.c (main): Call usage with an argument. - -Sun May 2 16:05:04 1993 Jim Meyering (meyering@comco.com) - - * configure.in: Reverse if-else branches in AC_TEST_PROGRAM test - for 8-bit clean memcmp. - - * cat.c (usage, main): Remove unused argument. - - * csplit.c (remove_line): Remove set-but-not-used variable, `line_got.' - (check_for_offset): Remove unused argument `argnum.' - - * configure.in: Add AC_SIZE_T. - -Sat May 1 09:03:19 1993 Jim Meyering (meyering@comco.com) - - * uniq.c (main): Interpret non-option arguments with a leading `+' - only if we haven't seen `--'. - - * tr.c (main): Change variable name to avoid shadowed dcl. - * wc.c (write_counts): Ditto. - - * sum.1: Make documentation agree with the code. - - * od.c: Depend only on HAVE_LONG_DOUBLE for long double support. - -Fri Apr 30 20:16:03 1993 Jim Meyering (meyering@comco.com) - - * configure.in [AC_HAVE_HEADERS]: Add limits.h. - - * configure.in [CFLAGS, LDFLAGS]: Assign reasonable defaults. - - * od.c (parse_old_offset): Don't use prototype in function - definition. Remove unnecessary conjunct from test for hexadecimal - prefix. - - * od.c: Depend on __GNUC__ || HAVE_LONG_DOUBLE rather than __STDC__ - for long double support; there are compilers (Stardent Vistra svr4) - without long double but still define __STDC__. - -Thu Apr 29 02:01:27 1993 Jim Meyering (meyering@comco.com) - - * src/*.c and man/*.c except for sort: Add --help and --version - options. - - * pr.c: Convert to use getopt_long. - - * lib/memcmp.c: Use version from glibc. - [WORDS_BIGENDIAN]: Test this instead of the using glibc's - __BYTE_ORDER macro. - * configure.in: Use AC_WORDS_BIGENDIAN to set it. - - * od.c (parse_old_offset): Allow `0X' as well as `0x' prefix to - indicate hex. - - * Makefile.in (dist): Depend on Makefile so that changes to - Makefile.in (like adding new files to DISTRIB) are reflected - in the new distribution. - -Fri Apr 23 21:53:47 1993 Jim Meyering (meyering@comco.com) - - * {lib,src}/Makefile.in [.c.o]: Make CPPFLAGS and CFLAGS follow - other options so users can use them to override DEFS. - * src/Makefile.in [.c.o]: Add -I$(srcdir) for version.h. - - * Makefile.in [CFLAGS, LDFLAGS]: Don't set to -g explicitely; - configure's AC_SUBST will set these. - - * Makefile.in [Makefile]: Add dependencies and a rule to remake it. - [targets that cd then run make in subdirectories]: Don't depend - on `cd ..'; use a subshell instead. - - * Makefile.in [info, install-info, dvi, check, installcheck]: - New targets but no rules; comply with standards. - - * configure.in [CFLAGS]: Default to -g -O if CC is gcc and the user - hasn't specified CFLAGS. - [LDFLAGS]: Substitute into Makefile. - -Tue Mar 30 21:36:11 1993 Jim Meyering (meyering@comco.com) - - * od.c: New option --compatible, -C. - (parse_old_offset): New function. - * od.1: Document new option. - -Mon Mar 29 21:27:56 1993 Jim Meyering (meyering@comco.com) - - * cut.c, expand.c, join.c, nl.c: Always call error with errno - (not zero) after failed fclose or non-zero ferror. - -Sun Mar 28 16:59:31 1993 Mike Haertel (mike@cs.uoregon.edu) - - * configure.in: Add check for working memcmp; use GNU's if - the system's doesn't grok the 8th bit. - * memcmp.c: Fix it so it groks the 8th bit. - TODO: We really need to provide a fast memcmp, since most - machines will have a broken memcmp. Probably should get - the one from glibc. - * sort.c (mergefps): Maintain keybeg and keylim when copying - the current line to `saved'. - (numcompare): Skip white space here since -n no longer implies -b. - (getmonth): Skip white space here since -M no longer implies -b. - (compare): Completely overhauled to make the 8th bit work right, - also to properly handle the global reverse option. - (set_ordering): -n no longer implies -b, according to Posix. - For consistency, -M also no longer implies -b. - (main): Correct treatment of -r and global keys. - (findlines): Clear keybeg and keylim if no keys are used. - (sort): Avoid overwriting tempfiles[] array bounds. - -Sun Mar 21 22:29:29 1993 Jim Meyering (meyering@comco.com) - - * pr.c (close_file): Reverse May 13, '92 change, but add the condition - that cols_ready_to_print not be decremented when printing across. - The command `echo |pr -2ta' didn't terminate. - (print_page): Rewrite conditional (that had side effects in second - conjunct) using nested if statements to make it clear that we do - indeed want those semantics. - -Tue Jan 19 13:35:24 1993 David J. MacKenzie (djm@kropotkin.gnu.ai.mit.edu) - - * Version 1.4. - - * system.h: Try BBSIZE if BSIZE isn't defined. - From Tony Robinson <ajr@eng.cam.ac.uk>. - -Sat Dec 12 12:37:00 1992 David J. MacKenzie (djm@kropotkin.gnu.ai.mit.edu) - - * tail.c (tail_forever): Use an array of file descriptors - instead of forking processes. - (dump_remainder): Return number of bytes read. - (tail_file): Fill in the new array. - From Ian Lance Taylor. - -Fri Dec 11 17:18:16 1992 David J. MacKenzie (djm@kropotkin.gnu.ai.mit.edu) - - * system.h: Only define index, bcmp, etc. if not already defined. - -Tue Dec 8 10:31:14 1992 Jim Meyering (meyering@idefix.comco.com) - - * tr.c (is_char_class_member): Remove unreached return after abort. - -Sun Dec 6 22:34:52 1992 Jim Meyering (meyering@idefix.comco.com) - - * csplit, cut.c, expand.c, fold.c, head.c, join.c, od.c, pr.c, - sort.c, split.c, tail.c, tr.c, unexpand.c, uniq.c: Remove inclusion - of <ctype.h> and definitions of is* ctype macros to system.h. - Change a few more uses of is* ctype macros to (protected) upper - case versions. - - * system.h: Add isascii-protected ctype IS* macros. - -Wed Dec 2 12:28:10 1992 Jim Meyering (meyering@idefix.comco.com) - - * all files using getopt.h: Convert static declarations of - struct option to use new macros from getopt.h: no_argument, - required_argument, and optional_argument. - -Tue Dec 01 10:57:24 1992 Jim Meyering (meyering@idefix.comco.com) - - * od.c, pr.c, sort.c: Make uses of ctype.h macros consistent. - - * tr.c (main): Close stdin and stdout and check return status. - -Tue Nov 24 09:26:08 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * system.h, csplit.c: Use HAVE_FCNTL_H and HAVE_STRING_H - instead of USG. - -Tue Nov 24 08:42:30 1992 Jim Meyering (meyering@idefix.comco.com) - - * tr.c: Define new macros ISPRINT, ISALNUM, ISXDIGIT, ... that - use isascii if it is defined. - (is_char_class_member, make_printable_char, make_printable_str, - non_neg_strtol): Use new macros instead of lower case ones - from <ctype.h>. - - * od.c (print_ascii, dump_strings): Use ISDIGIT and ISPRINT - macros like pr.c. Suggested by David J. MacKenzie. - - * od.c (print_ascii, dump_strings): Check for isascii before isprint. - (dump_strings): Free malloc'd buffer before returning. - (skip): Return non-zero if an error occurred, zero otherwise. - Exit only if asked to skip beyond end of combined input. - (check_and_close): New function. - (skip, read_block, read_char): Call check_and_close when done - processing the file associated with in_stream. - (skip, read_block, read_char): Set have_read_stdin. - (main): Close stdin (if it was ever read) and check for errors - just before exiting. - (write_block, dump_strings, dump): Don't test return value from - functions that operate on streams. Rely on later ferror tests. - -Sat Nov 21 12:41:49 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * sort.c (main, usage): Add -T option. - -Thu Nov 19 14:33:40 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * tail.c (tail_forever, sigusr1, kill_kids): New functions to - do -f on multiple files. - (main): Call tail_forever. - From Ian Lance Taylor. - -Tue Nov 10 14:29:11 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * cut.c (cut_fields): Add cast. - - * od.c (decode_one_format): Remove '#' from pre_fmt_string; - many systems don't support it. - Conditionalize long double support on __STDC__, not __GNUC__. - From Ian Lance Taylor. - -Mon Nov 9 00:24:41 1992 Jim Meyering (meyering@idefix.comco.com) - - * sort.c (numcompare, keycompare): Add parentheses suggested - by gcc -Wall. Put braces around individual monthtab initializers. - - * cksum.c: Declare error. Make checksum table `const.' - - * pr.c: Remove comment and dcl of unused variable, `print_a_number'. - - * split.c (main): Add `default: abort();' to enumeration switch. - - * All files: Make all functions and extern variables static. - Make all longopts arrays const as well as static. - Make a couple statically initialized aggregates `const.' - -Sun Nov 8 19:46:59 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * od.c (main): Make old-style format options accumulate. - From Jim Meyering. - -Sat Nov 7 00:26:14 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * tr.c (look_up_char_class): Add cast. - - * nl.c (build_type_arg), csplit.c (extract_regexp), tac.c (main): - Add `const' to variable receiving value from re_compile_pattern. - - * wc.c (wc): If doing only -c, use st_size for regular files. - - * fold.c (fold_file): Was folding 1 column too early. - From Eric Backus <ericb@lsid.hp.com>. - - * memset.c: New file. - -Fri Nov 6 20:14:51 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * cksum.c: New file. - -Tue Oct 13 16:24:06 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * tac.c (tac_stdin): Handle SIGPIPE. - * sort.c (main): Handle SIGTERM. - - * od.c: New file. - - * system.h [USG || STDC_HEADERS]: Define bcmp. - -Sat Oct 3 20:41:24 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) - - * sort.c (main): Handle SIGPIPE. From trq@dionysos.thphys.ox.ac.uk. - -Tue Sep 29 01:10:05 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) - - * paste.c (main): Don't write on a string constant. - -Mon Aug 24 00:02:45 1992 Jim Meyering (meyering@churchy.gnu.ai.mit.edu) - - * tr.c: Minor cleanup. Replaced some assert(0) with abort(). - -Tue Jul 7 02:14:19 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) - - * cmp.c, cmp.1: Move to diff distribution. - -Fri Jul 3 16:37:59 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) - - * system.h: Change FOO_MISSING to HAVE_FOO. - -Wed May 13 20:05:41 1992 David J. MacKenzie (djm@churchy.gnu.ai.mit.edu) - - * pr.c (COLUMN): Add structure member to remember filename. - (main, init_fps, open_file, close_file): Use it. - - (close_file): Don't decrement cols_ready_to_print when closing - a file. From cdl@mpl.UCSD.EDU (Carl Lowenstein). - -Mon May 11 19:17:33 1992 David J. MacKenzie (djm@churchy.gnu.ai.mit.edu) - - * cmp.c: --show-chars -> --print-chars. - - * pr.c: Rename some variables. - -Sat May 9 18:39:47 1992 David J. MacKenzie (djm@wookumz.gnu.ai.mit.edu) - - * system.h: Define DEV_BSIZE if not defined. - -Wed Apr 22 02:15:09 1992 David J. MacKenzie (djm@churchy.gnu.ai.mit.edu) - - * system.h, tac.c: SIGTYPE -> RETSIGTYPE. + * src/cp.c (do_copy): Tweak diagnostic to be consistent with the one + from mv: s/missing file arguments/missing file argument/. + With --target-directory=DIR, cp and mv work with a single file argument. + Reported by Karl Berry. -Fri Apr 17 10:42:23 1992 David J. MacKenzie (djm@wookumz.gnu.ai.mit.edu) + * tests/rm/isatty: Enable this test. - * sort.c (main): Don't stop processing args when we hit "-"; - treat it like a regular filename. - From ian@airs.com (Ian Lance Taylor). +2002-12-31 Jim Meyering <jim@meyering.net> - * pr.c (print_page): Fix off by one line count when ^L is in input. - From Andreas Schwab (schwab@ls5.informatik.uni-dortmund.de). + * src/remove.c (AD_push_initial): Don't set status to RM_OK here. + (AD_push): Likewise. + (AD_INIT_OTHER_MEMBERS): Define. + (remove_dir): Define the `status' member manually after each + call to AD_push or AD_push_initial. -Mon Apr 6 20:52:29 1992 Jim Meyering (meyering@churchy.gnu.ai.mit.edu) + * src/ls.c [struct dev_ino]: Remove definition. + Include "dev-ino.h" instead. - * tr.c (validate): Change error message so it doesn't mention - actual name of --truncate-set1 option. From David MacKenzie. +2002-12-28 Jim Meyering <jim@meyering.net> -Sun Apr 5 14:22:42 1992 Jim Meyering (meyering@hal.gnu.ai.mit.edu) + * tests/du/Makefile.am (TESTS): Add no-deref. + * tests/du/no-deref: New script. - * tr.c (string2_extend, validate): Give an error message when - translating without --truncate-set1, with empty string2, and - with non-empty string1. "tr 1 ''" produced a failed assertion. +2002-12-23 Jim Meyering <jim@meyering.net> -Mon Mar 30 02:20:56 1992 David J. MacKenzie (djm@wookumz.gnu.ai.mit.edu) + * src/remove.c (remove_cwd_entries): Fix typo in comment. - * system.h: Change how ST_BLKSIZE is calculated to allow for - non-POSIX systems that don't define BSIZE in sys/param.h. +2002-12-21 Jim Meyering <jim@meyering.net> -Sat Mar 28 11:18:01 1992 David J. MacKenzie (djm@wookumz.gnu.ai.mit.edu) + * announce-gen: Generate MML-formatted announcement. + This makes it a *lot* harder to send stale MD5/SHA1 signatures. - * sum.c (main, bsd_sum_file): Don't print filename if BSD - algorithm is used and only one file was given. +2002-12-20 Jim Meyering <jim@meyering.net> -Wed Mar 25 11:34:41 1992 Jim Meyering (meyering@wombat.gnu.ai.mit.edu) + * src/touch.c (touch): Change the wording of a diagnostic so + that it makes sense both when the file exists and when it doesn't. + Suggestion from Michael Stone. - * tr.c (get_spec_stats): Fix assertion to allow ranges like a-a - with starting character equal to ending character. This is - contrary to the POSIX spec, but what is already implemented - in find_closing_delim. +2002-12-18 Jim Meyering <jim@meyering.net> -Mon Mar 16 00:15:11 1992 David J. MacKenzie (djm@wookumz.gnu.ai.mit.edu) + * src/stty.c (valid_options): Declare to be static. - * Version 1.3. +2002-12-15 Jim Meyering <jim@meyering.net> - * sort.c (numcompare, checkfp): Add parens to placate gcc2. + * Makefile.cfg: Remove rules related to generating m4/jm-glibc-io.m4. - * sort.c (mergefps): For -u, output the first, not last, of - the lines that compare equal. From Mike Haertel. + * src/chmod.c, src/copy.c, src/copy.h, src/cp-hash.h, src/csplit.c: + * src/date.c, src/expr.c, src/fmt.c, src/id.c, src/install.c: + * src/ls.c, src/od.c, src/pathchk.c, src/pr.c, src/remove.c: + * src/shred.c, src/sort.c, src/stat.c, src/stty.c, src/sum.c: + * src/tee.c, src/test.c: Remove all uses of `PARAMS'. -Tue Mar 10 10:51:38 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) + * src/remove.c (PARAMS): Remove definition. + * src/sys2.h: Likewise. - * tr.c: Remove initial capitals and periods from error messages. + * src/ls.c, src/stat.c, src/date.c: Remove declaration of nstrftime. + Include strftime.h instead. -Sun Mar 8 22:03:45 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) +2002-12-14 Jim Meyering <jim@meyering.net> - * sum.c (main): Add -r option for SYSV compat. + * Makefile.cfg ($(url_dir_list)): Use .../coreutils, not .../fetish. -Thu Feb 27 22:26:25 1992 David J. MacKenzie (djm@wookumz.gnu.ai.mit.edu) + * src/system.h [! HAVE_DECL_MEMRCHR]: Declare memrchr. + This is necessary at least for Irix6.5 when using c89. + Reported by Nelson Beebe. - * sort.c (compare): If -s given, leave lines in their original order. - (main): Recognize -s. - (usage): Document -s. - From Mike Haertel. + * tests/misc/Makefile.am (TESTS): Add cat-tty-eof. -Tue Feb 18 20:29:45 1992 Randall Smith (randy at geech.gnu.ai.mit.edu) + * tests/misc/cat-tty-eof: New test. - * sort.c (sort): Check for complete parsing of buffer into - lines before nixing temp files. + * src/mknod.c (usage): Specify how major and minor mode numbers + are interpreted. Report forwarded by Kristin E Thomas. + * src/mknod.c: Remove now-redundant usage-specifying comment. -Mon Feb 17 10:35:58 1992 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-12-13 Jim Meyering <jim@meyering.net> - * sum.c (sysv_sum_file): Use %lu instead of %u to print a - long. Not that it matters for GNU . . . + * Version 4.5.4. - * tr.c (unquote, make_printable_str): Use \007 instead of ANSI \a. - (append_normal_char, append_range, append_char_class, - append_repeated_char, append_equiv_class, spec_init): - Initialize `next' field of new `struct List_element'. - From rommel@informatik.tu-muenchen.de (Kai-Uwe Rommel). + * tests/du/trailing-slash: Allow for a directory of size `0'. + That happens at least on file systems of type tmpfs on linux-2.4.18. -Sat Feb 8 17:16:49 1992 David J. MacKenzie (djm at apple-gunkies.gnu.ai.mit.edu) + * announce-gen: New script to begin replacing the commands + associated with the rule here... + * Makefile.maint (announcement): Invoke announce-gen. + * Makefile.am (EXTRA_DIST): Add announce-gen. - * join.c (get_line): Renamed from getline to avoid GNU libc conflict. + * tests/cp/preserve-2: New file/test, for latest fix. + * tests/cp/Makefile.am (TESTS): Add preserve-2. -Sun Feb 2 21:22:01 1992 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-12-11 TAKAI Kousuke <takai@vlsi.kuee.kyoto-u.ac.jp> - * Version 1.2. + Fix a bug whereby cp would fail to parse an option like + --preserve=mode,ownership. + * src/cp.c (decode_preserve_arg): Advance `comma' to + point the character following the comma. - * nl.c: Support multiple files and "-" for stdin. - (main): Check for read and write errors. - (nl_file): New function. +2002-12-11 Jim Meyering <jim@meyering.net> -Wed Jan 29 10:09:10 1992 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * src/pathchk.c (NEED_PATHCONF_WRAPPER): Undefine before defining, + in case it's already defined. - * tr.c (main): -t option was called -b in getopt spec. - (validate): Don't warn that set1 is longer than set2. +2002-12-09 Jim Meyering <jim@meyering.net> - * tr.c: Rename --sysv-string2-truncate to --truncate-string1. + * tests/touch/fail-diag: Don't get a test failure if /no exists. + Instead, evoke a framework failure if /no-$$ exists. + Reported by Michael Stone. -Fri Jan 17 16:29:05 1992 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-12-08 Jim Meyering <jim@meyering.net> - * nl.c: New program from bin-src. + * src/du.c (lstat) [! LSTAT_FOLLOWS_SLASHED_SYMLINK]: + Define to rpl_lstat, so that even on systems like Solaris 5.8, + du honors (per POSIX) the trailing slash on an argument referring + to a symlink-to-directory. - * nl.c (main): Use a struct linebuffer for line_buf. - (process_file): Use readline instead of fgets, to preserve NULs. - (check_section): Use memcmp instead of strncmp. - (proc_text): Print line_buf with fwrite instead of printf. +2002-12-06 Jim Meyering <jim@meyering.net> - * nl.c (main): Usage message if too many args given. Check - for error in closing input file. Lengths of section delimiter - strings were 1 too large. Take separator_str into account in - length of print_no_line_fmt. - (build_print_fmt): Allocate space for print_fmt, in case - separator_str is long. - (proc_text): A blank line is one that contains nothing, not - even nonprinting characters. + * Use autoconf-2.57. Regenerate dependent files. + * Use automake-1.7.2. Regenerate dependent files. -Fri Jan 17 01:04:22 1992 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * src/ls.c (gobble_file): Also stat the file if it's a + regular file and --indicator-style=classify (aka -F). + Thanks to Ed Santiago for opening my eyes. - * All programs: Document `--' instead of `+' to introduce - long-named options, in usage messages. + * tests/ls/file-type: New file. Test for the above. + A test to contrast ls -F and ls --indicator-style=file-type. + * tests/ls/Makefile.am (TESTS): Add file-type. - * sum.c (bsd_sum_file): Renamed from sum_file. - (sysv_sum_file): New function. - (main): Recognize an option to select between the algorithms. +2002-12-04 Jim Meyering <jim@meyering.net> -Sun Jan 5 17:41:18 1992 Jim Meyering (meyering at churchy.gnu.ai.mit.edu) + * tests/ls/follow-slink: Make sure the symlink was created. + Richard Dawe reported that `ln -s link link' succeeds, but creates + no file on systems running some version of the DJGPP libc. - * pr.c (close_file, print_page): Fixed bug that had the command - yes |head |pr -t printing "yyyyyyyyyy". - * (print_page): Fixed bug that had pr -3 -a printing two too few - trailer lines per page. - * (main): Added restriction that -a and -m are incompatible. - Although the POSIX spec doesn't explicitly say they shouldn't - be used together, it says -a modifies the -column option and - that -column shouldn't be used with -m. +2002-12-03 Jim Meyering <jim@meyering.net> -Thu Jan 2 15:23:59 1992 David J. MacKenzie (djm at albert.gnu.ai.mit.edu) + * src/Makefile.am (AUTOMAKE_OPTIONS): Remove definition (to ansi2knr) + since this package no longer panders to K&R compilers. - * nl.c: Include regex.h after, not before, sys/types.h. +2002-12-02 Jim Meyering <jim@meyering.net> -Thu Jan 2 12:18:10 1992 Tom Lord (lord at geech.gnu.ai.mit.edu) + * tests/du/slink: Skip this test if `.' is on a non-local file system. - * sort.c (fillbuf) return bytes buffered instead of bytes read. + * tests/Fetish.pm (_at_replace): Do the substitution only if there's + something to replace. -Fri Dec 27 22:53:36 1991 Jim Kingdon (kingdon at geech.gnu.ai.mit.edu) +2002-12-01 Jim Meyering <jim@meyering.net> - * sort.c (LINEALLOC): New #define. - (struct lines): New field ``limit''. - (initlines): Set it from new arg ``limit''. - (sort, mergefps, checkfp): Pass new arg to initlines(). - (findlines): Don't realloc past lines->limit. + * src/stat.c: Don't include <string.h> or <ctype.h>. + That's already done via system.h. + * src/dircolors.c: Don't include <ctype.h>. -Tue Dec 24 01:24:03 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-11-30 Jim Meyering <jim@meyering.net> - * tac.c, sort.c, csplit.c, system.h: Change POSIX ifdefs to - HAVE_UNISTD_H and _POSIX_VERSION. + * ls.c (gobble_file): Remove the block of code that caused + `ls --color -F symlink-to-dir' to list the files in + `symlink-to-dir/.'. Now, it prints `symlink-to-dir@', (just + like `ls -F symlink-to-dir') but with the addition of highlighting. + Similarly, `ls --color -dF symlink-to-dir' would print + `symlink-to-dir/'; now it prints `symlink-to-dir@'. + Reported by Jeff Sheinberg as Debian bug #168203. + * tests/ls-2/tests (sl-F-color, sl-dF-color): New tests for the above. - * xwrite.c: Change POSIX ifdef to HAVE_UNISTD_H. + ls is now more efficient: with certain options, it no longer needs + to stat each directory entry on systems with valid dirent.d_type. + * src/ls.c (print_dir): Add DT_LNK and DT_REG. + (main): Make --recursive set format_needs_type, not format_needs_stat. + (gobble_file): Remove a FIXME comment, now that it's fixed. -Sat 14 Dec 1991 11:46:42 Jim Meyering (meyering at wombat) +2002-11-24 Jim Meyering <jim@meyering.net> - * tr.c: Fixed an inaccurate comment on posix_pedantic. + * src/du.c (du_files): Don't strip any trailing slash. + Rewrite so that `/' is no longer represented internally as + the empty string. + (count_entry): When appending a file name component, + account for the fact that the current path may end in `/'. + François Pinard reported that `du symlink-to-dir/' was not + equivalent to `du symlink-to-dir/.'. Now it is. + * tests/du/trailing-slash: New file/test, for the above fix. + * tests/du/Makefile.am (TESTS): Add trailing-slash. -Thu 12 Dec 1991 21:15:20 Jim Meyering (meyering at hal) +2002-11-23 Jim Meyering <jim@meyering.net> - * tr.c: Changed underscores to hyphens in long option name - "sysv_string2_truncate". + * src/tac.c (output): Declare some local variables to be of type size_t, + rather than `int' to avoid warnings from gcc. -Wed Dec 11 13:33:34 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-11-21 Paul Eggert <eggert@twinsun.com> - * tac.c (main): Set obscure_syntax to tell re_search to - allocate memory for the group registers. + * src/ls.c (decode_switches): Use case-sensitive matching to + decode the QUOTING_STYLE environment variable. This is more + consistent with the documentation, and with --quoting-style. -Fri Dec 6 18:26:27 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-11-21 Martin Buck <martin.buck@ascom.ch - * tac.c, sort.c, csplit.c [POSIX]: Use sigaction instead of - signal, which POSIX doesn't have. - * sort.c: Replace inthandler and huphandler with sighandler. - * csplit.c (main): Only handle signals if they were not being - ignored. + * src/stty.c (struct speeds): Add support for all baud rates defined + in linux-2.4.19. - * tr.c: POSIX_ME_HARDER -> POSIXLY_CORRECT. +2002-11-19 Jim Meyering <jim@meyering.net> -Wed Dec 4 00:47:47 1991 Jim Meyering (meyering at wombat) + * tests/sum/sysv: Export LC_ALL=C, to avoid failure when + run in a UTF locale. Report and suggested fix by Bruno Haible. + * tests/fmt/basic: Likewise. - * tr.c (unquote): Reformat code so it doesn't go beyond column 80. - * tr.c (squeeze_filter): Comment a little on why it's better - to step through the input by two. - * tr.c (set_initialize): Write a comment describing the function. - * tr.c: Eliminated the variable `portability_warnings' and replaced - references to it by references to `!posix_pedantic'. One of the - uses of portability_warnings had been wrong. +2002-11-17 Jim Meyering <jim@meyering.net> -Tue Dec 3 14:03:35 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * configure.ac: Update via autoupdate. + Add `AM_GNU_GETTEXT_VERSION(0.11.5)'. - * tr.c: New program. + * src/mv.c (movefile): Don't remove trailing slashes from SOURCE. + Reported by Hans Ginzel. -Sun Dec 1 15:07:35 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-11-15 Jim Meyering <jim@meyering.net> - * linebuffer.[ch] (freebuffer): New function (used by cron). + * Makefile.cfg (gnu_rel_host): Define. + (url_dir_list): Choose from (alpha|ftp).gnu.org depending + on whether $(VERSION) looks like a major release number. -Thu Oct 17 22:30:22 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * Makefile.maint (mail_gpg_sign_cookie): Backslash-escape `#'. + (release): Rename from `alpha'. + (alpha): Depend on release. - * system.h, configure, Makefile.in: Don't include memory.h if - STDC_HEADERS, removing need for MEMORY_H_MISSING. + * Makefile.maint (signatures): Define with ?=, so it's easy to override. -Thu 17 Oct 1991 16:53:07 Jim Meyering (meyering at wombat) +2002-11-14 Jim Meyering <jim@meyering.net> - * pr.c (print_page): REALLY fixed `extra newline at EOF' problem. - Somehow, part of my patch didn't make it last time. + * Makefile.maint (mail_gpg_sign_cookie): Make optional. + (announcement): Use the new variable. -Sat Oct 12 12:04:47 1991 David J. MacKenzie (djm at churchy.gnu.ai.mit.edu) + * Makefile.maint: Sync with Bison, i.e.: + (po-check): Scan .l and .y files instead of the + .c and the .h files that they generate. This fixes the bug + reported by Tim Van Holder in: + <http://mail.gnu.org/pipermail/bison-patches/2002-November/001352.html> + Look for N_ as well as for _. Try to avoid matching #define for + N_ and _. + From Paul Eggert. - * tail.c (pipe_lines, pipe_bytes): Initialize `first->next'. +2002-11-12 Jim Meyering <jim@meyering.net> - * cmp.c (cmp): Print EOF message to stderr, not stdout, for - POSIX 1003.2.11.2. + * src/ls.c (HAVE_SYMLINKS): Remove unnecessary macro definition. + Replace sole use with equivalent `#ifdef S_ISLNK'. + Inconsistency reported by Dmitry V. Levin. - * sort.c (xfwrite): fwrite never returns < 0, so check if - number written is number we asked to write. - (fillbuf, main): fread never returns < 0, so check ferror instead. - From Rainer Orth. +2002-11-11 Jim Meyering <jim@meyering.net> -Tue Oct 8 18:07:08 1991 Jim Meyering (meyering at churchy) + * src/stat.c (usage): Transform --help items output via s/ - / /, + so that help2man produces properly formatted man pages. + Reported by Herbert Xu as Debian bug #168400. - * pr.c (print_page): Really fixed `extra newline at EOF' problem. - * (store_columns): Fixed bug that caused `pr -b -2' to coredump - on files of certain lengths. +2002-11-10 Jim Meyering <jim@meyering.net> -Fri Oct 4 22:30:25 1991 Jim Meyering (meyering at churchy) + * src/ls.c (sighandler): Handle SIGTSTP specially. + Based on suggestions from Solar Designer and Dmitry V. Levin. + Add comments. - * pr.c (print_page): Fixed to not add single spurious newline - at EOF when using -t. + * Makefile.cfg (cvs_files): Define. From autoconf. + (local_updates): Likewise. + + * src/ls.c (restore_default_color_handler, sigtstp_handler): + Remove functions. + (sighandler): New function, based on the one in sort.c. + (main): Use sigaction, if possible; otherwise signal. + Handle these signals: + SIGHUP, SIGINT, SIGPIPE, SIGQUIT, SIGTERM, SIGTSTP. + Don't register our handler if the signal is already being ignored. + + * src/dd.c (interrupt_handler): Use raise, rather than kill+getpid. + * src/csplit.c (interrupt_handler): Likewise. + * src/sort.c (sighandler): Likewise. + (main): Declare `i' and `nsigs' to be unsigned, not int. + +2002-11-09 Jim Meyering <jim@meyering.net> + + ls --color: restore terminal text color upon signal. + * src/ls.c: Include "full-write.h" and <signal.h>. + (restore_default_color, restore_default_color_handler): New functions. + (sigtstp_handler, put_indicator_direct): New functions. + (main) [print_with_color]: Register signal handlers. + Patch mostly by Solar Designer and Stanislav Ievlev. + + Update from autoconf. + * Makefile.maint (AMTAR): Remove definition. + (update, cvs-update, po-update, do-po-update): New rules. + (wget-update): Update (thus renaming to cvs-update). + (automake_repo): Use anoncvs@sources.redhat.com. + +2002-11-06 Jim Meyering <jim@meyering.net> + + * tests/misc/Makefile.am (TESTS): Add printf-hex. + + * tests/misc/printf: Be careful to test the code in this package, + not the shell built-in function. + + * src/printf.c (print_esc): A hexadecimal escape sequence has + at most two hex. digits, not three. Reported by Padraig Brady. + (usage): Update description. + * tests/misc/printf-hex: New file/test, for the above fix. + +2002-10-07 Paul Eggert <eggert@twinsun.com> + + Add support for locale-specific size indications (e.g., + thousands-separators) and for explicit size suffixes on output. + + * doc/coreutils.texi (Block size): Say that: + This affects display format as well as block size. + Fractional block counts are rounded up. + ls file size blocksize defaults to 1. + A block size spec preceded by ' generates thousands separators. + A suffix without a preceding integer generates suffixes. + (tail invocation): 32k -> 32 KiB. + (What information is listed): ls -h is now equivalent to + ls --block-size=human, and ls -H is now equivalent to + ls --block-size=si. Displayed file size is now always affected by + --block-size. + + * lib/inttostr.c, lib/inttostr.h, lib/imaxtostr.c, lib/offtostr.c, + lib/umaxtostr.c: New files, taken from GNU tar. + + * lib/Makefile.am (libfetish_a_SOURCES): Add imaxtostr.c, offtostr.c, + umaxtostr.c. + (EXTRA_DIST): Add inttostr.c. + + * lib/human.c, lib/human.h: Rewrite to support locale-specific + notations like thousands separators. + Specify what includer of include.h must include beforehand. + (human_group_digits, human_suppress_point_zero, human_autoscale, + human_base_1024, human_SI, human_B): New enum values. + (human_readable): Rename from human_readable_inexact; put the + options before the sizes. All uses changed. The old human_readable + function has been removed; use inttostr.h instead. + (human_options): Renamed from human_block_size, with new signature + that allows block sizes up to UINTMAX_MAX. All callers changed. + + * m4/prereq.m4 (jm_PREREQ_HUMAN): Check for locale.h, localeconv, + AC_HEADER_STDBOOL. No need to check for limits.h since it's in + freestanding C89. No need to check for stdlib.h or string.h since + autoconf does this now. + + * src/cksum.c (cksum): Use primitives from inttostr.h, not + human.h, to print large numbers simply. + * src/csplit.c (handle_line_error, parse_patterns): Likewise. + * src/dd.c (print_stats, main): Likewise. + * src/df.c (print_header): Likewise. + * src/factor.c (print_factors): Likewise. + * src/ls.c (print_long_format, print_file_name_and_frills): Likewise. + * src/shred.c (dopass): Likewise. + * src/sort.c (checkfp): Likewise. + * src/sum.c (bsd_sum_file, sysv_sym_file): Likewise. + * src/tail.c (xlseek): Likewise. + * src/wc.c (write_counts, wc): Likewise. -Wed Oct 2 01:02:05 1991 David J. MacKenzie (djm at apple-gunkies) + * src/df.c (human_output_opts): New var. + (output_block_size): Now uintmax_t, not int, to handle larger + block sizes. All uses changed. + * src/du.c: Likewise. + * src/ls.c: Likewise. - * pr.c (print_page): Don't pad the page if -t given. + * src/df.c (print_header): In the header line, prefer SI to human + representation if it's shorter; if neither is shorter, try to + intuit what the user would prefer. - * csplit.c (load_buffer), sort.c (mergefps): Use bcopy, not memcpy. + * src/expr.c (inttostr): Remove; use new imaxtostr library + function instead. -Thu Sep 26 12:35:00 1991 David J. MacKenzie (djm at churchy.gnu.ai.mit.edu) + * src/ls.c (file_output_block_size): New var, to distinguish + file sizes from other sizes. + (decode_switches): Set it. - * Version 1.1. + * src/shred.c (OUTPUT_BLOCK_SIZE): remove. + (dopass): When printing progress, use floor for what has been done + so far (since we should be conservative there), and ceiling for + what needs to be done (since that's what other programs use). - * configure, system.h: Include memory.h if it works. +2002-10-19 Jim Meyering <jim@meyering.net> - * split.c: Allow `b' unit as well as `k' and `m'. + * src/pinky.c (print_heading): Align TTY and Name headings. + Reported by Karl Eichwalder. - * head.c, tail.c: Replace -b +blocks option with specifying - units (b, k, or m) after the number. - (parse_unit): New function. +2002-10-18 Jim Meyering <jim@meyering.net> - * fold.c (main): Check that -w arg is a number. + * src/split.c (cwrite): Change type of `bytes' parameter to size_t + Remove now-useless cast. + (stdread): Remove function. + (bytes_split): Use size_t instead of int. + Use safe_read, not stdread. + (lines_split): Likewise. + Use memchr rather than a `while' loop. + (line_bytes_split): Use size_t instead of int. + Use safe_read, not stdread. + (main): Add some FIXME comments to remind me to remove casts. - * cut.c: +delimiter takes an arg. + * src/system.h (ST_BLKSIZE): Correct comment describing how to + reproduce HPUX-11 cat failure. From Petter Reinholdtsen. -Mon Sep 16 14:52:38 1991 David J. MacKenzie (djm at churchy.gnu.ai.mit.edu) +2002-10-17 Jim Meyering <jim@meyering.net> - * pr.c (close_file): Don't close an already closed file. + Fix a problem that could make e.g., `cat' misbehave on systems which + give invalid (unreasonably large) values for stat.st_blksize. + * src/system.h (ST_BLKSIZE): Ensure that the result is in [1..4MB]. + Reported by Petter Reinholdtsen. -Thu Sep 12 00:14:43 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-10-14 Jim Meyering <jim@meyering.net> - * memchr.c: New file. - * configure: Check if it's needed. + Specifying a printf conversion specifer as nl's separator string + could cause nl to segfault. + * src/nl.c (build_print_fmt): Don't include separator string + in the printf format; it might contain `%'. + Use a better bound on the length of the print_fmt buffer. + (print_lineno): Print the separator here instead. + Reported by Doug Coleman. - * csplit.c, gcsplit.1: New program. + * tests/misc/nl: New file/tests, including a test for the above. + * tests/misc/Makefile.am (TESTS): Add nl. - * pr.c (cleanup): Only free buffers if they were allocated. + * tests/misc/split-l: New test, to make sure `split --lines=N' works. + * tests/misc/Makefile.am (TESTS): Add split-l. - * sort.c [!USG && !STDC_HEADERS]: Declare memchr. +2002-10-13 Jim Meyering <jim@meyering.net> -Wed Sep 11 20:54:16 1991 Jim Meyering (meyering at churchy) + * Version 4.5.3. - * pr.c: The following 3 bugs appeared (at least) when printing - a single file with the options `-3 -f'. - * (print_white_space): Single spaces were being replaced - with tabs. - * (print_page): Some lines were getting too much white space - at the beginning because spaces_not_printed wasn't being reset - to 0. - * (read_line): The single space between a truncated column - on its left and the column on its right was omitted. Fixed - so that previous value of input_position is restored before - returning FALSE. + * src/du.c (usage): Tweak description of --dereference-args/-D. -Sat Sep 7 03:22:18 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * src/du.c (count_entry): Also save cwd when dereferencing (via + --dereference-args, -D) a command-line argument. + Reported by Michal Svec. Based on a patch by Andreas Schwab. - * configure: Only remove /etc from PATH when it's not part of - a larger name. + * src/Makefile.am (../AUTHORS): New target/rule. -Wed Sep 4 17:09:24 1991 David J. MacKenzie (djm at apple-gunkies) +2002-10-12 Jim Meyering <jim@meyering.net> - * linebuffer.c (readline): Fix incorrect recalculation of `end'. + * src/paste.c (paste_parallel): Declare local, `delims_saved', to be + of type size_t, since that's the way it's used and avoids a warning. - * head.c, tail.c: Replace `mode' variables and bitmasks with - separate variables for each option. + * src/csplit.c (struct cstring) [len]: Declare to be unsigned int, + since that's how it's always used and avoids a new warning from gcc. + (read_input): Adapt to new safe_read ABI. -Mon Sep 2 04:00:37 1991 David J. MacKenzie (djm at apple-gunkies) + * src/cut.c (cut_fields): Add a temporary size_t variable, n_bytes, + to avoid warnings. - * wc.c: New program. + * src/pinky.c (print_long_entry): fread returns size_t. + Declare local `bytes' accordingly, to avoid warning. -Sun Sep 1 01:18:38 1991 David J. MacKenzie (djm at apple-gunkies) + tail -c +N would perform an extra read after encountering EOF + [this change is analogous (bytes vs. lines) to the one of 2002-01-27] + * src/tail.c (start_bytes): Detect EOF, inform caller. + (tail_bytes): Upon EOF in start_bytes, return immediately. + (file_lines): Reorganize to use memrchr rather than an explicit loop. + Adapt to new safe_read ABI. - * fold.c (fold_file): Read in an int, not a char, for EOF - comparison. +2002-10-11 Jim Meyering <jim@meyering.net> - * configure: Check whether st_blksize is missing. + * tests/du/deref: New file/test, for the above fix. + * tests/du/Makefile.am (TESTS): Add deref. - * tac.c (save_stdin): Put copy of pipe input in TMPDIR if - defined, instead of /tmp. +2002-10-10 Jim Meyering <jim@meyering.net> -Thu Aug 29 14:48:15 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * tests/ln/Makefile.am (TESTS): Add target-1. + * tests/ln/target-1: New file/test, for the fix on 2002-10-08. - * xwrite.c [POSIX]: unistd.h might require sys/types.h. +2002-10-09 Jim Meyering <jim@meyering.net> -Wed Aug 28 11:57:39 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * tests/cp/backup-is-src: Ensure that certain environment variables + are not set (e.g., SIMPLE_BACKUP_SUFFIX). Reported by Duncan Roe. - * paste.c (main): Consider -d "" to be like -d "\0", - for POSIX (if I read it right). + * tests/tail-2/big-4gb: Mark this as an expensive test; it would + consume 4GB of disk space on systems without support for sparse files. + Fix a logic error that'd make it `cat err' even though dd didn't fail. - * sort.c, join.c: New programs. + * src/dircolors.hin (.jar): Fix typo: s/;3$/;31/. + Patch by steven@magelico.net, forwarded by Michael Stone. - * cut.c (set_field): Allow blanks as well as commas to - separate numbers in ranges. + * tests/ls/dired: Ensure that ls produces English messages. + Patch by Alexey Vyskubov, forwarded by Michael Stone. -Sun Aug 25 19:57:40 1991 Jim Meyering (meyering at apple-gunkies) +2002-10-08 Dmitry V. Levin <ldv@altlinux.org> - * pr.c: Failure to open an input file is no longer a fatal error. - A message is printed for each failed open. When printing - in parallel, each failed open results in one fewer output column. - Added POSIX -r option to suppress the message. - * pr.c: Added variables: failed_opens, ignore_failed_opens. - These changes were based in part on work by David MacKenzie. + * src/ln.c (main): Fix target_directory parsing when n_files == 1. -Sat Aug 24 15:27:39 1991 Jim Meyering (meyering at pogo) +2002-10-08 Jim Meyering <jim@meyering.net> - * pr.c: Complain if user gives both -m and -[0-9]+ options. + * tests/tail-2/big-4gb: Use double quotes around diagnostic. + Fix syntax in test: use =, not ==. + Reported by Bob Proulx. + Change all the rest like this: grep -lR "testing framework'" .\ + |xargs perl -pi -e 's/'\''(\$0: failure in testing framework)'\''/"$1"/' -Wed Aug 21 22:04:57 1991 David J. MacKenzie (djm at apple-gunkies) + * src/sum.c (sysv_sum_file): Adapt to new safe_read ABI. + * src/tr.c (squeeze_filter, read_and_delete, read_and_xlate): Likewise. + * src/tac.c (save_stdin, tac_stdin_to_mem): Likewise. + * src/wc.c (wc): Likewise. - * Version 1.0. +2002-10-07 Paul Eggert <eggert@twinsun.com> -Mon Aug 19 00:16:51 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * src/cat.c (cat): + Don't advance the write pointer past the end of the write buffer. + * src/sort.c (begfield, limfield): Likewise. - * expand.c: Rename some variables. - (expand): Don't access value off end of array. - * unexpand.c: Rename some variables. - (unexpand): Don't access value off end of array. - Instead of copying tabs verbatim and flushing pending spaces - when one is reached, count them as the proper number of - pending spaces. Instead of changing tabs to single spaces if - the tabstop list is exhausted, print the rest of the line - unchanged (for POSIX). +2002-10-07 Jim Meyering <jim@meyering.net> -Sat Aug 17 01:49:41 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * src/cat.c (simple_cat, cat): Adapt to new safe_read ABI. + * src/head.c (head_bytes, head_lines): Likewise. - * cut.c (cut_file), paste.c (paste_parallel, paste_serial): - Clear EOF and error conditions on stdin so it can be reused. +2002-10-06 Jim Meyering <jim@meyering.net> - * expand.c, unexpand.c (parse_tabstops): Allow blanks as well - as commas to separate tabstops, for POSIX. - * expand.c (expand), unexpand.c (unexpand): Don't line-buffer - the output; send it directly to stdout. - * unexpand.c (main): Make -t stupidly imply -a for POSIX. - (unexpand): If a tab stop list was given and we move past its end, - copy the rest of the line verbatim. + * src/dd.c (scanargs): Ensure that specified block sizes (specified + via ibs=N, obs=N, and bs=N) are no larger than SSIZE_MAX. + (skip, dd_copy): Adapt to new safe_read ABI. - * split.c (convint): New function to allow 'm' and 'k' after - byte counts. - (main): Use it. Change -c option to -b for POSIX. + * Makefile.maint (signatures): Define. + (%.sig): New rule. + (announcement): Depend on $(signatures). -Fri Aug 9 02:47:02 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * Makefile.maint (announcement): Output all URLs for detached + signatures, not just the last one from the previous loop. - * pr.c: Protect isdigit with isascii, if required. +2002-10-05 Jim Meyering <jim@meyering.net> -Tue Aug 6 21:42:25 1991 David J. MacKenzie (djm at wheat-chex) + * Version 4.5.2. - Most of the following is from Paul Eggert: - * cat.c (main): If stdin is read, check close at end. - * cmp.c (main): Check for stdin being closed. - Check for close errors on stdin and stdout. - (cmp): Return a value instead of exiting. - * cut.c (cut_file): New function, from code in main. - Check for read errors. - (main): Check for close errors. - * expand.c, unexpand.c (main): Check for close errors. - (next_file): Go to next file if one can't be opened. - Check for close errors. - * head.c (main), tail.c (main): If stdin was read, check for - close errors. - * head.c (head_file), tail.c (tail_file): Check for close errors. - * paste.c (main, paste_parallel, paste_serial), tac.c (main): - Check for close errors. Close stdin if it was read. - * split.c (main): Check for close errors. + * src/remove.c (remove_entry) [ROOT_CAN_UNLINK_DIRS]: With `rm -i DIR', + don't recurse into directory, DIR. Prompted by a report from + Leonardo Milano. - * configure, Makefile.in's: Support +srcdir option. - Make config.status. Fix up clean targets. + * tests/rm/i-no-r: New file/test, for the above fix. + * tests/rm/Makefile.am (TESTS): Add i-no-r. -Wed Jul 31 01:32:59 1991 David J. MacKenzie (djm at hal) + * tests/tail-2/big-4gb: New file/test, for the fix of 2002-09-27. + * tests/tail-2/Makefile.am (TESTS): Add big-4gb. - * linebuffer.h (struct linebuffer): Add a field to indicate - the number of valid chars in the line. - * linebuffer.c (initbuffer, readline): Fill it in. - * uniq.c, comm.c: Use it. +2002-10-03 Jim Meyering <jim@meyering.net> - * pr.c (main): Check stdin and stdout fclose for errors. - (init_parameters): If there's no room for header and footer, - omit them rather than dying (for POSIX). - (init_header): Take a file descriptor as additional arg. - (init_fps): Change callers. Note when stdin is read. - (open_file): For filename "-" use stdin. - (close_file): Don't close stdin. Check close for errors. - (print_char, char_to_clump): Use isprint instead of explicit - comparisons. + * src/rm.c (AUTHORS): Mark translatable string with `N_ (...)'. + * src/df.c (AUTHORS): Likewise. + * src/du.c (AUTHORS): Likewise. + * src/tail.c (AUTHORS): Likewise. + * src/touch.c (AUTHORS): Likewise. - * memcmp.c: New file (needed for comm). - * bcopy.c: New file (needed for fold). - * system.h: Don't define bcopy as memcpy. - * configure: Check for bcopy and memcmp. +2002-10-02 Jim Meyering <jim@meyering.net> - * uniq.c (main): Use "-" instead of NULL to mean stdin or - stdout. - (check_file): Use "-" instead of NULL to mean stdin or stdout. - Check readline return instead of for NUL character to - detect eof. - Check fclose for errors. - (find_field): Use linebuffer length, not NULs, to detect end - of line. - (different): New function, replaces compare. Uses memcmp - instead of strncmp. - (writeline): Use fwrite instead of fputs so NULs are preserved. + * Makefile.am (SUBDIRS): Remove `old'. + (EXTRA_DIST): List the files in old/. + * configure.ac (AC_CONFIG_FILES): Remove old/* names. + Suggestion from Akim Demaille. - * comm.c (compare_files): Return an error indication. - Don't take a filename of NULL to mean stdin. - Use memcmp instead of strcmp to allow for NULs. - Check fclose for errors. - (writeline): Use fwrite instead of fputs so NULs are preserved. +2002-10-01 Jim Meyering <jim@meyering.net> - * sum.c (sum_file): Take an arg indicating whether to print - the filename, and don't take NULL meaning stdin. Set a flag - when we read stdin. Check fclose return for errors. - (main): If stdin was read, check fclose return for errors. - Use filename of "-" if no args given. + * src/sys2.h (SSIZE_MAX): Define. -Thu Jul 25 15:17:10 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-09-30 Jim Meyering <jim@meyering.net> - * fold.c: Rewritten from scratch for POSIX. + * src/csplit.c: Don't include stdlib.h here. It's already included + via system.h. -Wed Jul 24 01:55:41 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) +2002-09-29 Jim Meyering <jim@meyering.net> - * split.c (line_bytes_split): Use xmalloc instead of alloca. - * system.h: Don't declare alloca. + * src/tr.c (find_bracketed_repeat): Rearrange pointer/integer + expression to avoid bogus warning from gcc. - * tac.c, tail.c: Use SEEK_ instead of L_ for lseek. - * system.h: Define SEEK_ macros if not defined. + * src/cat.c (simple_cat): Use a temporary to avoid bogus warnings. + (cat): Declare insize and outsize to be of type size_t, not int. + Rearrange pointer/integer expressions to avoid bogus warnings. + (main): Declare insize and outsize to be of type size_t, not int. - * pr.c: Rename variable `truncate' to avoid library function conflict. + * src/tail.c (parse_options): Give a sensible diagnostic for + an invalid byte or line count. Reported by Mikko Tuumanen. -Tue Jul 23 13:21:48 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + * src/touch.c (main): Split a long line. - * linebuffer.c, linebuffer.h: New files. - * comm.c, uniq.c (initbuffer, readline): Functions - removed (use versions in linebuffer.c). + * tests/du/Makefile.am (TESTS): Add slink. + * tests/du/slink: New test for system.h change of 2002-08-31. -Mon Jul 22 13:23:53 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + In move mode, always first try to rename. Before, upon failure to + rename a directory, this code would never attempt to rename any + other file in that directory, but would thenceforth always copy. + On some systems (e.g., NetApp's OnTap-6.4), renaming a directory + may fail with EXDEV, yet renaming files within that directory to + a newly-created destination directory succeeds. + * src/copy.c (copy_internal): Remove local, move_mode; + use x->move_mode instead. Based on a patch from Tom Haynes. - * sum.c (sumfile): Always print 5 digits for second number, too. - Interpret "-" to mean stdin. +2002-09-28 Jim Meyering <jim@meyering.net> -Sat Jul 20 14:24:40 1991 David J. MacKenzie (djm at bleen) + * src/split.c (FAIL_ONLY_ONE_WAY): New macro. + Factor out some duplication. + (main): Use it. + [case 'a']: Use strtoul rather than strtol to avoid compiler warnings. - * uniq.c: Use isblank instead of isspace, to support POSIX.2. - * comm.c, pr.c, uniq.c (concat, fatal, error, - pfatal_with_name, xmalloc, xrealloc): Functions removed. + * src/sort.c (begfield, limfield): Rearrange comparisons to avoid + compiler warnings. + (fillbuf, keycompare): Cast literal `-1' to size_t in comparisons, + to avoid compiler warnings. -Sat Jul 13 02:04:53 1991 David J. MacKenzie (djm at geech.gnu.ai.mit.edu) + * src/shred.c (dopass): Use a uintmax_t temporary to avoid bogus + compiler warnings. - * nl.c: Add long-named options. Doc fixes. + Fix things so `mkdir -p' can create very deep directories, e.g., + mkdir -p $(perl -e 'print "a/" x 40000') now works. + * src/mkdir.c (main): For --parents (-p), call make_path with the + entire directory name, so we don't ever require that file operations + like stat or chmod be performed on the entire command line argument. + * makepath.c (make_path): Restore umask *before* creating the final + component. -Sat Jul 6 02:19:09 1991 David J. MacKenzie (djm at geech.gnu.ai.mit.edu) +2002-09-27 Andreas Schwab <schwab@suse.de> - * expand.c, unexpand.c [STDC_HEADERS]: Include stdlib.h. + * src/tail.c (tail_bytes): Change type of bytes_remaining to off_t + to avoid overflow. Reported by Hans Lermen. - * xwrite.c [POSIX]: Include unistd.h. - [STDC_HEADERS]: Don't declare errno. +2002-09-26 Jim Meyering <jim@meyering.net> -Sun Jun 30 23:35:16 1991 David J. MacKenzie (djm at geech.gnu.ai.mit.edu) + * src/install.c (get_ids): Use strtoul, not strtol. Remove some casts. - * uniq.c: Add long-named options. Remove marginally useful -z - option (zero padded repeat counts). +2002-09-25 Jim Meyering <jim@meyering.net> -Thu Jun 27 16:31:45 1991 David J. MacKenzie (djm at geech.gnu.ai.mit.edu) + * src/test.c (eaccess): Change type of local `euid' from int to uid_t + and add a cast, to avoid a warning about `signed and unsigned type in + conditional expression'. - * tail.c (tail_file), tac.c (save_stdin, tac_file), split.c - (cwrite), head.c (head_file), cat.c (main): Check close return - value for delayed error report due to NFS. +2002-09-22 Jim Meyering <jim@meyering.net> -Tue Jun 11 00:12:15 1991 David J. MacKenzie (djm at geech.gnu.ai.mit.edu) + * src/rmdir.c: Include "dirname.h", for declaration of + strip_trailing_slashes. - * cat.c: Replace "uchar" with "unsigned char", to avoid - problems with various systems' typedefs. + * src/stat.c (PRIdMAX, PRIuMAX): Remove definitions. + Now they're defined through system.h. -Thu Jun 6 12:54:26 1991 David J. MacKenzie (djm at geech.gnu.ai.mit.edu) + * src/cp-hash.c, src/dd.c, src/df.c, src/du.c, src/ls.c, + * src/stat.c, src/wc.c: Remove all inclusions of inttypes.h, + since it's already included from sys2.h via system.h. - * cat.c (cat): Interpret ENOTTY return from FIONREAD ioctl to mean - operation is unsupported, for HP-UX 7.0. + * Use automake-1.6f. Regenerate dependent files. -Sun Apr 14 21:49:17 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + * src/Makefile.am (PERL): Remove duplicate definition. - * sum.c: Always print five digits for first number. + fmt's -s, -t, -c options didn't work properly for long lines. + Since get_line may end up calling put_paragraph (for long lines), + be sure to set global, `other_indent', before it is used there. -Fri Mar 15 16:16:54 1991 David J. MacKenzie (djm at geech.ai.mit.edu) + * src/fmt.c (set_other_indent): New function, factored out of... + (get_paragraph): ... here. Call it. + (get_line): Call set_other_indent before calling flush_paragraph, + which calls fmt_paragraph, which in turn calls put_paragraph, + which uses other_indent. - * cat.c, cmp.c: Don't use fileno(); not needed. + * tests/fmt/Makefile.am (TESTS): Add long-line. + * tests/fmt/long-line: New file/test, for the above fix. -Thu Jan 10 02:16:55 1991 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-09-21 Jim Meyering <jim@meyering.net> - * tac.c, tail.c: Change _POSIX_SOURCE to POSIX. + * src/od.c: No longer include deprecated <values.h>. + It was required solely for now-removed reference to BITSPERBYTE. + * src/install.c: Likewise. + Suggestion from Bruno Haible. -Thu Dec 27 00:06:45 1990 David J. MacKenzie (djm at egypt) +2002-09-06 Andreas Schwab <schwab@suse.de> - * cut.c (cut_file_bytes, cut_file_fields): Make inbufp and - outbufp global. - (enlarge_line): Adjust inbufp and outbufp. + `rmdir -p dir-specified-with-trailing-slash/' would fail. + * src/rmdir.c (remove_parents): Strip trailing slashes. -Sun Sep 9 16:54:19 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-09-20 Jim Meyering <jim@meyering.net> - * cat.c: Declare free returning void, not int, so it - doesn't bomb on Xenix. + * tests/rmdir/t-slash: New file/test, for the above fix. + * tests/rmdir/Makefile.am (TESTS): Add t-slash. -Mon Sep 3 22:23:57 1990 David J. MacKenzie (djm at coke) + * Makefile.maint (announcement): Arrange to gpg-sign the message. + Add a URL for each detached signature file. - * tac.c: Print error messages before calling cleanup, not after. +2002-09-07 Bruno Haible <bruno@clisp.org> -Tue Aug 28 18:05:24 1990 David J. MacKenzie (djm at albert.ai.mit.edu) + * configure.ac: Add need-ngettext to AM_GNU_GETTEXT invocation. - * tac.c (cleanup): Return SIGTYPE, not int. +2002-09-18 Jim Meyering <jim@meyering.net> -Tue Aug 7 12:51:18 1990 David J. MacKenzie (djm at apple-gunkies) + `od -t x8' used the wrong (`l'-prefixed) printf format. + Likewise for the o8 and u8 formats. + * src/od.c (ISPEC_TO_FORMAT): Define macro. + (decode_one_format): Use PRIdMAX, PRIoMAX, etc. for LONG_LONG. + Reported by Arun Sharma. - * cut.c (main, usage): Add -b and -n options for POSIX. - (set_fields): Don't allow SPC or TAB as number separators. +2002-09-17 Jim Meyering <jim@meyering.net> - * paste.c (paste_parallel): If open of any file fails, quit - (for POSIX). + * src/sys2.h (PRIdMAX, PRIoMAX, PRIuMAX, PRIxMAX): Define if necessary. + From gettext's intl/loadmsgcat.c. -Mon Aug 6 22:14:13 1990 David J. MacKenzie (djm at apple-gunkies) + * tests/od/x8: New file/test, for the above fix. + * tests/od/Makefile.am (TESTS): Add x8. - * pr.c: Add POSIX -F option (same as -f). +2002-09-15 Jim Meyering <jim@meyering.net> - * uniq.c (check_file): Allow '-' to mean stdin or stdout. + * Use autoconf-2.54. Regenerate dependent files. -Mon Aug 6 14:43:30 1990 David J. MacKenzie (djm at pogo.ai.mit.edu) + * src/csplit.c (get_format_width): Add cast to avoid + warning about `signed and unsigned type in conditional expression'. - * head.c, tail.c: Change `chars' to `bytes' globally. - (main, usage): Use POSIX.2 draft 10 option syntax. +2002-09-14 Jim Meyering <jim@meyering.net> -Sun Aug 5 11:51:12 1990 David J. MacKenzie (djm at pogo.ai.mit.edu) + * src/who.c (print_user): Change type of local to size_t + to avoid warnings about `comparison between signed and unsigned'. + * src/ptx.c (generate_all_output): Likewise. - * cat.c (main): Don't delay error messages, so they appear - where expected. - (main, simple_cat, cat): Make errors in input files nonfatal. + * src/dd.c (main, skip): Add casts to avoid warnings about + `comparison between signed and unsigned'. -Sat Aug 4 10:11:30 1990 David J. MacKenzie (djm at pogo.ai.mit.edu) + * src/id.c (print_full_info, print_group_list): Add casts to avoid + warnings about `signed and unsigned type in conditional expression'. - * cat.c: Remove -c option added for POSIX draft 9, since POSIX - draft 10 removed it. + * src/md5sum.c: Change type of global, digest_hex_bytes, to size_t + to avoid warnings about `comparison between signed and unsigned'. + (split_3): Change parameter names to be readable and add comment. + Clean up the test for whether a line may be ignored. - * tac.c (tac_stdin): Use fstat instead of lseek to determine - whether stdin is seekable, because lseek silently fails on - some special files, like tty's. - tail.c (tail_chars, tail_lines): Use fstat instead of lseek; - don't turn off -f for non-regular files (assume the user knows - what he's doing; it might work for fifo's and sockets). +2002-09-13 Jim Meyering <jim@meyering.net> - * paste.c (main): If no files given, use stdin. - Don't let collapse_escapes write on string constant (delim default). - (paste_parallel): Don't close stdin. + * src/printf.c (main): Handle leading command line argument of `--'. + Reported by Raul: DervishD <raul@pleyades.net> + * tests/misc/printf: New file: test for the above. + * tests/misc/Makefile.am (TESTS): Add printf. - * cut.c (main): Use standard input for filename of "-". + * src/date.c (usage): Explain that %S's range of [0..60] is required -- + rather than 0..59 -- to accommodate the occasional positive leap second. + Reported by Richard Neill. - * comm.c (compare_files): Allow '-' to mean stdin. +2002-09-12 Jim Meyering <jim@meyering.net> -Fri Aug 3 13:38:28 1990 David J. MacKenzie (djm at pogo.ai.mit.edu) + * src/Makefile.am (nanosec_libs): Define. + (sleep_LDADD, tail_LDADD): Use it here. - * cut.c (enlarge_line): Take an arg giving the required amount - of space. Change callers. - (main): Don't allow -t'<TAB>' without -f. - Make `delim' unsigned to fix sign extension problem in comparison. + Factor nanosleep-related code into ../lib/xnanosleep.c. + * src/sleep.c: Include xnanosleep.h. + Factor out fenv.h-related code. + (timespec_subtract): Remove function. + (main): Remove code that deals with computing start and stop times + as well as the loop around nanosleep. Now that's in xnanosleep.c. -Tue Jul 17 12:36:11 EDT 1990 Jay Fenlason (hack@ai.mit.edu) + Allow S (in --sleep-interval=S) to be a floating point value. + * src/tail.c: Include xnanosleep.h and xstrtod.h. + Move declaration of global variable, sleep_interval, to ... + (main): ...here. + (usage): Update description of --sleep-interval option. + (tail_forever): New parameter, sleep_interval. Update caller. + Use xnanosleep, rather than sleep. + (parse_options): New parameter, sleep_interval. Update caller. + Use xstrtod, now that we accept floating point values. + Prompted by a patch from Augey Mikus. - * pr.c Deleted excess whitespace from ends of lines. - Modified to work with current version of getopt, which - returns 1 instead of 0 for non-options. - Reversed the meaning of the -f option, to be compatable - with real pr. +2002-09-06 Jim Meyering <jim@meyering.net> -Sun Jul 8 00:39:31 1990 David J. MacKenzie (djm at apple-gunkies) + * src/remove.c (prompt): Change comment to give a better note to + translators. From Michael Piefel. - * cmp.c (main, usage): Rename -L option to -c and don't have - it imply -l. - (printc): Take an arg to specify number of chars to pad to, - for column alignment. - (cmp): Respect flag_print_chars in default output format. - Align columns for cmp -cl. +2002-09-02 Jim Meyering <jim@meyering.net> -Sat Jul 7 17:23:30 1990 David J. MacKenzie (djm at apple-gunkies) + * README: A good problem report/patch includes diffs against + the most recent test release. - * cmp.c: For +show-chars, have getopt return 'L' so - `flag_print_chars' gets set. + * src/pathchk.c (NEED_PATHCONF_WRAPPER): Define. + (pathconf_wrapper): Define only if NEED_PATHCONF_WRAPPER is set. -Fri Jun 29 01:04:19 1990 David J. MacKenzie (djm at apple-gunkies) + * src/kill.c (print_table_row): Use an unsigned type for widths + to avoid warning about comparison between signed and unsigned. + (list_signals): Likewise. - * tac.c (main): Initialize fastmap and translate fields of - regex before compiling it. + * src/od.c (skip): Add a cast to avoid warning about comparison + between signed and unsigned. + * src/install.c (get_ids): Likewise. Also rearrange range-checking + comparisons to make them more readable. -Fri Jun 22 00:38:20 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-09-01 Jim Meyering <jim@meyering.net> - * tac.c: Change +regexp to +regex for consistency with GNU find. + * Version 4.5.1. -Wed Jun 20 01:46:09 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-08-31 Jim Meyering <jim@meyering.net> - * cat.c (cat): If FIONREAD is available, only use it if it is - supported by the filesystem that the file is on. + Symlinks were always reported as using 0 blocks. + * src/system.h (ST_NBLOCKS): Don't depend on file type. + This reverts the change of 2000-01-30. + Based on a report and patch from Neil Brown via Michael Stone. + This fixes Debian Bug#156358. -Sun Jun 3 20:26:19 1990 David J. MacKenzie (djm at albert.ai.mit.edu) + * Most files: Change `exit (0)' to `exit (EXIT_SUCCESS)', + `exit (1)' to `exit (EXIT_FAILURE)', and + `usage (1)' to `usage (EXIT_FAILURE)'. - * cat.c (main): Add a variable to control whether the check - for input file == output file is made, because no values of - st_dev and st_ino should be assumed to be available for this - purpose. Only do the check for regular files. + * chgrp.c, chmod.c, chown.c, chroot.c, cp.c, date.c, dd.c, du.c, + * hostname.c, id.c, install.c, ln.c, mkdir.c, mkfifo.c, mknod.c, + * nice.c, pinky.c, printf.c, pwd.c, shred.c, sleep.c, stty.c, + * su.c, tac-pipe.c, tail.c, tee.c, touch.c, uname.c, uptime.c, + * users.c, who.c: Change `error (1, ...' to `error (EXIT_FAILURE, ...'. + But don't change `error (0, ...' to `error (EXIT_SUCCESS, ...', since + error never exits successfully. - * tac.c: Use bcopy instead of memcpy. +2002-08-29 Jim Meyering <jim@meyering.net> -Thu May 31 00:55:36 1990 David J. MacKenzie (djm at apple-gunkies) + * src/remove.c (remove_cwd_entries): Use closedir (not CLOSEDIR) + when ignoring any return value. - * head.c: Use longs instead of ints for file offsets, for 16 - bit machines. + * src/remove.c (remove_cwd_entries): Detect and diagnose readdir + failures. On some systems (at least EMC Celerra and Solaris5.8), + this appears to be necessary. + (is_empty_dir): Likewise. Also, always close directory handle. + * src/ls.c (print_dir): Likewise. + (print_dir): Rename local variable: reading -> dirp. + Reported by Mike Coleman. -Tue May 22 00:56:51 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-08-28 Jim Meyering <jim@meyering.net> - * cmp.c: Change some ints to longs for 16 bit machines. - (bcmp_cnt): Make char-pointer counting slightly simpler. + * src/remove.c (remove_cwd_entries): Use CLOSEDIR, not closedir. + Give a diagnostic and fail if closedir fails. -Sat May 12 01:16:42 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-08-26 Jim Meyering <jim@meyering.net> - * cat.c (main): Allow input file to be output file for devices - (ttys, etc.). Check whether input file is output file when - reading standard input. Print any error messages for standard - input. + * Makefile.am (THANKS-to-translators): New rule. + (EXTRA_DIST): Add both THANKS-to-translators and THANKStt.in. + * THANKStt.in: New file. - * cmp.c (bcmp_cnt): Handle int comparisons correctly on 16 bit - machines as well as 32 bit ones. - * cmp.c, tail.c: Use longs instead of ints for file offsets. + * src/cat.c (close_stdout_wrapper): New, kludgey, function and + file-scoped global. + (main): Register it with atexit. + Close STDOUT_FILENO, to avoid a problem when writing to + /dev/audio on at least Solaris 5.7 and 5.8 systems. + Reported by Shing-Shong Shei. -Fri May 11 02:11:03 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-08-25 Jim Meyering <jim@meyering.net> - * cmp.c: Fix some exit statuses for POSIX. + * src/cat.c (main): Close STDIN_FILENO rather than a literal `0'. + * src/tac.c (main): Likewise. + * src/tail.c (main): Likewise. + * src/tee.c (main): Likewise. + * src/tr.c (main): Likewise. + * src/wc.c (main): Likewise. -Tue May 8 03:41:42 1990 David J. MacKenzie (djm at abyss) +2002-08-20 Jim Meyering <jim@meyering.net> - * tac.c: Use regular expressions as the record boundaries. - Give better error messages. - Reformat code and make it more readable. - (main): Use getopt_long to parse options. - (tac_stdin): Do not make a temporary file if standard input - is a file. - (tac_file): New function. - (tac): Take an open file desc as an arg. - (output): Rewrite to use its own efficient buffering. - (xmalloc, xrealloc, xwrite): New functions. + * tests/mv/setup: Rewrite not to use `: ${VAR=not_set}' paradigm. -Sun Apr 8 20:33:20 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-08-10 Paul Eggert <eggert@twinsun.com> - * head.c, tail.c: Use `error' instead of `fatal_perror' and - `nonfatal_perror'. Remove some unnecessary info from messages. + * src/nohup.sh: Don't use "exec --"; it's not portable and + shouldn't be needed. -Wed Mar 21 09:30:18 1990 David J. MacKenzie (djm at pogo.ai.mit.edu) +2002-08-09 Jim Meyering <jim@meyering.net> - * comm.c (main): Pass the list of files to compare_files as a - char ** instead of a char *. - (compare_files): Make arg a char **. + * src/pr.c (main): Don't ignore -COLUMN if it's the last option. + (usage): Clarify help text for the -COLUMN option. + Patch by Padraig Brady. + * tests/pr/Test.pm [col-last]: New test for the above. - * uniq.c: Declare some functions as void. - Change global vars `countmode' and `mode' from ints to enums. - (main): Use getopt to parse options and support POSIX options. - Don't use integer_arg to parse numbers, since `-#' can't be - parsed that way using getopt. - (find_field): Use isspace for finding fields boundaries. + * configure.ac: Start with version 4.5.1, chosen so that it's larger + than the latest version numbers of the component packages. -Tue Mar 20 14:28:25 1990 David J. MacKenzie (djm at pogo.ai.mit.edu) + * man/Makefile.am (check-x-vs-1): Set and export PATH so we use + programs in ../src. - * comm.c (main): Call usage if given bad option or wrong - number of args. Exit with 0 status normally. - (usage): New function. - Declare some other functions as void. +2002-08-08 Jim Meyering <jim@meyering.net> -Wed Mar 14 10:48:40 1990 David J. MacKenzie (djm at rice-chex) + * src/date.c: Guard inclusion of <langinfo.h> with + `#if HAVE_LANGINFO_CODESET', not `#if HAVE_LANGINFO_H'. + * src/sort.c: Likewise. + Patch by GOTO Masanori. - * cmp.c (main, cmp, usage): Replace -q +quick option with -L - +show-chars option to add ASCII representation of bytes to -l format. +2002-08-05 Paul Eggert <eggert@twinsun.com> -Tue Mar 13 00:50:14 1990 David J. MacKenzie (djm at rice-chex) + Fix some minor time-related bugs with POSIX time arguments. + Some valid time stamps were being rejected (notably -1, and + time stamps before 1900 on 64-bit hosts). And some invalid + time stamps were being accepted, e.g. September 31. - * cmp.c (cmp): Change EOF message for POSIX compatibility. - For -l format, clear bits > FF. + * src/date.c (main): Adjust to posixtime signature change. + * src/touch.c (main): Likewise. Remove unnecessary initialization. + Use localtime, not posixtm, to warn about obsolete "touch". -Mon Mar 5 17:21:00 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-08-05 Jim Meyering <jim@meyering.net> - * tail.c: Move global `errors' into main instead of having - nonfatal_perror set it. - (tail, tail_chars, tail_file, tail_lines, pipe_chars, pipe_lines): - Return an error status. - (file_lines, start_chars, start_lines): Reverse the meaning of - the return value. - (tail_lines, tail_chars): Account for that reversal. + * tests/misc/Makefile.am (TESTS): Add nice and pathchk1. -Mon Mar 5 00:34:36 1990 David J. MacKenzie (djm at albert.ai.mit.edu) +2002-08-04 Jim Meyering <jim@meyering.net> - * head.c: Move global `errors' into main and have the various - functions return an error status instead of setting it in - nonfatal_perror. + * src/Makefile.am (check-README): New target/rule. + (check): Depend on it. -Sat Mar 3 11:27:27 1990 Torbj|rn Granlund (tege at echnaton) + * configure.ac (AC_CONFIG_FILES): Add old/Makefile and old/*/Makefile. - * cmp.c (cmp): Call function bcmp_cnt for flag == 0 (i.e. no - options specified), to compare the two blocks and count - newlines simultaneously. - * cmp.c New function: bcmp_cnt. +2002-08-03 Jim Meyering <jim@meyering.net> - * cmp.c (main): Test if output is redirected to /dev/null, and - assume `-s' if this is so. + * Makefile.am (SUBDIRS): Add old. + * old/: New directory, containing legacy ChangeLog* and NEWS files + from the fileutils, sh-utils, and textutils packages. -Tue Feb 20 17:09:19 1990 David J. MacKenzie (djm at albert.ai.mit.edu) + * src/Makefile.am (AM_INSTALLCHECK_STD_OPTIONS_EXEMPT): Set to false. - * cat.c: Change `argbad' from a char to a short, so it will - work on machines with unsigned chars. +2002-08-02 Paul Eggert <eggert@twinsun.com> -Sat Feb 10 02:16:40 1990 David J. MacKenzie (djm at albert.ai.mit.edu) + * NEWS, doc/coreutils.texi: uniq now obeys LC_COLLATE. - * cmp.c (cmp): Rename `r' to `first_diff', and `x' to `smaller'. - Remove unneccessary variable `c1'. If -l was given, increase - `char_number' by the number of bytes read, after producing output, - rather than by the offset of the first differing bytes, before - producing output. - Replace if-else-if constructions with case statements for clarity. - (bcmp2): Rename `n' to `nread'. + * src/uniq.c: Include hard-locale.h, xmemcoll.h. + (hard_LC_COLLATE): New var. + (different): Args are now char *, not const char *. + Use xmemcoll instead of memcmp to compare lines, so that + LC_COLLATE has effect. However, use memcmp if it is an + easy locale. + (check_file): Do not include newline in comparison, so that + xmemcoll has a byte to stomp on temporarily. + (main): Set hard_LC_COLLATE. -Wed Dec 20 01:32:06 1989 David J. MacKenzie (djm at hobbes.ai.mit.edu) +2002-07-29 Jim Meyering <jim@meyering.net> - * nl.c (proc_text): Use re_search instead of re_match. + * Makefile.am (SUBDIRS): Remove djgpp, for now. -Tue Dec 19 01:26:34 1989 David J. MacKenzie (djm at hobbes.ai.mit.edu) +2002-07-20 Jim Meyering <jim@meyering.net> - * nl.c: Indent. Un-nest statements. Use GNU regexp functions - instead of System V ones. Move function declarations together. - (quit): Remove useless function. - (program_name): New variable for error messages. - (main): Use perror in error message. - (xmalloc): New function to replace myalloc. - (myalloc): Function removed. - Global: use program_name and xmalloc. - -Sun Dec 17 00:36:36 1989 David J. MacKenzie (djm at hobbes.ai.mit.edu) + * Makefile.am (false.c): Convert only the final EXIT_SUCCESS + into EXIT_FAILURE. Otherwise, false --help and false --version + would fail. - * uniq.c: Declare some functions. - (main): Initialize infile and outfile. Call usage if given - invalid args. Normally exit with 0 status instead of garbage. - (usage): New function to print usage message and exit. - (check_file): Remove unused variable. - (readline): Compare against EOF, not < 0. - (xmalloc, xrealloc): Return char *, not int. - Ok to return 0 if 0 bytes requested. - (lb1, lb2): Remove unused global vars. - (concat): Remove unused function. +2002-07-08 Jim Meyering <jim@meyering.net> -Sat Dec 16 15:15:50 1989 David J. MacKenzie (djm at hobbes.ai.mit.edu) + * src/Makefile.am (uninstall-local): Search for @GNU_PACKAGE@, + rather than the hard-coded `sh-utils'. - * comm.c: Remove unused global variables lb1, lb2. - (main): Remove unneeded variable. - (compare_files): Remove unused arg. - (readline): un-nest assignment. Test against EOF instead of < 0. - (error): Print to stderr, not stdout. - (xmalloc, xrealloc): Return char * instead of int. - Returning 0 is ok if 0 bytes requested (ANSI C). +2002-07-01 Jim Meyering <jim@meyering.net> - -Local Variables: -version-control: never -End: + * configure.ac: Merge the three files from fileutils, + textutils, and sh-utils. + * Makefile.am: Likewise. + * src/Makefile.am: Likewise. diff --git a/contrib/gnu-sort/INSTALL b/contrib/gnu-sort/INSTALL index 62ea076c1f70..54caf7c190f2 100644 --- a/contrib/gnu-sort/INSTALL +++ b/contrib/gnu-sort/INSTALL @@ -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 ================ diff --git a/contrib/gnu-sort/NEWS b/contrib/gnu-sort/NEWS index a1722997d637..394a824d11af 100644 --- a/contrib/gnu-sort/NEWS +++ b/contrib/gnu-sort/NEWS @@ -1,457 +1,718 @@ -Changes in release 2.1 -[2.0.22] -* `od -t f8' works once again [bug introduced in textutils-2.0.8] -* various portability fixes, and general clean-up -* various minor, corner-case bug fixes -[2.0.21] -* split accepts new option -a or --suffix-length. -* split no longer generates longer suffixes than requested; instead, it reports - an error when suffixes are exhausted. POSIX requires this behavior. -* The _POSIX2_VERSION environment variable lets you select which version - of POSIX the utilities should conform to. Its default value is system - dependent. Set _POSIX2_VERSION=199209 to cause the utilities to support - obsolete usage like "sort +1". -* The following obsolete usages are no longer supported when conforming - to POSIX 1003.1-2001, which prohibits most digit-string options: - expand -N (instead, use expand -t N) - head -N (instead, use head -c N or head -n N) - fold -N (instead, use fold -w N) - split -N (instead, use split -l N) - tail -N (instead, use tail -c N or tail -n N) - unexpand -N (instead, use unexpand --first-only -t N) - uniq -N (instead, use uniq -f N) - The following obsolete usages (options without arguments) are no - longer supported when conforming to POSIX 1003.1-2001, which - prohibits most options with optional arguments: - od -s (instead, use od --strings) - od -w (instead, use od --width) - pr -S (instead, use pr --sep-string) -[2.0.20] -* tr no longer gets failed a assertion for [==] or [::] -* The following obsolete usages are no longer supported when conforming - to POSIX 1003.1-2001, which prohibits most options with leading "+": - sort +POS1 -POS2 (instead, use sort -k) - tail +N (instead, use tail -c +N or tail -n +N) - uniq +N (instead, use uniq -s N) -* Warnings are issued for obsolete usages on older hosts, - unless POSIXLY_CORRECT is set in the environment. -* sort -m no longer segfaults when given an empty file -* sort -S now accepts 'K' as a synonym for 'k'. -* wc recognizes all locale-defined white-space characters, not just those - in the "C" locale. -[2.0.19] -* portability tweak to make lib/regex.c compile -* split translatable strings only in the middle of sentences -[2.0.18] -* sort could segfault on systems without a working mkstemp function and - with a gettimeofday function that clobbers the static buffer that - localtime uses for it's return value -- introduced in 2.0.17 -[2.0.17] -* csplit no longer gets a failed assertion for this: - printf 'a\n\n'|csplit - '/^$/' 2 -* sort detects physical memory attributes more portably -* tail no longer gets a segfault on Linux's /proc/ksyms -* sum -s produces the proper 16-bit checksum for large files - (this fixes a bug that was introduced in 2.0f) -* uniq is now about 3 times faster than the version from 2.0 on Linux systems; - the code uses lock-avoiding variants of common I/O functions -[2.0.16] -* tail -F no longer segfaults -[2.0.15] -* `head -c N' and `od -N N' now read no more than N bytes of input -* tail accepts new option: -F, equivalent to `--follow=name --retry', - for compatibility with the FreeBSD and NetBSD versions of tail. -* fmt no longer segfaults when using a maximum line width larger than 32767 -* uniq's --all-repeated option has new modes to delimit groups - of duplicate lines: --all-repeated={precede,separate,none(default)} -[2.0.14] -* sort now accepts long options like "--reverse" and "--". -* sort now checks option syntax as POSIX requires, except that (as usual - for GNU) options can follow file names unless POSIXLY_CORRECT is set. - For example, invalid positional combinations like "sort +1 -r -2" are - now rejected as per POSIX. -* The next POSIX standard will require that obsolescent 'sort' - positional options like +1 be treated as file names, not options. - Please use 'sort -k' instead. -[2.0.13] -* pr accepts new -D or --date option, to specify date format. -* The following changes are required by POSIX: - - If POSIXLY_CORRECT is set, dates in pr headers now look something like - 'Dec 4 23:59 2001', with the exact appearance affected by LC_TIME. - - pr -h now affects only the center header string, not the entire header. - - pr no longer truncates headers. -* Spacing in pr headers has been adjusted slightly. -* `fmt --prefix=S' now works when S contains a byte with the high bit set -[2.0.12] -* sort has improved performance when using very little main memory -* sort has improved memory management -* sort is no longer susceptible to certain denial of service attacks -* sort no longer suffers from a race condition whereby an interrupt received - during cleanup could cause it to fail to remove temporary files. - This problem could arise only on hosts without sigaction. -[2.0.11] -* sort accepts new -S SIZE option, to specify main-memory usage. -[2.0.10] -* od is faster and more portable than it was in 2.0.9 -* tail avoids an uninitialized memory reference -[2.0.9] -* od now prints valid addresses for offsets of 2^32 and larger, and allows - the byte offset (-j) and byte count (-N) arguments to be 2^32 and larger. -* tail now works with line and byte counts of 2^32 and larger, on systems - with large file support -* join now works with an 8-bit delimiter -* fix a compilation failure on some Solaris systems with wc.c -[2.0.8] -* od now supports 8-byte integers, assuming they're printable with e.g., %lld -* new program: sha1sum -* wc accepts new -m option: count (potentially multi-byte) characters -* wc's `--chars' option is now equivalent to -m, not --bytes as it used to be -* `cat -n' works properly when processing 2^31 or more lines -[2.0g] -* sort's --help output now warns that it is locale-aware -* tail: fix a buffer underrun error that occurred on an empty pipe, - also thanks to bounded pointers -* pr: fix a bounds violation found by Greg McGary's bounded-pointers-enabled gcc - It could have caused (with low probability) the columns on the last page of - output *not* to be `balanced' when they should have been. -* sort: if the -T tmpdir option is given multiple times, all the given - directories are used; this can improve performance for huge sort/merges. -[2.0f] +GNU coreutils NEWS -*- outline -*- +* Major changes in release 5.2.1 (2004-03-12) [stable] + +** Bug fixes + + mv could mistakenly fail to preserve hard links when moving two + or more arguments between partitions. + + `cp --sparse=always F /dev/hdx' no longer tries to use lseek to create + holes in the destination. + + nohup now sets the close-on-exec flag for its copy of the stderr file + descriptor. This avoids some nohup-induced hangs. For example, before + this change, if you ran `ssh localhost', then `nohup sleep 600 </dev/null &', + and then exited that remote shell, the ssh session would hang until the + 10-minute sleep terminated. With the fixed nohup, the ssh session + terminates immediately. + + `expr' now conforms to POSIX better: + + Integers like -0 and 00 are now treated as zero. + + The `|' operator now returns 0, not its first argument, if both + arguments are null or zero. E.g., `expr "" \| ""' now returns 0, + not the empty string. + + The `|' and `&' operators now use short-circuit evaluation, e.g., + `expr 1 \| 1 / 0' no longer reports a division by zero. + +** New features + + `chown user.group file' now has its traditional meaning even when + conforming to POSIX 1003.1-2001, so long as no user has a name + containing `.' that happens to equal `user.group'. + + +* 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') + +** New features +- head now accepts --lines=-N (--bytes=-N) to print all but the + N lines (bytes) at the end of the file +- md5sum --check now accepts the output of the BSD md5sum program, e.g., + MD5 (f) = d41d8cd98f00b204e9800998ecf8427e +- date -d DATE can now parse a DATE string like May-23-2003 +- chown: `.' is no longer recognized as a separator in the OWNER:GROUP + specifier on POSIX 1003.1-2001 systems. If chown *was not* compiled + on such a system, then it still accepts `.', by default. If chown + was compiled on a POSIX 1003.1-2001 system, then you may enable the + old behavior by setting _POSIX2_VERSION=199209 in your environment. +- chown no longer tries to preserve set-user-ID and set-group-ID bits; + on some systems, the chown syscall resets those bits, and previous + versions of the chown command would call chmod to restore the original, + pre-chown(2) settings, but that behavior is problematic. + 1) There was a window whereby a malicious user, M, could subvert a + chown command run by some other user and operating on files in a + directory where M has write access. + 2) Before (and even now, on systems with chown(2) that doesn't reset + those bits), an unwary admin. could use chown unwittingly to create e.g., + a set-user-ID root copy of /bin/sh. + +** Bug fixes +- chown --dereference no longer leaks a file descriptor per symlink processed +- `du /' once again prints the `/' on the last line +- split's --verbose option works once again [broken in 4.5.10 and 5.0] +- tail -f is no longer subject to a race condition that could make it + delay displaying the last part of a file that had stopped growing. That + bug could also make tail -f give an unwarranted `file truncated' warning. +- du no longer runs out of file descriptors unnecessarily +- df and `readlink --canonicalize' no longer corrupt the heap on + non-glibc, non-solaris systems +- `env -u UNSET_VARIABLE' no longer dumps core on non-glibc systems +- readlink's --canonicalize option now works on systems like Solaris that + lack the canonicalize_file_name function but do have resolvepath. +- mv now removes `a' in this example on all systems: touch a; ln a b; mv a b + This behavior is contrary to POSIX (which requires that the mv command do + nothing and exit successfully), but I suspect POSIX will change. +- date's %r format directive now honors locale settings +- date's `-' (no-pad) format flag now affects the space-padded-by-default + conversion specifiers, %e, %k, %l +- fmt now diagnoses invalid obsolescent width specifications like `-72x' +- fmt now exits nonzero when unable to open an input file +- tsort now fails when given an odd number of input tokens, + as required by POSIX. Before, it would act as if the final token + appeared one additional time. + +** Fewer arbitrary limitations +- tail's byte and line counts are no longer limited to OFF_T_MAX. + Now the limit is UINTMAX_MAX (usually 2^64). +- split can now handle --bytes=N and --lines=N with N=2^31 or more. + +** Portability +- `kill -t' now prints signal descriptions (rather than `?') on systems + like Tru64 with __sys_siglist but no strsignal function. +- stat.c now compiles on Ultrix systems +- sleep now works on AIX systems that lack support for clock_gettime +- rm now works around Darwin6.5's broken readdir function + Before `rm -rf DIR' would fail to remove all files in DIR + if there were more than 338. + +* Major changes in release 5.0 (2003-04-02): +- false --help now exits nonzero + +[4.5.12] +* printf no longer treats \x specially when POSIXLY_CORRECT is set +* printf avoids buffer overrun with format ending in a backslash and +* printf avoids buffer overrun with incomplete conversion specifier +* printf accepts multiple flags in a single conversion specifier + +[4.5.11] +* seq no longer requires that a field width be specified +* seq no longer fails when given a field width of `0' +* seq now accepts ` ' and `'' as valid format flag characters +* df now shows a HOSTNAME: prefix for each remote-mounted file system on AIX 5.1 +* portability tweaks for HP-UX, AIX 5.1, DJGPP + +[4.5.10] +* printf no longer segfaults for a negative field width or precision +* shred now always enables --exact for non-regular files +* du no longer lists hard-linked files more than once +* du no longer dumps core on some systems due to `infinite' recursion + via nftw's use of the buggy replacement function in getcwd.c +* portability patches for a few vendor compilers and 64-bit systems +* du -S *really* now works like it did before the change in 4.5.5 + +[4.5.9] +* du no longer truncates file sizes or sums to fit in 32-bit size_t +* work around Linux kernel bug in getcwd (fixed in 2.4.21-pre4), so that pwd + now fails if the name of the working directory is so long that getcwd + truncates it. Before it would print the truncated name and exit successfully. +* `df /some/mount-point' no longer hangs on a GNU libc system when another + hard-mounted NFS file system (preceding /some/mount-point in /proc/mounts) + is inaccessible. +* rm -rf now gives an accurate diagnostic when failing to remove a file + under certain unusual conditions +* mv and `cp --preserve=links' now preserve multiple hard links even under + certain unusual conditions where they used to fail + +[4.5.8] +* du -S once again works like it did before the change in 4.5.5 +* stat accepts a new file format, %B, for the size of each block reported by %b +* du accepts new option: --apparent-size +* du --bytes (-b) works the same way it did in fileutils-3.16 and before +* du reports proper sizes for directories (not zero) (broken in 4.5.6 or 4.5.7) +* df now always displays under `Filesystem', the device file name + corresponding to the listed mount point. Before, for a block- or character- + special file command line argument, df would display that argument. E.g., + `df /dev/hda' would list `/dev/hda' as the `Filesystem', rather than say + /dev/hda3 (the device on which `/' is mounted), as it does now. +* test now works properly when invoked from a set user ID or set group ID + context and when testing access to files subject to alternate protection + mechanisms. For example, without this change, a set-UID program that invoked + `test -w F' (to see if F is writable) could mistakenly report that it *was* + writable, even though F was on a read-only file system, or F had an ACL + prohibiting write access, or F was marked as immutable. + +[4.5.7] +* du would fail with more than one DIR argument when any but the last did not + contain a slash (due to a bug in ftw.c) + +[4.5.6] +* du no longer segfaults on Solaris systems (fixed heap-corrupting bug in ftw.c) +* du --exclude=FILE works once again (this was broken by the rewrite for 4.5.5) +* du no longer gets a failed assertion for certain hierarchy lay-outs + involving hard-linked directories +* `who -r' no longer segfaults when using non-C-locale messages +* df now displays a mount point (usually `/') for non-mounted + character-special and block files + +[4.5.5] +* ls --dired produces correct byte offset for file names containing + nonprintable characters in a multibyte locale +* du has been rewritten to use a variant of GNU libc's ftw.c +* du now counts the space associated with a directory's directory entry, + even if it cannot list or chdir into that subdirectory. +* du -S now includes the st_size of each entry corresponding to a subdirectory +* rm on FreeBSD can once again remove directories from NFS-mounted file systems +* ls has a new option --dereference-command-line-symlink-to-dir, which + corresponds to the new default behavior when none of -d, -l -F, -H, -L + has been specified. +* ls dangling-symlink now prints `dangling-symlink'. + Before, it would fail with `no such file or directory'. +* ls -s symlink-to-non-dir and ls -i symlink-to-non-dir now print + attributes of `symlink', rather than attributes of their referents. +* Fix a bug introduced in 4.5.4 that made it so that ls --color would no + longer highlight the names of files with the execute bit set when not + specified on the command line. +* shred's --zero (-z) option no longer gobbles up any following argument. + Before, `shred --zero file' would produce `shred: missing file argument', + and worse, `shred --zero f1 f2 ...' would appear to work, but would leave + the first file untouched. +* readlink: new program +* cut: new feature: when used to select ranges of byte offsets (as opposed + to ranges of fields) and when --output-delimiter=STRING is specified, + output STRING between ranges of selected bytes. +* rm -r can no longer be tricked into mistakenly reporting a cycle. +* when rm detects a directory cycle, it no longer aborts the entire command, + but rather merely stops processing the affected command line argument. + +[4.5.4] +* cp no longer fails to parse options like this: --preserve=mode,ownership +* `ls --color -F symlink-to-dir' works properly +* ls is much more efficient on directories with valid dirent.d_type. +* stty supports all baud rates defined in linux-2.4.19. +* `du symlink-to-dir/' would improperly remove the trailing slash +* `du ""' would evoke a bounds violation. +* In the unlikely event that running `du /' resulted in `stat ("/", ...)' + failing, du would give a diagnostic about `' (empty string) rather than `/'. +* printf: a hexadecimal escape sequence has at most two hex. digits, not three. +* The following features have been added to the --block-size option + and similar environment variables of df, du, and ls. + - A leading "'" generates numbers with thousands separators. + For example: + $ ls -l --block-size="'1" file + -rw-rw-r-- 1 eggert src 47,483,707 Sep 24 23:40 file + - A size suffix without a leading integer generates a suffix in the output. + For example: + $ ls -l --block-size="K" + -rw-rw-r-- 1 eggert src 46371K Sep 24 23:40 file +* ls's --block-size option now affects file sizes in all cases, not + just for --block-size=human-readable and --block-size=si. Fractional + sizes are now always rounded up, for consistency with df and du. +* df now displays the block size using powers of 1000 if the requested + block size seems to be a multiple of a power of 1000. +* nl no longer gets a segfault when run like this `yes|nl -s%n' + +[4.5.3] +* du --dereference-args (-D) no longer fails in certain cases +* `ln --target-dir=DIR' no longer fails when given a single argument + +[4.5.2] +* `rm -i dir' (without --recursive (-r)) no longer recurses into dir +* `tail -c N FILE' now works with files of size >= 4GB +* `mkdir -p' can now create very deep (e.g. 40,000-component) directories +* rmdir -p dir-with-trailing-slash/ no longer fails +* printf now honors the `--' command line delimiter +* od's 8-byte formats x8, o8, and u8 now work +* tail now accepts fractional seconds for its --sleep-interval=S (-s) option + +[4.5.1] +* du and ls now report sizes of symbolic links (before they'd always report 0) +* uniq now obeys the LC_COLLATE locale, as per POSIX 1003.1-2001 TC1. + +======================================================================== +Here are the NEWS entries made from fileutils-4.1 until the +point at which the packages merged to form the coreutils: + +[4.1.11] +* `rm symlink-to-unwritable' doesn't prompt [introduced in 4.1.10] +[4.1.10] +* rm once again gives a reasonable diagnostic when failing to remove a file + owned by someone else in a sticky directory [introduced in 4.1.9] +* df now rounds all quantities up, as per POSIX. +* New ls time style: long-iso, which generates YYYY-MM-DD HH:MM. +* Any time style can be preceded by "posix-"; this causes "ls" to + use traditional timestamp format when in the POSIX locale. +* The default time style is now posix-long-iso instead of posix-iso. + Set TIME_STYLE="posix-iso" to revert to the behavior of 4.1.1 thru 4.1.9. +* `rm dangling-symlink' doesn't prompt [introduced in 4.1.9] +* stat: remove support for --secure/-s option and related %S and %C format specs +* stat: rename --link/-l to --dereference/-L. + The old options will continue to work for a while. +[4.1.9] +* rm can now remove very deep hierarchies, in spite of any limit on stack size +* new programs: link, unlink, and stat +* New ls option: --author (for the Hurd). +* `touch -c no-such-file' no longer fails, per POSIX +[4.1.8] +* mv no longer mistakenly creates links to preexisting destination files + that aren't moved +[4.1.7] +* rm: close a hole that would allow a running rm process to be subverted +[4.1.6] +* New cp option: --copy-contents. +* cp -r is now equivalent to cp -R. Use cp -R -L --copy-contents to get the + traditional (and rarely desirable) cp -r behavior. +* ls now accepts --time-style=+FORMAT, where +FORMAT works like date's format +* The obsolete usage `touch [-acm] MMDDhhmm[YY] FILE...' is no longer + supported on systems conforming to POSIX 1003.1-2001. Use touch -t instead. +* cp and inter-partition mv no longer give a misleading diagnostic in some + unusual cases +[4.1.5] +* cp -r no longer preserves symlinks +* The block size notation is now compatible with SI and with IEC 60027-2. + For example, --block-size=1MB now means --block-size=1000000, + whereas --block-size=1MiB now means --block-size=1048576. + A missing `B' (e.g. `1M') has the same meaning as before. + A trailing `B' now means decimal, not binary; this is a silent change. + The nonstandard `D' suffix (e.g. `1MD') is now obsolescent. +* -H or --si now outputs the trailing 'B', for consistency with the above. +* Programs now output trailing 'K' (not 'k') to mean 1024, as per IEC 60027-2. +* New df, du short option -B is short for --block-size. +* You can omit an integer `1' before a block size suffix, + e.g. `df -BG' is equivalent to `df -B 1G' and to `df --block-size=1G'. +* The following options are now obsolescent, as their names are + incompatible with IEC 60027-2: + df, du: -m or --megabytes (use -BM or --block-size=1M) + df, du, ls: --kilobytes (use --block-size=1K) +[4.1.4] +* df --local no longer lists smbfs file systems whose name starts with // +* dd now detects the Linux/tape/lseek bug at run time and warns about it. +[4.1.3] +* ls -R once again outputs a blank line between per-directory groups of files. + This was broken by the cycle-detection change in 4.1.1. +* dd once again uses `lseek' on character devices like /dev/mem and /dev/kmem. + On systems with the linux kernel (at least up to 2.4.16), dd must still + resort to emulating `skip=N' behavior using reads on tape devices, because + lseek has no effect, yet appears to succeed. This may be a kernel bug. +[4.1.2] +* cp no longer fails when two or more source files are the same; + now it just gives a warning and doesn't copy the file the second time. + E.g., cp a a d/ produces this: + cp: warning: source file `a' specified more than once +* chmod would set the wrong bit when given symbolic mode strings like + these: g=o, o=g, o=u. E.g., `chmod a=,o=w,ug=o f' would give a mode + of --w-r---w- rather than --w--w--w-. +[4.1.1] +* mv (likewise for cp), now fails rather than silently clobbering one of + the source files in the following example: + rm -rf a b c; mkdir a b c; touch a/f b/f; mv a/f b/f c +* ls -R detects directory cycles, per POSIX. It warns and doesn't infloop. +* cp's -P option now means the same as --no-dereference, per POSIX. + Use --parents to get the old meaning. +* When copying with the -H and -L options, cp can preserve logical + links between source files with --preserve=links +* cp accepts new options: + --preserve[={mode,ownership,timestamps,links,all}] + --no-preserve={mode,ownership,timestamps,links,all} +* cp's -p and --preserve options remain unchanged and are equivalent + to `--preserve=mode,ownership,timestamps' +* mv and cp accept a new option: --reply={yes,no,query}; provides a consistent + mechanism to control whether one is prompted about certain existing + destination files. Note that cp's and mv's -f options don't have the + same meaning: cp's -f option no longer merely turns off `-i'. +* remove portability limitations (e.g., PATH_MAX on the Hurd, fixes for + 64-bit systems) +* mv now prompts before overwriting an existing, unwritable destination file + when stdin is a tty, unless --force (-f) is specified, as per POSIX. +* mv: fix the bug whereby `mv -uf source dest' would delete source, + even though it's older than dest. +* chown's --from=CURRENT_OWNER:CURRENT_GROUP option now works +* cp now ensures that the set-user-ID and set-group-ID bits are cleared for + the destination file when when copying and not preserving permissions. +* `ln -f --backup k k' gives a clearer diagnostic +* ls no longer truncates user names or group names that are longer + than 8 characters. +* ls's new --dereference-command-line option causes it to dereference + symbolic links on the command-line only. It is the default unless + one of the -d, -F, or -l options are given. +* ls -H now means the same as ls --dereference-command-line, as per POSIX. +* ls -g now acts like ls -l, except it does not display owner, as per POSIX. +* ls -n now implies -l, as per POSIX. +* ls can now display dates and times in one of four time styles: + + - The `full-iso' time style gives full ISO-style time stamps like + `2001-05-14 23:45:56.477817180 -0700'. + - The 'iso' time style gives ISO-style time stamps like '2001-05-14 ' + and '05-14 23:45'. + - The 'locale' time style gives locale-dependent time stamps like + 'touko 14 2001' and 'touko 14 23:45' (in a Finnish locale). + - The 'posix-iso' time style gives traditional POSIX-locale + time stamps like 'May 14 2001' and 'May 14 23:45' unless the user + specifies a non-POSIX locale, in which case it uses ISO-style dates. + This is the default. + + You can specify a time style with an option like --time-style='iso' + or with an environment variable like TIME_STYLE='iso'. GNU Emacs 21 + and later can parse ISO dates, but older Emacs versions cannot, so + if you are using an older version of Emacs outside the default POSIX + locale, you may need to set TIME_STYLE="locale". + +* --full-time is now an alias for "-l --time-style=full-iso". + + +======================================================================== +Here are the NEWS entries made from sh-utils-2.0 until the +point at which the packages merged to form the coreutils: + + [2.0.15] +* date no longer accepts e.g., September 31 in the MMDDhhmm syntax +* fix a bug in this package's .m4 files and in configure.ac + [2.0.14] +* nohup's behavior is changed as follows, to conform to POSIX 1003.1-2001: + - nohup no longer adjusts scheduling priority; use "nice" for that. + - nohup now redirects stderr to stdout, if stderr is not a terminal. + - nohup exit status is now 126 if command was found but not invoked, + 127 if nohup failed or if command was not found. + [2.0.13] +* uname and uptime work better on *BSD systems +* pathchk now exits nonzero for a path with a directory component + that specifies a non-directory + [2.0.12] +* kill: new program +* who accepts new options: --all (-a), --boot (-b), --dead (-d), --login, + --process (-p), --runlevel (-r), --short (-s), --time (-t), --users (-u). + The -u option now produces POSIX-specified results and is the same as + the long option `--users'. --idle is no longer the same as -u. +* The following changes apply on systems conforming to POSIX 1003.1-2001, + and are required by the new POSIX standard: + - `date -I' is no longer supported. Instead, use `date --iso-8601'. + - `nice -NUM' is no longer supported. Instead, use `nice -n NUM'. +* New 'uname' options -i or --hardware-platform, and -o or --operating-system. + 'uname -a' now outputs -i and -o information at the end. + New uname option --kernel-version is an alias for -v. + Uname option --release has been renamed to --kernel-release, + and --sysname has been renamed to --kernel-name; + the old options will work for a while, but are no longer documented. +* 'expr' now uses the LC_COLLATE locale for string comparison, as per POSIX. +* 'expr' now requires '+' rather than 'quote' to quote tokens; + this removes an incompatibility with POSIX. +* date -d 'last friday' would print a date/time that was one hour off + (e.g., 23:00 on *thursday* rather than 00:00 of the preceding friday) + when run such that the current time and the target date/time fall on + opposite sides of a daylight savings time transition. + This problem arose only with relative date strings like `last monday'. + It was not a problem with strings that include absolute dates. +* factor is twice as fast, for large numbers + [2.0.11] +* setting the date now works properly, even when using -u +* `date -f - < /dev/null' no longer dumps core +* some DOS/Windows portability changes + [2.0j] +* `date -d DATE' now parses certain relative DATEs correctly + [2.0i] +* fixed a bug introduced in 2.0h that made many programs fail with a + `write error' when invoked with the --version option + [2.0h] * all programs fail when printing --help or --version output to a full device -* cut no longer gets a segfault under some circumstances -* unexpand accepts new option: --first-only -[2.0e] -* `tail -f directory' no longer gets a failed assertion -* sort: big performance improvement when sorting many small files; - from Charles Randall -* configure and portability changes in m4/ and lib/ -[2.0d] -* preliminary sort performance improvements -* tsort now works more like the traditional UNIX tsort. Before it would - exit when it found a loop. Now it continues and outputs all items. -* unexpand no longer infloops on certain sequences of white space +* printf exits nonzero upon write failure +* yes now detects and terminates upon write failure +* date --rfc-822 now always emits day and month names from the `C' locale +* portability tweaks for Solaris8, Ultrix, and DOS + [2.0g] +* date now handles two-digit years with leading zeros correctly. +* printf interprets unicode, \uNNNN \UNNNNNNNN, on systems with the + required support; from Bruno Haible. +* stty's rprnt attribute now works on HPUX 10.20 +* seq's --equal-width option works more portably + [2.0f] +* fix build problems with ut_name vs. ut_user + [2.0e] +* stty: fix long-standing bug that caused test failures on at least HPUX + systems when COLUMNS was set to zero +* still more portability fixes * unified lib/: now that directory and most of the configuration framework is common between fileutils, textutils, and sh-utils -[2.0c] -* include lib/nanosleep.h. -[2.0b] -* portability tweaks for error.c vs. systems with deficient strerror_r -[2.0a] -* `tail --follow=name' no longer gets a failed assertion for a - dev,inode-reusing race condition -* sort and comm no longer consider newlines to be part of the line, - as this requirement will likely be removed from POSIX.2. - This undoes some changes made for textutils 1.22m and 1.22n. -* tail's (short only) -f option no longer accepts an optional argument, - so e.g., `tail -fn 2 file' works again. -* tail no longer refuses to operate on certain types of files -* fixed bug in tsort's handling of cycles - -Changes in release 2.0 -[1.22q] -* HPUX portability fix: md5sum would dump core due to use of libc's getline -[1.22p] -* portability fixes from Paul Eggert based largely on tar-1.13 reports -* `tail --pid=PID' now works even when PID belongs to some other user -[1.22o] -* tail accepts new option: --pid=PID -[1.22n] -* tail accepts the following new options (some of which were added in 1.22g): - --retry - --follow[={name|descriptor}] - --max-unchanged-stats=N - --max-consecutive-size-changes=N - --sleep-interval=S -* wc uses the POSIX-mandated output format when POSIXLY_CORRECT is set -* To maintain compatibility with sort, comm and join now obey the LC_COLLATE - locale, and comm now considers newlines to be part of the lines. -* use lib/memchr.c only if it's not provided by the system -- this means - that on systems with a fast library memchr function you may notice an - improvement. If you use a system with a buggy or signifcantly slower - memchr, please report it. -[1.22m] -* sort now considers newlines to be part of the line, as required by POSIX.2. - E.g. a line starting with a tab now sorts before an empty line, - since tab precedes newline in the ASCII collating sequence. -* sort handles NUL bytes correctly when configured/compiled with --enable-nls -* fix typos in my version of AC_SEARCH_LIBS. -* fix dates on config files so builders don't need autoconf/automake -[1.22l] -* sort no longer autodetects the locale of numbers and months, - as that conflicts with POSIX.2 -* `join -tC' now works when input contains trailing spaces -* portability tweaks for Irix's cc -[1.22k] -* `sort -n' works with negative numbers when configured/compiled - with --enable-nls -* head accepts byte and line counts of type uintmax_t (so up to 2^64 - 1) -[1.22j] -* tail: fix bug introduced in 1.22i -[1.22i] -* tail now terminates in `yes > k & sleep 1; tail -2c k' -* `tail -f' now ensures that stdout is unbuffered -* fix a bug in cut to allow use of 8-bit delimiters -* pr accepts POSIX compliant options -s and -w, - the new capital letter options -J, -S and _W turn off the - unexpected interferences of the small letter options -s and -w - if used together with the column options. -* pr output has been adapted to other UNIXes in some cases. -[1.22h] -* portability tweaks -* Window/NT/DOS support -[1.22g] -* uniq accepts new option: --all-repeated (-D). -* Windows/DOS portability fixes -* new program: tsort -* tail has several new options -* md5sum can handle file names with embedded backslash characters -* pr accepts long option names (see `pr --help') -* new program: ptx (moved to this package from being its own distribution) -[1.22f] -* cut accepts new --output-delimiter=STR option -* `sort -o no-such-file no-such-file' now fails, as it should -* fix pr bug: pr -td didn't double space -* fix tac bug when using -b, -r, and -s SEPARATOR -* fix sort bug whereby using key-local `d' option would cause following - key specs to be ignored when any two keys (in the `d'-modified test) - compared equal. -[1.22e] -* remove maintainer mode -[1.22d] -* wc accepts new option: --max-line-length (-L) -* sort can sort according to your locale if your C library supports that -[1.22c] -[1.22b] -* od supports a new trailing `z' character in a type specification: - $ od -tx1z . - 0000000 be ef c6 0f fd f9 d7 e0 ec cb f3 c6 00 db e8 00 >................< - 0000020 00 00 d2 00 00 00 00 00 00 00 00 00 00 00 00 00 >................< - 0000040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 >................< - * - 0000600 00 00 00 00 00 00 00 00 00 00 00 00 00 00 35 cc >..............5.< - 0000620 05 63 76 74 2e 6f 00 00 29 ac 08 70 72 6f 6a 65 >.cvt.o..)..proje< - 0000640 63 74 73 00 00 00 18 9a 05 63 76 74 2e 63 00 00 >cts......cvt.c..< - 0000660 18 d9 03 52 43 53 00 00 18 c0 05 78 2e 64 61 74 >...RCS.....x.dat< - -[1.22a] -* sort -c reports both the number and the contents of the first out-of-order - line, in addition to the file name. -* `head -c 4096m' is no longer treated just like `head -c 0' - now it gets a diagnostic about 4096m being too large. -* pr: For compatibility (also more POSIX compliant): Include default - separator `TAB' when merging lines of full length. -* When POSIXLY_CORRECT is not set, tail -N now accepts more than one file - argument, to be consistent with the way head -N works. If POSIXLY_CORRECT - is set, using two or more file arguments with the obsolescent form (-N) - evokes an error. To avoid the warning or failure, use the POSIX -n N option - or the GNU --lines=N option. - -Changes in release 1.22 -[1.21a] -* Fix a bug in tail when invoked with an argument like `+NUMBERc' -* Add test suite for tail - -Changes in release 1.21 -* Using --program-prefix no longer applies the prefix twice - -Changes in release 1.20 -* fix pr: -l now uses total number of lines per page also with -f -* fix pr: use left-hand-side truncation of header string to avoid line - overflow -* fix pr: it now accepts `form feeds set in input files', also with -m - and multiple form feeds at different pages in each file -* pr now accepts: -h "", print a blank line header -* pr: when skipping pages (+FIRST_PAGE option) line counting (-n option) - starts with 1st line of input file (not of 1st page printed) by default -* pr accepts new option: -N, start printing with an optional line number -* pr -t retains `form feeds set in input files' (`don't destroy page layout') -* pr accepts new option: -T, equivalent to -t, but eliminate also form feeds - (`clear file') -* pr accepts the extension: +FIRST_PAGE[:LAST_PAGE] -* pr -w and -s option disentangled (`use a separator' no longer destroys - column alignment) -* pr accepts new option: -j, merge lines of full length -* pr accepts the extension: -s[STRING], use separator string instead of - character only -* pr -b is no longer an independent option, balancing is always used - with -COLUMN (a requirement of unrestricted use of form feeds) -* pr accepts new option: --test, to run the pr tests with a constant - header string -* join passes all of its tests on Alpha OSF 4.0. -* sort no longer improperly ignores blanks in determining starting and ending - positions for keys with explicit character offsets -* fix bug in csplit with regexp and negative offset that led to infinite loop - Changes in test release 1.19q -* fix bug in sort -c that sometimes resulted in a segfault - Changes in test release 1.19p -* md5sum's --string option is being deprecated and is no longer documented. - It is still accepted, but will be removed altogether in 1.22. -* tr '[:lower:]' '[:upper:]' no longer fails when LC_CTYPE is set to - iso_8859_1 on Solaris -- or any other character set with differing - numbers of uppercase and lowercase characters -* split and tail diagnose unrecognized multiplier suffixes, in e.g., - `split --bytes=1M' (should be `-b 1m' or `--bytes=1m') -* fix bug in md5sum's handling of partial reads -* fix bug in treatment by sort -f of bytes with high-bit set -* update configuration system to use automake's aclocal program -* configure performs sanity check on CC and CFLAGS to avoid a misleading - failure that suggested cross-compiling was the cause -* distribute test suites for cut, join, sort, and tr -* unexpand no longer gets in endless loop -* when verifying checksums, md5sum uses the binary mode flag from the - input stream rather than the one from the command line - -Changes in release 1.19 -* md5sum can verify digests of files with names containing newline characters -* update from gettext-0.10.20. - -Changes in release 1.18 -* when building sort, link with -lm on systems that use the replacement strtod -* update from gettext-0.10.17. - -Changes in release 1.17 -* include texinfo.tex in the distribution - -Changes in release 1.16 -* sort is compatible with Unix sort when a key-end spec refers to the N'th - character in a field that has fewer than N characters -* tail with old-style options like -20k and +31m operates on units of bytes, - as the --help usage message says. Before, it used units of lines. - -Changes in release 1.15 -* od gives better diagnostics for invalid format specs -* uses automake-generated Makefile templates -* configure takes a new option: --enable-maintainer-mode -* fix a bug in fmt when prefix has trailing white space -* internationalized diagnostic messages -* fix a couple bugs in tr involving use of -c and/or -d flags -- see ChangeLog -* diagnose some improper or questionable invocations of csplit -* properly handle `echo |csplit - 1 1', rather than aborting -* fix join: without -t it now ignores leading blanks -* sort accepts new option: -z for NUL terminated records -* join accepts new option: --ignore-case, -i -* uniq accepts new option: --ignore-case, -i - -User-visible changes in release 1.14 -* sort -i and sort -d properly order strings containing ignored characters -* nl: rename misleading --first-page=N option to --starting-line-number=N. -* sort diagnoses invalid arguments to -k, then fails -* sort -n properly orders invalid integers with respect to valid integers -* sorting works with character offsets larger than corresponding field width -* sort's -b option and `b' modifier work -* sort -k2,2 works. -* csplit detects integer overflow when converting command line arguments -* sort accepts new option/flag, -g, for sorting numbers in scientific notation -* join accepts POSIX `-o 0' field specifier. -* tr 'a[b*512]' '[a*]' < /dev/null terminates -* tr '[:*3][:digit:]' 'a-m' and tr 'a[=*2][=c=]' 'xyyz' no longer fail -* special characters in tr's string1 and string2 may be escaped with backslash - -User-visible changes in release 1.13 -* md5sum: with --check, distinguish between open/read failure and bad checksum -* md5sum: remove -h, -s, -v short options -* md5sum: rename --verbose to --warn, --quiet to --status -* md5sum --check fails if it finds no properly formatted checksum lines -* sort -c prints `disorder on...' message on standard error, not stdout -* sort -k works as described in the texinfo documentation -* tail works on NetBSD -* md5sum reads and writes (de facto) standard Plumb/Lankester format -* sort accepts -.1 +.2 options for compatibility -* od works properly when dump limit is specified and is a multiple of - bytes_per_block (set by --width, 16 by default). - -User-visible changes in release 1.12 -* sort no longer reports spurious errors on Ultrix systems -* new program: md5sum -* all --help messages have been improved -* join's -a1 and -a2 options work -* tr '[:upper:]' '[:lower:]' no longer reads uninitialized memory -* sort properly handles command line arguments like `+7.2n' -* fmt properly formats paragraphs not terminated by a newline -* tail -f flushes stdout before sleeping so that it will output partial - lines sooner -* sort properly orders fields where one field is a proper prefix of the other -* sort properly interprets field offsets specified via the -k option -* dd, od, and tail work on systems for which off_t is long long (e.g. BSD4.4) -* wc is faster when not counting words -* wc now works even when file pointer isn't at beginning of file -* expand no longer seg faults with very long tab lists - -User-visible changes in release 1.11 -* fmt is built - -User-visible changes in release 1.10 -* skeletal texinfo documentation (mainly just the `invoking' nodes) -* new program: fmt -* tail -f on multiple files reports file truncation -* tail -q has been fixed so it never prints headers -* wc -c is much faster when operating on non-regular files -* unexpand gives a diagnostic (rather than a segfault) when given a name of - a nonexistent file. -* cat, csplit, head, split, sum, tac, tail, tr, and wc no longer fail - gratuitously when continued after a suspended read or write system call. -* cut interprets -d '' to mean `use the NUL byte as the delimiter' rather - than reporting that no delimiter was specified and failing. -* `echo a:b:c: | cut -d: -f3,4' prints `c:'. Before it printed just `c'. -* cut has been rewritten, is markedly faster for large inputs, and passes a - fairly large test suite. -* sort properly handles the argument to the -T option. - -Major changes in release 1.9.1: -* cut no longer ignores the last line of input when that line lacks a - trailing newline character - -Major changes in release 1.9: -* `echo a:b:c: | cut -d: -f3-' prints `c:' and - `echo a:b | cut -d: -f1' prints `a'. -* the command `printf '\t\n' |fold -w n' now terminates. - Before, it wouldn't stop for n less than 8. -* sort accepts and ignores -y[string] options for compatibilty with Solaris. -* cat -v /dev/null works on more systems -* od's --compatible (-C) flag renamed to --traditional (no short option) -* --help and --version exit successfully -* --help gives a one-line description of each option and shows the - correspondence between short and long-named options. -* fix bug in cut. Now `echo 'a:b:c:' | cut -d: -f3-' works. - Before it printed `c' instead of `c:' -* csplit allows repeat counts to be specified via `{*}'. -* csplit accepts a new option, --suffix=format that supercedes the - --digits option. The --digits option will continue to work. -* csplit accepts a new option, --elide-empty-files. -* configure uses config.h, so DEFS won't exceed preprocessor limits of - some compilers on the number of symbols defined via -D. -* work around problem where $(srcdir)/config.h was used instead of - ../config.h -- this happened only when building in a subdirectory - and when config.h remained in $(srcdir) from a previous ./configure. - -Major changes in release 1.8: -* added non-ANSIfied version of memchr.c from GNU libc. - -Major changes in release 1.7: -* none -Major changes in release 1.6: -* with the --version option programs print the version and exit immediately -* pr -2a really terminates -* pr -n produces multi-column output - -Major changes in release 1.5: -* sort is 8-bit clean -* sort's -n and -M options no longer imply -b -* several bugs in sort have been fixed -* all programs accept --help and --version options -* od --compatible accepts pre-POSIX arguments -* pr -2a terminates - -Major changes in release 1.4: -* add od and cksum programs -* move cmp to GNU diff distribution -* tail -f works for multiple files -* pr prints the file name in error messages -* fix some off by 1 errors in pr and fold -* optimize wc -c on regular files -* sort handles `-' argument correctly -* sort supports -T option -* tr ranges like a-a work -* tr x '' fails gracefully -* default sum output format is BSD compatible -* paste -d '' works + [2.0d] +* fix portability problem with sleep vs lib/strtod.c's requirement for -lm + [2.0c] +* fix portability problems with nanosleep.c and with the new code in sleep.c + [2.0b] +* Regenerate lib/Makefile.in so that nanosleep.c is distributed. + [2.0a] +* sleep accepts floating point arguments on command line +* sleep's clock continues counting down when sleep is suspended +* when a suspended sleep process is resumed, it continues sleeping if + there is any time remaining +* who once again prints whatever host information it has, even without --lookup + +======================================================================== +For older NEWS entries for the fileutils, textutils, and sh-utils +packages, see ./old/*/NEWS. + + This package began as the union of the following: + textutils-2.1, fileutils-4.1.11, sh-utils-2.0.15. diff --git a/contrib/gnu-sort/README b/contrib/gnu-sort/README index e2fb18e34228..0de53059cbbc 100644 --- a/contrib/gnu-sort/README +++ b/contrib/gnu-sort/README @@ -1,41 +1,147 @@ -These are the GNU text file (actually, file contents) processing -utilities. Most of these programs have significant advantages over -their Unix counterparts, such as greater speed, additional options, -and fewer arbitrary limits. +These are the GNU core utilities. This package is the union of +the GNU fileutils, sh-utils, and textutils packages. -The programs that can be built with this package are: cat, cksum, comm, -csplit, cut, expand, fmt, fold, head, join, md5sum, nl, od, paste, pr, ptx -sha1sum, sort, split, sum, tac, tail, tr, tsort, unexpand, uniq, and wc. +Most of these programs have significant advantages over their Unix +counterparts, such as greater speed, additional options, and fewer +arbitrary limits. + +The programs that can be built with this package are: + + [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd + df dir dircolors dirname du echo env expand expr factor false fmt fold + ginstall groups head hostid hostname id join kill link ln logname ls + md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr + printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort + split stat stty su sum sync tac tail tee test touch tr true tsort tty + uname unexpand uniq unlink uptime users vdir wc who whoami yes See the file NEWS for a list of major changes in the current release. See the file INSTALL for compilation and installation instructions. -I M P O R T A N T: +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 +programs to things like gls, gnuls, l, etc. Renaming a program +file shouldn't affect how it operates, so that people can get the +behavior they want with whatever name they want. + +Special thanks to Paul Eggert, Brian Matthews, Bruce Evans, Karl Berry, +Kaveh Ghazi, and François Pinard for help with debugging and porting +these programs. Many thanks to all of the people who have taken the +time to submit problem reports and fixes. All contributed changes are +attributed in the ChangeLog file. + +And thanks to the following people who have provided accounts for +portability testing on many different types of systems: Bob Proulx, +Christian Robert, François Pinard, Greg McGary, Harlan Stenn, +Joel N. Weber, Mark D. Roth, Matt Schalit, Nelson H. F. Beebe, +Réjean Payette, Sam Tardieu. + +Thanks to Michael Stone for inflicting test releases of the fileutils +on Debian's unstable distribution, and to all the kind folks who used +that distribution and found and reported bugs. + +Note that each man page is now automatically generated from a template +and from the corresponding --help usage message. Patches to the template +files (man/*.x) are welcome. However, the authoritative documentation +is in texinfo form in the doc directory. + +If you run the tests on a SunOS4.1.4 system, expect the ctime-part of +the ls `time-1' test to fail. I believe that is due to a bug in the +way Sun implemented link(2) and chmod(2). + +*************************************** +Last-minute notes, before coreutils-5.0 +--------------------------------------- + +A known problem exists when compiling on HPUX on both hppa and ia64 +in 64-bit mode (i.e. +DD64) on all known HPUX 11.x versions. This +is not due to a bug in the package but instead due to a bug in the +system header file which breaks things in 64-bit mode. The default +compilation mode is 32-bit and the software compiles fine using the +default mode. To build this software in 64-bit mode you will need +to fix the system /usr/include/inttypes.h header file. After +correcting that file the software also compiles fine in 64-bit mode. +Here is one possible patch to correct the problem. + +--- /usr/include/inttypes.h.orig Thu May 30 01:00:00 1996 ++++ /usr/include/inttypes.h Sun Mar 23 00:20:36 2003 +@@ -489 +489 @@ +-#ifndef __STDC_32_MODE__ ++#ifndef __LP64__ + +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. + +*************************************** + +There are pretty many tests, but nowhere near as many as we need. +Additions and corrections are very welcome. + +If you see a problem that you've already reported, feel free to re-report +it -- it won't bother me to get a reminder. Besides, the more messages I +get regarding a particular problem the sooner it'll be fixed -- usually. +If you sent a complete patch and, after a couple weeks you haven't +received any acknowledgement, please ping us. A complete patch includes +a well-written ChangeLog entry, unified (diff -u format) diffs relative +to the most recent test release (or, better, relative to the latest +sources in the CVS repository), an explanation for why the patch is +necessary or useful, and if at all possible, enough information to +reproduce whatever problem prompted it. Plus, you'll earn lots of +karma if you include a test case to exercise any bug(s) you fix. +Instructions for checking out the latest source via CVS are here: + + http://savannah.gnu.org/cvs/?group=coreutils + + +If your patch adds a new feature, please try to get some sort of consensus +that it is a worthwhile change. One way to do that is to send mail to +bug-coreutils@gnu.org including as much description and justification +as you can. Based on the feedback that generates, you may be able to +convince us that it's worth adding. + - Some Cray C compilers lack support for a 32-bit arithmetic type. - Since gettext requires such a type, you should use the --disable-nls - option when invoking configure on such systems. +WARNING: If you modify files like configure.in, m4/*.m4, aclocal.m4, +or any Makefile.am, then don't be surprised if what gets regenerated no +longer works. To make things work, you'll have to be using appropriate +versions of automake and autoconf. As for what versions are `appropriate', +use the versions of -The textutils are intended to be POSIX.2 compliant (with BSD and other -extensions), like the rest of the GNU system. They are almost there, -but a few incompatibilities remain. + * autoconf specified via AC_PREREQ in m4/jm-macros.m4 + * automake specified via AM_INIT_AUTOMAKE in configure.ac -Note that the man pages are now automatically generated from templates -and from the --help usage message. Patches to the template files (man/*.x) -are welcome. However, the authoritative documentation is in texinfo form -in the doc directory. +Usually it's fine to use versions that are newer than those specified. These programs all recognize the `--version' option. When reporting bugs, please include in the subject line both the package name/version and the name of the program for which you found a problem. For general documentation on the coding and usage standards -this distribution follows, see the GNU standards document -http://www.gnu.org/prep/standards.html, and the documentation -for automake and autoconf: -http://www.gnu.org/software/autoconf/autoconf.html, -http://www.gnu.org/software/automake/automake.html. +this distribution follows, see the GNU Coding Standards, +http://www.gnu.org/prep/standards_toc.html. Mail suggestions and bug reports for these programs to -bug-textutils@gnu.org. +the address on the last line of --help output. diff --git a/contrib/gnu-sort/THANKS b/contrib/gnu-sort/THANKS index 25dfff890a04..4b8bfbdd68a2 100644 --- a/contrib/gnu-sort/THANKS +++ b/contrib/gnu-sort/THANKS @@ -1,11 +1,12 @@ -These people have contributed to the GNU fileutils, textutils, -and/or sh-utils packages. Some have reported problems, others have -contributed improvements to the documentation, actual code, and even +These people have contributed to the GNU coreutils (formerly, the fileutils, +textutils, and/or sh-utils packages). Some have reported problems, others +have contributed improvements to the documentation, actual code, and even complete programs. Those contributions are described in the ChangeLog 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. -Some old names and addresses are still in the ChangeLog. +??? 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 @@ -18,6 +19,7 @@ aldomel aldomel@ix.netcom.com Alen Muzinic zveki@fly.cc.fer.hr Alexandre Duret-Lutz duret_g@epita.fr Alexey Solovyov alekso@math.uu.se +Alexey Vyskubov alexey@pippuri.mawhrin.net Alfred M. Szmidt ams@kemisten.nu Andi Kleen freitag@alancoxonachip.com Andre Novaes Cunha Andre.Cunha@br.global-one.net @@ -26,25 +28,37 @@ Andreas Jaeger jaeger@gnu.org Andreas Luik luik@isa.de Andreas Schwab schwab@suse.de Andreas Stolcke stolcke@ICSI.Berkeley.EDU +Andrei Gaponenko andr@triumf.ca Andres Soolo andres@soolo.matti.ee Andrew Burgess aab@cichlid.com Andrew Dalke dalke@bioreason.com Andrew Pham andpha@us.ibm.com Andrew Tridgell tridge@samba.org +Andrey Borzenkov arvidjaar@mail.ru Andries Brouwer Andries.Brouwer@cwi.nl Andy Longton alongton@metamark.com Antonio Rendas ajrendas@yahoo.com Ariel Faigon ariel@cthulhu.engr.sgi.com Arne H. Juul arnej@solan.unit.no Arne Henrik Juul arnej@imf.unit.no +Arnold Robbins arnold@skeeve.com Arthur Pool pool@commerce.uq.edu.au +Arun Sharma arun.sharma@intel.com +Arvind Autar Autar022@planet.nl +Augey Mikus mikus@dqc.org Austin Donnelly Austin.Donnelly@cl.cam.ac.uk Axel Kittenberger Anshil@gmx.net Bauke Jan Douma bjdouma@xs4all.nl +Ben Elliston bje@air.net.au +Ben Harris bjh21@netbsd.org Bengt Martensson bengt@mathematik.uni-Bremen.de +Bernard Giroud bernard.giroud@creditlyonnais.ch Bernd Leibing bernd.leibing@rz.uni-ulm.de +Bernd Melchers melchers@cis.fu-berlin.de Bernhard Baehr bernhard.baehr@gmx.de +Bernhard Gabler bernhard@uni-koblenz.de Bernhard Rosenkraenzer bero@redhat.de +Bert Deknuydt Bert.Deknuydt@esat.kuleuven.ac.be Bill Peters peters@gaffel.as.arizona.edu Bjorn Helgaas helgaas@rsn.hp.com Bob McCracken kerouac@ravenet.com @@ -53,6 +67,8 @@ Branden Robinson branden@necrotic.deadbeast.net 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 @@ -62,6 +78,7 @@ Charles Randall crandall@matchlogic.com Chip Salzenberg chip@valinux.com Chris Faylor cgf@cygnus.com Chris J. Bednar cjb@AdvancedDataSolutions.com +Chris Lesniewski ctl@mit.edu Chris Sylvain csylvain@umm.edu Chris Yeo cyeo@biking.org Christi Alice Scarborough christi@chiark.greenend.org.uk @@ -71,29 +88,41 @@ 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 +Cray-Cyber Project http://www.cray-cyber.org Dale Scheetz dwarf@polaris.net 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 +David Eisner cradle@umd.edu +David Flynn dav@chess.plus.com 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 Dirk-Jan Faber djfaber@snow.nl -Dan Jacobson http://www.geocities.com/jidani +Dmitry Rutsky rutsky@school.ioffe.rssi.ru +Dmitry V. Levin ldv@altlinux.org Don Parsons dparsons@synapse.kent.edu Donni Erpel donald@appc11.gsi.de +Doug Coleman coleman@iarc1.ece.utexas.edu Doug McLaren dougmc@comco.com Dragos Harabor dharabor@us.oracle.com -Ed Avis epa98@doc.ic.ac.uk +Duncan Roe duncanr@optimation.com.au +Ed Avis ed@membled.com Edzer Pebesma Edzer.Pebesma@rivm.nl Eirik Fuller eirik@hackrat.com Eivind eivindt@multinet.no @@ -106,34 +135,41 @@ Eric S. Raymond esr@snark.thyrsus.com Erik Bennett bennett@cvo.oneworld.com Erik Corry erik@kroete2.freinet.de Felix Lee flee@teleport.com +Ferdinand fw@scenic.mine.nu Fletcher Mattox fletcher@cs.utexas.edu Florin Iucha fiucha@hsys.mic.ro +François Pinard pinard@iro.umontreal.ca Frank Adler fadler@allesklar.de Frank T Lofaro ftlofaro@snooks.Egr.UNLV.EDU -François Pinard pinard@iro.umontreal.ca Fred Fish fnf@ninemoons.com -Frederik Eaton frederik@caltech.edu Frédéric L. W. Meunier 0@pervalidus.net +Frederik Eaton frederik@caltech.edu 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 -Gaël Quéri gqueri@mail.dotcom.fr +Geoff Collyer geoff at collyer.net Geoff Kuenning geoff@cs.hmc.edu Geoff Odhner geoff@franklin.com Geoff Whale geoffw@cse.unsw.EDU.AU Gerhard Poul gpoul@gnu.org Germano Leichsenring germano@jedi.cs.kobe-u.ac.jp +Göran Uddeborg goeran@uddeborg.pp.se GOTO Masanori gotom@debian.or.jp Greg Louis glouis@dynamicro.on.ca Greg McGary gkm@gnu.org +Greg Schafer gschafer@zip.com.au Greg Troxel gdt@bbn.com Greg Wooledge gawooledge@sherwin.com Gregory Leblanc gleblanc@cu-portland.edu -Göran Uddeborg goeran@uddeborg.pp.se H. J. Lu hjl@valinux.com +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 @@ -143,6 +179,8 @@ Ian Jackson ijackson@chiark.greenend.org.uk Ian Lance Taylor ian@cygnus.com Ian Turner vectro@pipeline.com Iida Yosiaki iida@gnu.org +Ingo Saitz ingo@debian.org +Ivo Timmermans ivo@debian.org James james@albion.glarp.com James Antill jmanti%essex.ac.uk@seralph21.essex.ac.uk James Sneeringer jvs@ocslink.com @@ -153,17 +191,20 @@ Jan Fedak J.Fedak@sh.cvut.cz Jan Nieuwenhuizen janneke@gnu.org 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@erols.com +Jeff Sheinberg jeff@bsrd.net +Jens Elkner elkner@imsgroup.de Jens Schmidt jms@jsds.hamburg.com Jerome Abela abela@hsc.fr +Jérôme Zago bug-coreutils-ml@agt-the-walker.net Jesse Thilo jgt2@eecs.lehigh.edu Jie Xu xuj@iag.net Jim Blandy jimb@cyclic.com Jim Dennis jimd@starshine.org Joakim Rosqvist dvljrt@cs.umu.se Jochen Hein jochen@jochen.org -Joe Orton joe@orton.demon.co.uk +Joe Orton joe@manyfish.co.uk Johan Danielsson joda@pdc.kth.se John Bley jbb6@acpub.duke.edu John David Anglin dave.anglin@nrc.ca @@ -181,27 +222,32 @@ 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-Uwe Rommel rommel@informatik.tu-muenchen.de Kai Henningsen kai@debian.org -Kalle Olavi Niemitalo tosi@stekt.oulu.fi +Kai-Uwe Rommel rommel@informatik.tu-muenchen.de +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 Karl-Michael Schneider schneide@phil.uni-passau.de Karsten Thygesen karthy@kom.auc.dk Kaveh R. Ghazi ghazi@caip.rutgers.edu +Keith M. Briggs keith.briggs@bt.com Keith Owens kaos@audio.apana.org.au -Keith Thompson kst@sdsc.edu +Keith Thompson kst@cts.com Ken Pizzini kenp@halcyon.com +Kristin E Thomas kristint@us.ibm.com Kjetil Torgrim Homme kjetilho@ifi.uio.no Kristoffer Rose kris@diku.dk -??? kytek@cybercomm.net 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 Lorne Baker lbaker@nitro.avint.net +Luke Hassell lukehassell@yahoo.com M. P. Suzuki mpsuzuki@hiroshima-u.ac.jp Maciej Kwapulinski pikpok@univ.gda.pl Manas Garg manas@cygsoft.com @@ -212,15 +258,18 @@ 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 Markus Demleitner msdemlei@auriga.ari.uni-heidelberg.de Martin martin@dresden.nacamar.de +Martin Buck martin.buck@ascom.ch Martin Gallant martyg@goodbit.net Martin Hippe martin.hippe@schlund.de Martin Michlmayr tbm@cyrius.com @@ -232,50 +281,70 @@ 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 Matthew S. Levine mslevine@theory.lcs.mit.edu Matthew Smith matts@bluesguitar.org Matthew Swift swift@alum.mit.edu -Mattias Wadenstein maswan@acc.umu.se Matthias Urlichs smurf@noris.de +Matti Aarnio matti.aarnio@zmailer.org +Mattias Wadenstein maswan@acc.umu.se 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 Michael Stutz stutz@dsl.org +Michael van Elst mlelstv@dev.de.cw.net Michael Veksler mveksler@techunix.technion.ac.il +Michail Litvak mci@owl.openwall.com +Michal Svec msvec@suse.cz Michel Robitaille robitail@IRO.UMontreal.CA Michiel Bacchiani bacchian@raven.bu.edu Mike Castle dalgoda@ix.netcom.com +Mike Coleman mkc@mathdogs.com +Mike Jetzer mjetzer@mke.catalystwms.com +Mikko Tuumanen m@sorvankyla.yok.utu.fi Miles Bader miles@gnu.ai.mit.edu Minh Tran-Le tranle@intellicorp.com 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 Olav Morkrid olav@funcom.com Ole Laursen olau@hardworking.dk -Oskar Liljeblad osk@hem.passagen.se +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 @@ -284,6 +353,7 @@ Phelippe Neveu pneveu@pcigeomatics.com Phil Richards phil.richards@vf.vodafone.co.uk Philippe De Muyter phdm@macqel.be Philippe Schnoebelen Philippe.Schnoebelen@imag.fr +Phillip Jones mouse@datastacks.com Piergiorgio Sartor sartor@sony.de Piotr Kwapulinski kwap@univ.gda.pl Prashant TR tr@eth.net @@ -291,43 +361,63 @@ Rainer Orth ro@TechFak.Uni-Bielefeld.DE 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 Rick Sladkey jrs@world.std.com Rik Faith faith@cs.unc.edu Risto Kankkunen kankkune@lingsoft.fi Robert H. de Vries robert@and.nl +Robert Millan zeratul2@wanadoo.es Rogier Wolff R.E.Wolff@BitWizard.nl Roland Huebner ro-huebner@gmx.de +Roland Turner raz@raz.cx Ronald F. Guilmette rfg@netcom.com Ross Alexander r.alexander@auckland.ac.nz Ross Paterson rap@doc.ic.ac.uk Ross Ridge rridge@calum.csclub.uwaterloo.ca Sami Farin sfarin@ratol.fi +Samuel Tardieu sam@rfc1149.net Samuli Karkkainen Samuli.Karkkainen@hut.fi Sander van Malssen svm@kozmix.ow.nl Santiago Vila Doncel sanvila@unex.es Savochkin Andrey Vladimirovich saw@msu.ru Scott Lurndal slurn@griffin.engr.sgi.com +Shing-Shong Shei shei@cs.indiana.edu Soeren Sonnenburg sonnenburg@informatik.hu-berlin.de +Solar Designer solar@owl.openwall.com +Stanislav Ievlev inger@altlinux.ru Stéphane Chazelas Stephane_CHAZELAS@yahoo.fr +Stephen Depooter sbdep@myrealbox.com Stephen Eglen eglen@pcg.wustl.edu Stephen Gildea gildea@stop.mail-abuse.org -Stephen Smoogen ?????????? +Stephen Smoogen smooge@mindspring.com Steve McConnel steve@acadcomp.sil.org +Steven G. Johnson stevenj@alum.mit.edu +Steven Mocking ufo@quicknet.nl +Steven P Watson steven@magelico.net Stuart Kemp skemp@peter.bmc.com +Szakacsits Szabolcs szaka@sienet.hu Tadayoshi Funaba tadf@kt.rim.or.jp 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 Tim Smithers mouse@dmouse.com.au 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 @@ -341,6 +431,8 @@ 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 Werner Almesberger Werner.Almesberger@epfl.ch @@ -349,7 +441,9 @@ Will Edgington wedgingt@acm.org William Bader william@nscs.fast.net William Dowling will@franklin.com William Lewis wiml@omnigroup.com +wiregauze wiregauze@yahoo.com Wojciech Purczynski cliph@isec.pl Wolfram Kleff kleff@cs.uni-bonn.de Won-kyu Park wkpark@chem.skku.ac.kr +Yann Dirson dirson@debian.org Zvi Har'El rl@math.technion.ac.il diff --git a/contrib/gnu-sort/THANKS-to-translators b/contrib/gnu-sort/THANKS-to-translators new file mode 100644 index 000000000000..c84ff647b57e --- /dev/null +++ b/contrib/gnu-sort/THANKS-to-translators @@ -0,0 +1,36 @@ +The following teams have translated the many diagnostics of this +package into many different languages. Thank you! + +--- +http://www.iro.umontreal.ca/contrib/po/HTML/team-af.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-be.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-ca.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-cs.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-da.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-de.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-el.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-es.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-et.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-fi.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-fr.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-ga.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-gl.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-hu.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-it.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-ja.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-ko.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-lg.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-ms.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-nb.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-nl.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-no.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-pl.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-pt.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-pt_BR.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-ru.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-sk.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-sl.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-sv.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-tr.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-zh_CN.html +http://www.iro.umontreal.ca/contrib/po/HTML/team-zh_TW.html diff --git a/contrib/gnu-sort/TODO b/contrib/gnu-sort/TODO index a102576fb508..b3a2fa3bdc72 100644 --- a/contrib/gnu-sort/TODO +++ b/contrib/gnu-sort/TODO @@ -1,93 +1,169 @@ -Tasks for GNU textutils (listed in no particular order): +restore djgpp, eventually +merge TODO lists +add unit tests for lib/*.c - write texinfo documentation for sha1sum +strip: add an option to specify the program used to strip binaries. + suggestion from Karl Berry - Something that I would really appreciate is if someone would run the - Open Group's VSC-lite test suite against the fileutils and textutils - and report the failures. +doc/coreutils.texi: + Address this comment: FIXME: mv's behavior in this case is system-dependent + Better still: fix the code so it's *not* system-dependent. - http://www.opengroup.org/testing/downloads/vsclite.html +implement --target-directory=DIR for install (per texinfo documentation) - I've been meaning to do it myself for months, but haven't found the time. - There's a bit of set-up required, some of which requires root access, e.g., - to create a few test user accounts and some test groups. - ------------------ +ls: add --format=FORMAT option that controls how each line is printed. - uniq: remove support for obsolescent +N syntax +cp --no-preserve=X should not attempt to preserve attribute X + reported by Andreas Schwab - add tests for od - add some endian-aware tests for od +copy.c: Address the FIXME-maybe comment in copy_internal. +And once that's done, add an exclusion so that `cp --link' +no longer incurs the overhead of saving src. dev/ino and dest. filename +in the hash table. - tac: Set DONT_UNLINK_WHILE_OPEN when necessary. +See if we can be consistent about where --verbose sends its output: + These all send --verbose output to stdout: + head, tail, rm, cp, mv, ln, chmod, chown, chgrp, install, ln + These send it to stderr: + shred mkdir split + readlink is different - tail: add an option so that using -f on N files doesn't monopolize - N file descriptors +Write an autoconf test to work around build failure in HPUX's 64-bit mode. +See notes in README -- and remove them once there's a work-around. - tac: add options to help handle boundary cases - E.g., options to distinguish DELIM_STRING is - - starter (see existing --before option) - - terminator (this is what most people expect wrt NEWLINE - - separator (this would make `echo -n a:b:c|tac -s:' print `c:b:a') +Integrate use of sendfile, suggested here: + http://mail.gnu.org/archive/html/bug-fileutils/2003-03/msg00030.html +I don't plan to do that, since a few tests demonstrate no significant benefit. - tail: support -r option by librarifying tac and using that +Should printf '\0123' print "\n3"? + per report from TAKAI Kousuke on Mar 27 + http://mail.gnu.org/archive/html/bug-coreutils/2003-03/index.html - cut: maybe add an option to say `fields are separated by whitespace'. - Of course, that isn't really necessary because you can preprocess - cut's input with tr to get the same effect: +printf: consider adapting builtins/printf.def from bash - echo 'a b c' |tr -s '[:blank:]' | cut -d ' ' -f 2 +df: add `--total' option, suggested here http://bugs.debian.org/186007 ------------- +seq: give better diagnostics for invalid formats: + e.g. no or too many % directives +seq: consider allowing format string to contain no %-directives - From: kwzh@gnu.ai.mit.edu (Karl Heuer) - Subject: [textutils-1.22] [sort] feature requests - To: textutils-bugs@gnu.ai.mit.edu - Date: Thu, 5 Jun 97 13:06:51 -0400 +dd: consider adding an option to suppress `bytes/block read/written' +output to stderr. Suggested here: + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=165045 - [...] - Another feature that I would sometimes find useful: change -c so that - it will report up to N instances of disorder before bailing out, where - N defaults to 1 but can be set to infinity or to some finite value by - another option. (An "instance of disorder" is two adjacent lines that - are malsorted; this does not imply that swapping them or removing one - or both would cause the list to be sorted. (1 3 5 7 9 0 2 4 6 8) has - just one instance of disorder.) +m4: rename all macros that start with AC_ to start with another prefix ------------- +resolve RH report on cp -a forwarded by Tim Waugh - Date: Fri, 1 May 1998 20:27:39 -0700 (PDT) - From: Paul Rubin <phr@netcom.com> - To: gnu@gnu.org - Subject: small project suggestion +Martin Michlmayr's patch to provide ls with `--sort directory' option - Someone should rewrite the "sum" utility to give a choice of - different checksum algorithms (it's poorly organized for that now). - An experienced programmer could probably do it in a day or so, - or it might be a good, self-contained project for someone who is - just getting started. +tail: don't use xlseek; it *exits*. + Instead, maybe use a macro and return nonzero. - Algorithms that it should include are: - -- the POSIX algorithm - -- the BSD algorithm - -- CRC32 algorithm (used by pkzip) - -- CRC16 (used in TCP/IP) - -- possibly other CRC's (like the different CCITT polynomials) - -- SHA-1 and MD5 cryptographic hashes (replacing "md5sum"). - and possibly: - -- DSA digital signature based on secret key generated from - a passphrase (prompt the user, or read an environment variable). +add mktemp? Suggested by Nelson Beebe +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 -comm: add an option-enable check for sortedness of input files +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 -uniq: add a more flexible key selection mechanism +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. ---------------------- +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 -Charles Randall <crandall@matchlogic.com> -is working on making sort more suitable and efficient for very -large sets of input data. +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 + + +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. + [I now have a patch adding --from0-file for du] + + 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. + + A more efficient version of factor, and possibly one that + accepts inputs of size 2^64 and larger. + + 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 diff --git a/contrib/gnu-sort/lib/__fpending.c b/contrib/gnu-sort/lib/__fpending.c new file mode 100644 index 000000000000..a872102abf8a --- /dev/null +++ b/contrib/gnu-sort/lib/__fpending.c @@ -0,0 +1,30 @@ +/* __fpending.c -- return the number of pending output bytes on a stream + Copyright (C) 2000 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Written by Jim Meyering. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#include "__fpending.h" + +size_t +__fpending (FILE *fp) +{ + return PENDING_OUTPUT_N_BYTES; +} diff --git a/contrib/gnu-sort/lib/__fpending.h b/contrib/gnu-sort/lib/__fpending.h new file mode 100644 index 000000000000..5a5158216c1a --- /dev/null +++ b/contrib/gnu-sort/lib/__fpending.h @@ -0,0 +1,17 @@ +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#include <stddef.h> +#include <stdio.h> + +#if HAVE_STDIO_EXT_H +# include <stdio_ext.h> +#endif + +#ifndef HAVE_DECL___FPENDING +"this configure-time declaration test was not run" +#endif +#if !HAVE_DECL___FPENDING +size_t __fpending (FILE *); +#endif diff --git a/contrib/gnu-sort/lib/argmatch.c b/contrib/gnu-sort/lib/argmatch.c index 005be881f21b..210689ba3f5f 100644 --- a/contrib/gnu-sort/lib/argmatch.c +++ b/contrib/gnu-sort/lib/argmatch.c @@ -1,5 +1,7 @@ /* argmatch.c -- find a match for a string in an array - Copyright (C) 1990, 1998, 1999, 2001 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 @@ -18,25 +20,22 @@ /* Written by David MacKenzie <djm@ai.mit.edu> Modified by Akim Demaille <demaille@inf.enst.fr> */ +#if HAVE_CONFIG_H +# include <config.h> +#endif + +/* Specification. */ #include "argmatch.h" #include <stdio.h> -#ifdef STDC_HEADERS -# include <string.h> -#endif +#include <stdlib.h> +#include <string.h> -#if HAVE_LOCALE_H -# include <locale.h> -#endif - -#if ENABLE_NLS -# include <libintl.h> -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) #include "error.h" +#include "exit.h" #include "quotearg.h" #include "quote.h" #include "unlocked-io.h" @@ -48,17 +47,10 @@ # define ARGMATCH_QUOTING_STYLE locale_quoting_style #endif -/* The following test is to work around the gross typo in - systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE - is defined to 0, not 1. */ -#if !EXIT_FAILURE -# undef 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 @@ -80,7 +72,6 @@ argmatch_exit_fn argmatch_die = __argmatch_die; null-terminated array ARGLIST, return the index in ARGLIST of the matched element, else -1 if it does not match any element or -2 if it is ambiguous (is a prefix of more than one element). - If SENSITIVE, comparison is case sensitive. If VALLIST is none null, use it to resolve ambiguities limited to synonyms, i.e., for @@ -88,10 +79,9 @@ argmatch_exit_fn argmatch_die = __argmatch_die; "no", "nope" -> 1 "y" is a valid argument, for `0', and "n" for `1'. */ -static int -__argmatch_internal (const char *arg, const char *const *arglist, - const char *vallist, size_t valsize, - int case_sensitive) +int +argmatch (const char *arg, const char *const *arglist, + const char *vallist, size_t valsize) { int i; /* Temporary index in ARGLIST. */ size_t arglen; /* Length of ARG. */ @@ -103,9 +93,7 @@ __argmatch_internal (const char *arg, const char *const *arglist, /* Test all elements for either exact match or abbreviated matches. */ for (i = 0; arglist[i]; i++) { - if (case_sensitive - ? !strncmp (arglist[i], arg, arglen) - : !strncasecmp (arglist[i], arg, arglen)) + if (!strncmp (arglist[i], arg, arglen)) { if (strlen (arglist[i]) == arglen) /* Exact match found. */ @@ -133,22 +121,6 @@ __argmatch_internal (const char *arg, const char *const *arglist, return matchind; } -/* argmatch - case sensitive version */ -int -argmatch (const char *arg, const char *const *arglist, - const char *vallist, size_t valsize) -{ - return __argmatch_internal (arg, arglist, vallist, valsize, 1); -} - -/* argcasematch - case insensitive version */ -int -argcasematch (const char *arg, const char *const *arglist, - const char *vallist, size_t valsize) -{ - return __argmatch_internal (arg, arglist, vallist, valsize, 0); -} - /* Error reporting for argmatch. CONTEXT is a description of the type of entity that was being matched. VALUE is the invalid value that was given. @@ -203,12 +175,9 @@ int __xargmatch_internal (const char *context, const char *arg, const char *const *arglist, const char *vallist, size_t valsize, - int case_sensitive, argmatch_exit_fn exit_fn) { - int res = __argmatch_internal (arg, arglist, - vallist, valsize, - case_sensitive); + int res = argmatch (arg, arglist, vallist, valsize); if (res >= 0) /* Success. */ return res; @@ -241,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 @@ -294,12 +262,12 @@ main (int argc, const char *const *argv) } if ((cp = getenv ("VERSION_CONTROL"))) - backup_type = XARGCASEMATCH ("$VERSION_CONTROL", cp, - backup_args, backup_vals); + backup_type = XARGMATCH ("$VERSION_CONTROL", cp, + backup_args, backup_vals); if (argc == 2) - backup_type = XARGCASEMATCH (program_name, argv[1], - backup_args, backup_vals); + backup_type = XARGMATCH (program_name, argv[1], + backup_args, backup_vals); printf ("The version control is `%s'\n", ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals)); diff --git a/contrib/gnu-sort/lib/argmatch.h b/contrib/gnu-sort/lib/argmatch.h index b71930097052..e8bb23c667ba 100644 --- a/contrib/gnu-sort/lib/argmatch.h +++ b/contrib/gnu-sort/lib/argmatch.h @@ -1,5 +1,7 @@ /* argmatch.h -- definitions and prototypes for argmatch.c - Copyright (C) 1990, 1998, 1999, 2001 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 @@ -21,109 +23,89 @@ #ifndef ARGMATCH_H_ # define ARGMATCH_H_ 1 -# if HAVE_CONFIG_H -# include <config.h> -# endif +# include <stddef.h> -# include <sys/types.h> +# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) -# ifndef PARAMS -# if PROTOTYPES || (defined (__STDC__) && __STDC__) -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif /* GCC. */ -# endif /* Not PARAMS. */ +# define ARGMATCH_CONSTRAINT(Arglist, Vallist) \ + (ARRAY_CARDINALITY (Arglist) == ARRAY_CARDINALITY (Vallist) + 1) /* Assert there are as many real arguments as there are values - (argument list ends with a NULL guard). There is no execution - cost, since it will be statically evalauted to `assert (0)' or - `assert (1)'. Unfortunately there is no -Wassert-0. */ + (argument list ends with a NULL guard). ARGMATCH_VERIFY is + preferred, since it is guaranteed to be checked at compile-time. + ARGMATCH_ASSERT is for backward compatibility only. */ -# undef ARRAY_CARDINALITY -# define ARRAY_CARDINALITY(Array) (sizeof ((Array)) / sizeof (*(Array))) +# define ARGMATCH_VERIFY(Arglist, Vallist) \ + struct argmatch_verify \ + { \ + char argmatch_verify[ARGMATCH_CONSTRAINT(Arglist, Vallist) ? 1 : -1]; \ + } -# define ARGMATCH_ASSERT(Arglist, Vallist) \ - assert (ARRAY_CARDINALITY ((Arglist)) == ARRAY_CARDINALITY ((Vallist)) + 1) +# define ARGMATCH_ASSERT(Arglist, Vallist) \ + assert (ARGMATCH_CONSTRAINT (Arglist, Vallist)) /* Return the index of the element of ARGLIST (NULL terminated) that matches with ARG. If VALLIST is not NULL, then use it to resolve false ambiguities (i.e., different matches of ARG but corresponding to the same values in VALLIST). */ -int argmatch - PARAMS ((const char *arg, const char *const *arglist, - const char *vallist, size_t valsize)); -int argcasematch - PARAMS ((const char *arg, const char *const *arglist, - const char *vallist, size_t valsize)); +int argmatch (char const *arg, char const *const *arglist, + char const *vallist, size_t valsize); # define ARGMATCH(Arg, Arglist, Vallist) \ - argmatch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist))) - -# define ARGCASEMATCH(Arg, Arglist, Vallist) \ - argcasematch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist))) + argmatch (Arg, Arglist, (char const *) (Vallist), sizeof *(Vallist)) /* 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)'. */ -typedef void (*argmatch_exit_fn) PARAMS ((void)); + in turn defaults to `exit (exit_failure)'. */ +typedef void (*argmatch_exit_fn) (void); extern argmatch_exit_fn argmatch_die; /* Report on stderr why argmatch failed. Report correct values. */ -void argmatch_invalid - PARAMS ((const char *context, const char *value, int problem)); +void argmatch_invalid (char const *context, char const *value, int problem); /* Left for compatibility with the old name invalid_arg */ # define invalid_arg(Context, Value, Problem) \ - argmatch_invalid ((Context), (Value), (Problem)) + argmatch_invalid (Context, Value, Problem) /* Report on stderr the list of possible arguments. */ -void argmatch_valid - PARAMS ((const char *const *arglist, - const char *vallist, size_t valsize)); +void argmatch_valid (char const *const *arglist, + char const *vallist, size_t valsize); # define ARGMATCH_VALID(Arglist, Vallist) \ - argmatch_valid (Arglist, (const char *) Vallist, sizeof (*(Vallist))) + argmatch_valid (Arglist, (char const *) (Vallist), sizeof *(Vallist)) /* Same as argmatch, but upon failure, reports a explanation on the failure, and exits using the function EXIT_FN. */ -int __xargmatch_internal - PARAMS ((const char *context, - const char *arg, const char *const *arglist, - const char *vallist, size_t valsize, - int case_sensitive, argmatch_exit_fn exit_fn)); +int __xargmatch_internal (char const *context, + char const *arg, char const *const *arglist, + char const *vallist, size_t valsize, + argmatch_exit_fn exit_fn); /* Programmer friendly interface to __xargmatch_internal. */ -# define XARGMATCH(Context, Arg, Arglist, Vallist) \ - (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist), \ - (const char *) (Vallist), \ - sizeof (*(Vallist)), \ - 1, argmatch_die)]) - -# define XARGCASEMATCH(Context, Arg, Arglist, Vallist) \ - (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist), \ - (const char *) (Vallist), \ - sizeof (*(Vallist)), \ - 0, argmatch_die)]) +# define XARGMATCH(Context, Arg, Arglist, Vallist) \ + ((Vallist) [__xargmatch_internal (Context, Arg, Arglist, \ + (char const *) (Vallist), \ + sizeof *(Vallist), \ + argmatch_die)]) /* Convert a value into a corresponding argument. */ -const char *argmatch_to_argument - PARAMS ((char const *value, const char *const *arglist, - const char *vallist, size_t valsize)); +char const *argmatch_to_argument (char const *value, + char const *const *arglist, + char const *vallist, size_t valsize); # define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist) \ - argmatch_to_argument ((Value), (Arglist), \ - (const char *) (Vallist), sizeof (*(Vallist))) + argmatch_to_argument (Value, Arglist, \ + (char const *) (Vallist), sizeof *(Vallist)) #endif /* ARGMATCH_H_ */ diff --git a/contrib/gnu-sort/lib/closeout.c b/contrib/gnu-sort/lib/closeout.c new file mode 100644 index 000000000000..a551d1ae8be6 --- /dev/null +++ b/contrib/gnu-sort/lib/closeout.c @@ -0,0 +1,95 @@ +/* closeout.c - close standard output + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#include "closeout.h" + +#include <stdio.h> + +#include <errno.h> +#ifndef errno +extern int errno; +#endif + +#include "gettext.h" +#define _(msgid) gettext (msgid) + +#include "error.h" +#include "exitfail.h" +#include "quotearg.h" +#include "unlocked-io.h" +#include "__fpending.h" + +static const char *file_name; + +/* Set the file name to be reported in the event an error is detected + by close_stdout. */ +void +close_stdout_set_file_name (const char *file) +{ + file_name = file; +} + +/* 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 + of every function that does an explicit write to stdout. The last + printf can succeed in writing to the internal stream buffer, and yet + the fclose(stdout) could still fail (due e.g., to a disk full error) + when it tries to write out that buffered data. Thus, you would be + left with an incomplete output file and the offending program would + exit successfully. + + FIXME: note the fflush suggested above is implicit in the fclose + we actually do below. Consider doing only the fflush and/or using + setvbuf to inhibit buffering. + + Besides, it's wasteful to check the return value from every call + that writes to stdout -- just let the internal stream state record + the failure. That's what the ferror test is checking below. + + It's important to detect such failures and exit nonzero because many + tools (most notably `make' and other build-management systems) depend + on being able to detect failure in other tools via their exit status. */ + +void +close_stdout (void) +{ + int e = ferror (stdout) ? 0 : -1; + + /* If the stream's error bit is clear and there is nothing to flush, + then return right away. */ + if (e && __fpending (stdout) == 0) + return; + + if (fclose (stdout) != 0) + e = errno; + + if (0 <= e) + { + char const *write_error = _("write error"); + if (file_name) + error (exit_failure, e, "%s: %s", quotearg_colon (file_name), + write_error); + else + error (exit_failure, e, "%s", write_error); + } +} diff --git a/contrib/gnu-sort/lib/closeout.h b/contrib/gnu-sort/lib/closeout.h index 80f24e45f9da..d27d7601eb7b 100644 --- a/contrib/gnu-sort/lib/closeout.h +++ b/contrib/gnu-sort/lib/closeout.h @@ -1,17 +1,25 @@ +/* Close standard output. + + Copyright (C) 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. */ + #ifndef CLOSEOUT_H # define CLOSEOUT_H 1 -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -# endif - -void close_stdout_set_status PARAMS ((int status)); -void close_stdout_set_file_name PARAMS ((const char *file)); -void close_stdout PARAMS ((void)); -void close_stdout_status PARAMS ((int status)); +void close_stdout_set_file_name (const char *file); +void close_stdout (void); #endif diff --git a/contrib/gnu-sort/lib/error.c b/contrib/gnu-sort/lib/error.c index c02abcee8a65..1149235a101e 100644 --- a/contrib/gnu-sort/lib/error.c +++ b/contrib/gnu-sort/lib/error.c @@ -1,22 +1,20 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000, 2001 Free Software Foundation, Inc. - This file is part of the GNU C Library. Its master source is NOT part of - the C library, however. The master source lives in /gd/gnu/lib. + Copyright (C) 1990-1998, 2000-2002, 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. + 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. - The GNU C Library is distributed in the hope that it will be useful, + 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 - Lesser 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 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. */ + 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 <djm@gnu.ai.mit.edu>. */ @@ -24,38 +22,28 @@ # include <config.h> #endif +#include "error.h" + +#include <stdarg.h> #include <stdio.h> -#if HAVE_LIBINTL_H +#include <stdlib.h> +#include <string.h> + +#ifdef _LIBC # include <libintl.h> +#else +# include "gettext.h" #endif + #ifdef _LIBC # include <wchar.h> # 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 (); +#if !_LIBC +# include "unlocked-io.h" #endif -#include "error.h" -#include "unlocked-io.h" - #ifndef _ # define _(String) String #endif @@ -63,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; @@ -77,6 +61,7 @@ unsigned int error_message_count; # define program_name program_invocation_name # include <errno.h> +# include <libio/libioP.h> /* In GNU libc we want do not want to use the common name `error' directly. Instead make it a weak alias. */ @@ -89,10 +74,12 @@ extern void __error_at_line (int status, int errnum, const char *file_name, # define error __error # define error_at_line __error_at_line -# ifdef USE_IN_LIBIO -# include <libio/iolibio.h> -# define fflush(s) _IO_fflush (s) -# endif +# include <libio/iolibio.h> +# define fflush(s) INTUSE(_IO_fflush) (s) +# undef putc +# define putc(c, fp) INTUSE(_IO_putc) (c, fp) + +# include <bits/libc-lock.h> #else /* not _LIBC */ @@ -103,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 @@ -157,7 +127,7 @@ print_errno_message (int errnum) s = _("Unknown system error"); #endif -#if _LIBC && USE_IN_LIBIO +#if _LIBC if (_IO_fwide (stderr, 0) > 0) { __fwprintf (stderr, L": %s", s); @@ -168,108 +138,81 @@ 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 && USE_IN_LIBIO +#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; - - do + 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); + + 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 && USE_IN_LIBIO +#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); #ifdef _LIBC -# ifdef USE_IN_LIBIO _IO_flockfile (stderr); -# else - __flockfile (stderr); -# endif #endif if (error_print_progname) (*error_print_progname) (); else { -#if _LIBC && USE_IN_LIBIO +#if _LIBC if (_IO_fwide (stderr, 0) > 0) __fwprintf (stderr, L"%s: ", program_name); else @@ -277,26 +220,13 @@ 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 -# ifdef USE_IN_LIBIO _IO_funlockfile (stderr); -# else - __funlockfile (stderr); +# ifdef __libc_ptf_call + __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0); # endif #endif } @@ -306,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) { @@ -338,19 +256,23 @@ 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 -# ifdef USE_IN_LIBIO _IO_flockfile (stderr); -# else - __flockfile (stderr); -# endif #endif if (error_print_progname) (*error_print_progname) (); else { -#if _LIBC && USE_IN_LIBIO +#if _LIBC if (_IO_fwide (stderr, 0) > 0) __fwprintf (stderr, L"%s: ", program_name); else @@ -360,7 +282,7 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist) if (file_name != NULL) { -#if _LIBC && USE_IN_LIBIO +#if _LIBC if (_IO_fwide (stderr, 0) > 0) __fwprintf (stderr, L"%s:%d: ", file_name, line_number); else @@ -368,26 +290,13 @@ 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 -# ifdef USE_IN_LIBIO _IO_funlockfile (stderr); -# else - __funlockfile (stderr); +# ifdef __libc_ptf_call + __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0); # endif #endif } diff --git a/contrib/gnu-sort/lib/error.h b/contrib/gnu-sort/lib/error.h index 177b2dcbe870..8ed63595f24f 100644 --- a/contrib/gnu-sort/lib/error.h +++ b/contrib/gnu-sort/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; diff --git a/contrib/gnu-sort/lib/exit.h b/contrib/gnu-sort/lib/exit.h new file mode 100644 index 000000000000..4e8d46516546 --- /dev/null +++ b/contrib/gnu-sort/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 */ diff --git a/contrib/gnu-sort/lib/exitfail.c b/contrib/gnu-sort/lib/exitfail.c new file mode 100644 index 000000000000..2ae5f69555f4 --- /dev/null +++ b/contrib/gnu-sort/lib/exitfail.c @@ -0,0 +1,27 @@ +/* Failure exit status + + 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 + 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; see the file COPYING. + If not, write to the Free Software Foundation, + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#include "exitfail.h" +#include "exit.h" + +int volatile exit_failure = EXIT_FAILURE; diff --git a/contrib/gnu-sort/lib/exitfail.h b/contrib/gnu-sort/lib/exitfail.h new file mode 100644 index 000000000000..cf5ab719586e --- /dev/null +++ b/contrib/gnu-sort/lib/exitfail.h @@ -0,0 +1,20 @@ +/* Failure exit status + + Copyright (C) 2002 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; see the file COPYING. + If not, write to the Free Software Foundation, + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +extern int volatile exit_failure; diff --git a/contrib/gnu-sort/lib/gettext.h b/contrib/gnu-sort/lib/gettext.h index 6d2d4f8ea154..835732e01fe5 100644 --- a/contrib/gnu-sort/lib/gettext.h +++ b/contrib/gnu-sort/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 */ diff --git a/contrib/gnu-sort/lib/hard-locale.h b/contrib/gnu-sort/lib/hard-locale.h index 5b054d9a5cb9..ddc15d019dbc 100644 --- a/contrib/gnu-sort/lib/hard-locale.h +++ b/contrib/gnu-sort/lib/hard-locale.h @@ -1,18 +1,24 @@ -#ifndef HARD_LOCALE_H_ -# define HARD_LOCALE_H_ 1 +/* Determine whether a locale is hard. + + Copyright (C) 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. -# if HAVE_CONFIG_H -# include <config.h> -# endif + 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. -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -# endif + 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 HARD_LOCALE_H_ +# define HARD_LOCALE_H_ 1 -int hard_locale PARAMS ((int)); +int hard_locale (int); #endif /* HARD_LOCALE_H_ */ diff --git a/contrib/gnu-sort/lib/human.c b/contrib/gnu-sort/lib/human.c index a9ccf38c4831..36cfd7348876 100644 --- a/contrib/gnu-sort/lib/human.c +++ b/contrib/gnu-sort/lib/human.c @@ -1,7 +1,7 @@ /* human.c -- print human readable file size - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software - Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 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 @@ -17,55 +17,40 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Originally contributed by lm@sgi.com; - --si, output block size selection, and large file support - added by eggert@twinsun.com. */ +/* Written by Paul Eggert and Larry McVoy. */ #if HAVE_CONFIG_H # include <config.h> #endif -#include <sys/types.h> -#include <stdio.h> +#include "human.h" -#if HAVE_LIMITS_H -# include <limits.h> +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) #endif - -#if HAVE_STRING_H -# include <string.h> -#else -# include <strings.h> +#ifndef UINTMAX_MAX +# define UINTMAX_MAX ((uintmax_t) -1) #endif -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif -#if HAVE_STDLIB_H -# include <stdlib.h> +#if HAVE_LOCALE_H && HAVE_LOCALECONV +# include <locale.h> #endif -#ifndef HAVE_DECL_GETENV -"this configure-time declaration test was not run" -#endif -#if !HAVE_DECL_GETENV -char *getenv (); -#endif +#include <stdio.h> +#include <stdlib.h> +#include <string.h> -#if ENABLE_NLS -# include <libintl.h> -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) #include <argmatch.h> #include <error.h> #include <xstrtol.h> -#include "human.h" +/* The maximum length of a suffix like "KiB". */ +#define HUMAN_READABLE_SUFFIX_LENGTH_MAX 3 -static const char suffixes[] = +static const char power_letter[] = { 0, /* not used */ 'K', /* kibi ('k' for kilo is a special case) */ @@ -78,33 +63,18 @@ static const char suffixes[] = 'Y' /* yotta or 2**80 */ }; -/* Generate into P[-1] (and possibly P[-2]) the proper suffix for - POWER and BASE. Return the address of the generated suffix. */ -static char * -generate_suffix_backwards (char *p, int power, int base) -{ - char letter = suffixes[power]; - - if (base == 1000) - { - *--p = 'B'; - if (power == 1) - letter = 'k'; - } - - *--p = letter; - return p; -} -/* If INEXACT_STYLE is not human_round_to_even, and if easily +/* If INEXACT_STYLE is not human_round_to_nearest, and if easily possible, adjust VALUE according to the style. */ -static double -adjust_value (enum human_inexact_style inexact_style, double value) + +static long double +adjust_value (int inexact_style, long double value) { - /* Do not use the floor or ceil functions, as that would mean - linking with the standard math library, which is a porting pain. - So leave the value alone if it is too large to easily round. */ - if (inexact_style != human_round_to_even && value < (uintmax_t) -1) + /* Do not use the floorl or ceill functions, as that would mean + checking for their presence and possibly linking with the + standard math library, which is a porting pain. So leave the + value alone if it is too large to easily round. */ + if (inexact_style != human_round_to_nearest && value < UINTMAX_MAX) { uintmax_t u = value; value = u + (inexact_style == human_ceiling && u != value); @@ -113,199 +83,321 @@ adjust_value (enum human_inexact_style inexact_style, double value) return value; } -/* Like human_readable_inexact, except always round to even. */ -char * -human_readable (uintmax_t n, char *buf, - int from_block_size, int output_block_size) +/* Group the digits of NUMBER according to the grouping rules of the + current locale. NUMBER contains NUMBERLEN digits. Modify the + bytes pointed to by NUMBER in place, subtracting 1 from NUMBER for + each byte inserted. Return the starting address of the modified + number. + + To group the digits, use GROUPING and THOUSANDS_SEP as in `struct + lconv' from <locale.h>. */ + +static char * +group_number (char *number, size_t numberlen, + char const *grouping, char const *thousands_sep) { - return human_readable_inexact (n, buf, from_block_size, output_block_size, - human_round_to_even); + register char *d; + size_t grouplen = SIZE_MAX; + size_t thousands_seplen = strlen (thousands_sep); + size_t i = numberlen; + + /* The maximum possible value for NUMBERLEN is the number of digits + in the square of the largest uintmax_t, so double the size of + uintmax_t before converting to a bound. 302 / 1000 is ceil + (log10 (2.0)). Add 1 for integer division truncation. */ + char buf[2 * sizeof (uintmax_t) * CHAR_BIT * 302 / 1000 + 1]; + + memcpy (buf, number, numberlen); + d = number + numberlen; + + for (;;) + { + unsigned char g = *grouping; + + if (g) + { + grouplen = g < CHAR_MAX ? g : i; + grouping++; + } + + if (i < grouplen) + grouplen = i; + + d -= grouplen; + i -= grouplen; + memcpy (d, buf + i, grouplen); + if (i == 0) + return d; + + d -= thousands_seplen; + memcpy (d, thousands_sep, thousands_seplen); + } } -/* Convert N to a human readable format in BUF. +/* Convert N to a human readable format in BUF, using the options OPTS. N is expressed in units of FROM_BLOCK_SIZE. FROM_BLOCK_SIZE must be nonnegative. - OUTPUT_BLOCK_SIZE must be nonzero. If it is positive, use units of - OUTPUT_BLOCK_SIZE in the output number. - - Use INEXACT_STYLE to determine whether to take the ceiling or floor - of any result that cannot be expressed exactly. - - If OUTPUT_BLOCK_SIZE is negative, use a format like "127K" if - possible, using powers of -OUTPUT_BLOCK_SIZE; otherwise, use - ordinary decimal format. Normally -OUTPUT_BLOCK_SIZE is either - 1000 or 1024; it must be at least 2. Most people visually process - strings of 3-4 digits effectively, but longer strings of digits are - more prone to misinterpretation. Hence, converting to an - abbreviated form usually improves readability. Use a suffix - indicating which power is being used. For example, assuming - -OUTPUT_BLOCK_SIZE is 1024, 8500 would be converted to 8.3K, - 133456345 to 127M, 56990456345 to 53G, and so on. Numbers smaller - than -OUTPUT_BLOCK_SIZE aren't modified. If -OUTPUT_BLOCK_SIZE is - 1024, append a "B" after any size letter. */ + Use units of TO_BLOCK_SIZE in the output number. TO_BLOCK_SIZE + must be positive. + + Use (OPTS & (human_round_to_nearest | human_floor | human_ceiling)) + to determine whether to take the ceiling or floor of any result + that cannot be expressed exactly. + + If (OPTS & human_group_digits), group the thousands digits + according to the locale, e.g., `1,000,000' in an American English + locale. + + If (OPTS & human_autoscale), deduce the output block size + automatically; TO_BLOCK_SIZE must be 1 but it has no effect on the + output. Use powers of 1024 if (OPTS & human_base_1024), and powers + of 1000 otherwise. For example, assuming powers of 1024, 8500 + would be converted to 8.3, 133456345 to 127, 56990456345 to 53, and + so on. Numbers smaller than the power aren't modified. + human_autoscale is normally used together with human_SI. + + If (OPTS & human_SI), append an SI prefix indicating which power is + being used. If in addition (OPTS & human_B), append "B" (if base + 1000) or "iB" (if base 1024) to the SI prefix. When ((OPTS & + human_SI) && ! (OPTS & human_autoscale)), TO_BLOCK_SIZE must be a + power of 1024 or of 1000, depending on (OPTS & + human_base_1024). */ char * -human_readable_inexact (uintmax_t n, char *buf, - int from_block_size, int output_block_size, - enum human_inexact_style inexact_style) +human_readable (uintmax_t n, char *buf, int opts, + uintmax_t from_block_size, uintmax_t to_block_size) { + int inexact_style = + opts & (human_round_to_nearest | human_floor | human_ceiling); + unsigned int base = opts & human_base_1024 ? 1024 : 1000; uintmax_t amt; - int base; - int to_block_size; - int tenths = 0; - int power; + int tenths; + int exponent = -1; + int exponent_max = sizeof power_letter - 1; char *p; + char *psuffix; + char const *integerlim; /* 0 means adjusted N == AMT.TENTHS; 1 means AMT.TENTHS < adjusted N < AMT.TENTHS + 0.05; 2 means adjusted N == AMT.TENTHS + 0.05; 3 means AMT.TENTHS + 0.05 < adjusted N < AMT.TENTHS + 0.1. */ - int rounding = 0; + int rounding; + + char const *decimal_point = "."; + size_t decimal_pointlen = 1; + char const *grouping = ""; + char const *thousands_sep = ""; +#if HAVE_LOCALE_H && HAVE_LOCALECONV + struct lconv const *l = localeconv (); + size_t pointlen = strlen (l->decimal_point); + if (0 < pointlen && pointlen <= MB_LEN_MAX) + { + decimal_point = l->decimal_point; + decimal_pointlen = pointlen; + } + grouping = l->grouping; + if (strlen (l->thousands_sep) <= MB_LEN_MAX) + thousands_sep = l->thousands_sep; +#endif + + psuffix = buf + LONGEST_HUMAN_READABLE - HUMAN_READABLE_SUFFIX_LENGTH_MAX; + p = psuffix; - if (output_block_size < 0) + /* Adjust AMT out of FROM_BLOCK_SIZE units and into TO_BLOCK_SIZE + units. If this can be done exactly with integer arithmetic, do + not use floating point operations. */ + if (to_block_size <= from_block_size) { - base = -output_block_size; - to_block_size = 1; + if (from_block_size % to_block_size == 0) + { + uintmax_t multiplier = from_block_size / to_block_size; + amt = n * multiplier; + if (amt / multiplier == n) + { + tenths = 0; + rounding = 0; + goto use_integer_arithmetic; + } + } } - else + else if (from_block_size != 0 && to_block_size % from_block_size == 0) { - base = 0; - to_block_size = output_block_size; + uintmax_t divisor = to_block_size / from_block_size; + uintmax_t r10 = (n % divisor) * 10; + uintmax_t r2 = (r10 % divisor) * 2; + amt = n / divisor; + tenths = r10 / divisor; + rounding = r2 < divisor ? 0 < r2 : 2 + (divisor < r2); + goto use_integer_arithmetic; } - p = buf + LONGEST_HUMAN_READABLE; - *p = '\0'; - -#ifdef lint - /* Suppress `used before initialized' warning. */ - power = 0; -#endif + { + /* Either the result cannot be computed easily using uintmax_t, + or from_block_size is zero. Fall back on floating point. + FIXME: This can yield answers that are slightly off. */ - /* Adjust AMT out of FROM_BLOCK_SIZE units and into TO_BLOCK_SIZE units. */ + long double dto_block_size = to_block_size; + long double damt = n * (from_block_size / dto_block_size); + size_t buflen; + size_t nonintegerlen; - { - int multiplier; - int divisor; - int r2; - int r10; - if (to_block_size <= from_block_size - ? (from_block_size % to_block_size != 0 - || (multiplier = from_block_size / to_block_size, - (amt = n * multiplier) / multiplier != n)) - : (from_block_size == 0 - || to_block_size % from_block_size != 0 - || (divisor = to_block_size / from_block_size, - r10 = (n % divisor) * 10, - r2 = (r10 % divisor) * 2, - amt = n / divisor, - tenths = r10 / divisor, - rounding = r2 < divisor ? 0 < r2 : 2 + (divisor < r2), - 0))) + if (! (opts & human_autoscale)) { - /* Either the result cannot be computed easily using uintmax_t, - or from_block_size is zero. Fall back on floating point. - FIXME: This can yield answers that are slightly off. */ + sprintf (buf, "%.0Lf", adjust_value (inexact_style, damt)); + buflen = strlen (buf); + nonintegerlen = 0; + } + else + { + long double e = 1; + exponent = 0; + + do + { + e *= base; + exponent++; + } + while (e * base <= damt && exponent < exponent_max); - double damt = n * (from_block_size / (double) to_block_size); + damt /= e; - if (! base) - sprintf (buf, "%.0f", adjust_value (inexact_style, damt)); - else + sprintf (buf, "%.1Lf", adjust_value (inexact_style, damt)); + buflen = strlen (buf); + nonintegerlen = decimal_pointlen + 1; + + if (1 + nonintegerlen + ! (opts & human_base_1024) < buflen + || ((opts & human_suppress_point_zero) + && buf[buflen - 1] == '0')) { - char suffix[3]; - char const *psuffix; - double e = 1; - power = 0; + sprintf (buf, "%.0Lf", + adjust_value (inexact_style, damt * 10) / 10); + buflen = strlen (buf); + nonintegerlen = 0; + } + } + + p = psuffix - buflen; + memmove (p, buf, buflen); + integerlim = p + buflen - nonintegerlen; + } + goto do_grouping; + + use_integer_arithmetic: + { + /* The computation can be done exactly, with integer arithmetic. + + Use power of BASE notation if requested and if adjusted AMT is + large enough. */ + + if (opts & human_autoscale) + { + exponent = 0; + if (base <= amt) + { do { - e *= base; - power++; + unsigned r10 = (amt % base) * 10 + tenths; + unsigned r2 = (r10 % base) * 2 + (rounding >> 1); + amt /= base; + tenths = r10 / base; + rounding = (r2 < base + ? (r2 + rounding) != 0 + : 2 + (base < r2 + rounding)); + exponent++; } - while (e * base <= damt && power < sizeof suffixes - 1); + while (base <= amt && exponent < exponent_max); - damt /= e; + if (amt < 10) + { + if (inexact_style == human_round_to_nearest + ? 2 < rounding + (tenths & 1) + : inexact_style == human_ceiling && 0 < rounding) + { + tenths++; + rounding = 0; + + if (tenths == 10) + { + amt++; + tenths = 0; + } + } + + if (amt < 10 + && (tenths || ! (opts & human_suppress_point_zero))) + { + *--p = '0' + tenths; + p -= decimal_pointlen; + memcpy (p, decimal_point, decimal_pointlen); + tenths = rounding = 0; + } + } + } + } - suffix[2] = '\0'; - psuffix = generate_suffix_backwards (suffix + 2, power, base); - sprintf (buf, "%.1f%s", - adjust_value (inexact_style, damt), psuffix); - if (4 + (base == 1000) < strlen (buf)) - sprintf (buf, "%.0f%s", - adjust_value (inexact_style, damt * 10) / 10, psuffix); + if (inexact_style == human_round_to_nearest + ? 5 < tenths + (0 < rounding + (amt & 1)) + : inexact_style == human_ceiling && 0 < tenths + rounding) + { + amt++; + + if ((opts & human_autoscale) + && amt == base && exponent < exponent_max) + { + exponent++; + if (! (opts & human_suppress_point_zero)) + { + *--p = '0'; + p -= decimal_pointlen; + memcpy (p, decimal_point, decimal_pointlen); + } + amt = 1; } + } + + integerlim = p; - return buf; + do + { + int digit = amt % 10; + *--p = digit + '0'; } + while ((amt /= 10) != 0); } - /* Use power of BASE notation if adjusted AMT is large enough. */ + do_grouping: + if (opts & human_group_digits) + p = group_number (p, integerlim - p, grouping, thousands_sep); - if (base && base <= amt) + if (opts & human_SI) { - power = 0; - - do + if (exponent < 0) { - int r10 = (amt % base) * 10 + tenths; - int r2 = (r10 % base) * 2 + (rounding >> 1); - amt /= base; - tenths = r10 / base; - rounding = (r2 < base - ? 0 < r2 + rounding - : 2 + (base < r2 + rounding)); - power++; + uintmax_t power; + exponent = 0; + for (power = 1; power < to_block_size; power *= base) + if (++exponent == exponent_max) + break; } - while (base <= amt && power < sizeof suffixes - 1); - p = generate_suffix_backwards (p, power, base); + if (exponent) + *psuffix++ = (! (opts & human_base_1024) && exponent == 1 + ? 'k' + : power_letter[exponent]); - if (amt < 10) + if (opts & human_B) { - if (2 * (1 - (int) inexact_style) - < rounding + (tenths & (inexact_style == human_round_to_even))) - { - tenths++; - rounding = 0; - - if (tenths == 10) - { - amt++; - tenths = 0; - } - } - - if (amt < 10) - { - *--p = '0' + tenths; - *--p = '.'; - tenths = rounding = 0; - } + if ((opts & human_base_1024) && exponent) + *psuffix++ = 'i'; + *psuffix++ = 'B'; } } - if (inexact_style == human_ceiling - ? 0 < tenths + rounding - : inexact_style == human_round_to_even - ? 5 < tenths + (2 < rounding + (amt & 1)) - : /* inexact_style == human_floor */ 0) - { - amt++; - - if (amt == base && power < sizeof suffixes - 1) - { - *p = suffixes[power + 1]; - *--p = '0'; - *--p = '.'; - amt = 1; - } - } - - do - *--p = '0' + (int) (amt % 10); - while ((amt /= 10) != 0); + *psuffix = '\0'; return p; } @@ -318,44 +410,68 @@ human_readable_inexact (uintmax_t n, char *buf, #endif static char const *const block_size_args[] = { "human-readable", "si", 0 }; -static int const block_size_types[] = { -1024, -1000 }; +static int const block_size_opts[] = + { + human_autoscale + human_SI + human_base_1024, + human_autoscale + human_SI + }; -static int +static uintmax_t default_block_size (void) { return getenv ("POSIXLY_CORRECT") ? 512 : DEFAULT_BLOCK_SIZE; } static strtol_error -humblock (char const *spec, int *block_size) +humblock (char const *spec, uintmax_t *block_size, int *options) { int i; + int opts = 0; if (! spec && ! (spec = getenv ("BLOCK_SIZE"))) *block_size = default_block_size (); - else if (0 <= (i = ARGMATCH (spec, block_size_args, block_size_types))) - *block_size = block_size_types[i]; else { - char *ptr; - unsigned long val; - strtol_error e = xstrtoul (spec, &ptr, 0, &val, "eEgGkKmMpPtTyYzZ0"); - if (e != LONGINT_OK) - return e; - if (*ptr) - return LONGINT_INVALID_SUFFIX_CHAR; - if ((int) val < 0 || val != (int) val) - return LONGINT_OVERFLOW; - *block_size = (int) val; + if (*spec == '\'') + { + opts |= human_group_digits; + spec++; + } + + if (0 <= (i = ARGMATCH (spec, block_size_args, block_size_opts))) + { + opts |= block_size_opts[i]; + *block_size = 1; + } + else + { + char *ptr; + strtol_error e = xstrtoumax (spec, &ptr, 0, block_size, + "eEgGkKmMpPtTyYzZ0"); + if (e != LONGINT_OK) + return e; + for (; ! ('0' <= *spec && *spec <= '9'); spec++) + if (spec == ptr) + { + opts |= human_SI; + if (ptr[-1] == 'B') + opts |= human_B; + if (ptr[-1] != 'B' || ptr[-2] == 'i') + opts |= human_base_1024; + break; + } + } } + *options = opts; return LONGINT_OK; } -void -human_block_size (char const *spec, int report_errors, int *block_size) +int +human_options (char const *spec, bool report_errors, uintmax_t *block_size) { - strtol_error e = humblock (spec, block_size); + int opts; + strtol_error e = humblock (spec, block_size, &opts); if (*block_size == 0) { *block_size = default_block_size (); @@ -363,4 +479,5 @@ human_block_size (char const *spec, int report_errors, int *block_size) } if (e != LONGINT_OK && report_errors) STRTOL_FATAL_ERROR (spec, _("block size"), e); + return opts; } diff --git a/contrib/gnu-sort/lib/human.h b/contrib/gnu-sort/lib/human.h index 4ec9f0da8602..604fec1ba7f7 100644 --- a/contrib/gnu-sort/lib/human.h +++ b/contrib/gnu-sort/lib/human.h @@ -1,3 +1,24 @@ +/* human.h -- print human readable file size + + Copyright (C) 1996, 1997, 1998, 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 + 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 and Larry McVoy. */ + #ifndef HUMAN_H_ # define HUMAN_H_ 1 @@ -5,35 +26,64 @@ # include <config.h> # endif +# include <limits.h> +# include <stdbool.h> + # if HAVE_INTTYPES_H # include <inttypes.h> +# else +# if HAVE_STDINT_H +# include <stdint.h> +# endif # endif /* A conservative bound on the maximum length of a human-readable string. - The output can be the product of the largest uintmax_t and the largest int, - so add their sizes before converting to a bound on digits. */ -# define LONGEST_HUMAN_READABLE ((sizeof (uintmax_t) + sizeof (int)) \ - * CHAR_BIT / 3) - -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -# endif + The output can be the square of the largest uintmax_t, so double + its size before converting to a bound. + 302 / 1000 is ceil (log10 (2.0)). Add 1 for integer division truncation. + Also, the output can have a thousands separator between every digit, + so multiply by MB_LEN_MAX + 1 and then subtract MB_LEN_MAX. + Finally, append 3, the maximum length of a suffix. */ +# define LONGEST_HUMAN_READABLE \ + ((2 * sizeof (uintmax_t) * CHAR_BIT * 302 / 1000 + 1) * (MB_LEN_MAX + 1) \ + - MB_LEN_MAX + 3) -enum human_inexact_style +/* Options for human_readable. */ +enum { - human_floor = -1, - human_round_to_even = 0, - human_ceiling = 1 + /* Unless otherwise specified these options may be ORed together. */ + + /* The following three options are mutually exclusive. */ + /* Round to plus infinity (default). */ + human_ceiling = 0, + /* Round to nearest, ties to even. */ + human_round_to_nearest = 1, + /* Round to minus infinity. */ + human_floor = 2, + + /* Group digits together, e.g. `1,000,000'. This uses the + locale-defined grouping; the traditional C locale does not group, + so this has effect only if some other locale is in use. */ + human_group_digits = 4, + + /* When autoscaling, suppress ".0" at end. */ + human_suppress_point_zero = 8, + + /* Scale output and use SI-style units, ignoring the output block size. */ + human_autoscale = 16, + + /* Prefer base 1024 to base 1000. */ + human_base_1024 = 32, + + /* Append SI prefix, e.g. "k" or "M". */ + human_SI = 64, + + /* Append "B" (if base 1000) or "iB" (if base 1024) to SI prefix. */ + human_B = 128 }; -char *human_readable PARAMS ((uintmax_t, char *, int, int)); -char *human_readable_inexact PARAMS ((uintmax_t, char *, int, int, - enum human_inexact_style)); +char *human_readable (uintmax_t, char *, int, uintmax_t, uintmax_t); -void human_block_size PARAMS ((char const *, int, int *)); +int human_options (char const *, bool, uintmax_t *); #endif /* HUMAN_H_ */ diff --git a/contrib/gnu-sort/lib/inttostr.c b/contrib/gnu-sort/lib/inttostr.c new file mode 100644 index 000000000000..78a48af84cee --- /dev/null +++ b/contrib/gnu-sort/lib/inttostr.c @@ -0,0 +1,49 @@ +/* inttostr.c -- convert integers to printable strings + + Copyright (C) 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. */ + +/* Written by Paul Eggert */ + +#include "inttostr.h" + +/* Convert I to a printable string in BUF, which must be at least + INT_BUFSIZE_BOUND (INTTYPE) bytes long. Return the address of the + printable string, which need not start at BUF. */ + +char * +inttostr (inttype i, char *buf) +{ + char *p = buf + INT_STRLEN_BOUND (inttype); + *p = 0; + + if (i < 0) + { + do + *--p = '0' - i % 10; + while ((i /= 10) != 0); + + *--p = '-'; + } + else + { + do + *--p = '0' + i % 10; + while ((i /= 10) != 0); + } + + return p; +} diff --git a/contrib/gnu-sort/lib/inttostr.h b/contrib/gnu-sort/lib/inttostr.h new file mode 100644 index 000000000000..de2b164f6b1a --- /dev/null +++ b/contrib/gnu-sort/lib/inttostr.h @@ -0,0 +1,49 @@ +/* inttostr.h -- convert integers to printable strings + + Copyright (C) 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 + 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 + +#if HAVE_INTTYPES_H +# include <inttypes.h> +#endif + +#if HAVE_LIMITS_H +# include <limits.h> +#endif +#ifndef CHAR_BIT +# define CHAR_BIT 8 +#endif + +#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +/* Upper bound on the string length of an integer converted to string. + 302 / 1000 is ceil (log10 (2.0)). Subtract 1 for the sign bit; + add 1 for integer division truncation; add 1 more for a minus sign. */ +#define INT_STRLEN_BOUND(t) ((sizeof (t) * CHAR_BIT - 1) * 302 / 1000 + 2) + +#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1) + +char *offtostr (off_t, char *); +char *imaxtostr (intmax_t, char *); +char *umaxtostr (uintmax_t, char *); diff --git a/contrib/gnu-sort/lib/long-options.c b/contrib/gnu-sort/lib/long-options.c index e36685fb01a6..1c4e74a001d6 100644 --- a/contrib/gnu-sort/lib/long-options.c +++ b/contrib/gnu-sort/lib/long-options.c @@ -1,5 +1,7 @@ /* Utility to accept --help and --version options as unobtrusively as possible. - Copyright (C) 1993, 1994, 1998, 1999, 2000 Free Software Foundation, Inc. + + Copyright (C) 1993, 1994, 1998, 1999, 2000, 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 @@ -21,22 +23,16 @@ # include <config.h> #endif +/* Specification. */ +#include "long-options.h" + +#include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <getopt.h> -#if HAVE_STDLIB_H -# include <stdlib.h> -#endif -#include "long-options.h" #include "version-etc.h" -#if ENABLE_NLS -# include <libintl.h> -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif - static struct option const long_options[] = { {"help", no_argument, 0, 'h'}, @@ -53,8 +49,8 @@ parse_long_options (int argc, const char *command_name, const char *package, const char *version, - const char *authors, - void (*usage_func)()) + void (*usage_func) (int), + /* const char *author1, ...*/ ...) { int c; int saved_opterr; @@ -70,11 +66,15 @@ parse_long_options (int argc, switch (c) { case 'h': - (*usage_func) (0); + (*usage_func) (EXIT_SUCCESS); case 'v': - version_etc (stdout, command_name, package, version, authors); - exit (0); + { + va_list authors; + va_start (authors, usage_func); + version_etc_va (stdout, command_name, package, version, authors); + exit (0); + } default: /* Don't process any other long-named options. */ diff --git a/contrib/gnu-sort/lib/long-options.h b/contrib/gnu-sort/lib/long-options.h index f82ff047eeec..50f0c34e1010 100644 --- a/contrib/gnu-sort/lib/long-options.h +++ b/contrib/gnu-sort/lib/long-options.h @@ -1,5 +1,5 @@ /* long-options.h -- declaration for --help- and --version-handling function. - Copyright (C) 1993, 1994, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 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 @@ -17,19 +17,10 @@ /* Written by Jim Meyering. */ -#ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - -void - parse_long_options PARAMS ((int _argc, - char **_argv, - const char *_command_name, - const char *_package, - const char *_version, - const char *_authors, - void (*_usage) (int))); +void parse_long_options (int _argc, + char **_argv, + const char *_command_name, + const char *_package, + const char *_version, + void (*_usage) (int), + /* const char *author1, ...*/ ...); diff --git a/contrib/gnu-sort/lib/memcoll.c b/contrib/gnu-sort/lib/memcoll.c index a2decfe27c47..34ae767dbdbb 100644 --- a/contrib/gnu-sort/lib/memcoll.c +++ b/contrib/gnu-sort/lib/memcoll.c @@ -1,5 +1,5 @@ /* Locale-specific memory comparison. - Copyright 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 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,26 +21,27 @@ # include <config.h> #endif +#include "memcoll.h" + #include <errno.h> #ifndef errno extern int errno; #endif -#include <sys/types.h> - -#if HAVE_STRING_H -# include <string.h> -#endif +#include <string.h> /* Compare S1 (with length S1LEN) and S2 (with length S2LEN) according to the LC_COLLATE locale. S1 and S2 do not overlap, and are not - adjacent. Temporarily modify the bytes after S1 and S2, but - restore their original contents before returning. Set errno to an + adjacent. Perhaps temporarily modify the bytes after S1 and S2, + but restore their original contents before returning. Set errno to an error number if there is an error, and to zero otherwise. */ int memcoll (char *s1, size_t s1len, char *s2, size_t s2len) { int diff; + +#if HAVE_STRCOLL + char n1 = s1[s1len]; char n2 = s2[s2len]; @@ -75,5 +76,14 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len) s1[s1len - 1] = n1; s2[s2len - 1] = n2; +#else + + diff = memcmp (s1, s2, s1len < s2len ? s1len : s2len); + if (! diff) + diff = s1len < s2len ? -1 : s1len != s2len; + errno = 0; + +#endif + return diff; } diff --git a/contrib/gnu-sort/lib/memcoll.h b/contrib/gnu-sort/lib/memcoll.h index 4909bddff076..66b2ecb1e87f 100644 --- a/contrib/gnu-sort/lib/memcoll.h +++ b/contrib/gnu-sort/lib/memcoll.h @@ -1,18 +1,28 @@ +/* Locale-specific memory comparison. + + Copyright (C) 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 + 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. */ + +/* Contributed by Paul Eggert <eggert@twinsun.com>. */ + #ifndef MEMCOLL_H_ # define MEMCOLL_H_ 1 -# if HAVE_CONFIG_H -# include <config.h> -# endif - -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -# endif +# include <stddef.h> -int memcoll PARAMS ((char *, size_t, char *, size_t)); +int memcoll (char *, size_t, char *, size_t); #endif /* MEMCOLL_H_ */ diff --git a/contrib/gnu-sort/lib/pathmax.h b/contrib/gnu-sort/lib/pathmax.h index de9313b0abbc..bdd756e9c51f 100644 --- a/contrib/gnu-sort/lib/pathmax.h +++ b/contrib/gnu-sort/lib/pathmax.h @@ -1,5 +1,5 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1992, 1999, 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 @@ -25,7 +25,7 @@ /* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define PATH_MAX but might cause redefinition warnings when sys/param.h is later included (as on MORE/BSD 4.3). */ -# if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__) +# if defined _POSIX_VERSION || !defined __GNUC__ # include <limits.h> # endif diff --git a/contrib/gnu-sort/lib/physmem.c b/contrib/gnu-sort/lib/physmem.c index 4219c7011be2..dc67b575cff5 100644 --- a/contrib/gnu-sort/lib/physmem.c +++ b/contrib/gnu-sort/lib/physmem.c @@ -1,5 +1,5 @@ /* Calculate the size of physical memory. - Copyright 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 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 @@ -31,12 +31,61 @@ # include <sys/pstat.h> #endif +#if HAVE_SYS_SYSMP_H +# include <sys/sysmp.h> +#endif + +#if HAVE_SYS_SYSINFO_H && HAVE_MACHINE_HAL_SYSINFO_H +# include <sys/sysinfo.h> +# include <machine/hal_sysinfo.h> +#endif + +#if HAVE_SYS_TABLE_H +# include <sys/table.h> +#endif + +#include <sys/types.h> + +#if HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif + +#if HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif + +#if HAVE_SYS_SYSTEMCFG_H +# include <sys/systemcfg.h> +#endif + +#ifdef _WIN32 +# define WIN32_LEAN_AND_MEAN +# include <windows.h> +/* MEMORYSTATUSEX is missing from older windows headers, so define + a local replacement. */ +typedef struct +{ + DWORD dwLength; + DWORD dwMemoryLoad; + DWORDLONG ullTotalPhys; + DWORDLONG ullAvailPhys; + DWORDLONG ullTotalPageFile; + DWORDLONG ullAvailPageFile; + DWORDLONG ullTotalVirtual; + DWORDLONG ullAvailVirtual; + DWORDLONG ullAvailExtendedVirtual; +} lMEMORYSTATUSEX; +typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*); +#endif + +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) + /* Return the total amount of physical memory. */ double physmem_total (void) { #if defined _SC_PHYS_PAGES && defined _SC_PAGESIZE - { + { /* This works on linux-gnu, solaris2 and cygwin. */ double pages = sysconf (_SC_PHYS_PAGES); double pagesize = sysconf (_SC_PAGESIZE); if (0 <= pages && 0 <= pagesize) @@ -45,7 +94,7 @@ physmem_total (void) #endif #if HAVE_PSTAT_GETSTATIC - { + { /* This works on hpux11. */ struct pst_static pss; if (0 <= pstat_getstatic (&pss, sizeof pss, 1, 0)) { @@ -57,6 +106,80 @@ physmem_total (void) } #endif +#if HAVE_SYSMP && defined MP_SAGET && defined MPSA_RMINFO && defined _SC_PAGESIZE + { /* This works on irix6. */ + struct rminfo realmem; + if (sysmp (MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0) + { + double pagesize = sysconf (_SC_PAGESIZE); + double pages = realmem.physmem; + if (0 <= pages && 0 <= pagesize) + return pages * pagesize; + } + } +#endif + +#if HAVE_GETSYSINFO && defined GSI_PHYSMEM + { /* This works on Tru64 UNIX V4/5. */ + int physmem; + + if (getsysinfo (GSI_PHYSMEM, (caddr_t) &physmem, sizeof (physmem), + NULL, NULL, NULL) == 1) + { + double kbytes = physmem; + + if (0 <= kbytes) + return kbytes * 1024.0; + } + } +#endif + +#if HAVE_SYSCTL && defined HW_PHYSMEM + { /* This works on *bsd and darwin. */ + unsigned int physmem; + size_t len = sizeof physmem; + static int mib[2] = { CTL_HW, HW_PHYSMEM }; + + if (sysctl (mib, ARRAY_SIZE (mib), &physmem, &len, NULL, 0) == 0 + && len == sizeof (physmem)) + return (double) physmem; + } +#endif + +#if HAVE__SYSTEM_CONFIGURATION + /* This works on AIX. */ + return _system_configuration.physmem; +#endif + +#if defined _WIN32 + { /* this works on windows */ + PFN_MS_EX pfnex; + HMODULE h = GetModuleHandle ("kernel32.dll"); + + if (!h) + return 0.0; + + /* Use GlobalMemoryStatusEx if available. */ + if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx"))) + { + lMEMORYSTATUSEX lms_ex; + lms_ex.dwLength = sizeof lms_ex; + if (!pfnex (&lms_ex)) + return 0.0; + return (double) lms_ex.ullTotalPhys; + } + + /* Fall back to GlobalMemoryStatus which is always available. + but returns wrong results for physical memory > 4GB. */ + else + { + MEMORYSTATUS ms; + GlobalMemoryStatus (&ms); + return (double) ms.dwTotalPhys; + } + } +#endif + /* Guess 64 MB. It's probably an older host, so guess small. */ return 64 * 1024 * 1024; } @@ -66,7 +189,7 @@ double physmem_available (void) { #if defined _SC_AVPHYS_PAGES && defined _SC_PAGESIZE - { + { /* This works on linux-gnu, solaris2 and cygwin. */ double pages = sysconf (_SC_AVPHYS_PAGES); double pagesize = sysconf (_SC_PAGESIZE); if (0 <= pages && 0 <= pagesize) @@ -75,7 +198,7 @@ physmem_available (void) #endif #if HAVE_PSTAT_GETSTATIC && HAVE_PSTAT_GETDYNAMIC - { + { /* This works on hpux11. */ struct pst_static pss; struct pst_dynamic psd; if (0 <= pstat_getstatic (&pss, sizeof pss, 1, 0) @@ -89,6 +212,96 @@ physmem_available (void) } #endif +#if HAVE_SYSMP && defined MP_SAGET && defined MPSA_RMINFO && defined _SC_PAGESIZE + { /* This works on irix6. */ + struct rminfo realmem; + if (sysmp (MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0) + { + double pagesize = sysconf (_SC_PAGESIZE); + double pages = realmem.availrmem; + if (0 <= pages && 0 <= pagesize) + return pages * pagesize; + } + } +#endif + +#if HAVE_TABLE && defined TBL_VMSTATS + { /* This works on Tru64 UNIX V4/5. */ + struct tbl_vmstats vmstats; + + if (table (TBL_VMSTATS, 0, &vmstats, 1, sizeof (vmstats)) == 1) + { + double pages = vmstats.free_count; + double pagesize = vmstats.pagesize; + + if (0 <= pages && 0 <= pagesize) + return pages * pagesize; + } + } +#endif + +#if HAVE_SYSCTL && defined HW_USERMEM + { /* This works on *bsd and darwin. */ + unsigned int usermem; + size_t len = sizeof usermem; + static int mib[2] = { CTL_HW, HW_USERMEM }; + + if (sysctl (mib, ARRAY_SIZE (mib), &usermem, &len, NULL, 0) == 0 + && len == sizeof (usermem)) + return (double) usermem; + } +#endif + +#if defined _WIN32 + { /* this works on windows */ + PFN_MS_EX pfnex; + HMODULE h = GetModuleHandle ("kernel32.dll"); + + if (!h) + return 0.0; + + /* Use GlobalMemoryStatusEx if available. */ + if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx"))) + { + lMEMORYSTATUSEX lms_ex; + lms_ex.dwLength = sizeof lms_ex; + if (!pfnex (&lms_ex)) + return 0.0; + return (double) lms_ex.ullAvailPhys; + } + + /* Fall back to GlobalMemoryStatus which is always available. + but returns wrong results for physical memory > 4GB */ + else + { + MEMORYSTATUS ms; + GlobalMemoryStatus (&ms); + return (double) ms.dwAvailPhys; + } + } +#endif + /* Guess 25% of physical memory. */ return physmem_total () / 4; } + + +#if DEBUG + +# include <stdio.h> +# include <stdlib.h> + +int +main (void) +{ + printf ("%12.f %12.f\n", physmem_total (), physmem_available ()); + exit (0); +} + +#endif /* DEBUG */ + +/* +Local Variables: +compile-command: "gcc -DDEBUG -DHAVE_CONFIG_H -I.. -g -O -Wall -W physmem.c" +End: +*/ diff --git a/contrib/gnu-sort/lib/physmem.h b/contrib/gnu-sort/lib/physmem.h index d9a98096f6a1..67f880c9a8d4 100644 --- a/contrib/gnu-sort/lib/physmem.h +++ b/contrib/gnu-sort/lib/physmem.h @@ -1,19 +1,27 @@ -#ifndef PHYSMEM_H_ -# define PHYSMEM_H_ 1 +/* Calculate the size of physical memory. + + 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 General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -# if HAVE_CONFIG_H -# include <config.h> -# endif + 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. -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -# endif + 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. */ + +#ifndef PHYSMEM_H_ +# define PHYSMEM_H_ 1 -double physmem_total PARAMS ((void)); -double physmem_available PARAMS ((void)); +double physmem_total (void); +double physmem_available (void); #endif /* PHYSMEM_H_ */ diff --git a/contrib/gnu-sort/lib/posixver.c b/contrib/gnu-sort/lib/posixver.c index c45ac315bcfa..754d7ac55ace 100644 --- a/contrib/gnu-sort/lib/posixver.c +++ b/contrib/gnu-sort/lib/posixver.c @@ -1,21 +1,20 @@ /* Which POSIX version to conform to, for utilities. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 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 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. */ /* Written by Paul Eggert. */ @@ -23,12 +22,10 @@ # include <config.h> #endif -#include <limits.h> +#include "posixver.h" +#include <limits.h> #include <stdlib.h> -#if !HAVE_DECL_GETENV && !defined getenv -char *getenv (); -#endif #if HAVE_UNISTD_H # include <unistd.h> @@ -37,13 +34,17 @@ char *getenv (); # define _POSIX2_VERSION 0 #endif +#ifndef DEFAULT_POSIX2_VERSION +# define DEFAULT_POSIX2_VERSION _POSIX2_VERSION +#endif + /* The POSIX version that utilities should conform to. The default is specified by the system. */ int posix2_version (void) { - long int v = _POSIX2_VERSION; + long int v = DEFAULT_POSIX2_VERSION; char const *s = getenv ("_POSIX2_VERSION"); if (s && *s) diff --git a/contrib/gnu-sort/lib/quote.c b/contrib/gnu-sort/lib/quote.c index 0ce935cb20a5..5f11d836b3c3 100644 --- a/contrib/gnu-sort/lib/quote.c +++ b/contrib/gnu-sort/lib/quote.c @@ -1,26 +1,39 @@ +/* quote.c - quote arguments for output + Copyright (C) 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 + 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 <eggert@twinsun.com> */ #if HAVE_CONFIG_H # include <config.h> #endif -#if HAVE_STDDEF_H -# include <stddef.h> /* For the definition of size_t on windows w/MSVC. */ -#endif -#include <sys/types.h> -#include <quotearg.h> -#include <quote.h> +#include "quotearg.h" +#include "quote.h" -/* Return an unambiguous printable representated, allocated in slot N, - for NAME, suitable for diagnostics. */ +/* Return an unambiguous printable representation of NAME, + allocated in slot N, suitable for diagnostics. */ char const * quote_n (int n, char const *name) { return quotearg_n_style (n, locale_quoting_style, name); } -/* Return an unambiguous printable representation of NAME, suitable - for diagnostics. */ +/* Return an unambiguous printable representation of NAME, + suitable for diagnostics. */ char const * quote (char const *name) { diff --git a/contrib/gnu-sort/lib/quote.h b/contrib/gnu-sort/lib/quote.h index 5de896bdec4e..682f9d1fd2f9 100644 --- a/contrib/gnu-sort/lib/quote.h +++ b/contrib/gnu-sort/lib/quote.h @@ -1,12 +1,22 @@ -/* prototypes for quote.c */ - -#ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - -char const *quote_n PARAMS ((int n, char const *name)); -char const *quote PARAMS ((char const *name)); +/* quote.h - prototypes for quote.c + + Copyright (C) 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 + 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. */ + + +char const *quote_n (int n, char const *name); +char const *quote (char const *name); diff --git a/contrib/gnu-sort/lib/quotearg.c b/contrib/gnu-sort/lib/quotearg.c index 9d4395659803..c695646f13ec 100644 --- a/contrib/gnu-sort/lib/quotearg.c +++ b/contrib/gnu-sort/lib/quotearg.c @@ -21,52 +21,19 @@ # include <config.h> #endif -#if HAVE_STDDEF_H -# include <stddef.h> /* For the definition of size_t on windows w/MSVC. */ -#endif -#include <sys/types.h> -#include <quotearg.h> -#include <xalloc.h> - -#include <ctype.h> +#include "quotearg.h" -#if ENABLE_NLS -# include <libintl.h> -# define _(text) gettext (text) -#else -# define _(text) text -#endif -#define N_(text) text +#include "xalloc.h" -#if HAVE_LIMITS_H -# include <limits.h> -#endif -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif -#ifndef SIZE_MAX -# define SIZE_MAX ((size_t) -1) -#endif -#ifndef UCHAR_MAX -# define UCHAR_MAX ((unsigned char) -1) -#endif -#ifndef UINT_MAX -# define UINT_MAX ((unsigned int) -1) -#endif - -#if HAVE_C_BACKSLASH_A -# define ALERT_CHAR '\a' -#else -# define ALERT_CHAR '\7' -#endif - -#if HAVE_STDLIB_H -# include <stdlib.h> -#endif +#include <ctype.h> +#include <errno.h> +#include <limits.h> +#include <stdlib.h> +#include <string.h> -#if HAVE_STRING_H -# include <string.h> -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid #if HAVE_WCHAR_H @@ -84,8 +51,12 @@ # undef MB_CUR_MAX # define MB_CUR_MAX 1 # define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0) +# define iswprint(wc) isprint ((unsigned char) (wc)) +# undef HAVE_MBSINIT +#endif + +#if !defined mbsinit && !HAVE_MBSINIT # define mbsinit(ps) 1 -# define iswprint(wc) ISPRINT ((unsigned char) (wc)) #endif #ifndef iswprint @@ -97,17 +68,11 @@ # endif #endif -#define INT_BITS (sizeof (int) * CHAR_BIT) - -#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii(c) +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) #endif -/* Undefine to protect against the definition in wctype.h of solaris2.6. */ -#undef ISPRINT -#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) +#define INT_BITS (sizeof (int) * CHAR_BIT) struct quoting_options { @@ -153,9 +118,10 @@ static struct quoting_options default_quoting_options; struct quoting_options * clone_quoting_options (struct quoting_options *o) { - struct quoting_options *p - = (struct quoting_options *) xmalloc (sizeof (struct quoting_options)); + int e = errno; + struct quoting_options *p = xmalloc (sizeof *p); *p = *(o ? o : &default_quoting_options); + errno = e; return p; } @@ -287,7 +253,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, break; } - for (i = 0; ! (argsize == (size_t) -1 ? arg[i] == '\0' : i == argsize); i++) + for (i = 0; ! (argsize == SIZE_MAX ? arg[i] == '\0' : i == argsize); i++) { unsigned char c; unsigned char esc; @@ -326,8 +292,8 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, case '<': case '=': case '>': /* Escape the second '?' in what would otherwise be a trigraph. */ - i += 2; c = arg[i + 2]; + i += 2; STORE ('?'); STORE ('\\'); STORE ('?'); @@ -340,7 +306,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, } break; - case ALERT_CHAR: esc = 'a'; goto c_escape; + case '\a': esc = 'a'; goto c_escape; case '\b': esc = 'b'; goto c_escape; case '\f': esc = 'f'; goto c_escape; case '\n': esc = 'n'; goto c_and_shell_escape; @@ -428,7 +394,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, if (unibyte_locale) { m = 1; - printable = ISPRINT (c); + printable = isprint (c); } else { @@ -437,7 +403,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, m = 0; printable = 1; - if (argsize == (size_t) -1) + if (argsize == SIZE_MAX) argsize = strlen (arg); do @@ -533,8 +499,11 @@ quotearg_buffer (char *buffer, size_t buffersize, struct quoting_options const *o) { struct quoting_options const *p = o ? o : &default_quoting_options; - return quotearg_buffer_restyled (buffer, buffersize, arg, argsize, - p->style, p); + int e = errno; + size_t r = quotearg_buffer_restyled (buffer, buffersize, arg, argsize, + p->style, p); + errno = e; + return r; } /* Use storage slot N to return a quoted version of argument ARG. @@ -548,6 +517,8 @@ static char * quotearg_n_options (int n, char const *arg, size_t argsize, struct quoting_options const *options) { + int e = errno; + /* Preallocate a slot 0 buffer, so that the caller can always quote one small component of a "memory exhausted" message in slot 0. */ static char slot0[256]; @@ -567,18 +538,16 @@ quotearg_n_options (int n, char const *arg, size_t argsize, if (nslots <= n0) { unsigned int n1 = n0 + 1; - size_t s = n1 * sizeof *slotvec; - if (SIZE_MAX / UINT_MAX <= sizeof *slotvec - && n1 != s / sizeof *slotvec) + if (xalloc_oversized (n1, sizeof *slotvec)) xalloc_die (); if (slotvec == &slotvec0) { - slotvec = (struct slotvec *) xmalloc (sizeof *slotvec); + slotvec = xmalloc (sizeof *slotvec); *slotvec = slotvec0; } - slotvec = (struct slotvec *) xrealloc (slotvec, s); + slotvec = xrealloc (slotvec, n1 * sizeof *slotvec); memset (slotvec + nslots, 0, (n1 - nslots) * sizeof *slotvec); nslots = n1; } @@ -591,10 +560,13 @@ quotearg_n_options (int n, char const *arg, size_t argsize, if (size <= qsize) { slotvec[n].size = size = qsize + 1; - slotvec[n].val = val = xrealloc (val == slot0 ? 0 : val, size); + if (val != slot0) + free (val); + slotvec[n].val = val = xmalloc (size); quotearg_buffer (val, size, arg, argsize, options); } + errno = e; return val; } } @@ -602,7 +574,7 @@ quotearg_n_options (int n, char const *arg, size_t argsize, char * quotearg_n (int n, char const *arg) { - return quotearg_n_options (n, arg, (size_t) -1, &default_quoting_options); + return quotearg_n_options (n, arg, SIZE_MAX, &default_quoting_options); } char * @@ -625,7 +597,7 @@ char * quotearg_n_style (int n, enum quoting_style s, char const *arg) { struct quoting_options const o = quoting_options_from_style (s); - return quotearg_n_options (n, arg, (size_t) -1, &o); + return quotearg_n_options (n, arg, SIZE_MAX, &o); } char * @@ -648,7 +620,7 @@ quotearg_char (char const *arg, char ch) struct quoting_options options; options = default_quoting_options; set_char_quoting (&options, ch, 1); - return quotearg_n_options (0, arg, (size_t) -1, &options); + return quotearg_n_options (0, arg, SIZE_MAX, &options); } char * diff --git a/contrib/gnu-sort/lib/quotearg.h b/contrib/gnu-sort/lib/quotearg.h index 1134a516471a..efc933173dcb 100644 --- a/contrib/gnu-sort/lib/quotearg.h +++ b/contrib/gnu-sort/lib/quotearg.h @@ -1,5 +1,7 @@ /* quotearg.h - quote arguments for output - Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. + + Copyright (C) 1998, 1999, 2000, 2001, 2002 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,6 +19,11 @@ /* Written by Paul Eggert <eggert@twinsun.com> */ +#ifndef QUOTEARG_H_ +# define QUOTEARG_H_ 1 + +# include <stddef.h> + /* Basic quoting styles. */ enum quoting_style { @@ -30,9 +37,9 @@ enum quoting_style }; /* For now, --quoting-style=literal is the default, but this may change. */ -#ifndef DEFAULT_QUOTING_STYLE -# define DEFAULT_QUOTING_STYLE literal_quoting_style -#endif +# ifndef DEFAULT_QUOTING_STYLE +# define DEFAULT_QUOTING_STYLE literal_quoting_style +# endif /* Names of quoting styles and their corresponding values. */ extern char const *const quoting_style_args[]; @@ -40,37 +47,27 @@ extern enum quoting_style const quoting_style_vals[]; struct quoting_options; -#ifndef PARAMS -# if defined PROTOTYPES || defined __STDC__ -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - /* The functions listed below set and use a hidden variable that contains the default quoting style options. */ /* Allocate a new set of quoting options, with contents initially identical to O if O is not null, or to the default if O is null. It is the caller's responsibility to free the result. */ -struct quoting_options *clone_quoting_options - PARAMS ((struct quoting_options *o)); +struct quoting_options *clone_quoting_options (struct quoting_options *o); /* Get the value of O's quoting style. If O is null, use the default. */ -enum quoting_style get_quoting_style PARAMS ((struct quoting_options *o)); +enum quoting_style get_quoting_style (struct quoting_options *o); /* In O (or in the default if O is null), set the value of the quoting style to S. */ -void set_quoting_style PARAMS ((struct quoting_options *o, - enum quoting_style s)); +void set_quoting_style (struct quoting_options *o, enum quoting_style s); /* In O (or in the default if O is null), set the value of the quoting options for character C to I. Return the old value. Currently, the only values defined for I are 0 (the default) and 1 (which means to quote the character even if it would not otherwise be quoted). */ -int set_char_quoting PARAMS ((struct quoting_options *o, char c, int i)); +int set_char_quoting (struct quoting_options *o, char c, int i); /* Place into buffer BUFFER (of size BUFFERSIZE) a quoted version of argument ARG (of size ARGSIZE), using O to control quoting. @@ -80,35 +77,38 @@ int set_char_quoting PARAMS ((struct quoting_options *o, char c, int i)); If BUFFERSIZE is too small to store the output string, return the value that would have been returned had BUFFERSIZE been large enough. If ARGSIZE is -1, use the string length of the argument for ARGSIZE. */ -size_t quotearg_buffer PARAMS ((char *buffer, size_t buffersize, - char const *arg, size_t argsize, - struct quoting_options const *o)); +size_t quotearg_buffer (char *buffer, size_t buffersize, + char const *arg, size_t argsize, + struct quoting_options const *o); /* Use storage slot N to return a quoted version of the string ARG. Use the default quoting options. The returned value points to static storage that can be reused by the next call to this function with the same value of N. N must be nonnegative. */ -char *quotearg_n PARAMS ((int n, char const *arg)); +char *quotearg_n (int n, char const *arg); /* Equivalent to quotearg_n (0, ARG). */ -char *quotearg PARAMS ((char const *arg)); +char *quotearg (char const *arg); /* Use style S and storage slot N to return a quoted version of the string ARG. This is like quotearg_n (N, ARG), except that it uses S with no other options to specify the quoting method. */ -char *quotearg_n_style PARAMS ((int n, enum quoting_style s, char const *arg)); +char *quotearg_n_style (int n, enum quoting_style s, char const *arg); + /* Use style S and storage slot N to return a quoted version of the argument ARG of size ARGSIZE. This is like quotearg_n_style (N, S, ARG), except it can quote null bytes. */ -char *quotearg_n_style_mem PARAMS ((int n, enum quoting_style s, - char const *arg, size_t argsize)); +char *quotearg_n_style_mem (int n, enum quoting_style s, + char const *arg, size_t argsize); /* Equivalent to quotearg_n_style (0, S, ARG). */ -char *quotearg_style PARAMS ((enum quoting_style s, char const *arg)); +char *quotearg_style (enum quoting_style s, char const *arg); /* Like quotearg (ARG), except also quote any instances of CH. */ -char *quotearg_char PARAMS ((char const *arg, char ch)); +char *quotearg_char (char const *arg, char ch); /* Equivalent to quotearg_char (ARG, ':'). */ -char *quotearg_colon PARAMS ((char const *arg)); +char *quotearg_colon (char const *arg); + +#endif /* !QUOTEARG_H_ */ diff --git a/contrib/gnu-sort/lib/stdio-safer.h b/contrib/gnu-sort/lib/stdio-safer.h index bd5cbd8da8a9..8a22f1220658 100644 --- a/contrib/gnu-sort/lib/stdio-safer.h +++ b/contrib/gnu-sort/lib/stdio-safer.h @@ -1,9 +1,23 @@ -#ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - -FILE *fopen_safer PARAMS ((char const *, char const *)); +/* Invoke stdio functions, but avoid some glitches. + + 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, 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 <stdio.h> + +FILE *fopen_safer (char const *, char const *); diff --git a/contrib/gnu-sort/lib/strnlen.c b/contrib/gnu-sort/lib/strnlen.c new file mode 100644 index 000000000000..c9f389845117 --- /dev/null +++ b/contrib/gnu-sort/lib/strnlen.c @@ -0,0 +1,48 @@ +/* Find the length of STRING, but scan at most MAXLEN characters. + Copyright (C) 1996, 1997, 1998, 2000-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) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif +#undef strnlen + +#include <string.h> + +#undef __strnlen +#undef strnlen + +#ifndef _LIBC +# define strnlen rpl_strnlen +#endif + +#ifndef weak_alias +# define __strnlen strnlen +#endif + +/* Find the length of STRING, but scan at most MAXLEN characters. + If no '\0' terminator is found in that many characters, return MAXLEN. */ + +size_t +__strnlen (const char *string, size_t maxlen) +{ + const char *end = memchr (string, '\0', maxlen); + return end ? (size_t) (end - string) : maxlen; +} +#ifdef weak_alias +weak_alias (__strnlen, strnlen) +#endif diff --git a/contrib/gnu-sort/lib/timespec.h b/contrib/gnu-sort/lib/timespec.h new file mode 100644 index 000000000000..2c32a23db425 --- /dev/null +++ b/contrib/gnu-sort/lib/timespec.h @@ -0,0 +1,71 @@ +/* timespec -- System time interface + + Copyright (C) 2000, 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if ! defined TIMESPEC_H +# define TIMESPEC_H + +/* You must include config.h before including this file. */ + +# include <sys/types.h> +# if TIME_WITH_SYS_TIME +# include <sys/time.h> +# include <time.h> +# else +# if HAVE_SYS_TIME_H +# include <sys/time.h> +# else +# include <time.h> +# endif +# endif + +# if ! HAVE_STRUCT_TIMESPEC +/* Some systems don't define this struct, e.g., AIX 4.1, Ultrix 4.3. */ +struct timespec +{ + time_t tv_sec; + long tv_nsec; +}; +# endif + +# ifdef ST_MTIM_NSEC +# define ST_TIME_CMP_NS(a, b, ns) ((a).ns < (b).ns ? -1 : (a).ns > (b).ns) +# else +# define ST_TIME_CMP_NS(a, b, ns) 0 +# endif +# define ST_TIME_CMP(a, b, s, ns) \ + ((a).s < (b).s ? -1 : (a).s > (b).s ? 1 : ST_TIME_CMP_NS(a, b, ns)) +# define ATIME_CMP(a, b) ST_TIME_CMP (a, b, st_atime, st_atim.ST_MTIM_NSEC) +# define CTIME_CMP(a, b) ST_TIME_CMP (a, b, st_ctime, st_ctim.ST_MTIM_NSEC) +# define MTIME_CMP(a, b) ST_TIME_CMP (a, b, st_mtime, st_mtim.ST_MTIM_NSEC) + +# ifdef ST_MTIM_NSEC +# define TIMESPEC_NS(timespec) ((timespec).ST_MTIM_NSEC) +# else +# define TIMESPEC_NS(timespec) 0 +# endif + +# if ! HAVE_DECL_NANOSLEEP +/* Don't specify a prototype here. Some systems (e.g., OSF) declare + nanosleep with a conflicting one (const-less first parameter). */ +int nanosleep (); +# endif + +int gettime (struct timespec *); +int settime (struct timespec const *); + +#endif diff --git a/contrib/gnu-sort/lib/umaxtostr.c b/contrib/gnu-sort/lib/umaxtostr.c new file mode 100644 index 000000000000..4f49a7f8ddd9 --- /dev/null +++ b/contrib/gnu-sort/lib/umaxtostr.c @@ -0,0 +1,3 @@ +#define inttostr umaxtostr +#define inttype uintmax_t +#include "inttostr.c" diff --git a/contrib/gnu-sort/lib/unistd-safer.h b/contrib/gnu-sort/lib/unistd-safer.h index 1b6a0f7615ee..2976e9d0dc01 100644 --- a/contrib/gnu-sort/lib/unistd-safer.h +++ b/contrib/gnu-sort/lib/unistd-safer.h @@ -1,9 +1,21 @@ -#ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - -int dup_safer PARAMS ((int)); +/* Invoke unistd functions, but avoid some glitches. + + 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, 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. */ + +int dup_safer (int); diff --git a/contrib/gnu-sort/lib/version-etc.c b/contrib/gnu-sort/lib/version-etc.c index 4d4facf0c2b6..7523b087b237 100644 --- a/contrib/gnu-sort/lib/version-etc.c +++ b/contrib/gnu-sort/lib/version-etc.c @@ -1,5 +1,5 @@ /* Utility to help print --version output in a consistent format. - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999-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 @@ -21,44 +21,124 @@ # include <config.h> #endif +/* Specification. */ +#include "version-etc.h" + +#include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include "unlocked-io.h" -#include "version-etc.h" -#if ENABLE_NLS -# include <libintl.h> -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) /* Default copyright goes to the FSF. */ -char* version_etc_copyright = +const char* version_etc_copyright = /* Do *not* mark this string for translation. */ - "Copyright (C) 2002 Free Software Foundation, Inc."; + "Copyright (C) 2004 Free Software Foundation, Inc."; -/* Display the --version information the standard way. +/* Like version_etc, below, but with the NULL-terminated author list + provided via a variable of type va_list. */ +void +version_etc_va (FILE *stream, + const char *command_name, const char *package, + const char *version, va_list authors) +{ + unsigned int n_authors; - If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of - the program. The formats are therefore: + /* Count the number of authors. */ + { + va_list tmp_authors; - PACKAGE VERSION +#ifdef __va_copy + __va_copy (tmp_authors, authors); +#else + tmp_authors = authors; +#endif - or + n_authors = 0; + while (va_arg (tmp_authors, const char *) != NULL) + ++n_authors; + } - COMMAND_NAME (PACKAGE) VERSION. */ -void -version_etc (FILE *stream, - const char *command_name, const char *package, - const char *version, const char *authors) -{ if (command_name) fprintf (stream, "%s (%s) %s\n", command_name, package, version); else fprintf (stream, "%s %s\n", package, version); - fprintf (stream, _("Written by %s.\n"), authors); + + switch (n_authors) + { + case 0: + /* The caller must provide at least one author name. */ + abort (); + case 1: + /* TRANSLATORS: %s denotes an author name. */ + vfprintf (stream, _("Written by %s.\n"), authors); + break; + case 2: + /* TRANSLATORS: Each %s denotes an author name. */ + vfprintf (stream, _("Written by %s and %s.\n"), authors); + break; + case 3: + /* TRANSLATORS: Each %s denotes an author name. */ + vfprintf (stream, _("Written by %s, %s, and %s.\n"), authors); + break; + case 4: + /* TRANSLATORS: Each %s denotes an author name. + You can use line breaks, estimating that each author name occupies + ca. 16 screen columns and that a screen line has ca. 80 columns. */ + vfprintf (stream, _("Written by %s, %s, %s,\nand %s.\n"), authors); + break; + case 5: + /* TRANSLATORS: Each %s denotes an author name. + You can use line breaks, estimating that each author name occupies + ca. 16 screen columns and that a screen line has ca. 80 columns. */ + vfprintf (stream, _("Written by %s, %s, %s,\n%s, and %s.\n"), authors); + break; + case 6: + /* TRANSLATORS: Each %s denotes an author name. + You can use line breaks, estimating that each author name occupies + ca. 16 screen columns and that a screen line has ca. 80 columns. */ + vfprintf (stream, _("Written by %s, %s, %s,\n%s, %s, and %s.\n"), + authors); + break; + case 7: + /* TRANSLATORS: Each %s denotes an author name. + You can use line breaks, estimating that each author name occupies + ca. 16 screen columns and that a screen line has ca. 80 columns. */ + vfprintf (stream, _("Written by %s, %s, %s,\n%s, %s, %s, and %s.\n"), + authors); + break; + case 8: + /* TRANSLATORS: Each %s denotes an author name. + You can use line breaks, estimating that each author name occupies + ca. 16 screen columns and that a screen line has ca. 80 columns. */ + vfprintf (stream, _("\ +Written by %s, %s, %s,\n%s, %s, %s, %s,\nand %s.\n"), + authors); + break; + case 9: + /* TRANSLATORS: Each %s denotes an author name. + You can use line breaks, estimating that each author name occupies + ca. 16 screen columns and that a screen line has ca. 80 columns. */ + vfprintf (stream, _("\ +Written by %s, %s, %s,\n%s, %s, %s, %s,\n%s, and %s.\n"), + authors); + break; + default: + /* 10 or more authors. Use an abbreviation, since the human reader + will probably not want to read the entire list anyway. */ + /* TRANSLATORS: Each %s denotes an author name. + You can use line breaks, estimating that each author name occupies + ca. 16 screen columns and that a screen line has ca. 80 columns. */ + vfprintf (stream, _("\ +Written by %s, %s, %s,\n%s, %s, %s, %s,\n%s, %s, and others.\n"), + authors); + break; + } + va_end (authors); putc ('\n', stream); fputs (version_etc_copyright, stream); @@ -69,3 +149,28 @@ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"), stream); } + + +/* Display the --version information the standard way. + + If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of + the program. The formats are therefore: + + PACKAGE VERSION + + or + + COMMAND_NAME (PACKAGE) VERSION. + + The author names are passed as separate arguments, with an additional + NULL argument at the end. */ +void +version_etc (FILE *stream, + const char *command_name, const char *package, + const char *version, /* const char *author1, ...*/ ...) +{ + va_list authors; + + va_start (authors, version); + version_etc_va (stream, command_name, package, version, authors); +} diff --git a/contrib/gnu-sort/lib/version-etc.h b/contrib/gnu-sort/lib/version-etc.h index ae223d44e5a4..d505e75eae7d 100644 --- a/contrib/gnu-sort/lib/version-etc.h +++ b/contrib/gnu-sort/lib/version-etc.h @@ -1,5 +1,5 @@ /* Utility to help print --version output in a consistent format. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 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 @@ -20,19 +20,18 @@ #ifndef VERSION_ETC_H # define VERSION_ETC_H 1 -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -# endif +# include <stdarg.h> +# include <stdio.h> -extern char *version_etc_copyright; +extern const char *version_etc_copyright; -void -version_etc PARAMS ((FILE *stream, - const char *command_name, const char *package, - const char *version, const char *authors)); +extern void version_etc_va (FILE *stream, + const char *command_name, const char *package, + const char *version, va_list authors); + +extern void version_etc (FILE *stream, + const char *command_name, const char *package, + const char *version, + /* const char *author1, ...*/ ...); #endif /* VERSION_ETC_H */ diff --git a/contrib/gnu-sort/lib/xalloc.h b/contrib/gnu-sort/lib/xalloc.h index 098a6c2e0730..4b6585811bbc 100644 --- a/contrib/gnu-sort/lib/xalloc.h +++ b/contrib/gnu-sort/lib/xalloc.h @@ -1,5 +1,7 @@ /* xalloc.h -- malloc with out-of-memory checking - Copyright (C) 1990-1998, 1999, 2000 Free Software Foundation, Inc. + + Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 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 @@ -18,13 +20,7 @@ #ifndef XALLOC_H_ # define XALLOC_H_ -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -# endif +# include <stddef.h> # ifndef __attribute__ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ @@ -36,14 +32,9 @@ # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) # endif -/* Exit value when the requested amount of memory is not available. - It is initialized to EXIT_FAILURE, but the caller may set it to - some other value. */ -extern int xalloc_exit_failure; - /* If this pointer is non-zero, run the specified function upon each allocation failure. It is initialized to zero. */ -extern void (*xalloc_fail_func) PARAMS ((void)); +extern void (*xalloc_fail_func) (void); /* If XALLOC_FAIL_FUNC is undefined or a function that returns, this message is output. It is translated via gettext. @@ -51,37 +42,46 @@ extern void (*xalloc_fail_func) PARAMS ((void)); extern char const xalloc_msg_memory_exhausted[]; /* This function is always triggered when memory is exhausted. It is - in charge of honoring the three previous items. This is the + in charge of honoring the two previous items. It exits with status + exit_failure (defined in exitfail.h). This is the function to call when one wants the program to die because of a memory allocation failure. */ -extern void xalloc_die PARAMS ((void)) ATTRIBUTE_NORETURN; - -void *xmalloc PARAMS ((size_t n)); -void *xcalloc PARAMS ((size_t n, size_t s)); -void *xrealloc PARAMS ((void *p, size_t n)); -char *xstrdup PARAMS ((const char *str)); - -# define XMALLOC(Type, N_items) ((Type *) xmalloc (sizeof (Type) * (N_items))) -# define XCALLOC(Type, N_items) ((Type *) xcalloc (sizeof (Type), (N_items))) -# define XREALLOC(Ptr, Type, N_items) \ - ((Type *) xrealloc ((void *) (Ptr), sizeof (Type) * (N_items))) - -/* Declare and alloc memory for VAR of type TYPE. */ -# define NEW(Type, Var) Type *(Var) = XMALLOC (Type, 1) - -/* Free VAR only if non NULL. */ -# define XFREE(Var) \ - do { \ - if (Var) \ - free (Var); \ - } while (0) - -/* Return a pointer to a malloc'ed copy of the array SRC of NUM elements. */ -# define CCLONE(Src, Num) \ - (memcpy (xmalloc (sizeof (*Src) * (Num)), (Src), sizeof (*Src) * (Num))) - -/* Return a malloc'ed copy of SRC. */ -# define CLONE(Src) CCLONE (Src, 1) - +extern void xalloc_die (void) ATTRIBUTE_NORETURN; + +void *xmalloc (size_t s); +void *xnmalloc (size_t n, size_t s); +void *xzalloc (size_t s); +void *xcalloc (size_t n, size_t s); +void *xrealloc (void *p, size_t s); +void *xnrealloc (void *p, size_t n, size_t s); +void *x2realloc (void *p, size_t *pn); +void *x2nrealloc (void *p, size_t *pn, size_t s); +void *xclone (void const *p, size_t s); +char *xstrdup (const char *str); + +/* Return 1 if an array of N objects, each of size S, cannot exist due + to size arithmetic overflow. S must be positive and N must be + nonnegative. This is a macro, not an inline function, so that it + works correctly even when SIZE_MAX < N. + + By gnulib convention, SIZE_MAX represents overflow in size + calculations, so the conservative dividend to use here is + SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value. + However, malloc (SIZE_MAX) fails on all known hosts where + sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for + exactly-SIZE_MAX allocations on such hosts; this avoids a test and + branch when S is known to be 1. */ +# define xalloc_oversized(n, s) \ + ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) + +/* These macros are deprecated; they will go away soon, and are retained + temporarily only to ease conversion to the functions described above. */ +# define CCLONE(p, n) xclone (p, (n) * sizeof *(p)) +# define CLONE(p) xclone (p, sizeof *(p)) +# define NEW(type, var) type *var = xmalloc (sizeof (type)) +# define XCALLOC(type, n) xcalloc (n, sizeof (type)) +# define XMALLOC(type, n) xnmalloc (n, sizeof (type)) +# define XREALLOC(p, type, n) xnrealloc (p, n, sizeof (type)) +# define XFREE(p) free (p) #endif /* !XALLOC_H_ */ diff --git a/contrib/gnu-sort/lib/xmalloc.c b/contrib/gnu-sort/lib/xmalloc.c index bc6c0bd14ad4..181006b43dbc 100644 --- a/contrib/gnu-sort/lib/xmalloc.c +++ b/contrib/gnu-sort/lib/xmalloc.c @@ -1,5 +1,7 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-1999, 2000, 2002 Free Software Foundation, Inc. + + Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003, + 1999, 2000, 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 @@ -19,47 +21,32 @@ # include <config.h> #endif -#include <sys/types.h> +#include "xalloc.h" -#if STDC_HEADERS -# include <stdlib.h> -#else -void *calloc (); -void *malloc (); -void *realloc (); -void free (); -#endif +#include <stdlib.h> +#include <string.h> -#if ENABLE_NLS -# include <libintl.h> -# define _(Text) gettext (Text) -#else -# define textdomain(Domain) -# define _(Text) Text -#endif -#define N_(Text) Text +#include "gettext.h" +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid #include "error.h" -#include "xalloc.h" +#include "exitfail.h" -#ifndef EXIT_FAILURE -# define EXIT_FAILURE 1 +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) #endif #ifndef HAVE_MALLOC -"you must run the autoconf test for a properly working malloc" +"you must run the autoconf test for a GNU libc compatible malloc" #endif #ifndef HAVE_REALLOC -"you must run the autoconf test for a properly working realloc" +"you must run the autoconf test for a GNU libc compatible realloc" #endif -/* Exit value when the requested amount of memory is not available. - The caller may set it to some other value. */ -int xalloc_exit_failure = EXIT_FAILURE; - /* If non NULL, call this function when memory is exhausted. */ -void (*xalloc_fail_func) PARAMS ((void)) = 0; +void (*xalloc_fail_func) (void) = 0; /* If XALLOC_FAIL_FUNC is NULL, or does return, display this message before exiting when memory is exhausted. Goes through gettext. */ @@ -70,11 +57,29 @@ xalloc_die (void) { if (xalloc_fail_func) (*xalloc_fail_func) (); - error (xalloc_exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted)); + error (exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted)); /* The `noreturn' cannot be given to error, since it may return if its first argument is 0. To help compilers understand the - xalloc_die does terminate, call exit. */ - exit (EXIT_FAILURE); + xalloc_die does terminate, call abort. */ + abort (); +} + +/* Allocate an array of N objects, each with S bytes of memory, + dynamically, with error checking. S must be nonzero. */ + +static inline void * +xnmalloc_inline (size_t n, size_t s) +{ + void *p; + if (xalloc_oversized (n, s) || ! (p = malloc (n * s))) + xalloc_die (); + return p; +} + +void * +xnmalloc (size_t n, size_t s) +{ + return xnmalloc_inline (n, s); } /* Allocate N bytes of memory dynamically, with error checking. */ @@ -82,35 +87,169 @@ xalloc_die (void) void * xmalloc (size_t n) { - void *p; + return xnmalloc_inline (n, 1); +} + +/* Change the size of an allocated block of memory P to an array of N + objects each of S bytes, with error checking. S must be nonzero. */ - p = malloc (n); - if (p == 0) +static inline void * +xnrealloc_inline (void *p, size_t n, size_t s) +{ + if (xalloc_oversized (n, s) || ! (p = realloc (p, n * s))) xalloc_die (); return p; } +void * +xnrealloc (void *p, size_t n, size_t s) +{ + return xnrealloc_inline (p, n, s); +} + /* Change the size of an allocated block of memory P to N bytes, with error checking. */ void * xrealloc (void *p, size_t n) { - p = realloc (p, n); - if (p == 0) - xalloc_die (); - return p; + return xnrealloc_inline (p, n, 1); } -/* Allocate memory for N elements of S bytes, with error checking. */ + +/* If P is null, allocate a block of at least *PN such objects; + otherwise, reallocate P so that it contains more than *PN objects + each of S bytes. *PN must be nonzero unless P is null, and S must + be nonzero. Set *PN to the new number of objects, and return the + pointer to the new block. *PN is never set to zero, and the + returned pointer is never null. + + Repeated reallocations are guaranteed to make progress, either by + allocating an initial block with a nonzero size, or by allocating a + larger block. + + In the following implementation, nonzero sizes are doubled so that + repeated reallocations have O(N log N) overall cost rather than + O(N**2) cost, but the specification for this function does not + guarantee that sizes are doubled. + + Here is an example of use: + + int *p = NULL; + size_t used = 0; + size_t allocated = 0; + + void + append_int (int value) + { + if (used == allocated) + p = x2nrealloc (p, &allocated, sizeof *p); + p[used++] = value; + } + + This causes x2nrealloc to allocate a block of some nonzero size the + first time it is called. + + To have finer-grained control over the initial size, set *PN to a + nonzero value before calling this function with P == NULL. For + example: + + int *p = NULL; + size_t used = 0; + size_t allocated = 0; + size_t allocated1 = 1000; + + void + append_int (int value) + { + if (used == allocated) + { + p = x2nrealloc (p, &allocated1, sizeof *p); + allocated = allocated1; + } + p[used++] = value; + } + + */ + +static inline void * +x2nrealloc_inline (void *p, size_t *pn, size_t s) +{ + size_t n = *pn; + + if (! p) + { + if (! n) + { + /* The approximate size to use for initial small allocation + requests, when the invoking code specifies an old size of + zero. 64 bytes is the largest "small" request for the + GNU C library malloc. */ + enum { DEFAULT_MXFAST = 64 }; + + n = DEFAULT_MXFAST / s; + n += !n; + } + } + else + { + if (SIZE_MAX / 2 / s < n) + xalloc_die (); + n *= 2; + } + + *pn = n; + return xrealloc (p, n * s); +} + +void * +x2nrealloc (void *p, size_t *pn, size_t s) +{ + return x2nrealloc_inline (p, pn, s); +} + +/* If P is null, allocate a block of at least *PN bytes; otherwise, + reallocate P so that it contains more than *PN bytes. *PN must be + nonzero unless P is null. Set *PN to the new block's size, and + return the pointer to the new block. *PN is never set to zero, and + the returned pointer is never null. */ + +void * +x2realloc (void *p, size_t *pn) +{ + return x2nrealloc_inline (p, pn, 1); +} + +/* Allocate S bytes of zeroed memory dynamically, with error checking. + There's no need for xnzalloc (N, S), since it would be equivalent + to xcalloc (N, S). */ + +void * +xzalloc (size_t s) +{ + return memset (xmalloc (s), 0, s); +} + +/* Allocate zeroed memory for N elements of S bytes, with error + checking. S must be nonzero. */ void * xcalloc (size_t n, size_t s) { void *p; - - p = calloc (n, s); - if (p == 0) + /* Test for overflow, since some calloc implementations don't have + proper overflow checks. */ + if (xalloc_oversized (n, s) || ! (p = calloc (n, s))) xalloc_die (); return p; } + +/* Clone an object P of size S, with error checking. There's no need + for xnclone (P, N, S), since xclone (P, N * S) works without any + need for an arithmetic overflow check. */ + +void * +xclone (void const *p, size_t s) +{ + return memcpy (xmalloc (s), p, s); +} diff --git a/contrib/gnu-sort/lib/xmemcoll.c b/contrib/gnu-sort/lib/xmemcoll.c index 0e35cb677d58..0e30aef15067 100644 --- a/contrib/gnu-sort/lib/xmemcoll.c +++ b/contrib/gnu-sort/lib/xmemcoll.c @@ -1,5 +1,5 @@ /* Locale-specific memory comparison. - 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 @@ -28,22 +28,15 @@ extern int errno; #include <stdlib.h> -#if ENABLE_NLS -# include <libintl.h> -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) #include "error.h" +#include "exitfail.h" #include "memcoll.h" #include "quotearg.h" #include "xmemcoll.h" -/* Exit value when xmemcoll fails. - The caller may set it to some other value. */ -int xmemcoll_exit_failure = EXIT_FAILURE; - /* Compare S1 (with length S1LEN) and S2 (with length S2LEN) according to the LC_COLLATE locale. S1 and S2 do not overlap, and are not adjacent. Temporarily modify the bytes after S1 and S2, but @@ -60,7 +53,7 @@ xmemcoll (char *s1, size_t s1len, char *s2, size_t s2len) { error (0, collation_errno, _("string comparison failed")); error (0, 0, _("Set LC_ALL='C' to work around the problem.")); - error (xmemcoll_exit_failure, 0, + error (exit_failure, 0, _("The strings compared were %s and %s."), quotearg_n_style_mem (0, locale_quoting_style, s1, s1len), quotearg_n_style_mem (1, locale_quoting_style, s2, s2len)); diff --git a/contrib/gnu-sort/lib/xmemcoll.h b/contrib/gnu-sort/lib/xmemcoll.h index dfda0fce98cc..2f422e8c1c00 100644 --- a/contrib/gnu-sort/lib/xmemcoll.h +++ b/contrib/gnu-sort/lib/xmemcoll.h @@ -1,2 +1,2 @@ -extern int xmemcoll_exit_failure; +#include <stddef.h> int xmemcoll (char *, size_t, char *, size_t); diff --git a/contrib/gnu-sort/lib/xstrtol.c b/contrib/gnu-sort/lib/xstrtol.c index 446d62ec1f52..d0aa0a968688 100644 --- a/contrib/gnu-sort/lib/xstrtol.c +++ b/contrib/gnu-sort/lib/xstrtol.c @@ -1,5 +1,7 @@ /* A more useful interface to strtol. - Copyright (C) 1995, 1996, 1998-2001 Free Software Foundation, Inc. + + Copyright (C) 1995, 1996, 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 @@ -25,48 +27,37 @@ # define __strtol strtol # define __strtol_t long int # define __xstrtol xstrtol +# define STRTOL_T_MINIMUM LONG_MIN +# define STRTOL_T_MAXIMUM LONG_MAX #endif /* Some pre-ANSI implementations (e.g. SunOS 4) need stderr defined if assertion checking is enabled. */ #include <stdio.h> -#if STDC_HEADERS -# include <stdlib.h> -#endif - -#if HAVE_STRING_H -# include <string.h> -#else -# include <strings.h> -# ifndef strchr -# define strchr index -# endif -#endif - #include <assert.h> #include <ctype.h> +#include <stdlib.h> +#include <string.h> #include <errno.h> #ifndef errno extern int errno; #endif -#if HAVE_LIMITS_H -# include <limits.h> -#endif - -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif +#include <limits.h> /* The extra casts work around common compiler bugs. */ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) -/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. - It is necessary at least when t == time_t. */ #define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ - ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) -#define TYPE_MAXIMUM(t) (~ (t) 0 - TYPE_MINIMUM (t)) + ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) \ + : (t) 0)) +#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t))) + +#ifndef STRTOL_T_MINIMUM +# define STRTOL_T_MINIMUM TYPE_MINIMUM (__strtol_t) +# define STRTOL_T_MAXIMUM TYPE_MAXIMUM (__strtol_t) +#endif #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) # define IN_CTYPE_DOMAIN(c) 1 @@ -78,14 +69,6 @@ extern int errno; #include "xstrtol.h" -#if !HAVE_DECL_STRTOL && !defined strtol -long int strtol (); -#endif - -#if !HAVE_DECL_STRTOUL && !defined strtoul -unsigned long int strtoul (); -#endif - #if !HAVE_DECL_STRTOIMAX && !defined strtoimax intmax_t strtoimax (); #endif @@ -94,24 +77,30 @@ intmax_t strtoimax (); uintmax_t strtoumax (); #endif -static int +static strtol_error bkm_scale (__strtol_t *x, int scale_factor) { - __strtol_t product = *x * scale_factor; - if (*x != product / scale_factor) - return 1; - *x = product; - return 0; + if (TYPE_SIGNED (__strtol_t) && *x < STRTOL_T_MINIMUM / scale_factor) + { + *x = STRTOL_T_MINIMUM; + return LONGINT_OVERFLOW; + } + if (STRTOL_T_MAXIMUM / scale_factor < *x) + { + *x = STRTOL_T_MAXIMUM; + return LONGINT_OVERFLOW; + } + *x *= scale_factor; + return LONGINT_OK; } -static int +static strtol_error bkm_scale_by_power (__strtol_t *x, int base, int power) { + strtol_error err = LONGINT_OK; while (power--) - if (bkm_scale (x, base)) - return 1; - - return 0; + err |= bkm_scale (x, base); + return err; } /* FIXME: comment. */ @@ -123,6 +112,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base, char *t_ptr; char **p; __strtol_t tmp; + strtol_error err = LONGINT_OK; assert (0 <= strtol_base && strtol_base <= 36); @@ -139,8 +129,6 @@ __xstrtol (const char *s, char **ptr, int strtol_base, errno = 0; tmp = __strtol (s, p, strtol_base); - if (errno != 0) - return LONGINT_OVERFLOW; if (*p == s) { @@ -151,6 +139,12 @@ __xstrtol (const char *s, char **ptr, int strtol_base, else return LONGINT_INVALID; } + else if (errno != 0) + { + if (errno != ERANGE) + return LONGINT_INVALID; + err = LONGINT_OVERFLOW; + } /* Let valid_suffixes == NULL mean `allow any suffix'. */ /* FIXME: update all callers except the ones that allow suffixes @@ -158,19 +152,19 @@ __xstrtol (const char *s, char **ptr, int strtol_base, if (!valid_suffixes) { *val = tmp; - return LONGINT_OK; + return err; } if (**p != '\0') { int base = 1024; int suffixes = 1; - int overflow; + strtol_error overflow; if (!strchr (valid_suffixes, **p)) { *val = tmp; - return LONGINT_INVALID_SUFFIX_CHAR; + return err | LONGINT_INVALID_SUFFIX_CHAR; } if (strchr (valid_suffixes, '0')) @@ -253,18 +247,17 @@ __xstrtol (const char *s, char **ptr, int strtol_base, default: *val = tmp; - return LONGINT_INVALID_SUFFIX_CHAR; - break; + return err | LONGINT_INVALID_SUFFIX_CHAR; } - if (overflow) - return LONGINT_OVERFLOW; - - (*p) += suffixes; + err |= overflow; + *p += suffixes; + if (**p) + err |= LONGINT_INVALID_SUFFIX_CHAR; } *val = tmp; - return LONGINT_OK; + return err; } #ifdef TESTING_XSTRTO @@ -275,7 +268,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base, char *program_name; int -main (int argc, char** argv) +main (int argc, char **argv) { strtol_error s_err; int i; diff --git a/contrib/gnu-sort/lib/xstrtol.h b/contrib/gnu-sort/lib/xstrtol.h index 513855f14e5d..5765c88e239b 100644 --- a/contrib/gnu-sort/lib/xstrtol.h +++ b/contrib/gnu-sort/lib/xstrtol.h @@ -1,5 +1,7 @@ /* A more useful interface to strtol. - Copyright 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc. + + Copyright (C) 1995, 1996, 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 @@ -18,30 +20,36 @@ #ifndef XSTRTOL_H_ # define XSTRTOL_H_ 1 -# if HAVE_INTTYPES_H -# include <inttypes.h> /* for uintmax_t */ -# endif +# include "exitfail.h" -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () +/* Get uintmax_t. */ +# if HAVE_INTTYPES_H +# include <inttypes.h> +# else +# if HAVE_STDINT_H +# include <stdint.h> # endif # endif # ifndef _STRTOL_ERROR enum strtol_error { - LONGINT_OK, LONGINT_INVALID, LONGINT_INVALID_SUFFIX_CHAR, LONGINT_OVERFLOW + LONGINT_OK = 0, + + /* These two values can be ORed together, to indicate that both + errors occurred. */ + LONGINT_OVERFLOW = 1, + LONGINT_INVALID_SUFFIX_CHAR = 2, + + LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW = (LONGINT_INVALID_SUFFIX_CHAR + | LONGINT_OVERFLOW), + LONGINT_INVALID = 4 }; typedef enum strtol_error strtol_error; # endif # define _DECLARE_XSTRTOL(name, type) \ - strtol_error \ - name PARAMS ((const char *s, char **ptr, int base, \ - type *val, const char *valid_suffixes)); + strtol_error name (const char *, char **, int, type *, const char *); _DECLARE_XSTRTOL (xstrtol, long int) _DECLARE_XSTRTOL (xstrtoul, unsigned long int) _DECLARE_XSTRTOL (xstrtoimax, intmax_t) @@ -52,7 +60,7 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t) { \ switch ((Err)) \ { \ - case LONGINT_OK: \ + default: \ abort (); \ \ case LONGINT_INVALID: \ @@ -61,6 +69,7 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t) break; \ \ case LONGINT_INVALID_SUFFIX_CHAR: \ + case LONGINT_INVALID_SUFFIX_CHAR | LONGINT_OVERFLOW: \ error ((Exit_code), 0, "invalid character following %s in `%s'", \ (Argument_type_string), (Str)); \ break; \ @@ -74,7 +83,7 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t) while (0) # define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err) \ - _STRTOL_ERROR (2, Str, Argument_type_string, Err) + _STRTOL_ERROR (exit_failure, Str, Argument_type_string, Err) # define STRTOL_FAIL_WARN(Str, Argument_type_string, Err) \ _STRTOL_ERROR (0, Str, Argument_type_string, Err) diff --git a/contrib/gnu-sort/lib/xstrtoul.c b/contrib/gnu-sort/lib/xstrtoul.c index 6140bbee2e44..285f7b96f850 100644 --- a/contrib/gnu-sort/lib/xstrtoul.c +++ b/contrib/gnu-sort/lib/xstrtoul.c @@ -1,4 +1,6 @@ #define __strtol strtoul #define __strtol_t unsigned long int #define __xstrtol xstrtoul +#define STRTOL_T_MINIMUM 0 +#define STRTOL_T_MAXIMUM ULONG_MAX #include "xstrtol.c" diff --git a/contrib/gnu-sort/lib/xstrtoumax.c b/contrib/gnu-sort/lib/xstrtoumax.c index 04d7cf98ae4c..a8858bf6d75e 100644 --- a/contrib/gnu-sort/lib/xstrtoumax.c +++ b/contrib/gnu-sort/lib/xstrtoumax.c @@ -1,5 +1,5 @@ /* xstrtoumax.c -- A more useful interface to strtoumax. - Copyright 1999 Free Software Foundation, Inc. + Copyright (C) 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 @@ -23,9 +23,15 @@ #if HAVE_INTTYPES_H # include <inttypes.h> +#elif HAVE_STDINT_H +# include <stdint.h> #endif #define __strtol strtoumax #define __strtol_t uintmax_t #define __xstrtol xstrtoumax +#ifdef UINTMAX_MAX +# define STRTOL_T_MINIMUM 0 +# define STRTOL_T_MAXIMUM UINTMAX_MAX +#endif #include "xstrtol.c" diff --git a/contrib/gnu-sort/man/sort.1 b/contrib/gnu-sort/man/sort.1 index 9dcbace72740..2bb445dd74e8 100644 --- a/contrib/gnu-sort/man/sort.1 +++ b/contrib/gnu-sort/man/sort.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. -.TH SORT "1" "July 2002" "sort (textutils) 2.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. +.TH SORT "1" "March 2004" "sort (coreutils) 5.2.1" "User Commands" .SH NAME sort \- sort lines of text files .SH SYNOPSIS @@ -57,15 +57,15 @@ stabilize sort by disabling last-resort comparison \fB\-S\fR, \fB\-\-buffer\-size\fR=\fISIZE\fR use SIZE for main memory buffer .HP -\fB\-t\fR, \fB\-\-field\-separator\fR=\fISEP\fR use SEP instead of non- to whitespace transition +\fB\-t\fR, \fB\-\-field\-separator\fR=\fISEP\fR use SEP instead of non-blank to blank transition .TP \fB\-T\fR, \fB\-\-temporary\-directory\fR=\fIDIR\fR -use DIR for temporaries, not $TMPDIR or /tmp +use DIR for temporaries, not $TMPDIR or /tmp; multiple options specify multiple directories .TP \fB\-u\fR, \fB\-\-unique\fR -with \fB\-c\fR: check for strict ordering -otherwise: output only the first of an equal run +with \fB\-c\fR, check for strict ordering; +without \fB\-c\fR, output only the first of an equal run .TP \fB\-z\fR, \fB\-\-zero\-terminated\fR end lines with 0 byte, not newline @@ -93,9 +93,9 @@ native byte values. .SH AUTHOR Written by Mike Haertel and Paul Eggert. .SH "REPORTING BUGS" -Report bugs to <bug-textutils@gnu.org>. +Report bugs to <bug-coreutils@gnu.org>. .SH COPYRIGHT -Copyright \(co 2002 Free Software Foundation, Inc. +Copyright \(co 2004 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -108,6 +108,6 @@ and .B sort programs are properly installed at your site, the command .IP -.B info sort +.B info coreutils sort .PP should give you access to the complete manual. diff --git a/contrib/gnu-sort/src/sort.c b/contrib/gnu-sort/src/sort.c index 5b75ebe45a92..b67582a03817 100644 --- a/contrib/gnu-sort/src/sort.c +++ b/contrib/gnu-sort/src/sort.c @@ -1,5 +1,5 @@ /* sort - sort lines of text (with all kinds of options). - Copyright (C) 88, 1991-2002 Free Software Foundation, Inc. + Copyright (C) 88, 1991-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 @@ -27,12 +27,11 @@ #include <sys/types.h> #include <signal.h> #include <stdio.h> -#include <assert.h> #include "system.h" -#include "long-options.h" #include "error.h" #include "hard-locale.h" -#include "human.h" +#include "inttostr.h" +#include "long-options.h" #include "physmem.h" #include "posixver.h" #include "stdio-safer.h" @@ -50,9 +49,9 @@ struct rlimit { size_t rlim_cur; }; /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sort" -#define AUTHORS N_ ("Mike Haertel and Paul Eggert") +#define AUTHORS "Mike Haertel", "Paul Eggert" -#if HAVE_LANGINFO_H +#if HAVE_LANGINFO_CODESET # include <langinfo.h> #endif @@ -65,13 +64,6 @@ struct rlimit { size_t rlim_cur; }; double strtod (); #endif -/* Undefine, to avoid warning about redefinition on some systems. */ -/* FIXME: Remove these: use MIN/MAX from sys2.h. */ -#undef min -#define min(a, b) ((a) < (b) ? (a) : (b)) -#undef max -#define max(a, b) ((a) > (b) ? (a) : (b)) - #define UCHAR_LIM (UCHAR_MAX + 1) #define UCHAR(c) ((unsigned char) (c)) @@ -79,13 +71,17 @@ double strtod (); # define DEFAULT_TMPDIR "/tmp" #endif -/* Use this as exit status in case of error, not EXIT_FAILURE. This - is necessary because EXIT_FAILURE is usually 1 and POSIX requires - that sort exit with status 1 IFF invoked with -c and the input is - not properly sorted. Any other irregular exit must exit with a - status code greater than 1. */ -#define SORT_FAILURE 2 -#define SORT_OUT_OF_ORDER 1 +/* Exit statuses. */ +enum + { + /* POSIX says to exit with status 1 if invoked with -c and the + input is not properly sorted. */ + SORT_OUT_OF_ORDER = 1, + + /* POSIX says any other irregular exit must exit with a status + code greater than 1. */ + SORT_FAILURE = 2 + }; #define C_DECIMAL_POINT '.' #define NEGATION_SIGN '-' @@ -97,9 +93,9 @@ static char decimal_point; static int th_sep; /* if CHAR_MAX + 1, then there is no thousands separator */ /* Nonzero if the corresponding locales are hard. */ -static int hard_LC_COLLATE; +static bool hard_LC_COLLATE; # if HAVE_NL_LANGINFO -static int hard_LC_TIME; +static bool hard_LC_TIME; # endif # define IS_THOUSANDS_SEP(x) ((x) == th_sep) @@ -117,7 +113,7 @@ static int hard_LC_TIME; enum blanktype { bl_start, bl_end, bl_both }; /* The character marking end of line. Default to \n. */ -static int eolchar = '\n'; +static char eolchar = '\n'; /* Lines are held in core as counted strings. */ struct line @@ -141,32 +137,32 @@ struct buffer size_t alloc; /* Number of bytes allocated. */ size_t left; /* Number of bytes left from previous reads. */ size_t line_bytes; /* Number of bytes to reserve for each line. */ - int eof; /* An EOF has been read. */ + bool eof; /* An EOF has been read. */ }; struct keyfield { size_t sword; /* Zero-origin 'word' to start at. */ size_t schar; /* Additional characters to skip. */ - int skipsblanks; /* Skip leading white space at start. */ size_t eword; /* Zero-origin first word after field. */ size_t echar; /* Additional characters in field. */ - int skipeblanks; /* Skip trailing white space at finish. */ - int *ignore; /* Boolean array of characters to ignore. */ - char *translate; /* Translation applied to characters. */ - int numeric; /* Flag for numeric comparison. Handle + bool const *ignore; /* Boolean array of characters to ignore. */ + char const *translate; /* Translation applied to characters. */ + bool skipsblanks; /* Skip leading blanks at start. */ + bool skipeblanks; /* Skip trailing blanks at finish. */ + bool numeric; /* Flag for numeric comparison. Handle strings of digits with optional decimal point, but no exponential notation. */ - int general_numeric; /* Flag for general, numeric comparison. + bool general_numeric; /* Flag for general, numeric comparison. Handle numbers in exponential notation. */ - int month; /* Flag for comparison by month name. */ - int reverse; /* Reverse the sense of comparison. */ + bool month; /* Flag for comparison by month name. */ + bool reverse; /* Reverse the sense of comparison. */ struct keyfield *next; /* Next keyfield to try. */ }; struct month { - char *name; + char const *name; int val; }; @@ -174,20 +170,19 @@ struct month char *program_name; /* FIXME: None of these tables work with multibyte character sets. - Also, there are many other bugs when handling multibyte characters, - or even unibyte encodings where line boundaries are not in the - initial shift state. One way to fix this is to rewrite `sort' to - use wide characters internally, but doing this with good - performance is a bit tricky. */ + Also, there are many other bugs when handling multibyte characters. + One way to fix this is to rewrite `sort' to use wide characters + internally, but doing this with good performance is a bit + tricky. */ -/* Table of white space. */ -static int blanks[UCHAR_LIM]; +/* Table of blanks. */ +static bool blanks[UCHAR_LIM]; /* Table of non-printing characters. */ -static int nonprinting[UCHAR_LIM]; +static bool nonprinting[UCHAR_LIM]; /* Table of non-dictionary characters (not letters, digits, or blanks). */ -static int nondictionary[UCHAR_LIM]; +static bool nondictionary[UCHAR_LIM]; /* Translation table folding lower case to upper. */ static char fold_toupper[UCHAR_LIM]; @@ -242,36 +237,38 @@ static size_t temp_dir_count; /* Number of allocated slots in temp_dirs. */ static size_t temp_dir_alloc; -/* Our process ID. */ -static pid_t process_id; - /* Flag to reverse the order of all comparisons. */ -static int reverse; +static bool reverse; /* Flag for stable sort. This turns off the last ditch bytewise comparison of lines, and instead leaves lines in the same order they were read if all keys compare equal. */ -static int stable; +static bool stable; -/* Tab character separating fields. If NUL, then fields are separated - by the empty string between a non-whitespace character and a whitespace +/* If TAB has this value, blanks separate fields. */ +enum { TAB_DEFAULT = CHAR_MAX + 1 }; + +/* Tab character separating fields. If TAB_DEFAULT, then fields are + separated by the empty string between a non-blank character and a blank character. */ -static char tab; +static int tab = TAB_DEFAULT; /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -static int unique; +static bool unique; /* Nonzero if any of the input files are the standard input. */ -static int have_read_stdin; +static bool have_read_stdin; /* List of key field comparisons to be tried. */ static struct keyfield *keylist; +static void sortlines_temp (struct line *, size_t, struct line *); + void usage (int status) { - if (status != 0) + if (status != EXIT_SUCCESS) fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name); else @@ -313,11 +310,11 @@ Other options:\n\ -S, --buffer-size=SIZE use SIZE for main memory buffer\n\ "), stdout); printf (_("\ - -t, --field-separator=SEP use SEP instead of non- to whitespace transition\n\ - -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or %s\n\ + -t, --field-separator=SEP use SEP instead of non-blank to blank transition\n\ + -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or %s;\n\ multiple options specify multiple directories\n\ - -u, --unique with -c: check for strict ordering\n\ - otherwise: output only the first of an equal run\n\ + -u, --unique with -c, check for strict ordering;\n\ + without -c, output only the first of an equal run\n\ "), DEFAULT_TMPDIR); fputs (_("\ -z, --zero-terminated end lines with 0 byte, not newline\n\ @@ -345,10 +342,7 @@ native byte values.\n\ "), stdout ); printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } - /* Don't use EXIT_FAILURE here in case it is defined to be 1. - POSIX requires that sort return 1 IFF invoked with -c and - the input is not properly sorted. */ - assert (status == 0 || status == SORT_FAILURE); + exit (status); } @@ -395,7 +389,7 @@ static struct tempnode *volatile temphead; static void cleanup (void) { - struct tempnode *node; + struct tempnode const *node; for (node = temphead; node; node = node->next) unlink (node->name); @@ -403,7 +397,7 @@ cleanup (void) /* Report MESSAGE for FILE, then clean up and exit. */ -static void die PARAMS ((char const *, char const *)) ATTRIBUTE_NORETURN; +static void die (char const *, char const *) ATTRIBUTE_NORETURN; static void die (char const *message, char const *file) { @@ -425,7 +419,7 @@ create_temp_file (FILE **pfp) char const *temp_dir = temp_dirs[temp_dir_index]; size_t len = strlen (temp_dir); struct tempnode *node = - (struct tempnode *) xmalloc (sizeof node->next + len + sizeof slashbase); + xmalloc (sizeof node->next + len + sizeof slashbase); char *file = node->name; memcpy (file, temp_dir, len); @@ -458,7 +452,7 @@ xfopen (const char *file, const char *how) { if (*how == 'r') { - have_read_stdin = 1; + have_read_stdin = true; fp = stdin; } else @@ -503,10 +497,7 @@ static void add_temp_dir (char const *dir) { if (temp_dir_count == temp_dir_alloc) - { - temp_dir_alloc = temp_dir_alloc ? temp_dir_alloc * 2 : 16; - temp_dirs = xrealloc (temp_dirs, sizeof (temp_dirs) * temp_dir_alloc); - } + temp_dirs = x2nrealloc (temp_dirs, &temp_dir_alloc, sizeof *temp_dirs); temp_dirs[temp_dir_count++] = dir; } @@ -525,7 +516,7 @@ zaptemp (const char *name) { unlink (name); *pnode = node->next; - free ((char *) node); + free (node); break; } } @@ -535,8 +526,9 @@ zaptemp (const char *name) static int struct_month_cmp (const void *m1, const void *m2) { - return strcmp (((const struct month *) m1)->name, - ((const struct month *) m2)->name); + struct month const *month1 = m1; + struct month const *month2 = m2; + return strcmp (month1->name, month2->name); } #endif @@ -550,16 +542,10 @@ inittables (void) for (i = 0; i < UCHAR_LIM; ++i) { - if (ISBLANK (i)) - blanks[i] = 1; - if (!ISPRINT (i)) - nonprinting[i] = 1; - if (!ISALNUM (i) && !ISBLANK (i)) - nondictionary[i] = 1; - if (ISLOWER (i)) - fold_toupper[i] = toupper (i); - else - fold_toupper[i] = i; + blanks[i] = !!ISBLANK (i); + nonprinting[i] = !ISPRINT (i); + nondictionary[i] = !ISALNUM (i) && !ISBLANK (i); + fold_toupper[i] = (ISLOWER (i) ? toupper (i) : i); } #if HAVE_NL_LANGINFO @@ -568,14 +554,14 @@ inittables (void) { for (i = 0; i < MONTHS_PER_YEAR; i++) { - char *s; + char const *s; size_t s_len; size_t j; char *name; s = (char *) nl_langinfo (ABMON_1 + i); s_len = strlen (s); - monthtab[i].name = name = (char *) xmalloc (s_len + 1); + monthtab[i].name = name = xmalloc (s_len + 1); monthtab[i].val = i + 1; for (j = 0; j < s_len; j++) @@ -583,7 +569,7 @@ inittables (void) name[j] = '\0'; } qsort ((void *) monthtab, MONTHS_PER_YEAR, - sizeof (struct month), struct_month_cmp); + sizeof *monthtab, struct_month_cmp); } #endif } @@ -631,6 +617,11 @@ specify_sort_size (char const *s) if (e == LONGINT_OK) { + /* If multiple sort sizes are specified, take the maximum, so + that option order does not matter. */ + if (n < sort_size) + return; + sort_size = n; if (sort_size == n) { @@ -689,13 +680,18 @@ default_sort_size (void) by FPS and FILES, which are alternate paths to the same files. NFILES gives the number of input files; NFPS may be less. Assume that each input line requires LINE_BYTES extra bytes' worth of line - information. Return at most SIZE_BOUND. */ + information. Do not exceed a bound on the size: if the bound is + not specified by the user, use a default. */ static size_t sort_buffer_size (FILE *const *fps, int nfps, char *const *files, int nfiles, - size_t line_bytes, size_t size_bound) + size_t line_bytes) { + /* A bound on the input size. If zero, the bound hasn't been + determined yet. */ + static size_t size_bound; + /* In the worst case, each input byte is a newline. */ size_t worst_case_per_input_byte = line_bytes + 1; @@ -717,7 +713,23 @@ sort_buffer_size (FILE *const *fps, int nfps, != 0) die (_("stat failed"), files[i]); - file_size = S_ISREG (st.st_mode) ? st.st_size : INPUT_FILE_SIZE_GUESS; + if (S_ISREG (st.st_mode)) + file_size = st.st_size; + else + { + /* The file has unknown size. If the user specified a sort + buffer size, use that; otherwise, guess the size. */ + if (sort_size) + return sort_size; + file_size = INPUT_FILE_SIZE_GUESS; + } + + if (! size_bound) + { + size_bound = sort_size; + if (! size_bound) + size_bound = default_sort_size (); + } /* Add the amount of memory needed to represent the worst case where the input consists entirely of newlines followed by a @@ -757,7 +769,7 @@ initbuf (struct buffer *buf, size_t line_bytes, size_t alloc) buf->line_bytes = line_bytes; buf->alloc = alloc; buf->used = buf->left = buf->nlines = 0; - buf->eof = 0; + buf->eof = false; } /* Return one past the limit of the line array. */ @@ -777,8 +789,12 @@ begfield (const struct line *line, const struct keyfield *key) register char *ptr = line->text, *lim = ptr + line->length - 1; register size_t sword = key->sword; register size_t schar = key->schar; + register size_t remaining_bytes; - if (tab) + /* The leading field separator itself is included in a field when -t + is absent. */ + + if (tab != TAB_DEFAULT) while (ptr < lim && sword--) { while (ptr < lim && *ptr != tab) @@ -799,7 +815,9 @@ begfield (const struct line *line, const struct keyfield *key) while (ptr < lim && blanks[UCHAR (*ptr)]) ++ptr; - if (schar < lim - ptr) + /* Advance PTR by SCHAR (if possible), but no further than LIM. */ + remaining_bytes = lim - ptr; + if (schar < remaining_bytes) ptr += schar; else ptr = lim; @@ -815,10 +833,7 @@ limfield (const struct line *line, const struct keyfield *key) { register char *ptr = line->text, *lim = ptr + line->length - 1; register size_t eword = key->eword, echar = key->echar; - - /* Note: from the POSIX spec: - The leading field separator itself is included in - a field when -t is not used. FIXME: move this comment up... */ + register size_t remaining_bytes; /* Move PTR past EWORD fields or to one past the last byte on LINE, whichever comes first. If there are more than EWORD fields, leave @@ -827,7 +842,7 @@ limfield (const struct line *line, const struct keyfield *key) `beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first `blank' character after the preceding field. */ - if (tab) + if (tab != TAB_DEFAULT) while (ptr < lim && eword--) { while (ptr < lim && *ptr != tab) @@ -876,7 +891,7 @@ limfield (const struct line *line, const struct keyfield *key) */ /* Make LIM point to the end of (one byte past) the current field. */ - if (tab) + if (tab != TAB_DEFAULT) { char *newlim; newlim = memchr (ptr, tab, lim - ptr); @@ -902,7 +917,8 @@ limfield (const struct line *line, const struct keyfield *key) ++ptr; /* Advance PTR by ECHAR (if possible), but no further than LIM. */ - if (echar < lim - ptr) + remaining_bytes = lim - ptr; + if (echar < remaining_bytes) ptr += echar; else ptr = lim; @@ -910,22 +926,24 @@ limfield (const struct line *line, const struct keyfield *key) return ptr; } -/* FIXME */ +/* Return the number of trailing blanks in FIELD, with LEN bytes. */ -static void -trim_trailing_blanks (const char *a_start, char **a_end) +static size_t +trailing_blanks (char const *field, size_t len) { - while (*a_end > a_start && blanks[UCHAR (*(*a_end - 1))]) - --(*a_end); + size_t i; + for (i = len; 0 < i && blanks[UCHAR (field[i - 1])]; i--) + continue; + return len - i; } /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line table too. FILE is the name of the file corresponding to FP. - Return nonzero if some input was read. */ + Return true if some input was read. */ -static int +static bool fillbuf (struct buffer *buf, register FILE *fp, char const *file) { struct keyfield const *key = keylist; @@ -934,7 +952,7 @@ fillbuf (struct buffer *buf, register FILE *fp, char const *file) size_t mergesize = merge_buffer_size - MIN_MERGE_BUFFER_SIZE; if (buf->eof) - return 0; + return false; if (buf->used != buf->left) { @@ -970,9 +988,9 @@ fillbuf (struct buffer *buf, register FILE *fp, char const *file) die (_("read failed"), file); if (feof (fp)) { - buf->eof = 1; + buf->eof = true; if (buf->buf == ptrlim) - return 0; + return false; if (ptrlim[-1] != eol) *ptrlim++ = eol; } @@ -992,9 +1010,11 @@ fillbuf (struct buffer *buf, register FILE *fp, char const *file) { /* Precompute the position of the first key for efficiency. */ - line->keylim = key->eword == -1 ? p : limfield (line, key); + line->keylim = (key->eword == SIZE_MAX + ? p + : limfield (line, key)); - if (key->sword != -1) + if (key->sword != SIZE_MAX) line->keybeg = begfield (line, key); else { @@ -1004,7 +1024,10 @@ fillbuf (struct buffer *buf, register FILE *fp, char const *file) line->keybeg = line_start; } if (key->skipeblanks) - trim_trailing_blanks (line->keybeg, &line->keylim); + { + size_t keylen = line->keylim - line->keybeg; + line->keylim -= trailing_blanks (line->keybeg, keylen); + } } line_start = ptr; @@ -1021,15 +1044,12 @@ fillbuf (struct buffer *buf, register FILE *fp, char const *file) { buf->left = ptr - line_start; merge_buffer_size = mergesize + MIN_MERGE_BUFFER_SIZE; - return 1; + return true; } /* The current input line is too long to fit in the buffer. Double the buffer size and try again. */ - if (2 * buf->alloc < buf->alloc) - xalloc_die (); - buf->alloc *= 2; - buf->buf = xrealloc (buf->buf, buf->alloc); + buf->buf = x2nrealloc (buf->buf, &buf->alloc, sizeof *(buf->buf)); } } @@ -1106,7 +1126,7 @@ static int numcompare (register const char *a, register const char *b) { register int tmpa, tmpb, tmp; - register size_t loga, logb; + register size_t log_a, log_b; tmpa = *a; tmpb = *b; @@ -1159,20 +1179,20 @@ numcompare (register const char *a, register const char *b) tmp = tmpb - tmpa; - for (loga = 0; ISDIGIT (tmpa); ++loga) + for (log_a = 0; ISDIGIT (tmpa); ++log_a) do tmpa = *++a; while (IS_THOUSANDS_SEP (tmpa)); - for (logb = 0; ISDIGIT (tmpb); ++logb) + for (log_b = 0; ISDIGIT (tmpb); ++log_b) do tmpb = *++b; while (IS_THOUSANDS_SEP (tmpb)); - if (loga != logb) - return loga < logb ? 1 : -1; + if (log_a != log_b) + return log_a < log_b ? 1 : -1; - if (!loga) + if (!log_a) return 0; return tmp; @@ -1221,20 +1241,20 @@ numcompare (register const char *a, register const char *b) tmp = tmpa - tmpb; - for (loga = 0; ISDIGIT (tmpa); ++loga) + for (log_a = 0; ISDIGIT (tmpa); ++log_a) do tmpa = *++a; while (IS_THOUSANDS_SEP (tmpa)); - for (logb = 0; ISDIGIT (tmpb); ++logb) + for (log_b = 0; ISDIGIT (tmpb); ++log_b) do tmpb = *++b; while (IS_THOUSANDS_SEP (tmpb)); - if (loga != logb) - return loga < logb ? -1 : 1; + if (log_a != log_b) + return log_a < log_b ? -1 : 1; - if (!loga) + if (!log_a) return 0; return tmp; @@ -1289,12 +1309,11 @@ getmonth (const char *s, size_t len) if (len == 0) return 0; - month = (char *) alloca (len + 1); + month = alloca (len + 1); for (i = 0; i < len; ++i) month[i] = fold_toupper[UCHAR (s[i])]; - while (blanks[UCHAR (month[i - 1])]) - --i; - month[i] = '\0'; + len -= trailing_blanks (month, len); + month[len] = '\0'; do { @@ -1319,7 +1338,7 @@ getmonth (const char *s, size_t len) static int keycompare (const struct line *a, const struct line *b) { - struct keyfield *key = keylist; + struct keyfield const *key = keylist; /* For the first iteration only, the key positions have been precomputed for us. */ @@ -1332,8 +1351,8 @@ keycompare (const struct line *a, const struct line *b) for (;;) { - register unsigned char *translate = (unsigned char *) key->translate; - register int *ignore = key->ignore; + register char const *translate = key->translate; + register bool const *ignore = key->ignore; /* Find the lengths. */ size_t lena = lima <= texta ? 0 : lima - texta; @@ -1341,12 +1360,8 @@ keycompare (const struct line *a, const struct line *b) if (key->skipeblanks) { - char *a_end = texta + lena; - char *b_end = textb + lenb; - trim_trailing_blanks (texta, &a_end); - trim_trailing_blanks (textb, &b_end); - lena = a_end - texta; - lenb = b_end - textb; + lena -= trailing_blanks (texta, lena); + lenb -= trailing_blanks (textb, lenb); } /* Actually compare the fields. */ @@ -1367,12 +1382,12 @@ keycompare (const struct line *a, const struct line *b) { if (ignore || translate) { - char *copy_a = (char *) alloca (lena + 1 + lenb + 1); + char *copy_a = alloca (lena + 1 + lenb + 1); char *copy_b = copy_a + lena + 1; size_t new_len_a, new_len_b, i; /* Ignore and/or translate chars before comparing. */ - for (new_len_a = new_len_b = i = 0; i < max (lena, lenb); i++) + for (new_len_a = new_len_b = i = 0; i < MAX (lena, lenb); i++) { if (i < lena) { @@ -1429,7 +1444,7 @@ keycompare (const struct line *a, const struct line *b) CMP_WITH_IGNORE (translate[UCHAR (*texta)], translate[UCHAR (*textb)]); else - CMP_WITH_IGNORE (UCHAR (*texta), UCHAR (*textb)); + CMP_WITH_IGNORE (*texta, *textb); } else if (lena == 0) diff = - NONZERO (lenb); @@ -1449,7 +1464,7 @@ keycompare (const struct line *a, const struct line *b) } else { - diff = memcmp (texta, textb, min (lena, lenb)); + diff = memcmp (texta, textb, MIN (lena, lenb)); if (diff) goto not_equal; } @@ -1464,12 +1479,12 @@ keycompare (const struct line *a, const struct line *b) break; /* Find the beginning and limit of the next field. */ - if (key->eword != -1) + if (key->eword != SIZE_MAX) lima = limfield (a, key), limb = limfield (b, key); else lima = a->text + a->length - 1, limb = b->text + b->length - 1; - if (key->sword != -1) + if (key->sword != SIZE_MAX) texta = begfield (a, key), textb = begfield (b, key); else { @@ -1508,7 +1523,7 @@ compare (register const struct line *a, register const struct line *b) { diff = keycompare (a, b); alloca (0); - if (diff != 0 || unique || stable) + if (diff | unique | stable) return diff; } @@ -1519,30 +1534,31 @@ compare (register const struct line *a, register const struct line *b) if (alen == 0) diff = - NONZERO (blen); else if (blen == 0) - diff = NONZERO (alen); + diff = 1; else if (HAVE_SETLOCALE && hard_LC_COLLATE) diff = xmemcoll (a->text, alen, b->text, blen); - else if (! (diff = memcmp (a->text, b->text, min (alen, blen)))) + else if (! (diff = memcmp (a->text, b->text, MIN (alen, blen)))) diff = alen < blen ? -1 : alen != blen; return reverse ? -diff : diff; } -/* Check that the lines read from the given FP come in order. Print a +/* Check that the lines read from FILE_NAME come in order. Print a diagnostic (FILE_NAME, line number, contents of line) to stderr and return - one if they are not in order. Otherwise, print no diagnostic - and return zero. */ + false if they are not in order. Otherwise, print no diagnostic + and return true. */ -static int -checkfp (FILE *fp, char *file_name) +static bool +check (char const *file_name) { + FILE *fp = xfopen (file_name, "r"); struct buffer buf; /* Input buffer. */ struct line temp; /* Copy of previous line. */ size_t alloc = 0; uintmax_t line_number = 0; - struct keyfield *key = keylist; - int nonunique = 1 - unique; - int disordered = 0; + struct keyfield const *key = keylist; + bool nonunique = ! unique; + bool ordered = true; initbuf (&buf, sizeof (struct line), MAX (merge_buffer_size, sort_size)); @@ -1559,16 +1575,16 @@ checkfp (FILE *fp, char *file_name) { found_disorder: { - char hr_buf[LONGEST_HUMAN_READABLE + 1]; struct line const *disorder_line = line - 1; uintmax_t disorder_line_number = buffer_linelim (&buf) - disorder_line + line_number; + char hr_buf[INT_BUFSIZE_BOUND (uintmax_t)]; fprintf (stderr, _("%s: %s:%s: disorder: "), program_name, file_name, - human_readable (disorder_line_number, hr_buf, 1, 1)); + umaxtostr (disorder_line_number, hr_buf)); write_bytes (disorder_line->text, disorder_line->length, stderr, _("standard error")); - disordered = 1; + ordered = false; break; } } @@ -1609,7 +1625,7 @@ checkfp (FILE *fp, char *file_name) free (buf.buf); if (temp.text) free (temp.text); - return disordered; + return ordered; } /* Merge lines from FILES onto OFP. NFILES cannot be greater than @@ -1633,7 +1649,7 @@ mergefps (char **files, register int nfiles, such that cur[ord[0]] is the smallest line and will be next output. */ register int i, j, t; - struct keyfield *key = keylist; + struct keyfield const *key = keylist; saved.text = NULL; /* Read initial lines from each input file. */ @@ -1777,16 +1793,57 @@ mergefps (char **files, register int nfiles, xfclose (ofp, output_file); } +/* Merge into T the two sorted arrays of lines LO (with NLO members) + and HI (with NHI members). T, LO, and HI point just past their + respective arrays, and the arrays are in reverse order. NLO and + NHI must be positive, and HI - NHI must equal T - (NLO + NHI). */ + +static inline void +mergelines (struct line *t, + struct line const *lo, size_t nlo, + struct line const *hi, size_t nhi) +{ + for (;;) + if (compare (lo - 1, hi - 1) <= 0) + { + *--t = *--lo; + if (! --nlo) + { + /* HI - NHI equalled T - (NLO + NHI) when this function + began. Therefore HI must equal T now, and there is no + need to copy from HI to T. */ + return; + } + } + else + { + *--t = *--hi; + if (! --nhi) + { + do + *--t = *--lo; + while (--nlo); + + return; + } + } +} + /* Sort the array LINES with NLINES members, using TEMP for temporary space. + NLINES must be at least 2. The input and output arrays are in reverse order, and LINES and - TEMP point just past the end of their respective arrays. */ + TEMP point just past the end of their respective arrays. + + Use a recursive divide-and-conquer algorithm, in the style + suggested by Knuth volume 3 (2nd edition), exercise 5.2.4-23. Use + the optimization suggested by exercise 5.2.4-10; this requires room + for only 1.5*N lines, rather than the usual 2*N lines. Knuth + writes that this memory optimization was originally published by + D. A. Bell, Comp J. 1 (1958), 75. */ static void sortlines (struct line *lines, size_t nlines, struct line *temp) { - register struct line *lo, *hi, *t; - register size_t nlo, nhi; - if (nlines == 2) { if (0 < compare (&lines[-1], &lines[-2])) @@ -1795,32 +1852,51 @@ sortlines (struct line *lines, size_t nlines, struct line *temp) lines[-1] = lines[-2]; lines[-2] = tmp; } - return; } + else + { + size_t nlo = nlines / 2; + size_t nhi = nlines - nlo; + struct line *lo = lines; + struct line *hi = lines - nlo; + struct line *sorted_lo = temp; + + sortlines (hi, nhi, temp); + if (1 < nlo) + sortlines_temp (lo, nlo, sorted_lo); + else + sorted_lo[-1] = lo[-1]; - nlo = nlines / 2; - lo = lines; - nhi = nlines - nlo; - hi = lines - nlo; - - if (nlo > 1) - sortlines (lo, nlo, temp); + mergelines (lines, sorted_lo, nlo, hi, nhi); + } +} - if (nhi > 1) - sortlines (hi, nhi, temp); +/* Like sortlines (LINES, NLINES, TEMP), except output into TEMP + rather than sorting in place. */ - t = temp; +static void +sortlines_temp (struct line *lines, size_t nlines, struct line *temp) +{ + if (nlines == 2) + { + bool swap = (0 < compare (&lines[-1], &lines[-2])); + temp[-1] = lines[-1 - swap]; + temp[-2] = lines[-2 + swap]; + } + else + { + size_t nlo = nlines / 2; + size_t nhi = nlines - nlo; + struct line *lo = lines; + struct line *hi = lines - nlo; + struct line *sorted_hi = temp - nlo; - while (nlo && nhi) - if (compare (lo - 1, hi - 1) <= 0) - *--t = *--lo, --nlo; - else - *--t = *--hi, --nhi; - while (nlo--) - *--t = *--lo; + sortlines_temp (hi, nhi, sorted_hi); + if (1 < nlo) + sortlines (lo, nlo, temp); - for (lo = lines, nlo = nlines - nhi, t = temp; nlo; --nlo) - *--lo = *--t; + mergelines (temp, lo, nlo, sorted_hi, nhi); + } } /* Return the index of the first of NFILES FILES that is the same file @@ -1829,22 +1905,22 @@ sortlines (struct line *lines, size_t nlines, struct line *temp) output of a command like "cat OUTFILE". */ static int -first_same_file (char **files, int nfiles, char const *outfile) +first_same_file (char * const *files, int nfiles, char const *outfile) { int i; - int got_outstat = 0; + bool got_outstat = false; struct stat instat, outstat; for (i = 0; i < nfiles; i++) { - int standard_input = STREQ (files[i], "-"); + bool standard_input = STREQ (files[i], "-"); if (STREQ (outfile, files[i]) && ! standard_input) return i; if (! got_outstat) { - got_outstat = 1; + got_outstat = true; if ((STREQ (outfile, "-") ? fstat (STDOUT_FILENO, &outstat) : stat (outfile, &outstat)) @@ -1863,23 +1939,6 @@ first_same_file (char **files, int nfiles, char const *outfile) return nfiles; } -/* Check that each of the NFILES FILES is ordered. - Return a count of disordered files. */ - -static int -check (char **files, int nfiles) -{ - int i, disorders = 0; - FILE *fp; - - for (i = 0; i < nfiles; ++i) - { - fp = xfopen (files[i], "r"); - disorders += checkfp (fp, files[i]); - } - return disorders; -} - /* Merge NFILES FILES onto OUTPUT_FILE. However, merge at most MAX_MERGE input files directly onto OUTPUT_FILE. MAX_MERGE cannot exceed NMERGE. */ @@ -1912,15 +1971,11 @@ merge (char **files, int nfiles, int max_merge, char const *output_file) /* Sort NFILES FILES onto OUTPUT_FILE. */ static void -sort (char **files, int nfiles, char const *output_file) +sort (char * const *files, int nfiles, char const *output_file) { struct buffer buf; int n_temp_files = 0; - int output_file_created = 0; - - static size_t size; - if (! size && ! (size = sort_size)) - size = default_sort_size (); + bool output_file_created = false; buf.alloc = 0; @@ -1930,12 +1985,13 @@ sort (char **files, int nfiles, char const *output_file) char const *file = *files; FILE *fp = xfopen (file, "r"); FILE *tfp; + size_t bytes_per_line = (2 * sizeof (struct line) + - sizeof (struct line) / 2); if (! buf.alloc) - initbuf (&buf, 2 * sizeof (struct line), - sort_buffer_size (&fp, 1, files, nfiles, - 2 * sizeof (struct line), size)); - buf.eof = 0; + initbuf (&buf, bytes_per_line, + sort_buffer_size (&fp, 1, files, nfiles, bytes_per_line)); + buf.eof = false; files++; nfiles--; @@ -1945,9 +2001,8 @@ sort (char **files, int nfiles, char const *output_file) struct line *linebase; if (buf.eof && nfiles - && (2 * sizeof (struct line) + 1 - < (buf.alloc - buf.used - - 2 * sizeof (struct line) * buf.nlines))) + && (bytes_per_line + 1 + < (buf.alloc - buf.used - bytes_per_line * buf.nlines))) { /* End of file, but there is more input and buffer room. Concatenate the next input file; this is faster in @@ -1958,13 +2013,14 @@ sort (char **files, int nfiles, char const *output_file) line = buffer_linelim (&buf); linebase = line - buf.nlines; - sortlines (line, buf.nlines, linebase); + if (1 < buf.nlines) + sortlines (line, buf.nlines, linebase); if (buf.eof && !nfiles && !n_temp_files && !buf.left) { xfclose (fp, file); tfp = xfopen (output_file, "w"); temp_output = output_file; - output_file_created = 1; + output_file_created = true; } else { @@ -1997,11 +2053,11 @@ sort (char **files, int nfiles, char const *output_file) { int i = n_temp_files; struct tempnode *node; - char **tempfiles = (char **) xmalloc (n_temp_files * sizeof (char *)); + char **tempfiles = xnmalloc (n_temp_files, sizeof *tempfiles); for (node = temphead; i > 0; node = node->next) tempfiles[--i] = node->name; merge (tempfiles, n_temp_files, NMERGE, output_file); - free ((char *) tempfiles); + free (tempfiles); } } @@ -2020,7 +2076,7 @@ insertkey (struct keyfield *key) /* Report a bad field specification SPEC, with extra info MSGID. */ -static void badfieldspec PARAMS ((char const *, char const *)) +static void badfieldspec (char const *, char const *) ATTRIBUTE_NORETURN; static void badfieldspec (char const *spec, char const *msgid) @@ -2050,6 +2106,7 @@ parse_field_count (char const *string, size_t *val, char const *msgid) break; /* Fall through. */ case LONGINT_OVERFLOW: + case LONGINT_OVERFLOW | LONGINT_INVALID_SUFFIX_CHAR: if (msgid) error (SORT_FAILURE, 0, _("%s: count `%.*s' too large"), _(msgid), (int) (suffix - string), string); @@ -2089,7 +2146,7 @@ sighandler (int sig) signal (sig, SIG_DFL); #endif - kill (process_id, sig); + raise (sig); } /* Set the ordering options for KEY specified in S. @@ -2107,9 +2164,9 @@ set_ordering (register const char *s, struct keyfield *key, { case 'b': if (blanktype == bl_start || blanktype == bl_both) - key->skipsblanks = 1; + key->skipsblanks = true; if (blanktype == bl_end || blanktype == bl_both) - key->skipeblanks = 1; + key->skipeblanks = true; break; case 'd': key->ignore = nondictionary; @@ -2118,19 +2175,22 @@ set_ordering (register const char *s, struct keyfield *key, key->translate = fold_toupper; break; case 'g': - key->general_numeric = 1; + key->general_numeric = true; break; case 'i': - key->ignore = nonprinting; + /* Option order should not matter, so don't let -i override + -d. -d implies -i, but -i does not imply -d. */ + if (! key->ignore) + key->ignore = nonprinting; break; case 'M': - key->month = 1; + key->month = true; break; case 'n': - key->numeric = 1; + key->numeric = true; break; case 'r': - key->reverse = 1; + key->reverse = true; break; default: return (char *) s; @@ -2143,8 +2203,8 @@ set_ordering (register const char *s, struct keyfield *key, static struct keyfield * new_key (void) { - struct keyfield *key = (struct keyfield *) xcalloc (1, sizeof *key); - key->eword = -1; + struct keyfield *key = xzalloc (sizeof *key); + key->eword = SIZE_MAX; return key; } @@ -2154,10 +2214,11 @@ main (int argc, char **argv) struct keyfield *key; struct keyfield gkey; char const *s; - int i; int c = 0; - int checkonly = 0, mergeonly = 0, nfiles = 0; - int posix_pedantic = (getenv ("POSIXLY_CORRECT") != NULL); + bool checkonly = false; + bool mergeonly = false; + int nfiles = 0; + bool posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL); bool obsolete_usage = (posix2_version () < 200112); char const *short_options = (obsolete_usage ? COMMON_SHORT_OPTIONS "y::" @@ -2165,19 +2226,22 @@ main (int argc, char **argv) char *minus = "-", **files; char const *outfile = minus; static int const sigs[] = { SIGHUP, SIGINT, SIGPIPE, SIGTERM }; - int nsigs = sizeof sigs / sizeof *sigs; + unsigned int nsigs = sizeof sigs / sizeof *sigs; #ifdef SA_NOCLDSTOP struct sigaction oldact, newact; #endif + initialize_main (&argc, &argv); program_name = argv[0]; - process_id = getpid (); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); atexit (cleanup); + initialize_exit_failure (SORT_FAILURE); + atexit (close_stdout); + hard_LC_COLLATE = hard_locale (LC_COLLATE); #if HAVE_NL_LANGINFO hard_LC_TIME = hard_locale (LC_TIME); @@ -2186,7 +2250,7 @@ main (int argc, char **argv) #if HAVE_SETLOCALE /* Let's get locale's representation of the decimal point */ { - struct lconv *lconvp = localeconv (); + struct lconv const *lconvp = localeconv (); /* If the locale doesn't define a decimal point, or if the decimal point is multibyte, use the C decimal point. We don't support @@ -2202,42 +2266,44 @@ main (int argc, char **argv) } #endif - have_read_stdin = 0; + have_read_stdin = false; inittables (); - /* Change the way library functions fail. */ - xalloc_exit_failure = SORT_FAILURE; - xmemcoll_exit_failure = SORT_FAILURE; - #ifdef SA_NOCLDSTOP - sigemptyset (&caught_signals); - for (i = 0; i < nsigs; i++) - sigaddset (&caught_signals, sigs[i]); - newact.sa_handler = sighandler; - newact.sa_mask = caught_signals; - newact.sa_flags = 0; + { + unsigned int i; + sigemptyset (&caught_signals); + for (i = 0; i < nsigs; i++) + sigaddset (&caught_signals, sigs[i]); + newact.sa_handler = sighandler; + newact.sa_mask = caught_signals; + newact.sa_flags = 0; + } #endif - for (i = 0; i < nsigs; i++) - { - int sig = sigs[i]; + { + unsigned int i; + for (i = 0; i < nsigs; i++) + { + int sig = sigs[i]; #ifdef SA_NOCLDSTOP - sigaction (sig, NULL, &oldact); - if (oldact.sa_handler != SIG_IGN) - sigaction (sig, &newact, NULL); + sigaction (sig, NULL, &oldact); + if (oldact.sa_handler != SIG_IGN) + sigaction (sig, &newact, NULL); #else - if (signal (sig, SIG_IGN) != SIG_IGN) - signal (sig, sighandler); + if (signal (sig, SIG_IGN) != SIG_IGN) + signal (sig, sighandler); #endif - } + } + } - gkey.sword = gkey.eword = -1; + gkey.sword = gkey.eword = SIZE_MAX; gkey.ignore = NULL; gkey.translate = NULL; - gkey.numeric = gkey.general_numeric = gkey.month = gkey.reverse = 0; - gkey.skipsblanks = gkey.skipeblanks = 0; + gkey.numeric = gkey.general_numeric = gkey.month = gkey.reverse = false; + gkey.skipsblanks = gkey.skipeblanks = false; - files = (char **) xmalloc (sizeof (char *) * argc); + files = xnmalloc (argc, sizeof *files); for (;;) { @@ -2247,7 +2313,7 @@ main (int argc, char **argv) "-o FILE" or "-oFILE". */ if (c == -1 - || (posix_pedantic && nfiles != 0 + || (posixly_correct && nfiles != 0 && ! (obsolete_usage && ! checkonly && optind != argc @@ -2257,7 +2323,7 @@ main (int argc, char **argv) long_options, NULL)) == -1)) { - if (optind == argc) + if (argc <= optind) break; files[nfiles++] = argv[optind++]; } @@ -2274,7 +2340,7 @@ main (int argc, char **argv) if (s && *s == '.') s = parse_field_count (s + 1, &key->schar, NULL); if (! (key->sword | key->schar)) - key->sword = -1; + key->sword = SIZE_MAX; if (! s || *set_ordering (s, key, bl_start)) { free (key); @@ -2319,7 +2385,7 @@ main (int argc, char **argv) break; case 'c': - checkonly = 1; + checkonly = true; break; case 'k': @@ -2344,11 +2410,11 @@ main (int argc, char **argv) } } if (! (key->sword | key->schar)) - key->sword = -1; + key->sword = SIZE_MAX; s = set_ordering (s, key, bl_start); if (*s != ',') { - key->eword = -1; + key->eword = SIZE_MAX; key->echar = 0; } else @@ -2377,15 +2443,17 @@ main (int argc, char **argv) break; case 'm': - mergeonly = 1; + mergeonly = true; break; case 'o': + if (outfile != minus && strcmp (outfile, optarg) != 0) + error (SORT_FAILURE, 0, _("multiple output files specified")); outfile = optarg; break; case 's': - stable = 1; + stable = true; break; case 'S': @@ -2393,15 +2461,28 @@ main (int argc, char **argv) break; case 't': - tab = optarg[0]; - if (tab && optarg[1]) - { - /* Provoke with `sort -txx'. Complain about - "multi-character tab" instead of "multibyte tab", so - that the diagnostic's wording does not need to be - changed once multibyte characters are supported. */ - error (SORT_FAILURE, 0, _("multi-character tab `%s'"), optarg); - } + { + int newtab = optarg[0]; + if (! newtab) + error (SORT_FAILURE, 0, _("empty tab")); + if (optarg[1]) + { + if (strcmp (optarg, "\\0") == 0) + newtab = '\0'; + else + { + /* Provoke with `sort -txx'. Complain about + "multi-character tab" instead of "multibyte tab", so + that the diagnostic's wording does not need to be + changed once multibyte characters are supported. */ + error (SORT_FAILURE, 0, _("multi-character tab `%s'"), + optarg); + } + } + if (tab != TAB_DEFAULT && tab != newtab) + error (SORT_FAILURE, 0, _("incompatible tabs")); + tab = newtab; + } break; case 'T': @@ -2409,7 +2490,7 @@ main (int argc, char **argv) break; case 'u': - unique = 1; + unique = true; break; case 'y': @@ -2433,9 +2514,10 @@ main (int argc, char **argv) /* Inheritance of global options to individual keys. */ for (key = keylist; key; key = key->next) - if (!key->ignore && !key->translate && !key->skipsblanks && !key->reverse - && !key->skipeblanks && !key->month && !key->numeric - && !key->general_numeric) + if (! (key->ignore || key->translate + || (key->skipsblanks | key->reverse + | key->skipeblanks | key->month | key->numeric + | key->general_numeric))) { key->ignore = gkey.ignore; key->translate = gkey.translate; @@ -2447,9 +2529,9 @@ main (int argc, char **argv) key->reverse = gkey.reverse; } - if (!keylist && (gkey.ignore || gkey.translate || gkey.skipsblanks - || gkey.skipeblanks || gkey.month || gkey.numeric - || gkey.general_numeric)) + if (!keylist && (gkey.ignore || gkey.translate + || (gkey.skipsblanks | gkey.skipeblanks | gkey.month + | gkey.numeric | gkey.general_numeric))) insertkey (&gkey); reverse = gkey.reverse; @@ -2473,7 +2555,7 @@ main (int argc, char **argv) /* POSIX requires that sort return 1 IFF invoked with -c and the input is not properly sorted. */ - exit (check (files, nfiles) == 0 ? EXIT_SUCCESS : SORT_OUT_OF_ORDER); + exit (check (files[0]) ? EXIT_SUCCESS : SORT_OUT_OF_ORDER); } if (mergeonly) diff --git a/contrib/gnu-sort/src/system.h b/contrib/gnu-sort/src/system.h index a2c08d2f6b82..6154843d1dae 100644 --- a/contrib/gnu-sort/src/system.h +++ b/contrib/gnu-sort/src/system.h @@ -1,5 +1,5 @@ /* system-dependent definitions for fileutils, textutils, and sh-utils packages. - Copyright (C) 1989, 1991-2002 Free Software Foundation, Inc. + Copyright (C) 1989, 1991-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 @@ -15,6 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <alloca.h> + /* Include sys/types.h before this file. */ #if 2 <= __GLIBC__ && 2 <= __GLIBC_MINOR__ @@ -52,13 +54,12 @@ you must include <sys/types.h> before including this file #endif -#if HAVE_LIMITS_H /* limits.h must come before pathmax.h because limits.h on some systems undefs PATH_MAX, whereas pathmax.h sets PATH_MAX. */ -# include <limits.h> -#endif +#include <limits.h> #include "pathmax.h" +#include "localedir.h" #if TIME_WITH_SYS_TIME # include <sys/time.h> @@ -108,13 +109,9 @@ struct utimbuf /* Don't use bcopy! Use memmove if source and destination may overlap, memcpy otherwise. */ -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include <memory.h> -# endif -# include <string.h> -#else -# include <strings.h> +#include <string.h> +#if ! HAVE_DECL_MEMRCHR +void *memrchr (const void *, int, size_t); #endif #include <errno.h> @@ -122,18 +119,23 @@ struct utimbuf extern int errno; #endif -#if HAVE_STDBOOL_H -# include <stdbool.h> -#else -typedef enum {false = 0, true = 1} bool; +/* Some systems don't define the following symbols. */ +#ifndef ENOSYS +# define ENOSYS (-1) #endif - -#if HAVE_STDLIB_H -# define getopt system_getopt -# include <stdlib.h> -# undef getopt +#ifndef ENOTSUP +# define ENOTSUP (-1) +#endif +#ifndef EISDIR +# define EISDIR (-1) #endif +#include <stdbool.h> + +#define getopt system_getopt +#include <stdlib.h> +#undef getopt + /* The following test is to work around the gross typo in systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE is defined to 0, not 1. */ @@ -146,6 +148,25 @@ typedef enum {false = 0, true = 1} bool; # define EXIT_SUCCESS 0 #endif +/* Exit statuses for programs like 'env' that exec other programs. + EXIT_FAILURE might not be 1, so use EXIT_FAIL in such programs. */ +enum +{ + EXIT_FAIL = 1, + EXIT_CANNOT_INVOKE = 126, + EXIT_ENOENT = 127 +}; + +#include "exitfail.h" + +/* Set exit_failure to STATUS if that's not the default already. */ +static inline void +initialize_exit_failure (int status) +{ + if (status != EXIT_FAILURE) + exit_failure = status; +} + #if HAVE_FCNTL_H # include <fcntl.h> #else @@ -172,6 +193,18 @@ typedef enum {false = 0, true = 1} bool; # define O_TEXT _O_TEXT #endif +#if !defined O_NDELAY +# define O_NDELAY 0 +#endif + +#if !defined O_NONBLOCK +# define O_NONBLOCK O_NDELAY +#endif + +#if !defined O_NOCTTY +# define O_NOCTTY 0 +#endif + #ifdef __BEOS__ /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ # undef O_BINARY @@ -246,9 +279,7 @@ typedef enum {false = 0, true = 1} bool; # define ST_BLKSIZE(statbuf) DEV_BSIZE # if defined _POSIX_SOURCE || !defined BSIZE /* fileblocks.c uses BSIZE. */ # define ST_NBLOCKS(statbuf) \ - (S_ISREG ((statbuf).st_mode) \ - || S_ISDIR ((statbuf).st_mode) \ - ? (statbuf).st_size / ST_NBLOCKSIZE + ((statbuf).st_size % ST_NBLOCKSIZE != 0) : 0) + ((statbuf).st_size / ST_NBLOCKSIZE + ((statbuf).st_size % ST_NBLOCKSIZE != 0)) # else /* !_POSIX_SOURCE && BSIZE */ # define ST_NBLOCKS(statbuf) \ (S_ISREG ((statbuf).st_mode) \ @@ -256,9 +287,15 @@ typedef enum {false = 0, true = 1} bool; ? st_blocks ((statbuf).st_size) : 0) # endif /* !_POSIX_SOURCE && BSIZE */ #else /* HAVE_STRUCT_STAT_ST_BLOCKS */ -/* Some systems, like Sequents, return st_blksize of 0 on pipes. */ -# define ST_BLKSIZE(statbuf) ((statbuf).st_blksize > 0 \ - ? (statbuf).st_blksize : DEV_BSIZE) +/* Some systems, like Sequents, return st_blksize of 0 on pipes. + Also, when running `rsh hpux11-system cat any-file', cat would + determine that the output stream had an st_blksize of 2147421096. + So here we arbitrarily limit the `optimal' block size to 4MB. + If anyone knows of a system for which the legitimate value for + st_blksize can exceed 4MB, please report it as a bug in this code. */ +# define ST_BLKSIZE(statbuf) ((0 < (statbuf).st_blksize \ + && (statbuf).st_blksize <= (1 << 22)) /* 4MB */ \ + ? (statbuf).st_blksize : DEV_BSIZE) # if defined hpux || defined __hpux__ || defined __hpux /* HP-UX counts st_blocks in 1024-byte units. This loses when mixing HP-UX and BSD filesystems with NFS. */ @@ -279,14 +316,635 @@ typedef enum {false = 0, true = 1} bool; #endif /* HAVE_STRUCT_STAT_ST_BLOCKS */ #ifndef ST_NBLOCKS -# define ST_NBLOCKS(statbuf) \ - (S_ISREG ((statbuf).st_mode) \ - || S_ISDIR ((statbuf).st_mode) \ - ? (statbuf).st_blocks : 0) +# define ST_NBLOCKS(statbuf) ((statbuf).st_blocks) #endif #ifndef ST_NBLOCKSIZE # define ST_NBLOCKSIZE 512 #endif -#include "sys2.h" +/* Redirection and wildcarding when done by the utility itself. + Generally a noop, but used in particular for native VMS. */ +#ifndef initialize_main +# define initialize_main(ac, av) +#endif + +#ifndef S_IFMT +# define S_IFMT 0170000 +#endif + +#if STAT_MACROS_BROKEN +# undef S_ISBLK +# undef S_ISCHR +# undef S_ISDIR +# undef S_ISDOOR +# undef S_ISFIFO +# undef S_ISLNK +# undef S_ISNAM +# undef S_ISMPB +# undef S_ISMPC +# undef S_ISNWK +# undef S_ISREG +# undef S_ISSOCK +#endif + + +#ifndef S_ISBLK +# ifdef S_IFBLK +# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) +# else +# define S_ISBLK(m) 0 +# endif +#endif + +#ifndef S_ISCHR +# ifdef S_IFCHR +# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) +# else +# define S_ISCHR(m) 0 +# endif +#endif + +#ifndef S_ISDIR +# ifdef S_IFDIR +# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +# else +# define S_ISDIR(m) 0 +# endif +#endif + +#ifndef S_ISDOOR /* Solaris 2.5 and up */ +# ifdef S_IFDOOR +# define S_ISDOOR(m) (((m) & S_IFMT) == S_IFDOOR) +# else +# define S_ISDOOR(m) 0 +# endif +#endif + +#ifndef S_ISFIFO +# ifdef S_IFIFO +# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) +# else +# define S_ISFIFO(m) 0 +# endif +#endif + +#ifndef S_ISLNK +# ifdef S_IFLNK +# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) +# else +# define S_ISLNK(m) 0 +# endif +#endif + +#ifndef S_ISMPB /* V7 */ +# ifdef S_IFMPB +# define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB) +# define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC) +# else +# define S_ISMPB(m) 0 +# define S_ISMPC(m) 0 +# endif +#endif + +#ifndef S_ISNAM /* Xenix */ +# ifdef S_IFNAM +# define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM) +# else +# define S_ISNAM(m) 0 +# endif +#endif + +#ifndef S_ISNWK /* HP/UX */ +# ifdef S_IFNWK +# define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) +# else +# define S_ISNWK(m) 0 +# endif +#endif + +#ifndef S_ISREG +# ifdef S_IFREG +# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +# else +# define S_ISREG(m) 0 +# endif +#endif + +#ifndef S_ISSOCK +# ifdef S_IFSOCK +# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) +# else +# define S_ISSOCK(m) 0 +# endif +#endif + + +#ifndef S_TYPEISSEM +# ifdef S_INSEM +# define S_TYPEISSEM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSEM) +# else +# define S_TYPEISSEM(p) 0 +# endif +#endif + +#ifndef S_TYPEISSHM +# ifdef S_INSHD +# define S_TYPEISSHM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSHD) +# else +# define S_TYPEISSHM(p) 0 +# endif +#endif + +#ifndef S_TYPEISMQ +# define S_TYPEISMQ(p) 0 +#endif + + +/* If any of the following are undefined, + define them to their de facto standard values. */ +#if !S_ISUID +# define S_ISUID 04000 +#endif +#if !S_ISGID +# define S_ISGID 02000 +#endif + +/* S_ISVTX is a common extension to POSIX. */ +#ifndef S_ISVTX +# define S_ISVTX 01000 +#endif + +#if !S_IRUSR && S_IREAD +# define S_IRUSR S_IREAD +#endif +#if !S_IRUSR +# define S_IRUSR 00400 +#endif +#if !S_IRGRP +# define S_IRGRP (S_IRUSR >> 3) +#endif +#if !S_IROTH +# define S_IROTH (S_IRUSR >> 6) +#endif + +#if !S_IWUSR && S_IWRITE +# define S_IWUSR S_IWRITE +#endif +#if !S_IWUSR +# define S_IWUSR 00200 +#endif +#if !S_IWGRP +# define S_IWGRP (S_IWUSR >> 3) +#endif +#if !S_IWOTH +# define S_IWOTH (S_IWUSR >> 6) +#endif + +#if !S_IXUSR && S_IEXEC +# define S_IXUSR S_IEXEC +#endif +#if !S_IXUSR +# define S_IXUSR 00100 +#endif +#if !S_IXGRP +# define S_IXGRP (S_IXUSR >> 3) +#endif +#if !S_IXOTH +# define S_IXOTH (S_IXUSR >> 6) +#endif + +#if !S_IRWXU +# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR) +#endif +#if !S_IRWXG +# define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP) +#endif +#if !S_IRWXO +# define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH) +#endif + +/* S_IXUGO is a common extension to POSIX. */ +#if !S_IXUGO +# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) +#endif + +#ifndef S_IRWXUGO +# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) +#endif + +/* All the mode bits that can be affected by chmod. */ +#define CHMOD_MODE_BITS \ + (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) + +#include "timespec.h" + +#ifndef RETSIGTYPE +# define RETSIGTYPE void +#endif + +#ifdef __DJGPP__ + /* We need the declaration of setmode. */ +# include <io.h> + /* We need the declaration of __djgpp_set_ctrl_c. */ +# include <sys/exceptn.h> +#endif + +#if HAVE_STDINT_H +# include <stdint.h> +#endif + +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for the definition of UINTMAX_MAX */ +#endif + +#if !defined PRIdMAX || PRI_MACROS_BROKEN +# undef PRIdMAX +# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld") +#endif +#if !defined PRIoMAX || PRI_MACROS_BROKEN +# undef PRIoMAX +# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo") +#endif +#if !defined PRIuMAX || PRI_MACROS_BROKEN +# undef PRIuMAX +# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu") +#endif +#if !defined PRIxMAX || PRI_MACROS_BROKEN +# undef PRIxMAX +# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx") +#endif + +#include <ctype.h> + +/* Jim Meyering writes: + + "... Some ctype macros are valid only for character codes that + isascii says are ASCII (SGI's IRIX-4.0.5 is one such system --when + using /bin/cc or gcc but without giving an ansi option). So, all + ctype uses should be through macros like ISPRINT... If + STDC_HEADERS is defined, then autoconf has verified that the ctype + macros don't need to be guarded with references to isascii. ... + Defining isascii to 1 should let any compiler worth its salt + eliminate the && through constant folding." + + Bruno Haible adds: + + "... Furthermore, isupper(c) etc. have an undefined result if c is + outside the range -1 <= c <= 255. One is tempted to write isupper(c) + with c being of type `char', but this is wrong if c is an 8-bit + character >= 128 which gets sign-extended to a negative value. + The macro ISUPPER protects against this as well." */ + +#if STDC_HEADERS || (!defined (isascii) && !HAVE_ISASCII) +# define IN_CTYPE_DOMAIN(c) 1 +#else +# define IN_CTYPE_DOMAIN(c) isascii(c) +#endif + +#ifdef isblank +# define ISBLANK(c) (IN_CTYPE_DOMAIN (c) && isblank (c)) +#else +# define ISBLANK(c) ((c) == ' ' || (c) == '\t') +#endif +#ifdef isgraph +# define ISGRAPH(c) (IN_CTYPE_DOMAIN (c) && isgraph (c)) +#else +# define ISGRAPH(c) (IN_CTYPE_DOMAIN (c) && isprint (c) && !isspace (c)) +#endif + +/* This is defined in <sys/euc.h> on at least Solaris2.6 systems. */ +#undef ISPRINT + +#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) +#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) +#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) +#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c)) +#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) +#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (c)) +#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) +#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) +#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c)) +#define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) + +#if STDC_HEADERS +# define TOLOWER(Ch) tolower (Ch) +# define TOUPPER(Ch) toupper (Ch) +#else +# define TOLOWER(Ch) (ISUPPER (Ch) ? tolower (Ch) : (Ch)) +# define TOUPPER(Ch) (ISLOWER (Ch) ? toupper (Ch) : (Ch)) +#endif + +/* ISDIGIT differs from ISDIGIT_LOCALE, as follows: + - Its arg may be any int or unsigned int; it need not be an unsigned char. + - It's guaranteed to evaluate its argument exactly once. + - It's typically faster. + POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to + ISDIGIT_LOCALE unless it's important to use the locale's definition + of `digit' even when the host does not conform to POSIX. */ +#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) + +/* Take care of NLS matters. */ + +#if HAVE_LOCALE_H +# include <locale.h> +#else +# define setlocale(Category, Locale) /* empty */ +#endif + +#include "gettext.h" +#if ! ENABLE_NLS +# undef textdomain +# define textdomain(Domainname) /* empty */ +# undef bindtextdomain +# define bindtextdomain(Domainname, Dirname) /* empty */ +#endif + +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + +#ifndef HAVE_SETLOCALE +# define HAVE_SETLOCALE 0 +#endif + +#define STREQ(a, b) (strcmp ((a), (b)) == 0) + +#if !HAVE_DECL_FREE +void free (); +#endif + +#if !HAVE_DECL_MALLOC +char *malloc (); +#endif + +#if !HAVE_DECL_MEMCHR +char *memchr (); +#endif + +#if !HAVE_DECL_REALLOC +char *realloc (); +#endif + +#if !HAVE_DECL_STPCPY +# ifndef stpcpy +char *stpcpy (); +# endif +#endif + +#if !HAVE_DECL_STRNDUP +char *strndup (); +#endif + +#if !HAVE_DECL_STRSTR +char *strstr (); +#endif + +#if !HAVE_DECL_GETENV +char *getenv (); +#endif + +#if !HAVE_DECL_LSEEK +off_t lseek (); +#endif + +/* This is needed on some AIX systems. */ +#if !HAVE_DECL_STRTOUL +unsigned long strtoul (); +#endif + +#if !HAVE_DECL_GETLOGIN +char *getlogin (); +#endif + +#if !HAVE_DECL_TTYNAME +char *ttyname (); +#endif + +#if !HAVE_DECL_GETEUID +uid_t geteuid (); +#endif + +#if !HAVE_DECL_GETPWUID +struct passwd *getpwuid (); +#endif + +#if !HAVE_DECL_GETGRGID +struct group *getgrgid (); +#endif + +#if !HAVE_DECL_GETUID +uid_t getuid (); +#endif + +#include "xalloc.h" + +#if ! 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 + +/* Include automatically-generated macros for unlocked I/O. */ +#include "unlocked-io.h" + +#define SAME_INODE(Stat_buf_1, Stat_buf_2) \ + ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \ + && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev) + +#define DOT_OR_DOTDOT(Basename) \ + (Basename[0] == '.' && (Basename[1] == '\0' \ + || (Basename[1] == '.' && Basename[2] == '\0'))) + +#if SETVBUF_REVERSED +# define SETVBUF(Stream, Buffer, Type, Size) \ + setvbuf (Stream, Type, Buffer, Size) +#else +# define SETVBUF(Stream, Buffer, Type, Size) \ + setvbuf (Stream, Buffer, Type, Size) +#endif + +/* Factor out some of the common --help and --version processing code. */ + +/* These enum values cannot possibly conflict with the option values + ordinarily used by commands, including CHAR_MAX + 1, etc. Avoid + CHAR_MIN - 1, as it may equal -1, the getopt end-of-options value. */ +enum +{ + GETOPT_HELP_CHAR = (CHAR_MIN - 2), + GETOPT_VERSION_CHAR = (CHAR_MIN - 3) +}; + +#define GETOPT_HELP_OPTION_DECL \ + "help", no_argument, 0, GETOPT_HELP_CHAR +#define GETOPT_VERSION_OPTION_DECL \ + "version", no_argument, 0, GETOPT_VERSION_CHAR + +#define case_GETOPT_HELP_CHAR \ + case GETOPT_HELP_CHAR: \ + usage (EXIT_SUCCESS); \ + break; + +#define HELP_OPTION_DESCRIPTION \ + _(" --help display this help and exit\n") +#define VERSION_OPTION_DESCRIPTION \ + _(" --version output version information and exit\n") + +#include "closeout.h" +#include "version-etc.h" + +#define case_GETOPT_VERSION_CHAR(Program_name, Authors) \ + case GETOPT_VERSION_CHAR: \ + version_etc (stdout, Program_name, PACKAGE, VERSION, Authors, \ + (char *) NULL); \ + exit (EXIT_SUCCESS); \ + break; + +#ifndef MAX +# define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif + +#ifndef MIN +# define MIN(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +#ifndef CHAR_BIT +# define CHAR_BIT 8 +#endif + +/* The extra casts work around common compiler bugs. */ +#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) +/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. + It is necessary at least when t == time_t. */ +#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ + ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) +#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t))) + +/* Upper bound on the string length of an integer converted to string. + 302 / 1000 is ceil (log10 (2.0)). Subtract 1 for the sign bit; + add 1 for integer division truncation; add 1 more for a minus sign. */ +#define INT_STRLEN_BOUND(t) ((sizeof (t) * CHAR_BIT - 1) * 302 / 1000 + 2) + +#ifndef CHAR_MIN +# define CHAR_MIN TYPE_MINIMUM (char) +#endif + +#ifndef CHAR_MAX +# define CHAR_MAX TYPE_MAXIMUM (char) +#endif + +#ifndef SCHAR_MIN +# define SCHAR_MIN (-1 - SCHAR_MAX) +#endif + +#ifndef SCHAR_MAX +# define SCHAR_MAX (CHAR_MAX == UCHAR_MAX ? CHAR_MAX / 2 : CHAR_MAX) +#endif + +#ifndef UCHAR_MAX +# define UCHAR_MAX TYPE_MAXIMUM (unsigned char) +#endif + +#ifndef SHRT_MIN +# define SHRT_MIN TYPE_MINIMUM (short int) +#endif + +#ifndef SHRT_MAX +# define SHRT_MAX TYPE_MAXIMUM (short int) +#endif + +#ifndef INT_MAX +# define INT_MAX TYPE_MAXIMUM (int) +#endif + +#ifndef INT_MIN +# define INT_MIN TYPE_MINIMUM (int) +#endif + +#ifndef UINT_MAX +# define UINT_MAX TYPE_MAXIMUM (unsigned int) +#endif + +#ifndef LONG_MAX +# define LONG_MAX TYPE_MAXIMUM (long) +#endif + +#ifndef ULONG_MAX +# define ULONG_MAX TYPE_MAXIMUM (unsigned long) +#endif + +#ifndef SIZE_MAX +# define SIZE_MAX TYPE_MAXIMUM (size_t) +#endif + +#ifndef SSIZE_MAX +# define SSIZE_MAX TYPE_MAXIMUM (ssize_t) +#endif + +#ifndef UINTMAX_MAX +# define UINTMAX_MAX TYPE_MAXIMUM (uintmax_t) +#endif + +#ifndef OFF_T_MIN +# define OFF_T_MIN TYPE_MINIMUM (off_t) +#endif + +#ifndef OFF_T_MAX +# define OFF_T_MAX TYPE_MAXIMUM (off_t) +#endif + +#ifndef UID_T_MAX +# define UID_T_MAX TYPE_MAXIMUM (uid_t) +#endif + +#ifndef GID_T_MAX +# define GID_T_MAX TYPE_MAXIMUM (gid_t) +#endif + +#ifndef PID_T_MAX +# define PID_T_MAX TYPE_MAXIMUM (pid_t) +#endif + +/* Use this to suppress gcc's `...may be used before initialized' warnings. */ +#ifdef lint +# define IF_LINT(Code) Code +#else +# define IF_LINT(Code) /* empty */ +#endif + +#ifndef __attribute__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ +# define __attribute__(x) +# endif +#endif + +#ifndef ATTRIBUTE_NORETURN +# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +#endif + +#ifndef ATTRIBUTE_UNUSED +# define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +#endif + +#if defined strdupa +# define ASSIGN_STRDUPA(DEST, S) \ + do { DEST = strdupa (S); } while (0) +#else +# define ASSIGN_STRDUPA(DEST, S) \ + do \ + { \ + const char *s_ = (S); \ + size_t len_ = strlen (s_) + 1; \ + char *tmp_dest_ = alloca (len_); \ + DEST = memcpy (tmp_dest_, (s_), len_); \ + } \ + while (0) +#endif + +#ifndef EOVERFLOW +# define EOVERFLOW EINVAL +#endif + +#if ! HAVE_FSEEKO && ! defined fseeko +# define fseeko(s, o, w) ((o) == (long) (o) \ + ? fseek (s, o, w) \ + : (errno = EOVERFLOW, -1)) +#endif |