hrev49494 adds 1 changeset to branch 'master'
old head: 819176502578bd4ac2f404b83509f83b7725d278
new head: ed92a1052069f6a3afb353d71c563662de66a47a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=ed92a1052069+%5E819176502578
----------------------------------------------------------------------------
ed92a1052069: diffutils: use the outsourced packages.
* remove diffutils Jamfile from the build and diffutils sources from the tree.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev49494
Commit: ed92a1052069f6a3afb353d71c563662de66a47a
URL: http://cgit.haiku-os.org/haiku/commit/?id=ed92a1052069
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Aug 1 12:04:10 2015 UTC
----------------------------------------------------------------------------
231 files changed, 5 insertions(+), 101342 deletions(-)
Jamfile | 3 +-
build/jam/images/definitions/minimum | 6 +-
src/bin/Jamfile | 1 -
src/bin/diffutils/ABOUT-NLS | 396 -
src/bin/diffutils/AUTHORS | 112 -
src/bin/diffutils/COPYING | 340 -
src/bin/diffutils/ChangeLog | 3409 ------
src/bin/diffutils/INSTALL | 231 -
src/bin/diffutils/INSTALLME | 53 -
src/bin/diffutils/Jamfile | 4 -
src/bin/diffutils/Makefile | 455 -
src/bin/diffutils/Makefile.am | 23 -
src/bin/diffutils/Makefile.in | 455 -
src/bin/diffutils/NEWS | 202 -
src/bin/diffutils/README | 38 -
src/bin/diffutils/THANKS | 22 -
src/bin/diffutils/aclocal.m4 | 3633 ------
src/bin/diffutils/config.h | 515 -
src/bin/diffutils/config.hin | 514 -
src/bin/diffutils/config.status | 1568 ---
src/bin/diffutils/config/config.guess | 1321 ---
src/bin/diffutils/config/config.rpath | 513 -
src/bin/diffutils/config/config.sub | 1443 ---
src/bin/diffutils/config/depcomp | 436 -
src/bin/diffutils/config/install-sh | 251 -
src/bin/diffutils/config/mdate-sh | 97 -
src/bin/diffutils/config/missing | 336 -
src/bin/diffutils/config/mkinstalldirs | 101 -
src/bin/diffutils/config/texinfo.tex | 6364 ----------
src/bin/diffutils/configure | 15482 -------------------------
src/bin/diffutils/configure.ac | 135 -
src/bin/diffutils/doc/Makefile | 359 -
src/bin/diffutils/doc/Makefile.am | 24 -
src/bin/diffutils/doc/Makefile.in | 359 -
src/bin/diffutils/doc/diagmeet.note | 71 -
src/bin/diffutils/doc/diff.info | 5084 --------
src/bin/diffutils/doc/diff.texi | 4556 --------
src/bin/diffutils/doc/fdl.texi | 403 -
src/bin/diffutils/doc/stamp-vti | 4 -
src/bin/diffutils/doc/version.texi | 4 -
src/bin/diffutils/exgettext | 123 -
src/bin/diffutils/lib/Jamfile | 49 -
src/bin/diffutils/lib/Makefile | 493 -
src/bin/diffutils/lib/Makefile.am | 42 -
src/bin/diffutils/lib/Makefile.in | 493 -
src/bin/diffutils/lib/alloca.c | 504 -
src/bin/diffutils/lib/basename.c | 79 -
src/bin/diffutils/lib/c-stack.c | 237 -
src/bin/diffutils/lib/c-stack.h | 24 -
src/bin/diffutils/lib/cmpbuf.c | 147 -
src/bin/diffutils/lib/cmpbuf.h | 21 -
src/bin/diffutils/lib/dirname.h | 47 -
src/bin/diffutils/lib/error.c | 400 -
src/bin/diffutils/lib/error.h | 78 -
src/bin/diffutils/lib/exclude.c | 268 -
src/bin/diffutils/lib/exclude.h | 49 -
src/bin/diffutils/lib/exitfail.c | 31 -
src/bin/diffutils/lib/exitfail.h | 20 -
src/bin/diffutils/lib/fnmatch.c | 230 -
src/bin/diffutils/lib/fnmatch.hin | 69 -
src/bin/diffutils/lib/freesoft.c | 31 -
src/bin/diffutils/lib/freesoft.h | 1 -
src/bin/diffutils/lib/getopt.c | 1067 --
src/bin/diffutils/lib/getopt.h | 179 -
src/bin/diffutils/lib/getopt1.c | 187 -
src/bin/diffutils/lib/gettext.h | 59 -
src/bin/diffutils/lib/hard-locale.c | 79 -
src/bin/diffutils/lib/hard-locale.h | 18 -
src/bin/diffutils/lib/imaxtostr.c | 3 -
src/bin/diffutils/lib/inttostr.c | 49 -
src/bin/diffutils/lib/inttostr.h | 60 -
src/bin/diffutils/lib/malloc.c | 38 -
src/bin/diffutils/lib/memchr.c | 216 -
src/bin/diffutils/lib/mkstemp.c | 42 -
src/bin/diffutils/lib/offtostr.c | 3 -
src/bin/diffutils/lib/posix/Makefile.am | 4 -
src/bin/diffutils/lib/posix/Makefile.in | 229 -
src/bin/diffutils/lib/posix/regex.h | 562 -
src/bin/diffutils/lib/posixver.c | 58 -
src/bin/diffutils/lib/posixver.h | 1 -
src/bin/diffutils/lib/prepargs.c | 93 -
src/bin/diffutils/lib/prepargs.h | 3 -
src/bin/diffutils/lib/quotesys.c | 125 -
src/bin/diffutils/lib/quotesys.h | 9 -
src/bin/diffutils/lib/realloc.c | 44 -
src/bin/diffutils/lib/regex.c | 8438 --------------
src/bin/diffutils/lib/regex.hin | 46 -
src/bin/diffutils/lib/setmode.c | 62 -
src/bin/diffutils/lib/setmode.h | 27 -
src/bin/diffutils/lib/strcasecmp.c | 66 -
src/bin/diffutils/lib/strftime.c | 1406 ---
src/bin/diffutils/lib/strtoimax.c | 101 -
src/bin/diffutils/lib/strtol.c | 472 -
src/bin/diffutils/lib/strtoul.c | 22 -
src/bin/diffutils/lib/strtoull.c | 27 -
src/bin/diffutils/lib/strtoumax.c | 2 -
src/bin/diffutils/lib/tempname.c | 342 -
src/bin/diffutils/lib/umaxtostr.c | 3 -
src/bin/diffutils/lib/unlocked-io.h | 69 -
[ *** stats truncated: 132 lines dropped *** ]
----------------------------------------------------------------------------
diff --git a/Jamfile b/Jamfile
index c1774a4..cce7bfe 100644
--- a/Jamfile
+++ b/Jamfile
@@ -26,7 +26,8 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
bash coreutils curl freetype icu libsolv zlib
regular_image @{
- bzip2 ctags expat ffmpeg findutils gawk glu grep gutenprint
gzip jasper jpeg
+ bzip2 ctags diffutils expat ffmpeg findutils gawk glu grep
gutenprint
+ gzip jasper jpeg
less libicns libpcap libpng libpng16 libwebp
mesa mesa_devel mesa_swrast
netcat
diff --git a/build/jam/images/definitions/minimum
b/build/jam/images/definitions/minimum
index 5c29132..fa83679 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -3,8 +3,8 @@
SYSTEM_BIN = [ FFilterByBuildFeatures
addattr alert arp autologin
bc beep bfsinfo
- catattr checkfs checkitout chop clear cmp collectcatkeys compress
copyattr
- dc desklink df diff diff3 diskimage draggers
+ catattr checkfs checkitout chop clear collectcatkeys compress copyattr
+ dc desklink df diskimage draggers
driveinfo dstcheck dumpcatalog
eject error
fdinfo ffm filepanel finddir findpaths fortune fstrim
@@ -24,7 +24,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
query quit
rc reindex release renice resattr rmattr rmindex roster
route
- safemode screen_blanker screeninfo screenmode sdiff setarch setmime
settype
+ safemode screen_blanker screeninfo screenmode setarch setmime settype
setversion setvolume shutdown
strace su sysinfo
tcptester telnet telnetd top
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index e81be6e..e9d29fb 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -268,7 +268,6 @@ SubInclude HAIKU_TOP src bin compress ;
SubInclude HAIKU_TOP src bin consoled ;
SubInclude HAIKU_TOP src bin coreutils ;
SubInclude HAIKU_TOP src bin desklink ;
-SubInclude HAIKU_TOP src bin diffutils ;
SubInclude HAIKU_TOP src bin fwcontrol ;
SubInclude HAIKU_TOP src bin hid_decode ;
SubInclude HAIKU_TOP src bin ideinfo ;
diff --git a/src/bin/diffutils/ABOUT-NLS b/src/bin/diffutils/ABOUT-NLS
deleted file mode 100644
index 022965c..0000000
--- a/src/bin/diffutils/ABOUT-NLS
+++ /dev/null
@@ -1,396 +0,0 @@
-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
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
-
- If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site. But you do _not_
-need to install GNU `gettext' prior to configuring, installing or using
-this package with messages translated.
-
- Installers will find here some useful hints. These notes also
-explain how users should proceed for getting the programs to use the
-available translations. They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
-
- When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used. The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-Quick configuration advice
-==========================
-
- If you want to exploit the full power of internationalization, you
-should configure it using
-
- ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed. So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias, message inheritance, automatic
-charset conversion or plural form handling) as the implementation here.
-It is also not possible to offer this additional functionality on top
-of a `catgets' implementation. Future versions of GNU `gettext' will
-very likely convey even more functionality. So it might be a good idea
-to change to GNU `gettext' as soon as possible.
-
- So you need _not_ provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-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'.
-
- By default, this package will be installed to allow translation of
-messages. It will automatically detect whether the system already
-provides the GNU `gettext' functions. If not, the GNU `gettext' own
-library will be used. This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is _not_ required. Installers may use
-special options at configuration time for changing the default
-behaviour. The commands:
-
- ./configure --with-included-gettext
- ./configure --disable-nls
-
-will respectively bypass any pre-existing `gettext' to use the
-internationalizing routines provided within this package, or else,
-_totally_ disable translation of messages.
-
- When you already have GNU `gettext' installed on your system and run
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this. This might be not what is desirable. You
-should use the more recent version of the GNU `gettext' library. I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
-
- ./configure --with-included-gettext
-
-to prevent auto-detection.
-
- The configuration process will not test for the `catgets' function
-and therefore it will not be used. The reason is that even an
-emulation of `gettext' on top of `catgets' could not provide all the
-extensions of the GNU `gettext' library.
-
- Internationalized packages have usually many `po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language. Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package. However, the environment variable `LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-Using This Package
-==================
-
- 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
-suppose that you speak German and live in Germany. At the shell
-prompt, merely execute `setenv LANG de_DE' (in `csh'),
-`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
-This can be done from your `.login' or `.profile' file, once and for
-all.
-
- You might think that the country code specification is redundant.
-But in fact, some languages have dialects in different countries. For
-example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
-country code serves to distinguish the dialects.
-
- The locale naming convention of `LL_CC', with `LL' denoting the
-language and `CC' denoting the country, is the one use on systems based
-on GNU libc. On other systems, some variations of this scheme are
-used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
-locales supported by your system for your country by running the command
-`locale -a | grep '^LL''.
-
- Not all programs have translations for all languages. By default, an
-English message is shown in place of a nonexistent translation. If you
-understand other languages, you can set up a priority list of languages.
-This is done through a different environment variable, called
-`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
-for the purpose of message handling, but you still need to have `LANG'
-set to the primary language; this is required by other parts of the
-system libraries. For example, some Swedish users who would rather
-read translations in German than English for when Swedish is not
-available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
-
- In the `LANGUAGE' environment variable, but not in the `LANG'
-environment variable, `LL_CC' combinations can be abbreviated as `LL'
-to denote the language's main dialect. For example, `de' is equivalent
-to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
-(Portuguese as spoken in Portugal) in this context.
-
-Translating Teams
-=================
-
- 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
-teams can be found at the Free Translation Project's homepage,
-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
-area.
-
- If you'd like to volunteer to _work_ at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is _not_ the same as the list itself, it has
-`-request' appended. For example, speakers of Swedish can send a
-message to `sv-request@xxxxxx', having this message body:
-
- subscribe
-
- Keep in mind that team members are expected to participate
-_actively_ in translations, or at solving translational difficulties,
-rather than merely lurking around. If your team does not exist yet and
-you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@xxxxxxxxxxxxxxxx' to reach the
-coordinator for all translator teams.
-
- The English team is special. It works at improving and uniformizing
-the terminology in use. Proven linguistic skill are praised more than
-programming skill, here.
-
-Available Packages
-==================
-
- Languages are not equally supported in all packages. The following
-matrix shows the current state of internationalization, as of March
-2002. 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 bg ca cs da de el en eo es et fi fr
- +-------------------------------------+
- a2ps | [] [] [] [] |
- bash | [] [] [] [] |
- bfd | [] [] |
- binutils | [] [] |
- bison | [] [] [] |
- clisp | [] [] [] [] |
- cpio | [] [] [] [] |
- diffutils | [] [] [] [] [] [] |
- enscript | [] [] |
- error | [] [] |
- fetchmail | () [] [] [] () |
- fileutils | [] [] [] [] [] |
- findutils | [] [] [] [] [] |
- flex | [] [] [] [] |
- gas | [] [] |
- gawk | [] [] |
- gcal | [] [] |
- gcc | [] [] |
- gettext | [] [] [] [] [] |
- gnupg | [] [] [] [] [] [] |
- gprof | [] [] |
- grep | [] [] [] [] [] [] |
- hello | [] [] [] [] [] [] [] [] |
- id-utils | [] [] [] |
- indent | [] [] [] [] [] |
- jpilot | () [] [] [] |
- jwhois | [] [] |
- kbd | [] [] |
- ld | [] [] |
- libc | [] [] [] [] [] [] [] |
- lilypond | [] [] |
- lynx | [] [] [] [] |
- m4 | [] [] [] [] [] |
- make | [] [] [] [] |
- mysecretdiary | [] [] |
- nano | [] () [] [] [] [] |
- nano_1_0 | [] () [] [] [] [] |
- opcodes | [] [] [] |
- parted | [] [] [] [] |
- ptx | [] [] [] [] [] |
- python | |
- recode | [] [] [] [] [] [] |
- sed | [] [] [] [] [] [] [] [] |
- sh-utils | [] [] [] [] [] [] [] [] |
- sharutils | [] [] [] [] [] [] |
- sketch | () [] () |
- soundtracker | [] [] [] |
- sp | |
- tar | [] [] [] [] [] [] |
- texinfo | [] [] [] [] [] |
- textutils | [] [] [] [] [] |
- util-linux | [] [] [] [] |
- vorbis-tools | |
- wdiff | [] [] [] [] [] |
- wget | [] [] [] [] [] [] [] [] |
- +-------------------------------------+
- bg ca cs da de el en eo es et fi fr
- 1 12 11 31 36 9 1 8 39 15 1 50
-
- gl he hr hu id it ja ko lv nb nl nn
- +-------------------------------------+
- a2ps | () () [] |
- bash | |
- bfd | [] |
- binutils | [] |
- bison | [] [] |
- clisp | [] |
- cpio | [] [] [] |
- diffutils | [] [] [] |
- enscript | [] |
- error | [] |
- fetchmail | |
- fileutils | [] [] [] |
- findutils | [] [] [] [] [] [] |
- flex | [] |
- gas | |
- gawk | [] |
- gcal | |
- gcc | |
- gettext | [] |
- gnupg | [] [] [] |
- gprof | |
- grep | [] |
- hello | [] [] [] [] [] [] [] [] [] [] |
- id-utils | [] |
- indent | [] [] [] |
- jpilot | () () |
- jwhois | |
- kbd | |
- ld | |
- libc | [] [] [] [] |
- lilypond | [] [] |
- lynx | [] [] |
- m4 | [] [] [] [] |
- make | [] [] [] [] |
- mysecretdiary | |
- nano | [] [] [] () [] () [] |
- nano_1_0 | [] [] [] () [] () [] |
- opcodes | [] |
- parted | [] [] [] |
- ptx | [] [] [] [] |
- python | |
- recode | [] [] [] |
- sed | [] [] [] [] [] [] [] |
- sh-utils | [] [] [] [] [] |
- sharutils | [] [] [] |
- sketch | () |
- soundtracker | [] |
- sp | |
- tar | [] [] [] |
- texinfo | [] [] |
- textutils | [] [] |
- util-linux | () [] |
- vorbis-tools | |
- wdiff | |
- wget | [] [] [] [] [] |
- +-------------------------------------+
- gl he hr hu id it ja ko lv nb nl nn
- 19 7 0 4 6 11 22 9 1 8 19 4
-
- no pl pt pt_BR ru sk sl sv tr uk zh_TW
- +----------------------------------------+
- a2ps | () () () [] [] [] () | 8
- bash | | 4
- bfd | [] [] | 5
- binutils | [] | 4
- bison | [] [] [] | 8
- clisp | | 5
- cpio | [] [] [] [] | 11
- diffutils | [] [] [] [] [] | 14
- enscript | [] [] [] | 6
- error | [] [] [] | 6
- fetchmail | () () [] | 4
- fileutils | [] [] [] [] | 12
- findutils | [] [] [] [] [] [] [] | 18
- flex | [] [] [] | 8
- gas | [] | 3
- gawk | [] [] | 5
- gcal | [] [] | 4
- gcc | [] | 3
- gettext | [] [] [] [] | 10
- gnupg | [] [] [] | 12
- gprof | [] [] | 4
- grep | [] [] [] | 10
- hello | [] [] [] [] [] [] [] | 25
- id-utils | [] [] | 6
- indent | [] [] [] [] | 12
- jpilot | () () | 3
- jwhois | () () [] | 3
- kbd | [] [] | 4
- ld | [] [] | 4
- libc | [] [] [] [] [] [] | 17
- lilypond | [] | 5
- lynx | [] [] [] | 9
- m4 | [] [] [] | 12
- make | [] [] [] [] | 12
- mysecretdiary | [] [] | 4
- nano | () [] [] [] [] | 14
- nano_1_0 | () [] [] [] | 13
- opcodes | [] [] | 6
- parted | [] [] [] | 10
- ptx | [] [] [] [] [] [] | 15
- python | | 0
- recode | [] [] [] [] | 13
- sed | [] [] [] [] [] [] | 21
- sh-utils | [] [] [] [] [] [] [] [] [] | 22
- sharutils | [] [] [] | 12
- sketch | [] () | 3
- soundtracker | [] | 5
- sp | | 0
- tar | [] [] [] [] [] [] [] | 16
- texinfo | [] [] [] | 10
- textutils | [] [] [] [] | 11
- util-linux | [] [] [] | 8
- vorbis-tools | [] | 1
- wdiff | [] [] [] [] | 9
- wget | [] [] [] [] [] [] [] | 20
- +----------------------------------------+
- 35 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW
- 55 domains 5 13 2 12 25 11 11 41 34 4 7 489
-
- 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
-used for implementing regional variants of languages, or language
-dialects.
-
- For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-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 March 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
-`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
-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
-in particular that even non-free programs can use `libintl' as a shared
-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
-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
-`translation@xxxxxxxxxxxxxxxx' to make the `.pot' files available to
-the translation teams.
-
diff --git a/src/bin/diffutils/AUTHORS b/src/bin/diffutils/AUTHORS
deleted file mode 100644
index f5f0e90..0000000
--- a/src/bin/diffutils/AUTHORS
+++ /dev/null
@@ -1,112 +0,0 @@
-Authors of GNU diffutils.
-
- Copyright 2001 Free Software Foundation, Inc.
-
- This file is part of GNU diffutils.
-
- GNU diffutils 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.
-
- GNU diffutils 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 GNU diffutils; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-
-The following contributions warranted legal paper exchanges with the
-Free Software Foundation. Also see files ChangeLog and THANKS.
-
-DIFFUTILS Leonard H. Tower Jr. US 1949 1987-03-09
-Assigns diff (diff.c, initial version).
-
-DIFFUTILS Torbjorn Granlund Sweden 1961 1988-01-11
-Assigns cmp.
-tege@xxxxxxxxxxxxxxx
-
-DIFFUTILS Mike Haertel US 1967 1988-09-16
-Assigns changes to diff.
-
-DIFFUTILS David S. Hayes US ? 1988-01-12
-Assigns changes to diff.
-
-DIFFUTILS Randall Smith US 1964 1988-09-21
-Assigns diff3.
-
-DIFFUTILS Richard Stallman US 1953 1988-01-15
-Assigns changes to GNU Diff.
-
-DIFFUTILS F. Thomas May US 1965 1989-08-22
-Assigns changes to diff (for -D).
-
-DIFFUTILS Optimal Solutions, Inc. 1989-08-14
-Disclaims changes by Thomas May to diff.
-
-DIFFUTILS Wayne Davison 1990-09-10
-Disclaims changes to diff.
-
-DIFFUTILS Digital Research Inc. 1990-09-13
-Disclaims changes by Wayne Davison to diff.
-
-DIFFUTILS Paul Eggert 1990-03-16
-Disclaims changes to diff.
-eggert@xxxxxxxxxxx
-
-DIFFUTILS Paul Eggert 1990-08-14
-Disclaims changes to GNU Diff.
-eggert@xxxxxxxxxxx
-
-DIFFUTILS Twin Sun Inc. 1990-03-16
-Disclaims changes to GNU Diff by Paul Eggert.
-
-DIFFUTILS Twin Sun Inc. 1990-08-14
-Disclaims changes to GNU Diff by Paul Eggert.
-
-DIFFUTILS Chip Rosenthal US 1959 1990-03-06
-Assigns changes to diff.
-chip@xxxxxxxxxxxxxxxxxxx
-
-DIFFUTILS Unicom Systems Development 1990-03-06
-Disclaims changes by Chip Rosenthal to diff.
-
-GCC DIFFUTILS Paul Eggert and Twin Sun Inc. 1992-03-11
-Disclaims changes by Paul Eggert to gcc and diff.
-eggert@xxxxxxxxxxx
-
-DIFF Wayne Davison 1993-06-20
-Disclaims diffcvt.c.
-
-DIFFUTILS Francois Pinard Canada 1949 1993-01-15
-Assigns wdiff and future changes submitted to the FSF.
-pinard@xxxxxxxxxxxxxxxx
-
-DIFFUTILS Patrick D'Cruze Australia 1971 1994-11-10
-Assigns changes (makefile.in, analyze.c, cmp.c, error.c, diff.c,
-diff3.c, getopt.c, getopt1.c, regex.c, sdiff.c, util.c, xmalloc.c;
-new file: language.++)
-
-DIFFUTILS Paul R. Eggert US 1954 1997-04-07
-Assigns past and future changes.
-eggert@xxxxxxxxxxx
-
-DIFFUTILS Paul R. Eggert US 1954 1997-04-07
-Assigns past and future changes to manual.
-eggert@xxxxxxxxxxx
-
-ANY DIFFUTILS GNATS Cyclic Software 1997-11-11
-Assigns past and future works (work for hire by Tim Pierce (diffutils) and
-Abe Feldman (GNATS)).
-kingdon@xxxxxxxxxx
-
-WEBPAGES Gregory B. Harvey Canada 1976 1998-02-14
-Assigns web pages describing GNU Diffutils and future changes.
-
-DIFFUTILS Olga Nikulin Russia 1965 2001-01-11
-Assigns changes to diff. (diffutils-2.7.2/analyze.c, context.c, diff.[ch],
-ed.c, ifdef.c, io.c, normal.c, side.c, util.c)
-onikulin@xxxxxxxxx
diff --git a/src/bin/diffutils/COPYING b/src/bin/diffutils/COPYING
deleted file mode 100644
index d60c31a..0000000
--- a/src/bin/diffutils/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/src/bin/diffutils/ChangeLog b/src/bin/diffutils/ChangeLog
deleted file mode 100644
index 1e8723d..0000000
--- a/src/bin/diffutils/ChangeLog
+++ /dev/null
@@ -1,3409 +0,0 @@
-2002-04-05 Paul Eggert <eggert@xxxxxxxxxxxxxxx>
-
- * NEWS, configure.ac (AC_INIT): Version 2.8.1.
-
- * configure.ac (AC_HEADER_STDBOOL): Add.
- (AC_CHECK_HEADERS): Remove stdbool.h.
- * m4/stdbool.m4: New file.
- * m4/prereq.m4 (jm_PREREQ_EXCLUDE):
- Use AC_HEADER_STDBOOL rather than AC_CHECK_HEADERS(stdbool.h).
- (jm_PREREQ_HASH): Likewise.
-
- * src/system.h (SSIZE_MAX): Define if limits.h doesn't.
-
- * src/analyze.c (diff_2_files): Assign PTRDIFF_MAX - 1 to a
- size_t variable, just in case there's a problem with ptrdiff_t
- versus size_t.
-
- * lib/cmpbuf.c (errno): Remove decl; K&R C is no longer supported.
- Include limits.h.
- (SIZE_MAX, SSIZE_MAX): Define if standard headers don't.
- (MIN): New macro.
- (block_read): Do not attempt to read more than SSIZE_MAX bytes, as the
- resulting behavior is implementation-defined. Work around bug in
- Tru64 5.1, which can't read more than INT_MAX bytes at a time.
- * src/cmp.c (cmp): Use block_read instead of read, to work
- around Tru64 5.1 bug.
- * src/diff3.c (read_diff): Likewise.
- * src/diff3.c: Include cmpbuf.h.
-
- * THANKS: Add Ulrich Drepper.
-
- * INSTALLME: Mention GNU texinfo.
-
- * doc/diff.texi:
- Use new @copying directive.
- Put @contents first, not last, since Texinfo now suggests this.
- Fix bug in -w documentation noted by Karl Berry.
- Mention links for speedup.
- New node "Speedups" for future speedups.
- Just say "Index", not "Concept Index".
-
-2002-03-26 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * src/Makefile.am:
- (INCLUDES): Remove this obsolete macro, replacing it with:
- (AM_CPPFLAGS): New macro.
-
-2002-03-26 Albert Chin-A-Young <china@xxxxxxxxxxxxxxxxxx>
-
- * src/Makefile.am (datadir): Remove, as it conflicts with --datadir.
-
-2002-03-26 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * doc/diff.texi (dircategory GNU packages): Fix typo: a "* " was
- missing before the menu entry. Bug diagnosed by Adam Heath.
- Also, put this dircategory after the Individual utilities dircategory,
- to work around a compatibility problem with Debian install-info.
-
-2002-03-24 Eli Zaretskii <eliz@xxxxxxxxxxxxx>
-
- * src/io.c (sip): Do not mishandle buffered count when reverting
- to text mode.
-
-2002-03-23 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * NEWS, configure.ac (AC_INIT): Version 2.8.
- * configure.ac (AC_PREREQ): 2.53.
- * INSTALLME: Upgrade to gettext 0.11.1 and help2man 1.27.
-
- * doc/diff.texi: Upgrade the description of `patch' to GNU patch
- 2.5.4, and revamp the documentation accordingly.
-
- * src/diff.c (main): Fix typo that prevented diff -y from working.
- Bug reported by Mitsuru Chinen.
-
-2002-03-15 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * lib/c-stack.c (c_stack_die) [!HAVE_SIGINFO_T]: Don't use info.
- Bug reported by Eli Zaretskii.
-
-2002-03-15 Eli Zaretskii <eliz@xxxxxxxxxxxxx>
-
- * ms/config.sed: Tweak editing of install-info-am target.
-
-2002-03-12 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * NEWS, configure.ac (AC_INIT): Version 2.7.10.
-
- * NEWS: cmp -l -s and cmp -s -l are not allowed.
- Deprecate diff -h, -H, -L, -P, --inhibit-hunk-merge.
-
- * configure.ac (jm_PREREQ_HARD_LOCALE): Add.
- (AM_INIT_AUTOMAKE): Do not distribute shar file.
-
- * doc/diff.texi (Overview): byte != character.
- (Detailed Context, Detailed Unified, Alternate Names, diff Options):
- Do not document diff -L.
- (Comparing Directories, Making Patches, diff Options):
- Do not document diff -P.
- (diff Performance, sdiff Option Summary, diff Options, sdiff Options):
- Do not document diff -H.
- (diff Performance, diff Options): Do not document --horizon-lines.
- (cmp Options): Prefer -b to -c.
- (cmp Options, diff Options, diff3 Options, patch Options,
- sdiff Options): Put short options next to the similar long options.
- Document --help, and use the same wording for --verbose.
- (diff3 Options): Fix typo in description of -E, which used wrongly used
- "-e" instead of "-E".
-
- * lib/hard-locale.c (alloca): Remove.
- Include stdlib.h if available, for malloc.
- (hard_locale): Use malloc, not alloca, so that we need not worry about
- alloca issues. Test for storage allocation failure.
-
- * m4/prereq.m4 (jm_PREREQ): Add jm_PREREQ_HARD_LOCALE.
- (jm_PREREQ_HARD_LOCALE): New macro.
-
- * src/cmp.c (specify_comparison_type): New function.
- (check_stdout): "indices and codes" -> "byte numbers and values"
- (main): Detect clashing options.
- (cmp): Use "byte" rather than "char" if a translation for "byte"
- is available, even when in the POSIX locale.
-
- * src/diff.c (option_help_msgid): Do not document -L, -P,
- --horizon-lines, --inhibit-hunk-merge, -H.
- * src/diff.h: -L -> --label
-
-2002-03-11 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * NEWS, configure.ac (AC_INIT): Version 2.7.9.
-
- * INSTALLME: Update to autoconf 2.53, automake 1.6, help2man
- 1.25 with patch.
-
- * configure.ac (AC_INIT):
- Change package name from diff to diffutils.
- (AM_INIT_AUTOMAKE): Use new form, with option gnits,
- rather than old from that duplicated AC_INIT.
- (AM_MISSING_PROG): Add help2man.
- (REGEX_MALLOC): Define.
- (AC_CONFIG_FILES): Add man/Makefile.
-
- * Makefile.am (AUTOMAKE_OPTIONS): Remove.
- * doc/Makefile.am (AUTOMAKE_OPTIONS): Remove.
- * lib/Makefile.am (AUTOMAKE_OPTIONS): Likewise.
- * ms/Makefile.am (AUTOMAKE_OPTIONS): Likewise.
- * src/Makefile.am (AUTOMAKE_OPTIONS): Likewise.
-
- * lib/c-stack.c: Include <errno.h>
- (ENOTSUP): Define if errno.h doesn't.
- (SA_NODEFER, SA_ONSTACK, SA_RESETHAND, SA_SIGINFO, SIGSTKSZ,
- _SC_PAGESIZE, ALTERNATE_STACK_SIZE, stack_t, sigaltstack):
- Remove; we now assume them all when
- HAVE_XSI_STACK_OVERFLOW_HEURISTIC, so we don't need
- substitutes.
- (<ucontext.h>): Include only if HAVE_XSI_STACK_OVERFLOW_HEURISTIC.
- (alternate_signal_stack): Now of size SIGSTKSZ.
- (segv_handler): Simplify, under the assumption that
- HAVE_XSI_STACK_OVERFLOW_HEURISTIC is nonzero.
- (c_stack_action): Likewise.
- (exit_failure) [DEBUG]: Initialize to 0, not 1.
- (recurse, main) [DEBUG]: Remove main args.
-
- * m4/c-stack.m4 (AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC): Change
- wording of message. Do not check for stdbool.h or ucontext.h,
- or for ucontext_t or sigaction or sigaltstack.
-
- * po/LINGUAS: Add zh_TW.
-
- * Makefile.am (SUBDIRS): Add man.
- * man/Makefile.am: New file.
- * src/cmp.c (usage): Reword for help2man.
- * src/diff.c (option_help_msgid): Likewise.
- * src/diff3.c (option_help_msgid, usage): Likewise.
- * src/sdiff3.c (option_help_msgid, usage): Likewise.
- Reword for help2man.
-
- * THANKS: Add email address for Tower.
-
- * config/config.guess, config/config.sub, config/depcomp,
- config/install-sh, config/mdate-sh, config/missing,
- config/mkinstalldirs, config/texinfo.texi: Update
- to recent version (maintained in other packages).
-
-2002-03-04 Bruno Haible <haible@xxxxxxx>
-
- * m4/gettext.m4 (AM_GNU_GETTEXT): Set LIBINTL and LTLIBINTL to empty if
- no preinstalled GNU gettext was found.
-
-2002-03-02 Eli Zaretskii <eliz@xxxxxxxxxxxxx>
-
- * ms/config.sed: Tweak editing of install-info-am and
- uninstall-info-am targets, to include 8+3-butchered names of Info
- files.
-
-2002-02-28 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * NEWS, configure.ac (AC_INIT, AM_INIT_AUTOMAKE): Version 2.7.8.
-
- * doc/diff.texi: Add vr index.
- Update copyright to 2002.
- (Standards conformance): New chapter.
- (Binary): Differing binary files are trouble unless the user asked for
- brief output.
- (Detailed Context): Prefer ISO time stamp format in discussion.
- (Detailed Unified, Pagination): Likewise.
- (Less Context): Likewise. Also use short option.
- (Alternate Names): Separate option from arg.
- (Making Patches): Mention -U 2.
- (diff Options): Deprecate -LINES, as POSIX 1003.1-2001 does not
- allow it.
-
- * INSTALLME: Update advice for Solaris installation problems.
- We no longer use a test version of gettext.
- Autoconf test version updated from 2.52f to 2.52h.
- POSIX 1003.1-2001 patch for Automake.
-
- * configure.ac (AC__GNU_SOURCE): Add this,
- replacing AH_VERBATIM of _GNU_SOURCE.
- (tempname): Use AC_LIBOBJS, not LIBOBJS=, as now required by autoconf.
- (jm_PREREQ_C_STACK): Add.
- (AC_CONFIG_FILES): Remove intl/Makefile.
- (AM_GNU_GETTEXT): Add external arg, from gettext 0.11.
-
- * lib/c-stack.c, lib/c-stack.h, lib/exitfail.c, lib/exitfail.h,
- lib/posixver.c, lib/posixver.h, m4/c-stack.m4, m4/gnu-source.m4,
- po/cs.po, po/ja.po: New files.
-
- * intl/ChangeLog, intl/Makefile.in, intl/VERSION,
- intl/bindtextdom.c, intl/config.charset, intl/dcgettext.c,
- intl/dcigettext.c, intl/dcngettext.c, intl/dgettext.c,
- intl/dngettext.c, intl/explodename.c, intl/finddomain.c,
- intl/gettext.c, intl/gettextP.h, intl/gmo.h, intl/hash-string.h,
- intl/intl-compat.c, intl/l10nflist.c, intl/libgnuintl.h,
- intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c,
- intl/locale.alias, intl/localealias.c, intl/localename.c,
- intl/ngettext.c, intl/os2compat.c, intl/os2compat.h, intl/osdep.c,
- intl/plural-eval.c, intl/plural-exp.c, intl/plural-exp.h,
- intl/plural.c, intl/plural.y, intl/ref-add.sin, intl/ref-del.sin,
- intl/textdomain.c, m4/isc-posix.m4, m4/libtool.m4: Remove.
-
- * ABOUT-NLS: Update to Gettext 0.11.
-
- * Makefile.am (SUBDIRS): Remove intl.
-
- * config/config.guess, config/config.rpath, config/config.sub,
- config/texinfo.tex, config/depcomp, config/texinfo.tex,
- lib/tempname.c: Update to latest version from other packages.
-
- * lib/xalloc.h (xalloc_exit_failure): Remove; subsumed by exit_failure.
- * lib/xmalloc.c: Include exitfail.h.
- (xalloc_exit_failure): Remove; subsumed by exit_failure.
- All uses changed.
-
- * lib/Makefile.am (noinst_HEADERS): Add c-stack.h, exitfail.h.
- (libdiffutils_a_SOURCES): Add c-stack.c, exitfail.c, quotesys.c.
- (INCLUDES): Remove.
-
- * lib/cmpbuf.h (buffer_lcm): New arg LCM_MAX.
- * lib/cmpbuf.c: Include errno.h.
- (errno): Declare if !STDC_HEADERS.
- Include signal.h.
- (SA_RESTART): Define if not already defined.
- Include <inttypes.h>.
- (PTRDIFF_MAX): Define if not already defined.
- (TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Likewise.
- (block_read): Accommodate ancient AIX hosts that set errno to EINTR
- after uncaught SIGCONT.
- (buffer_lcm): Return a reasonable size if the multiple is too large.
- New arg LCM_MAX. All callers changed.
-
- * lib/hard-locale.c: Include "hard-locale.h".
- (hard_locale): Ignore ENABLE_NLS, since we want to operate on
- locales other than LC_MESSAGES.
-
- * m4/prereq.m4 (jm_PREREQ): Add jm_PREREQ_POSIXVER.
- (jm_PREREQ_POSIXVER): New macro.
-
- * m4/setmode.m4 (AC_FUNC_SETMODE_DOS):
- Check for fcntl.h and unistd.h unconditionally.
- Suggested by Bruno Haible.
-
- * po/LINGUAS: Add cs, ja.
- * po/POTFILES.in: Add lib/c-stack.c, src/dir.c.
-
- * src/Makefile.am (datadir): @DATADIRNAME@ -> share.
- (INCLUDES): Remove intl.
- (LDADD): Change INTLLIBS to LIBINTL.
- No longer need to link libdiffutils.a twice.
-
- * src/analyze.c (diff_2_files):
- Avoid arithmetic overflow in buffer size calculation.
-
- * src/cmp.c: Include c-stack.h, exitfail.h.
- (hard_locale_LC_MESSAGES): Depend on ENABLE_NLS.
- (try_help, check_stdout, main, cmp): 2 -> EXIT_TROUBLE.
- (main): Check for stack overflow.
- 0 -> EXIT_SUCCESS.
- 1 -> EXIT_FAILURE.
- (cmp): Likewise.
- Accommodate ancient AIX hosts that set errno to
- EINTR after uncaught SIGCONT.
-
- * src/context.c (pr_context_hunk):
- Do not dump core if an enormous context causes an
- arithmetic overflow.
- (pr_unidiff_hunk): Likewise.
- (find_hunk): Likewise.
-
- * src/diff.h: unsigned -> unsigned int.
- * src/diff.c: Include c-stack.h, exitfail.h.
- Do not include signal.h.
- (specify_style, specify_value): Bring these routines back, as POSIX
- requires that the order of options not matter.
- (shortopts): New constant.
- (group_format_option, line_format_option): New constants.
- (main): 0 -> EXIT_SUCCESS, 1 -> EXIT_FAILURE, 2 -> EXIT_TROUBLE.
- Ensure that order of options does not matter.
- Check for stack overflow.
- If contexts overflow, substitute LIN_MAX, as that's good enough.
- If multiple contexts are specified, use their maximum.
- -c is equivalent to -C 3 now, instead of having an implicit context;
- likewise for -u and -U 3.
- Use specify_style and specify_value.
- (SIGCHLD): Do not define; now done in a header.
- Use new style time stamp format for -u / -U.
- Reject numeric-string options if operating in POSIX 1003.1-2001 mode.
- Avoid overflow problems with tab width.
- Simplify from-file and to-file code.
- (usage): Do not mention obsolete options.
- (filetype): Do not mention whether a file is executable.
- Add typed memory objects.
- (compare_files): 0 -> EXIT_SUCCESS, 1 -> EXIT_FAILURE, 2 ->
- EXIT_TROUBLE.
-
- * src/diff3.c: Include c-stack.h, exitfail.h.
- (ALLOCATE): Remove. All uses changed to xmalloc, or to xmalloc plus
- an overflow check.
- (myread): Remove.
- (main): Check for stack overflow.
- 0 -> EXIT_SUCCESS, 1 -> EXIT_FAIULRE, 2 -> EXIT_TROUBLE.
- (try_help): Likewise.
- (process_diff): Check for integer overflow, to avoid core dumps.
- 2 -> EXIT_TROUBLE.
- (read_diff): Exit with status 126 if the file is not executable,
- for compatibility with POSIX 1003.1-2001.
- Accommodate ancient AIX hosts that set errno to EINTR after uncaught
- SIGCONT.
- Check for integer overflow to avoid core dumps.
- (fatal, perror_with_exit): 2 -> EXIT_TROUBLE.
-
- * src/dir.c (dir_read):
- Ignore st_size of directories: POSIX says it's garbage.
- Check for integer overflow to avoid core dumps.
- (diff_dirs): 0 -> EXIT_SUCCESS, 2 -> EXIT_TROUBLE.
-
- * src/ifdef.c: Include <xalloc.h>.
- (format_group, print_ifdef_lines): Avoid core dumps with bad formats.
- (do_printf_spec): Avoid alloca.
-
- * src/io.c (sip):
- Avoid integer overflow and core dumps if buffer alignments are
- preposterously incompatible.
- (slurp): Do not dump core if the file is growing as we read it.
- If a regular file grows, keep reading until we catch up with its EOF.
- (find_and_hash_each_line): Check for integer overflow to avoid cores.
- (GUESS_LINES): Remove.
- (guess_lines): New function. Avoid integer overflow.
- (find_identical_ends): Use it.
- Avoid integer overflow and possible core dumps.
-
- * src/sdiff.c: Include c-stack.h, exitfail.h. Do not include signal.h.
- 0 -> EXIT_SUCCESS, 1 -> EXIT_FAILURE, 2 -> EXIT_TROUBLE.
- (ck_editor_status): New function.
- (main): Check for stack overflow.
- Adopt POSIX convention for subsidiary programs not found.
- (diffarg): Check for integer overflow to avoid core dumps.
- (trapsigs): Remove SA_INTERRUPT special case; now done by header.
- (SIGCHLD): Likewise.
- (edit): Adopt POSIX convention for subsidiary programs not found.
-
- * src/side.c: unsigned -> unsigned int.
-
- * src/system.h: Don't use alloca or include <alloca.h>.
- unsigned -> unsigned int
- (EXIT_SUCCESS, EXIT_FAILURE, EXIT_TROUBLE): Define if not defined.
- Include signal.h.
- (SA_RESTART): Define if not defined.
- (SIGCHLD): Likewise.
-
- * src/util.c: 2 -> EXIT_TROUBLE.
- Adopt POSIX convention for ENOEXEC and exit status 126.
- unsigned -> unsigned int
-
-2002-01-24 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * NEWS, configure.ac (AC_INIT, AM_INIT_AUTOMAKE): Version 2.7.7.
-
- * intl/plural.c: Regenerate with Bison 1.31.
-
- * ABOUT-NLS, intl/*: Update to Gettext 0.11-pre5++.
- * INSTALL: Update to Autoconf 2.52f.
-
- * INSTALLME: New file.
- * Makefile.am (EXTRA_DIST): Add config/config.rpath, INSTALLME.
- (DISTCLEANFILES): Remove.
- * NEWS: Reformat for imminent 2.8 release.
- * README: Mention INSTALLME.
- * README-alpha: Move most of contents to INSTALLME.
- * THANKS: Add Bruno Haible, Jim Meyering, and Eli Zaretskii.
-
- * 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.
- * config/config.guess, config/config.sub, config/texinfo.tex:
- Update to latest version from FSF.
- * config/config.rpath: New file, from Gettext 0.11-pre5++.
-
- * configure.ac (AC_INIT): Use new 3-arg form.
- (AC_CONFIG_SRCDIR): Specify src/diff.c here, not in AC_INIT.
- (ALL_LINGUAS): Remove: now in po/LINGUAS as per Gettext 0.11.
- (AC_CONFIG_AUX_DIR): New macro invocation.
-
- * lib/Makefile.am (noinst_HEADERS): Add gettext.h.
- * lib/gettext.h: New file, from Gettext 0.11-pre5++.
- * lib/prepargs.c: Include <string.h>. Reported by Bruno Haible.
-
- * m4/codeset.m4, m4/gettext.m4, glibc21.m4, iconv.m4, isc-posix.m4,
- lcmessage.m4, progtest.m4: Upgrade to Gettext 0.11-pre5++.
- * m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: New files, from
- Gettext 0.11-pre5++.
-
- * po/LINGUAS: New file.
- * po/Makefile.in.in: Upgrade to Gettext 0.11-pre5++.
- * po/Makevars, po/Rules-quot, po/boldquot.sed: New files,
- from Gettext 0.11-pre5++.
-
- * src/cmp.c (copyright_string): Update to 2002.
- * src/diff.c (copyright_string): Likewise.
- * src/diff3.c (copyright_string): Likewise.
- * src/sdiff.c (copyright_string): Likewise.
-
- * src/cmp.c (bytes, parse_ignore_initial, cmp): Use UINTMAX_MAX
- instead of (uintmax_t) -1, to avoid warnings on some compilers.
- * src/io.c (file_block_read): Likewise, for SIZE_MAX.
-
- * src/cmp.c (usage): Reformat messages to ease translation.
- * src/diff3.c (usage): Likewise.
- * src/sdiff.c (usage): Likewise.
-
- * src/diff3.c (main): Remove unused variable.
-
- * src/dir.c: Include <setjmp.h>
- (struct dirdata): New member nnames.
- (locale_specific_sorting, failed_strcoll): New vars.
- (dir_read): Renamed from dir_sort. Don't sort the dir.
- Set new nnames member of struct dirdata. All callers changed.
- (compare_names): Don't check for errno after strcasecmp.
- Use strcoll only if locale_specific_sorting is nonzero.
- If strcoll fails, longjmp out rather than returning a value
- that might result in an invalid comparison function that might
- make qsort dump core.
- (diff_dirs): Sort the directory ourselves. Use setjmp to recover
- from strcoll failure, falling back on native byte comparison.
- Make local variables volatile if they need to preserve their value
- after setjmp/longjmp.
-
- * src/sdiff.c (handler_index_of_SIGINT, handler_index_of_SIGPIPE):
- New macros.
- (main): Do not confuse signal numbers with their indices.
- Bug reported by Bruno Haible.
- (edit): Cat lin to long before printing with %ld, since lin might
- be narrow than long.
-
- * src/system.h (UINTMAX_MAX): New macro.
- Include gettext.h, not libgettext.h.
- (N_): Do not wrap arg in parentheses. Fix from Bruno Haible.
-
- * src/util.c (finish_output): Ensure that werrno is initialized.
- (lines_differ): Have an explicit do-nothing case for
- IGNORE_NO_WHITE_SPACE, to pacify gcc -Wall.
-
-2001-12-29 Eli Zaretskii <eliz@xxxxxxxxxxxxx>
-
- * src/sdiff.c (interact): After extracting rlen from the editor
- command, test for a terminating null character, not for a newline.
-
- * ms/config.bat: Allow longer source directory names without
- overflowing the line length limits. Create the cache in the
- build directory, not in the source directory
- * ms/config.sed: Fix AC_CONFIG_LINKS for when symlinks are
- unavailable.
-
-2001-12-23 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * NEWS, configure.ac (AM_INIT_AUTOMAKE): Version 2.7.6.
-
- * configure.ac (ALL_LINGUAS): Add tr.
-
- * src/util.c (begin_output):
- Have child exit with status 127 rather than reporting
- failure on its own. Set errno to 0 before invoking popen.
- (finish_output): Report errno on pclose failure.
- Distinguish between subsidiary program not found, and failure.
-
- * src/sdiff.c (not_found, execdiff): Remove.
- (DIFF_PROGRAM_OPTION): New constant.
- (longopts, option_help_msgid, main): Add --diff-program=PROGRAM.
- (check_stdout): New function.
- (main): Remove DIFF_PROGRAM. Check stdout after printing version.
- Use check_stdout after printing help. Use execvp/perror_fatail rather
- than execdiff. Set errno to 0 before invoking popen.
- Check for pclose failure properly.
- (main, edit): If child exec fails, exit with 127 rather than trying to
- print diagnostic.
- Distinguish between subsidiary program failing and not being found.
- (edit): Handle signals the same way, regardless of whether we're using
- system or fork+exec. Check for system returning -1.
-
- * src/diff3.c (DIFF_PROGRAM_OPTION, HELP_OPTION): New constants.
- (longopts, main): Use them.
- (longopts, main, option_help_msgid): New option --diff-option=PROGRAM.
- (main): Remove DIFF_PROGRAM support.
- Check stdout after printing version.
- (check_stdout): Report errno info if fclose fails.
- (read_diff): Have child exit with status 127 when program is not found,
- rather than trying to have the child report failure. Check for
- pclose returning -1.
-
- * src/diff.c (DEFAULT_WIDTH): Remove.
- (main): Use 130 instead of DEFAULT_WIDTH, since it's not really
- builder-settable. Do not prepend DIFF_OPTIONS.
- (check-stdout): If fclose (stdout) fails, print errno info.
- (option_help_msgid): Default context is 3, not 2.
- (usage): Work even if ptrdiff_t is wider than int.
-
- * doc/diff.texi (diff Options): Remove DIFF_OPTIONS.
- (Invoking diff3, Invoking sdiff): Remove DIFF_PROGRAM.
- (diff3 Options, sdiff Options): Add --diff-program.
-
- * src/cmp.c (valid_suffixes):
- Add '0', to support suffixes like "MB" and "MiB".
- (check_stdout): Don't assume that the translations of "write failed"
- and of "standard output" lack '%'.
- (main): Check stdout after printing version.
-
- * lib/setmode.c: [HAVE_FCNTL_H && HAVE_SETMODE_DOS]: Include <fcntl.h>.
- [!HAVE_SETMODE_DOS]: Do not include <unistd.h>.
- (set_binary_mode): Return mode (not 1) if fd is a tty.
- Do not assume that O_TEXT is zero.
-
- * doc/diff.texi (cmp Options):
- In byte counts, a plain suffix (without any integer)
- is assumed to modify the integer 1. Index terms like "kibibyte".
- Document plain "k".
-
- (Reporting Bugs): Mention bug-report archive and test version
- location. Ask for "diff --version" in bug reports.
-
-2001-12-13 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * src/diff.c (DEFAULT_WIDTH): Remove; couldn't be changed without
- also changing option_help_msgid. All uses replaced with 130.
-
- * lib/setmode.c: Include fcntl.h and unistd.h only if
- HAVE_SETMODE_DOS.
- (setmode): Assume a file is binary unless the mode is O_TEXT.
- * ms/README: Fix minor typos.
-
-2001-12-13 Eli Zaretskii <eliz@xxxxxxxxxxxxx>
-
- * ms/README: New file.
-
- * lib/setmode.c (set_binary_mode) [HAVE_SETMODE_DOS]: Don't assume
- O_TEXT has a zero value. If FD is a terminal device, do nothing
- and return MODE, thus pretending that it was already in the
- requested MODE.
- [HAVE_FCNTL_H]: Include fcntl.h (needed for O_BINARY).
-
- * ms/config.sed: Remove the split prevention of config.status.
- Fix Sed commands for converting absolute file names into
- top_srcdir-relative ones.
-
- * ms/config.bat: Fix typos.
-
-2001-12-12 Neal H Walfield <neal@xxxxxxxxxx>
-
- * diff.c (option_help_msgid): Correct the default context width
- from 2 to 3.
-
-2001-12-11 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * m4/Makefile.am.in: Remove jm-glibc-io.m4
-
- * NEWS, configure.ac (AM_INIT_AUTOMAKE): Version 2.7.5.
-
- * configure.ac (PR_PROGRAM): Use AC_DEFINE_UNQUOTED, so that
- $PR_PROGRAM is expanded by sh.
- (ptrdiff_t, ssize_t): Use AC_CHECK_TYPE with a default of int,
- not AC_CHECK_TYPES.
- (jm_AC_DOS, AC_FUNC_SETMODE_DOS): New macros.
- (AC_CONFIG_FILES): Add ms/Makefile.
-
- * doc/diff.texi: Add --no-ignore-file-name-case.
- File name case sensitivity now affects file name exclusion.
- Fix typos.
-
- * src/util.c: Include dirname.h.
- (dir_file_pathname): Use base_name rather than file_name_lastdirchar.
-
- * src/system.h (S_IXUSR, S_IXGRP, S_IXOTH): New macros.
- Include <libgettext.h> rather than rolling it ourselves.
- (file_name_lastdirchar, HAVE_SETMODE, set_binary_mode): Remove.
-
- * src/sdiff.c: Include <dirname.h>.
- (expand_name): Use base_name rather than file_name_lastdirchar, for
- portability to DOS.
- (main): Initialize xalloc_exit_failure before possibly invoking
- any memory allocator.
-
- * src/io.c: Include setmode.h.
-
- * src/diff3.c (main):
- Initialize xalloc_exit_failure before possibly invoking any memory
- allocator.
-
- * src/diff.c: Include dirname.h, setmode.h.
-
- (main): Later values and/or styles now silently override earlier.
- (specify_value, specify_style): Likewise. All callers changed.
- Remove.
- (binary, main, option_help_msgid, compare_files):
- HAVE_SETMODE -> HAVE_SETMODE_DOS.
- (NO_IGNORE_FILE_NAME_CASE_OPTION): New constant.
- (longopts, main, option_help_msgid): Support it.
- (exclude_options): New function.
- (main): Use it. Initialize xalloc_exit_failure before potentially
- allocating memory.
-
- (filetype): Distinguish executable files from others, as POSIX
- suggests.
-
- (compare_files): Use base_name instead of file_name_lastdirchar.
-
- * src/cmp.c: Include <hard-locale.h>, <setmode.h>.
- (hard_locale_LC_MESSAGES): New macro.
- (sprintc): Remove int width arg; it's now the caller's responsibility
- to pad. All callers changed.
- (stat_buf): New static var; was formerly a local var in 'main'.
- (valid_suffixes): Add 'K', for 'KiB'.
- (option_help_msgid): Don't confuse bytes with characters.
- (main): Set xalloc_exit_failure before invoking anything that might
- allocate memory. Fix bug: -n was incorrectly ignored when optimizing
- the case of regular files with different lengths.
- (cmp): Use an index column wide enough to store this comparison's
- indexes. In locales other than the POSIX locale, say "byte"
- rather than "char".
-
- * ms/config.bat: pc -> ms
-
- * ms/Makefile.am, m4/setmode.m4, lib/setmode.c, lib/setmode.h:
- New file.
-
- * lib/Makefile.am (noinst_HEADERS): Add dirname.h, setmode.h.
- (libdiffutils_a_SOURCES): Add basename.c, setmode.c.
-
- * Makefile.am (SUBDIRS): Add ms.
-
-2001-12-10 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * m4/fnmatch.m4: Test for FNM_CASEFOLD.
-
-2001-12-03 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * lib/posix/regex.h: Fix copyright notice.
-
-2001-12-03 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * NEWS, configure.ac (AM_INIT_AUTOMAKE): Version 2.7.4.
-
- * diff.texi (direntry, Overview, Comparison, Binary, Invoking cmp):
- Use "byte" rather than "character" when talking about cmp, since
- it compares bytes, not character.
- (Invoking cmp): New trailing operands FROM-SKIP and TO-SKIP.
- -i or --ignore-initial now accepts FROM-SKIP:TO-SKIP.
- New option -n or --bytes.
- Count operands now may be in octal or hex, and may be followed by a
- size multiplier.
-
- * configure.ac (DEFAULT_DIFF_PROGRAM):
- Define to "diff", not "$bindir/diff" (which didn't work anyway).
- (AC_CHECK_MEMBERS): Add struct stat.st_blksize, struct stat.st_rdev.
- (AC_STRUCT_ST_BLKSIZE, AC_STRUCT_ST_RDEV): Remove; obsolescent.
- (AC_FUNC_FORK): Use this, instead of obsolescent AC_FUNC_VFORK.
- (AC_CONFIG_FILES, AC_CONFIG_COMMANDS): Add.
- (AC_OUTPUT): Remove args; they were obsolescent.
-
- * util.c (setup_output, begin_output, finish_output):
- HAVE_FORK -> HAVE_WORKING_FORK || HAVE_WORKING_VFORK.
- * sdiff.c (diffpid, cleanup, main, edit): Likewise.
- * diff3.c (read_diff): Likewise.
-
- * system.h (STAT_BLOCKSIZE):
- Use HAVE_STRUCT_STAT_ST_BLKSIZE, not HAVE_ST_BLKSIZE.
- (vfork): New macro.
- (HAVE_FORK): Remove.
- (set_binary_mode): New macro.
-
- * sdiff.c (main): HAVE_VFORK -> HAVE_WORKING_VFORK.
- (edit): Reopen the temporary file after the editor has run, in case
- the editor operates by unlinking the old file and linking a new one.
- (P_tmpdir): Rename from PVT_tmpdir; this fixes a typo.
- All uses changed.
-
- * io.c (sip, read_files):
- Remove tests for HAVE_SETMODE; use set_binary_mode
- instead of setmode.
- (sip): Fix typo in backward lseek when reverting to text mode.
-
- * config.site, config.sed, config.bat: New file.
-
- * Makefile.am (EXTRA_DIST): Add xstrtol.c.
- (noinst_HEADERS): Add xstrtol.h.
- (libdiffutils_a_SOURCES): Add xstrtoumax.c.
-
- * cmp.c: <xstrtol.h>: Include.
- (ignore_initial): Now an array with 2 elements. All uses changed.
- (bytes): New var.
- (HELP_OPTION): New constant.
- (long_options, main): Use it.
- (long_options, option_help_msgid, main, cmp):
- Add support for -n or --bytes.
- (parse_ignore_initial): New function.
- (option_help_msgid, main): Add -i M:N.
- (usage, main): Add two optional trailing operands, a la BSD.
- (main): setmode -> set_binary_mode.
- (cmp): Report byte number of what we've seen, not of the entire file.
- This is to be consistent with the line number, which is always relative
- with what we've seen.
-
-2001-12-02 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * diff.c (main, compare_files): setmode -> set_binary_mode.
-
- * xstrtol.c (__xstrtol): Don't accept 'Ki'; require 'KiB'.
-
- * xstrtol.c (__xstrtol): Add support for IEC 60027-2.
-
-2001-11-25 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * NEWS, configure.ac (AM_INIT_AUTOMAKE): Version 2.7.3.
-
- * README-alpha: New file.
-
- * src/Makefile.am (INCLUDES): Add -I../lib, for regex.h.
-
- * configure.ac:
- Don't set LIB_CLOCK_GETTIME to 'none required'; set it to
- the empty string instead.
-
- * lib/Makefile.am (EXTRA_DIST): Add strtoimax.c, strtol.c.
-
- * Makefile.am (SUBDIRS): Put intl before lib, so that libintl.h exists.
-
- * lib/Makefile.am (noinst_HEADERS): Add unlocked-io.h.
-
- * configure.ac (__EXTENSIONS__): New define, for the unlocked macros.
-
- * README: Add copyright notice.
- Remove stuff that doesn't apply any more.
-
- * doc/diff.texi: offsets -> indices for cmp
-
- * src/cmp.c (option_help_msgid): offsets -> indices
-
- * src/diff.c (option_help_msgid):
- Don't mention --binary on POSIX hosts.
-
- * src/sdiff.c (STRIP_TRAILING_CR_OPTION): New constant.
- (longopts, option_help_msgid, main): Add -E, --ignore-tab-expansion,
- --strip-trailing-cr.
-
- * doc/diff.texi: Change direcategory from Utilities to GNU Packages.
- Add individual utilities.
- Switch to Free Documentation License.
- @code -> @command
- @samp -> @option
- GNU -> @sc{gnu}
- Expand tabs to spaces, except when in an example that actually
- uses tabs.
- Prefer @node with just one arg.
- Document -E or --ignore-tab-expansion, --strip-trailing-cr,
- --ignore-file-name-case.
- Regular expressions are now grep style, not Emacs style.
- cmp's -c or --print-chars option is now -b or --print-bytes.
- Time stamps now depend on LC_TIME.
- -p now implies ^[[:alpha:]$_].
- Flags now include ' and 0.
- cmp -i is an alias for --ignore-initial
- Document --from-file, --to-file.
- Document DIFF_OPTIONS.
-
- * configure.ac (AC_CHECK_FUNCS): Add gettimeofday, clock_gettime.
- (LIB_CLOCK_GETTIME): New subst.
-
- * src/system.h: Assume C89 or better.
- (_GNU_SOURCE): Remove; config.h now defines it.
- (alloca): Declare like coreutils does it.
- (verify, TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM, O_RDWR,
- S_IRUSR, S_IWUSR): New macros.
- (STAT_BLOCKSIZE): Parenthesize definiens.
- <inttypes.h>: Include if HAVE_INTTYPES_H.
- (CHAR_MAX, INT_MAX): Remove.
- (PTRDIFF_MAX, SIZE_MAX): New macros.
- (strtoumax): New decl.
- Include stddef.h.
- (bzero): Remove.
- (bindtextdomain, textdomain, N_): New macros.
- (ISPRINT, ISSPACE): Remove ifndef wrappers.
- (ISUPPER, ISDIGIT): Remove.
- (TOLOWER): New macro.
- (MIN): Renamed from min; all callers changed.
- (MAX): Likewise, from max.
- (lin): New type.
- (LIN_MAX): New macro.
- (file_name_cmp): Renamed from filename_cmp. All callers changed.
- (file_name_lastdirchar): Renamed from file_name_lastdirchar.
- All callers changed.
- (could_be_mvfs_stat_bug, could_be_nfs_stat_bug,
- dev_may_have_duplicate_ino): Remove.
- (HAVE_SETMODE, NULL_DEVICE): New macros.
- (same_file): Do not check attributes.
- (same_file_attributes): New macro.
-
- * src/util.c: Assume C89 or better.
- int -> bool for booleans.
- int -> lin for line numbers.
- int -> size_t for sizes.
- Use angle-brackets when including quotesys.h.
- Include error.h, regex.h, xalloc.h.
- (message5): sizeof -> offsetof
- (begin_output): Invoke pr without -f.
- (lines_differ): Renamed from line_cmp, and return bool not 3-way int.
- All callers changed.
- Add support for IGNORE_TAB_EXPANSION.
- (change_letter): Now an array rather than a function. All
- callers changed.
- (translate_range): Translate line numbers to long, not lin,
- for convenience with printf.
- (analyze_hunk): Return enum changes instead of a count of
- inserts and deletes. All callers changed.
- (zalloc): New function.
-
- * src/side.c: Assume C89 or better.
- int -> bool for booleans.
- int -> lin for line numbers.
-
- * src/sdiff.c: Assume C89 or better.
- int -> bool for booleans.
- int -> lin for line numbers.
- Use angle-brackets when including getopt.h, quotesys.h.
- Include error.h, freesoft.h, stdio.h, xalloc.h.
- (copyright_string): Use only most recent year.
- (authorship_msgid, option_help_msgid): Wrap in N_().
-
- (tmpname): Now volatile.
- (tmpmade): Remove.
- (tmp): New var.
- (private_tempnam, exists, letters): Remove.
- (temporary_file): New function.
- (edit): Use it.
- (interact): Use strtoumax, not atoi.
-
- * src/normal.c: Assume C89 or better.
- int -> lin for line numbers.
-
- * src/io.c: Assume C89 or better.
- int -> bool for booleans.
- int -> lin for line numbers.
- int -> size_t for sizes.
- Use angle-brackets when including cmpbuf.h.
- Include regex.h, xalloc.h.
- (word): Remove; now done in system.h.
- (hash_value): New type; use it instead of 'unsigned' for hash values.
- (file_block_read): New function.
- (sip, slurp): Use it. Now static.
- (sip): Ensure block size is a multiple of word size. Clear eof flag.
- (slurp): Use xalloc_die to report memory exhaustion.
- (find_and_hash_each_line): Use TOLOWER instead of _tolower.
- Add support for IGNORE_TAB_EXPANSION.
- (prepare_text_end): Strip trailing CR if requested.
- (find_identical_ends): Prepare the text only once,
- if they're duplicates.
- Let the compiler take advantage more of the fact that the buffers are
- word-aligned.
- (primes): Remove.
- (prime_offset): New var.
- (read_var): Use prime_offset instead of primes.
- Use zalloc instead of xmalloc + bzero.
-
- * src/ifdef.c: Assume C89 or better.
- int -> lin for line numbers.
- (format_group): Use strtoumax to parse line numbers.
- (format_group, print_ifdef_lines): Use do_printf_spec to
- handle printf specs.
- (groups_letter_value): Don't use _tolower; it's locale-dependent.
- (do_printf_spec): Renamed from scan_printf_spec; now does the printing.
-
- * src/ed.c: Assume C89 or better.
- int -> lin for line numbers (or 'long' when that's more convenient).
- (print_ed_hunk): Fix bug when handling double-dot inserts.
-
- * src/dir.c: Assume C89 or better.
- int -> bool for booleans.
- Include error.h, exclude.h, xalloc.h.
-
- (dir_sort): Return 0 on error, 1 on success. All callers changed.
- compare_names -> compare_names_for_qsort.
-
- (compare_names): Try strcasecmp if ignore_file_name_case. Then try
- strcoll. Use file_name_cmp only as a last resort. Warn about
- strcasecmp or strcoll failure.
- (compare_names_for_qsort): New function.
-
- (diff_dirs): Use compare_names rather than filename_cmp.
-
- * src/diff3.c: Assume C89 or better.
- int -> bool for booleans.
- int -> lin for line numbers.
- Use angle-brackets when including getopt.h, quotesys.h.
- Include error.h, freesoft.h, inttostr.h, xalloc.h.
- (copyright_string): Use only most recent year.
- (authorship_msgid, option_help_msgid): Wrap in N_().
-
- Rename the following variables for consistency with user-visible
- option spellings. All uses changed.
- (text): Renamed from always_text.
- (initial_tab): Renamed from tab_align_flag.
-
- (horizon_lines): Remove. Remove all uses.
-
- (main): Invoke bindtextdomain and textdomain after setlocale.
- Rename "DIFF" to "DIFF_PROGRAM".
-
- Try to compare file0 to file1, because this is where changes are
- expected to come from. Diffing between these pairs of files is more
- likely to avoid phantom changes from file0 to file1.
- However, use file2 as the common file if this is a 3-way diff,
- for backward compatibility. Suggested by Karl Tomlinson.
-
- (create_diff3_block): Use xcalloc instead of malloc + bzero.
-
- (INT_STRLEN_BOUND): Remove; now in system.h.
-
- (read_diff): Always use --horizon-lines=100 rather than trying
- to guess it.
- Do not pass --inhibit-hunk-merge.
- Minimum chunk size is 1, not 8KiB.
- Use xalloc_die to report memory exhaustion.
- (undotlines): Use long for start, not int.
-
- * src/diff.h: Assume C89 or better.
- int -> bool for booleans.
- int -> lin for line numbers.
- Don't include regex.h.
- (enum changes): New enum.
- (enum line_class): Remove; subsumed by enum changes.
- (enum output_style): New constant OUTPUT_UNSPECIFIED.
-
- (ignore_space_change_flag, ignore_all_space_flag): Remove.
- (ignore_white_space): New decl, subsuming the above two. All
- uses changed.
-
- Rename the following decls for consistency with user-visible
- option spellings. All uses changed.
- (text): Renamed from always_text_flag.
- (ignore_blank_lines): Renamed from ignore_blank_lines_flag.
- (ignore_case): Renamed from ignore_case_flag.
- (brief): Renamed from no_details_flag.
- (initial_tab): Renamed from tab_align_flag.
- (expand_tabs): Renamed from tab_expand_flag.
- (starting_file): Renamed from dir_start_file.
- (paginate): Renamed from paginate_flag.
- (sdiff_merge_assist): Renamed from sdiff_help_sdiff.
- (left_column): Renamed from sdiff_left_only.
- (suppress_common_lines): Renamed from sdiff_skip_common_lines.
- (speed_large_files): Renamed from heuristic.
- (minimal): Renamed from no_discards.
-
- (inhibit_hunk_merge): Remove.
-
- (strip_trailing_cr, excluded, time_format): New decls.
-
- (files_can_be_treated_as_binary): Renamed from ignore_some_changes.
-
- (group_format, line_format): Now char const *[], not char *[].
-
- (struct file_data): Buffer is now word*, not char*, as it's always
- aligned and this can help the compiler. buffered_chars -> buffered
- (since it's a byte count, not a char count). All uses changed.
- New member `eof'.
-
- (FILE_BUFFER): New macro.
-
- (excluded_filename, error, free_software_msgid): Remove decls; now in
- other .h files.
-
- (sip, slurp): Remove decls.
- (file_block_read): New decl.
- (change_letter): Now an array, not a function.
- (lines_differ): Renamed from line_cmp.
- (analyze_hunk): Now returns enum changes rather than two change counts.
-
- * src/Makefile.am (diff_LDADD): New symbol.
-
- * src/diff.c: Assume C89 or better.
- int -> bool for booleans.
- long -> off_t for line numbers.
- Use angle-brackets when including getopt.h, fnmatch.h, quotesys.h.
- Include error.h, exclude.h, freesoft.h, hard-locale.h, prepargs.h,
- regex.h, signal.h, xalloc.h.
- (copyright_string): Use only most recent year.
- (authorship_msgid, option_help_msgid): Wrap in N_().
-
- Rename the following variables for consistency with user-visible
- option spellings. All uses changed.
- (binary): Renamed from binary_flag.
- (new_file): Renamed from entire_new_file_flag.
- (unidirectional_new_file): Renamed from unidirectional_new_file_flag.
- (report_identical_files): Renamed from print_file_same_flag.
-
- (numeric_arg): Remove.
-
- (exclude, exclude_alloc, exclude_count, excluded_filename, add_exclude,
- add_exclude_file):
- Remove; now done by exclude.h.
-
- (BINARY_OPTION, FROM_FILE_OPTION, HELP_OPTION, HORIZON_LINES_OPTION,
- IGNORE_FILE_NAME_CASE_OPTION, INHIBIT_HUNK_MERGE_OPTION,
- LEFT_COLUMN_OPTION, LINE_FORMAT_OPTION, NORMAL_OPTION,
- SDIFF_MERGE_ASSIST_OPTION, STRIP_TRAILING_CR_OPTION,
- SUPPRESS_COMMON_LINES_OPTION, TO_FILE_OPTION,
- UNCHANGED_LINE_FORMAT_OPTION, OLD_LINE_FORMAT_OPTION,
- NEW_LINE_FORMAT_OPTION, UNCHANGED_GROUP_FORMAT_OPTION,
- OLD_GROUP_FORMAT_OPTION, NEW_GROUP_FORMAT_OPTION,
- CHANGED_GROUP_FORMAT_OPTION): New constants.
- (longopts, main): Use them.
-
- (longopts, main, option_help_msgid): Add -E, --from-file, --to-file.
-
- (main): Invoke bindtextdomain and textdomain after setlocale.
- Use grep syntax, not Emacs, for regular expressions.
- Use exclude.h, not our own functions.
- Use ISO 8601 time format in hard locales.
- Prepend DIFF_OPTIONS.
- Don't update ignore_some_changes.
- Use strtoumax instead of numeric_arg.
- Use specify_value when appropriate.
- error -> try_help when appropriate.
- -p now means ^[[:alpha:]$_], not ^[_a-zA-Z$].
- Ignore --inhibit-hunk-merge.
- Prefer changed group formats to unchanged ones.
- Remove now-unnecessary casts.
- Set files_can_be_treated_as_binary.
-
- (specify_value): Renamed from specify_format. All uses changed.
-
- (specify_style): Default is now unspecified, not normal. All
- uses changed.
-
- (set_mtime_to_now): New function.
- (compare_files): Use it. Use memset, not bzero.
- Set stdin mtime to current time even when stdin is not a regular file.
- Check for same file attributes, as well as for same file.
- Use files_can_be_treated_as_binary.
- "write failed" -> "standard output on output failure.
-
- * src/context.c: Assume C89 or better.
- int -> lin for line numbers.
- Include inttostr.h, regex.h.
- (TIMESPEC_NS): New macro.
- (nstrftime): New decl.
- (print_context_label): Use nstrftime and time_format to format times.
- Print numeric time stamp value if localtime fails.
- (print_context_function): New function.
- (pr_context_hunk, pr_unidiff_hunk): Use it.
- (find_function): Use size_t for sizes, not int.
-
- * src/cmp.c: Assume C89 or better.
- int -> bool for booleans.
- long -> off_t for line numbers.
- Use angle-brackets when including cmpbuf.h, getopt.h.
- Include error.h, freesoft.h, inttostr.h, xalloc.h.
- (copyright_string): Use only most recent year.
- (authorship_msgid): Wrap in N_().
- (buffer): Now word*, not char*. All uses changed.
- (word): Remove macro; now in system.h.
- (long_options, option_help_msgid, main): -c --print-chars ->
- -b --print-bytes
- (check_stdout): "write failed" -> "standard output"
- (option_help_msgid): Wrap in N_().
- (main): Invoke bindtextdomain and textdomain after setlocale.
- Use strtoumax instead of doing the work ourselves.
- Check for same_file_attributes as well as same_file.
- (cmp): Use ssize_t for read returns, not size_t.
- Do not assume that size_t is not narrower than int.
- Do not assume that line numbers fit in 'long'.
- (block_compare_and_count, block_compare):
- Compiler now checks that buffers are word-aligned.
- (block_compare_and_count): Count sizes with size_t, not long.
- (sprintc): byte arg is unsigned char, not unsigned.
-
- * src/analyze.c: Assume C89 or better.
- int -> lin for line numbers.
- int -> bool for booleans.
- unsigned int -> size_t for sizes.
- Use angle-brackets when including cmpbuf.h.
- Include error.h, regex.h, xalloc.h.
- (discard_confusing_lines, diff_2_files): Use zalloc rather
- than xalloc+bzero.
- (discard_confusing_lines): unsigned int -> lin for values that
- are really line numbers.
- (shift_boundaries): Do not inhibit hunk merges.
- (build_reverse_script, build_script, diff_2_files): Use |, not ||.
- (diff_2_files): no_details_flag & ~ignore_some_changes ->
- files_can_be_treated_as_binary. Esure that buffer size is a multiple
- of sizeof (word). Use file_block_read to read buffers.
- (diff_2_files): Abort if output style is not one of the
- expected styles.
-
-2001-11-23 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * src/Makefile.am, m4/vararrays.m4: New file.
-
- * m4/prereq.m4 (jm_PREREQ_READUTMP):
- Remove, as it gives autoheader the willies.
-
- * m4/README, lib/prepargs.h, lib/prepargs.c, lib/offtostr.c,
- lib/umaxtostr.c, lib/inttostr.c, lib/inttostr.h,
- lib/imaxtostr.c, lib/freesoft.h: New files.
-
- * lib/freesoft.c: Include config.h, freesoft.h rather than diff.h.
- (free_software_msgid): Wrap contents in N_.
-
- * lib/cmpbuf.h: Use prototypes instead of old-style functions.
-
- * lib/cmpbuf.c:
- Don't include system.h; instead, include config.h, unistd.h.
- Use prototypes instead of old-style functions.
- (block_read): Don't assume that int is no wider than size_t.
-
- * lib/Makefile.am, po/POTFILES.in: New file.
-
-2001-11-22 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * pc/config.h:
- Define filename_cmp as an object-like macro, not as a function-like
- macro.
-
- * exgettext: Always operate in the C locale.
- Set AWK using a method that works even with broken shells.
-
- * doc/Makefile.am: New file.
-
- * configure.ac (AC_INIT):
- Use src/diff.c, not diff.h, as the source files got removed.
- (AM_CONFIG_HEADER): Switch from AC_CONFIG_HEADER.
- (AC_ARG_PROGRAM, AC_MINIX): Remove.
-
- (AC_PREREQ, AM_INIT_AUTOMAKE, ALL_LINGUAS, AC_PROG_AWK,
- AM_PROG_CC_STDC, AC_PROG_RANLIB, AC_C_INLINE, AC_C_VARARRAYS,
- DEFAULT_DIFF_PROGRAM, DEFAULT_EDITOR_PROGRAM,
- AC_STRUCT_ST_MTIM_NSEC): Add.
-
- (PR_PROGRAM): AC_DEFINE.
-
- (AC_SYS_LARGEFILE): Use instead of our homebrew version.
-
- (_GNU_SOURCE): Define if not defined.
-
- (AC_CHECK_HEADERS): Add stdbool.h, unistd.h.
- (AC_CHECK_TYPES): Add ptrdiff_t, uintmax_t.
- (AM_GNU_GETTEXT, XGETTEXT): Add.
-
- (WITH_MVFS_STAT_BUG, WITH_NFS_STAT_BUG): Remove.
- (HAVE_MEMCHR): Remove.
- (AC_CHECK_FUNCS): Add diraccess.
- (AC_REPLACE_FUNCS): Add memchr, waitpid.
- (jm_FUNC_GLIBC_UNLOCKED_IO, jm_FUNC_GNU_STRFTIME, jm_FUNC_MALLOC,
- jm_FUNC_REALLOC, jm_PREREQ_ERROR, jm_PREREQ_QUOTEARG, jm_PREREQ_REGEX,
- jm_PREREQ_TEMPNAME, jm_AC_PREREQ_XSTRTOUMAX, AC_FUNC_FNMATCH): Add.
- (fnmatch.h, regex.h): Do not create these files unless we're using
- our own fnmatch and regex.
-
- (AC_OUTPUT): Add doc/Makefile, intl/Makefile, lib/Makefile,
- lib/posix/Makefile, m4/Makefile, po/Makefile.in, src/Makefile.
-
- * Makefile.am: New file.
-
- * po/en_GB.po: Don't translate "program" to "programme".
-
-2001-11-20 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * m4/prereq.m4: New file.
-
-2001-03-16 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * lib/tempname.c (uint64_t):
- Define if not defined, and if UINT64_MAX is not defined.
-
-2001-02-26 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * lib/tempname.c: glibc 1.32
-
-2001-02-17 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * m4/Makefile.am.in: GNU fileutils 4.1
-
-2001-01-09 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * lib/tempname.c (struct_stat64): New macro.
- (direxists, __gen_tempname): Use it. This avoids a portability problem
- with Solaris 8.
-
- * lib/tempname.c (<config.h>): Include if HAVE_CONFIG_H.
- (<stddef.h>, <stdint.h>, <string.h>):
- Include only if STDC_HEADERS || _LIBC.
- (<fcntl.h>): Include only if HAVE_FCNTL_H || _LIBC.
- (<unistd.h>): Include only if HAVE_UNISTD_H || _LIBC.
- (<sys/time.h>): Include only if HAVE_SYS_TIME_H || _LIBC.
- (__set_errno): Define this macro if <errno.h> doesn't.
- (P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
- Define these macros if <stdio.h> doesn't.
- (S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
- Define these macros if <sys/stat.h>
- doesn't. Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
- (stat64, __getpid, __gettimeofday, __mkdir, __open, __open64, lxstat64,
- __xstat64): Define if not _LIBC.
- (__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
- (__gen_tempname): Invoke gettimeofday only if HAVE_GETTIMEOFDAY
- || _LIBC; otherwise, fall back on plain "time".
- Use macros like S_IRUSR | S_IWUSR rather than octal values like 0600.
-
- * lib/mkstemp.c (__GT_FILE): Define to zero if not defined.
-
-2000-10-25 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * lib/hard-locale.c: New file.
-
-2000-02-05 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * exgettext: From GCC repository
-
-1999-07-06 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * lib/mkstemp.c: glibc 2.2
-
-1998-12-11 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * src/sdiff.c (lf_snarf):
- Fix bug when help line wrapped around the input buffer.
-
-1998-09-15 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * diff.texi: Add @dircategory and @direntry.
-
-1998-09-14 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * Makefile.in (VERSION): Version 2.7.2.
- (DEFAULT_DIFF_PROGRAM): Renamed from DIFF_PROGRAM.
- (PR_PROGRAM): All `configure' to define it.
- (srcs): Add $(diffutils_srcs), freesoft.c, quotearg.c instead of
- quote.c, quotearg.h.
- (distfiles): Add acconfig.h, message/*.
- (all): Depend on $(destfiles), not info.
- (version.c): Parenthesize `GNU diffutils'.
- (common_o): Add freesoft.o
- (diff_o): quote.o -> quotearg.o
- (diff3_o, sdiff_o): Likewise.
- (diff.dvi): Depend on version.texi.
- (diff.o diff3.o quotearg.o sdiff.o util.o):
- New dependency on quotearg.h
- (diff3.o): DIFF_PROGRAM -> DEFAULT_DIFF_PROGRAM.
- (sdiff.o): Likewise.
- (messages.po): Remove.
- (message/msgid.po, message/template.po): New rules.
- (maintainer-clean): Renamed from realclean.
- (install): Install from source directory, if applicable.
- Invoke install-info if needed.
- (install-strip): New rule.
- (check): Set DIFF.
- (stamp-h.in): Don't put the date into the timestamp.
- (D_dirs): Add $D/message.
- ($D.tar.gz): Compress with gzip -9.
- Don't use ln to create distribution; it doesn't work with symlinks.
- (srcs, distfiles, diff_o, diff3_o, sdiff_o): Rename quotearg.c to
- quotesys.c and quotearg.h to quotesys.h.
-
- * configure.in (AC_PATH_PROG): Add PR_PROGRAM.
- If available, prefer support for large files unless the user specified
- one of the CPPFLAGS, LDFLAGS, or LIBS variables.
- (AC_STRUCT_ST_RDEV): Add.
- (HAVE_ST_FSTYPE_STRING): Add.
- (--with-mvfs-stat-bug, --with-nfs-stat-bug): New options.
- (HAVE_MEMCHR): New macro.
- (AC_CHECK_FUNCS): Add sicprocmask.
-
- * diff.h (XTERN): Renamed from EXTERN.
- (struct filedata): Remove dir_p arg.
- (struct comparison): New type.
- (diff_2_files, diff_dirs)" Ise ot/
- (error): Add printf attribute if applicable.
- (free_software_msgid): New decl.
- (pr_program): New decl.
- (fatal): Add noreturn attribute.
- (pfatal_with_name): Likewise.
-
- * system.h (__attribute__): New macro.
- (getenv): Don't declare if HAVE_STDLIB_H.
- (CHAR_MAX): New macro.
- (<locale.h>): New include.
- (<locale.h>): Include before <libintl.h>.
- (could_be_mvfs_stat_bug, could_be_nfs_stat_bug,
- dev_may_have_duplicate_ino, same_special_file): New macros.
- (same_file): Use them.
-
- * cmp.c (authorship_msgid): New var.
- (free_software_msgid): New decl.
- (error): Now has printf attribute.
- (try_help): Likewise.
- (long_options): Don't assume ASCII.
- (try_help): Now accepts operand arg.
- (main): Check for -1, not EOF, when calling getopt_long.
- Report --ignore-initial value when complaining about it.
- Output copyright and free software info with -v.
- Don't assume ASCII.
- Report last operand when one is missing.
- Report text of extra operand.
- Move block_read into cmpbuf.c.
-
- * diff.c (authorship_msgid): New var.
- (quotesys.h): Include.
- (ck_atoi): Remove.
- (function_regexp_list, ignore_regexp_list): Now static.
- (binary_flag): Renamed from binary_I_O.
- (entire_new_file_flag, unidirectional_new_file_flag,
- print_file_same_flag): Now static.
- (numeric_arg): Renamed from ck_atoi.
- New argument specifying the argument type.
- (longopts, main): Don't assume ASCII.
- (longopts): Remove old aliases --file-label, --entire-new-file,
- --ascii, --print.
- (main): Check for -1, not EOF, when calling getopt_long.
- Use numeric_arg to report errors.
- Report error if -l specified but pagination is not supported.
- Report error if -S is specified twice with conflicting values.
- Have --version conform to the new GNU standards.
- Add new --from-file, --to-file, --inhibit-hun,-merge options.
- Make the horizon at least as large as the context.
- Add casts to pacify gcc -Wall.
- (try_help): Add operand arg.
- (option_help_msgid): Doc fix to match above.
- (usage): Indent option_help_msgid.
- (compare_files): Now takes struct comparison
- instead of two directory names and a depth.
- (NONEXISTENT, UNOPENED, ERRNO_ENCODE, ERRNO_DECODE):
- New macros.
- (DIR_P): New macro.
- Report error if fflush does.
-
- * cmpbuf.c (block_read): Moved here from cmp.c.
-
- * cmpbuf.h (block_read): New decl.
-
- * io.c (cmpbuf.h): Include.
- (slurp): Check for arithmetic overflow when computing buffer size.
-
- * dir.c (diff_dirs): Check for recursive directory loop.
- Arg is now struct comparison const *.
- (dir_loop): New function
-
- * analyze.c (no_discards): Remove.
- (inhibit): Remove.
- (shift_boundaries): Don't inhibit. If inhibit_hunk_merge is nonzero,
- don't merge hunks.
- (briefly_report): Now returns 2 if trouble, CHANGES otherwise.
- (diff_2_files): Now takes struct comparison. If briefly_report reports
- trouble, pass it on to caller.
-
- * side.c (print_half_line): Add brackets to pacify GCC -Wall.
-
- * sdiff.c (quotesys.h): Include.
- (DIFF_PROGRAM, DEFAULT_EDITOR_PROGRAM): Remove.
- (free_software_msgid, editor_program, not_found): New vars.
- (diffbin, edbin): Remove.
- (editor_program): Renamed from edbin.
- (edit, interact): Now take extra string arg.
- (exiterr, fatal, perror_fatal, try_help): Add noreturn attribute.
- (sigset_t, sigemptyset, sigmask, sigaddset, SIG_BLOCK, SIG_SETMASK):
- (sigprocmask): New macros, if !HAVE_SIGPROCMASK.
- (error): Now has printf attribute.
- (longopts, main): Don't assume ASCII.
- (try_help): New operand arg.
- (usage): Conform to new GNU standards.
- (main): Set static vars for editor and diff program.
- Compare getopt_long result to -1, not EOF.
- -v conforms to new GNU standard.
- Complain better about extra and missing operands.
- If HAVE_VFORK, block SIGINT and SIGPIPE in the parent, since when
- the child munges its handlers it may somp on the parent.
- Pass rname to intract.
- Translate not-found message before forking.
- (give_help): Just output it all at once.
- (edit): New args lname, lline, rname, rline.
- (edit): New command 'd'.
- (interact): New args lname, rname.
-
- * util.c (quotesys.h): Include.
- (PR_PROGRAM): New macro.
- (pfatal_with_name): Abort if error returns.
- (fatal): Likewise.
- (print_message_queue): Free message chain after printing.
- (currently_recursive): Renamed from current_depth, and now a boolean.
- (begin_output): Report error if fflush does.
- Avoid stdio and gettext in child.
-
- * diff3.c (quotesys.h): Include.
- (free_software_msgid): New decl.
- (RANGE_START, RANGE_END): Renamed from START and END.
- (fatal, perror_with_exit, try_help): Add noreturn attribute.
- (error): Add printf attribute.
- (diff_program): Now a ptr, not an array.
- Initialize to DEFAULT_DIFF_PROGRAM instead of DIFF_PROGRAM.
- (longopts, main): Don't assume ASCII.
- (main): Use DIFF environment var to specify name of diff program.
- Compare getopt_long result to -1, not EOF.
- -v now reports version according to new GNU standard.
- Report spelling of extra operand, or last operand before missing one.
- (try_help): Now takes operand arg.
- (option_help_ms): Fix typo: missing comma.
- (usage): Update as per current GNU standards.
- (environ): Remove decl.
- (read_diff): Invoke diff with --inhibit-hunk-merge.
- Translate `not found' message before forking.
- Quote name of diff program.
- Pass horizon lines.
- `memory exhausted' -> `Memory exhausted'
-
- * pc/makefile (%.exe): Remove.
- (pc-clean): Remove *.exe
- * pc/makefile.sed (DEFAULT_DIFF_PROGRAM): Renamed from DIFF_PROGRAM.
- When editing mkinstalldirs rule, look for exec_prefix and prefix.
- Add .exe when installing files.
- * pc/emx/config.h (same_file): Add.
- * pc/config.h (same_file): Remove.
- * pc/djgpp/config.h: Adjust to latest patch from eliz.
- * pc/djgpp/makefile.sed: Don't alter PROGRAMS.
- * pc/pc.c: Update FSF address.
- (quote_system_arg): Renamed from system_quote_arg.
-
- * README: Add --with-mvfs-stat-bug, --with-nfs-stat-bug.
-
- * getmsgids: Add copyright date and update FSF address.
-
- * diff.texi: Document recent changes.
- The patch doc still corresponds to patch 2.2, unfortunately.
- Update GNU bug reporting address. Omit Larry Wall's address;
- it's obsolete and he's busy with perl.
-
- * context.c: Fix spacing.
-
- * NEWS: Mention --from-file=FILE, --to-file=FILE, ed.
-
- * acconfig.h, freesoft.c, message/de.po, message/en_UK.po,
- message/es.po, message/fr.po, message/pl.po, message/sv.po:
- New files.
-
- * ed.c: Remove `#if 0'ed code.
-
- * normal.c, waitpid.c: Update FSF address.
-
-1998-03-15 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * quotesys.c: Renamed from quotearg.c.
-
- * quotesys.h: Renamed from quotearg.h
- (__QUOTESYS_P): Renamed from __QUOTEARG_P.
-
-1997-05-05 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * quotesys.c, quotesys.h: New file.
-
-Mon Nov 14 05:10:56 1994 Paul Eggert <eggert@xxxxxxxxxxx>
-
- Add internationalization support.
- Several messages have been changed slightly,
- to make them more consistent and easier to translate.
- All strings that are messages are passed through gettext once before
- being used, so that they can be localized.
- Each function and macro whose first parameter is a gettext msgid
- has had its first parameter's name changed so it ends in `msgid'.
- All arrays of msgids have had their names changed to end in `msgid'.
- `getmsgids' uses this to determine which strings are msgids.
-
- * pc/COPYING, pc/INSTALL, pc/config.h,
- pc/djgpp/config.h, pc/djgpp/makefile.sed,
- pc/emx/config.h, pc/emx/diff.def, pc/emx/gnuregex.def,
- pc/emx/makefile.sed,
- pc/makefile, pc/makefile.sed, pc/pc.c: New files, for PC support.
-
- * getmsgids: New file.
-
- * Makefile.in (PACKAGE, VERSION, diffutils_srcs, D): New vars.
- (version.c, version.texi, messages.po): New files.
- messages.po is built automatically from source files and `getmsgids'.
- (distfiles): Add them, pc/*, and getmsgids.
- (diff.info): Now depends on version.texi.
- (realclean): Clean messages.po, version.*.
- (dist): Just build $D.tar.gz.
- ($D.tar.gz): New file, takes over old `dist' function.
- Don't assume $(distfiles) are all in same directory.
-
- * configure.in (AC_CHECK_HEADERS): Add libintl.h, locale.h.
- (AC_CHECK_LIB): Check for -lintl.
-
- * analyze.c (briefly_report): Rewrite `message (A?"B":"C")' as
- `if (A) message ("B") : message ("C")'; this is for getmsgids.
- (briefly_report, diff_2_files): For label, use file_label if set.
- * diff.c (compare_files): Likewise.
-
- * system.h (gettext): Declare; use a stub if ! HAVE_LIBINTL_H.
- (setlocale): Declare; use a stub if ! HAVE_LOCALE_H.
-
- * cmp.c, diff.c, diff3.c, sdiff.c (main):
- Invoke setlocale first thing, to tell library we're internationalized.
- (option_help_msgid): New constant.
- (usage): Use it, so message is translated one option at a time.
- * sdiff (help_msgid, give_help): Likewise.
-
- * cmp.c (sprintc): Renamed from `printc'.
- Now outputs to a buffer instead of stdout.
- (cmp): Use new sprintc; it's easier to internationalize.
-
- * diff.c (main): -D FOO now outputs `/* ! FOO */ instead of
- `/* not FOO */'.
-
- * sdiff.c (version_string): Fix decl typo: `const' was missing.
- (trapsigs): Ignore sigaction failure, to be compatible with `signal'.
-
- * util.c (struct msg, message5, print_message_queue):
- Allocate just one block of memory to save a message.
-
-Wed Nov 9 17:42:44 1994 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * sdiff.c (trapsigs): Don't check signal return value, since it's
- bogus under djgpp.
-
-Mon Oct 31 07:27:27 1994 Paul Eggert <eggert@xxxxxxxxxxx>
-
- * Makefile.in (srcs, diff_o, diff3_o, sdiff_o):
- New files quote.c, quote.o.
-
- * diff.h (function_regexp, ignore_regexp): Replace lists of compiled
- regexps with these single compiled regexps. All users changed.
- (regexp_list,function_regexp_list,ignore_regexp_list): Move to diff.c.
- * diff.c (add_regexp): Build one big regexp instead of a regexp list.
- (summarize_regexp_list): New function.
- (regexp_list): Redesigned struct; moved here from diff.h.
- (function_regexp_list, ignore_regexp_list): Likewise, for vars.
-
- * context.c (find_function): Simplify interface:
- don't return size of function line. All callers changed.
- (print_context_script, find_function): INT_MAX now denotes no
- previous match; this is simpler than `- file->prefix_lines - 1'.
-
- * diff3.c (read_diff): Quote arguments with system_quote_arg.
- * sdiff.c (main): Use system_quote_arg to compute command.
- * diff.c (option_list): Quote options with system_quote_arg.
[ *** diff truncated: 100337 lines dropped *** ]
