path: root/ChangeLog

2011-09-02  Jim Meyering  <meyering@redhat.com>

	version 3.2
	* NEWS: Record release date.

	build: update bootstrap and tests/init.sh from gnulib
	* bootstrap: Update from gnulib.
	* tests/init.sh: Likewise.

	build: update gnulib submodule to latest

	doc: diffutils' texi-derived doc may now be in debian's "main" section
	* NEWS (Packaging): Mention the "no front/back-cover" change.

2011-08-15  Jim Meyering  <meyering@redhat.com>

	maint: avoid new "make sytnax-check" failure.
	* src/diff.h (find_dir_file_pathname): Mark declaration with "extern"
	keyword, in order to placate the tight-scope syntax check.

2011-08-15  Paul Eggert  <eggert@cs.ucla.edu>

	* src/io.c (find_and_hash_each_line): Refactor for brevity.

2011-08-15  Roland McGrath  <roland@hack.frob.com>

	diff, sdiff: new option --ignore-trailing-space (-Z)
	Derived from Roland McGrath's patch (dated June 2004!) in:
	http://lists.gnu.org/archive/html/bug-gnu-utils/2004-07/msg00000.html
	* NEWS:
	* doc/diffutils.texi (White Space, Blank Lines)
	(sdiff Option Summary, diff Options, sdiff Options): Document -Z.
	* src/diff.h (IGNORE_TRAILING_SPACE)
	(IGNORE_TAB_EXPANSION_AND_TRAILING_SPACE): New constants, for -Z.
	* src/diff.c (shortopts, longopts, main, option_help_msgid):
	* src/sdiff.c (longopts, option_help_msgid, main):
	* src/io.c (find_and_hash_each_line):
	* src/util.c (lines_differ, analyze_hunk): Support -Z.

2011-08-14  Paul Eggert  <eggert@cs.ucla.edu>

	* bootstrap.conf (gnulib_modules): Remove timegm.
	This fixes a problem noted by Andreas Schwab in:
	http://lists.gnu.org/archive/html/bug-diffutils/2011-08/msg00035.html

2011-08-13  Tim Waugh  <twaugh@redhat.com>

	diff: --ignore-file-name-case now applies at top level too
	Derived from Tim Waugh's patch in:
	http://lists.gnu.org/archive/html/bug-diffutils/2011-08/msg00034.html
	* NEWS, doc/diffutils.texi (diff Options): Document this.
	* src/diff.c (compare_files): Implement this, by using
	find_dir_file_pathname.
	* src/diff.h (find_dir_file_pathname): New decl.
	* src/dir.c: Include filenamecat.h.
	(find_dir_file_pathname): New function.

2011-08-13  Paul Eggert  <eggert@cs.ucla.edu>

	* .gitignore: Add lib/unistr, lib/unused-parameter.h.

2011-08-10  Jim Meyering  <meyering@redhat.com>

	post-release administrivia
	* NEWS: Add header line for next release.
	* .prev-version: Record previous version.
	* cfg.mk (old_NEWS_hash): Auto-update.

	version 3.1
	* NEWS: Record release date.

	build: use largefile module and update to latest gnulib
	* configure.ac: Remove AC_SYS_LARGEFILE, subsumed by ...
	* bootstrap.conf (gnulib_modules): ...this.  Use largefile module.
	* gnulib: Update to latest.

2011-08-08  Santiago Vila  <sanvila@unex.es>

	doc: insert comma in --help line for --ignore-space-change (-b)
	* src/diff.c (option_help_msgid): Insert omitted comma between
	"-b" and "--ignore-space-change".  (tiny change)

2011-08-04  Jim Meyering  <meyering@redhat.com>

	doc: relax restriction on front-cover and back-cover texts
	* doc/diffutils.texi (copying): Relax restriction on front-cover
	and back-cover texts (just as m4 did here:
	http://git.savannah.gnu.org/cgit/m4.git/commit?id=ee1e92ec).
	Reported by Santiago Vila.  Fix suggested by Eric Blake.

2011-08-03  Jim Meyering  <meyering@redhat.com>

	tests: update init.sh from gnulib
	* tests/init.sh: Update from gnulib.

	build: update gnulib submodule to latest

2011-07-03  Jim Meyering  <meyering@redhat.com>

	maint: remove inclusion of unused header, for "make syntax-check"
	* src/diff3.c: Don't include <inttostr.h>.  Not used.
	* src/context.c: Likewise.

2011-06-19  Jim Meyering  <meyering@redhat.com>

	build: don't require perl when building from a tarball
	But do ensure -- in all other circumstances -- that the man/*.1
	files are rebuilt whenever the version number changes.
	* configure.ac (SRC_VERSION_C): Define.
	* man/Makefile.am (dist_man1_MANS): Rename from $(man1_MANS),
	so that we distribute those pesky man/*.1 files.
	(EXTRA_DIST): Reflect name change.
	(MAINTAINERCLEANFILES): Define this, not DISTCLEANFILES,
	now that these generated files are distributed.
	($(dist_man1_MANS)): Depend on $(SRC_VERSION_C), so we get the
	full dependency when not building from a tarball.

2011-06-13  Jim Meyering  <meyering@redhat.com>

	doc: do not distribute generated man/*.1 man files
	* man/help2man: New file.
	* man/Makefile.am: Use $(srcdir)/help2man.
	Convert $(dist_man1_MANS) to $(man1_MANS), to tell automake
	not to distribute the generated man/*.1 files.  Now they're
	generated at build-from-tarball time.
	($(man1_MANS)): Depend on version.c, so that man pages are
	regenerated whenever the version string changes.

	build: ccache works better without embedded version strings
	* src/Makefile.am: Generate version.c and version.h and put the
	new symbol in a tiny library to be used by each program.
	(LDADD): Add the new library.
	* src/cmp.c (main): Use Version, not PACKAGE_VERSION, so the .o
	file does not change with each commit-derived version increment.
	* src/diff.c (main): Likewise.
	* src/diff3.c (main): Likewise.
	* src/sdiff.c (main): Likewise.
	* src/system.h: Include "version.h".
	* .gitignore: Add version.[ch]

2011-06-12  Jim Meyering  <meyering@redhat.com>

	doc: ensure each program has a man/*.x file: add "SEE ALSO" references
	* man/cmp.x: New file.
	* man/diff3.x: New file.
	* man/sdiff.x: New file.
	* man/diff.x: Add xrefs to the other three programs, and to patch.
	* man/Makefile.am (EXTRA_DIST): List new files.
	(cmp.1, diff3.1, sdiff.1): Depend on each .x file.

	doc: rename diff.texi to diffutils.texi
	This makes the .texi basename the same as the package name,
	which is consistent with most other GNU packages.
	* doc/diffutils.texi: Rename from...
	* doc/diff.texi: ...removed.
	* doc/Makefile.am (info_TEXINFOS): Reflect name change.
	(diffutils_TEXINFOS): Likewise.
	* cfg.mk (gendocs_options_): Remove this customization.  It is no
	longer needed, now that the .texi name matches that of the package.
	* man/Makefile.am ($(dist_man1_MANS)): Remove now-unnecessary sed
	filter.
	* README: Update references to diffutils.texi etc. here, too.
	* .gitignore: Update here, too.
	Suggested by Karl Berry.

2011-06-08  Karl Berry  <karl@freefriends.org>

	cmp, diff, diff3, sdiff: edit and align --help text.
	* cmp.c (option_help_msgid, usage),
	* diff.c (option_help_msgid, usage),
	* diff3.c (option_help_msgid, usage),
	* sdiff.c (option_help_msgid, usage): align descriptions in the --help
	output and slightly edit content.

2011-05-28  Paul Eggert  <eggert@cs.ucla.edu>

	diff: don't use locales after local-specific sorting fails
	* src/dir.c (compare_names): Don't invoke strcasecmp if
	locale-specific sorting fails, because POSIX.1-2008 says strcasecmp
	has unspecified behavior outside the POSIX locale.  See:
	http://lists.gnu.org/archive/html/bug-diffutils/2011-05/msg00008.html

	bootstrap: Avoid multithreading.
	* bootstrap.conf (gnulib_tool_option_extras):
	Add "--avoid=localename --avoid=lock", because we don't want to
	bring in the multithreading code that recent gnulib changes would
	otherwise bring in.
	(excluded_files): Remove m4/lock.m4; no longer needed, now that
	we use --avoid=lock.

	build: update gnulib submodule to latest

2011-05-23  Karl Berry  <karl@gnu.org>

	maint: update README-hacking
	* README-hacking: Update a la coreutils for git, etc.

2011-05-23  Jim Meyering  <meyering@redhat.com>

	maint: update gnulib to latest with accompanying tight-scope tweaks
	* cfg.mk: Include $(srcdir)/dist-check.mk using "-include",
	to accommodate the new sc_tight_scope rule.
	(_gl_TS_extern): Define, to tell gnulib's tight_scope rule that
	headers here mark externs with "XTERN".
	* gnulib: Update to latest.

2011-05-18  Jim Meyering  <meyering@redhat.com>

	maint: use gnulib's new readme-release module
	* bootstrap.conf (gnulib_modules): Add readme-release.
	(bootstrap_epilogue): Add the recommended perl one-liner.
	* README-release: Remove file; it is now generated from gnulib.
	* .gitignore: Add it.

	build: update gnulib submodule to latest

	maint: prepare for the tight-scope check
	* src/diff.h: Mark function declarations with "extern" in
	preparation for the tight-scope check.
	(ignore_white_space): Separate enum decl from declaration
	of this variable.
	* src/Makefile.am (diff_SOURCES): Move diff.h from here to ...
	(noinst_HEADERS): ...here.
	For convenience, since the tight-scope rule uses $(noinst_HEADERS).

	maint: don't use now-removed gnulib "exit" module
	* bootstrap.conf (gnulib_modules): Remove "exit" module.
	It no longer exists.

2011-03-26  Jim Meyering  <meyering@redhat.com>

	build: update gnulib submodule to latest

	* .x-sc_space_tab: Remove file.  Instead, ...
	* cfg.mk (exclude_file_name_regexp--sc_space_tab): ...define this.

	maint: fix typo in unused rule
	* cfg.mk (config-save): Fix typo: add leading "_" in variable name.

2011-03-18  Jim Meyering  <meyering@redhat.com>

	doc: add a reference to wdiff(1) from diff.1
	* man/diff.x: New file, to add "SEE ALSO" reference to wdiff(1).
	* man/Makefile.am (diff.1): Depend on diff.x.
	($(dist_man1_MANS)): Tell help2man to include diff.x.
	(EXTRA_DIST): Add diff.x.
	Suggestion from Dan Jacobson in http://bugs.debian.org/613319

2011-03-18  Eric Blake  <eblake@redhat.com>

	docs: info should mention -L
	* doc/diff.texi (diff Options): Document -L.

	docs: diff --help should mention -L
	* src/diff.c (option_help_msgid): Document -L.

2011-02-15  Jim Meyering  <meyering@redhat.com>

	doc: speak of the --test (-a) option, not "the -a or --test option"
	Convert using this command:
	perl -pi -e \
	  's/(\@option{-.}) or (\@option{--.*?}) option/$2 ($1) option/' \
	  doc/diff.texi
	Then convert some more with this:
	perl -pi -e \
	    's/the (\@option{-.}) or (\@option{--.*?})$/the $2 ($1)/' \
	  doc/diff.texi
	Then convert more manually.

	Suggested by Dan Jacobson

2011-01-24  Jim Meyering  <meyering@redhat.com>

	maint: remove all uses of vfork: use fork instead
	Our use of vfork now provokes warnings from gcc-4.6.0.
	Also, vfork is no longer even specified by POSIX.1-2008.
	* src/diff3.c (read_diff): Change each use of vfork to "fork".
	Remove #ifdef'd code.
	* src/util.c (begin_output, finish_output): Likewise.
	* src/sdiff.c (cleanup, main, edit): Likewise.
	(handler_index_of_SIGPIPE): Remove now-unused definition.
	* src/system.h: Don't include <vfork.h>.
	(vfork): Remove definition.
	* ms/config.site: Remove reference to vfork cache variable.

	tests: avoid newer but less-portable tail option syntax
	* tests/function-line-vs-leading-space: Use sed -n '3,$p' rather than
	tail -n+3.  Older versions of tail do not accept that newer syntax.
	Reported by Sudhakara Peram.

	tests: fix an erroneous test
	On most systems, like-named files were compared, by luck.
	However, on others, different-named files would be compared
	since their names were being treated as equal -- but they had
	different content, so the test would fail.
	* tests/colliding-file-names: Use different sets of file names
	in d1 and d2 so that they cannot accidentally match.
	Put the same line in each test file.  This is required
	when files named e.g., abc and ABC are compared.
	This test was failing on a NixOS 86_64-darwin system.

	build: update gnulib submodule to latest

	tests: fix typo that silently disabled all tests
	* tests/Makefile.am (TESTS): Fix typo: s/jESTS/TESTS/

2011-01-23  Jim Meyering  <meyering@redhat.com>

	build: update gnulib submodule to latest

	maint: avoid new syntax-check failure
	* src/diff.c (specify_value): Use !STREQ(...), not strcmp(...) != 0.
	* src/diff3.c (main): Likewise.

2011-01-03  Jim Meyering  <meyering@redhat.com>

	maint: update copyright year ranges to include 2011
	Run "make update-copyright", so "make syntax-check" works in 2011.

	build: update gnulib submodule to latest

2010-12-16  Paul Eggert  <eggert@cs.ucla.edu>

	bootstrap: adjust to recent gnulib changes
	* bootstrap.conf (excluded_files): Do not exclude m4/size_max.m4
	and m4/xsize.m4 when using an external gettext, since they are
	now needed by other gnulib modules.

2010-12-16  Jim Meyering  <meyering@redhat.com>

	doc: add contributor guidelines: HACKING
	* HACKING: New file, copied 99% from the one in grep's repository.

2010-10-09  Jim Meyering  <meyering@redhat.com>

	maint: describe policy on copyright year number ranges
	* README: Mention coreutils' long-standing policy on use of M-N
	ranges in copyright year lists.  Requested by Richard Stallman.

2010-09-04  Jim Meyering  <meyering@redhat.com>

	maint: adjust init.sh use to conform
	* tests/help-version: Use one line: "${srcdir=.}/init.sh"; ...
	* tests/basic: Likewise.
	* tests/binary: Likewise.
	* tests/colliding-file-names: Likewise.
	* tests/excess-slash: Likewise.
	* tests/function-line-vs-leading-space: Likewise.
	* tests/help-version: Likewise.
	* tests/label-vs-func: Likewise.
	* tests/no-newline-at-eof: Likewise.
	* tests/stdin: Likewise.

	maint: avoid shadowing warning
	* src/dir.c (diff_dirs): Rename shadowed local cmp to "c".

	build: use gettext-h, not gettext
	* bootstrap.conf (gnulib_modules): Use gettext-h, not gettext.
	The latter is overkill for a package that uses
	AM_GNU_GETTEXT([external]...

	build: update build/test tools from gnulib
	* bootstrap: Update from gnulib.
	* tests/init.sh: Likewise.

	build: update gnulib submodule to latest

2010-08-15  Jim Meyering  <meyering@redhat.com>

	diff -r: avoid printing excess slashes in concatenated file names
	* bootstrap.conf (gnulib_modules): Add filenamecat.
	* src/diff.c: Include "filenamecat.h".
	(compare_files): Use file_name_concat, rather than dir_file_pathname.
	* src/util.c (dir_file_pathname): Remove now-unused function.
	* src/diff.h: Remove its declaration.
	* tests/excess-slash: New script to test for this.
	* tests/Makefile.am (TESTS): Add it.
	Forwarded by Santiago Vila from <bugs.debian.org/586301a>,
	reported by Jari Aalto.

2010-08-13  Paul Eggert  <eggert@cs.ucla.edu>

	diff: avoid spurious diffs when two distinct dir entries compare equal
	Problem reported by Christoph Anton Mitterer in:
	http://lists.gnu.org/archive/html/bug-diffutils/2010-08/msg00000.html

	* NEWS: Mention this bug fix.
	* src/dir.c (compare_names_for_qsort): Fall back on file_name_cmp
	if two distinct entries in the same directory compare equal.
	(diff_dirs): Prefer a file_name_cmp match when available.
	* tests/Makefile.am (TESTS): New test colliding-file-names.
	* tests/colliding-file-names: New file.

2010-05-09  Jim Meyering  <meyering@redhat.com>

	build: update gnulib submodule to latest

	build: don't define macros that gnulib provides
	* bootstrap.conf (gnulib_modules): Add signal, stdint.
	* lib/cmpbuf.c (SA_RESTART, SA_INTERRUPT): Remove definitions.
	(SIZE_MAX, PTRDIFF_MAX): Likewise.
	Include <stdint.h>.
	* src/system.h (WEXITSTATUS, WIFEXITED): Remove definitions.
	(SA_RESTART, SA_INTERRUPT): Likewise.

	build: rely on gnulib's sigprocmask module
	* src/sdiff.c: Remove #if-!HAVE_SIGPROCMASK-guarded code.
	* bootstrap.conf (gnulib_modules): Add sigprocmask.

2010-05-04  Jim Meyering  <meyering@redhat.com>

	doc: README-release: don't mention To:, Cc:, etc announcement headers,
	now that those are supplied automatically via gnulib's maint.mk.
	* README-release: sync with coreutils.

	maint: teach web-doc-generating code how to do its job
	* cfg.mk (gendocs_options): Define, so that gendocs.sh knows
	the name of our texinfo source file.
	* gnulib: Update to latest, for new gnu-web-doc-update and maint.mk.

2010-05-03  Jim Meyering  <meyering@redhat.com>

	doc: update release procedure
	* README-release: Rearrange slightly: post the announcement to
	Savannah first, so you can include a link to that post in the email.
	Sync a few details from coreutils' README-release.

	post-release administrivia
	* NEWS: Add header line for next release.
	* .prev-version: Record previous version.
	* cfg.mk (old_NEWS_hash): Auto-update.

	version 3.0
	* NEWS: Record release date.

	build: update gnulib submodule to latest

2010-05-01  Jim Meyering  <meyering@redhat.com>

	build: use gnulib's sys_wait module
	* bootstrap.conf (gnulib_modules): Use gnulib's sys_wait module,
	now that we assume its presence.

2010-04-30  Jim Meyering  <meyering@redhat.com>

	build: update gnulib submodule to latest
	* bootstrap: Also update from gnulib.
	* tests/init.sh: Likewise

	maint: remove now-useless #if HAVE_HEADER_H guards
	* src/system.h: Include <sys/wait.h> unconditionally,
	now that gnulib guarantees its presence.
	* lib/cmpbuf.c: Likewise for <unistd.h> and <inttypes.h>.

2010-04-17  Jim Meyering  <meyering@redhat.com>

	tests: use original no-newline-at-eof test, but with -U1, not -U2
	* tests/no-newline-at-eof: Revert to the smaller test, but with
	-U1 rather than -U2, since that actually triggers the bug.

2010-04-17  Paul Eggert  <eggert@cs.ucla.edu>

	Followon improvements for the fix for Debian bug 577832.
	* src/io.c (find_and_hash_each_line): Omit the inserted newline in
	a simpler way.
	* tests/no-newline-at-eof: Fix the test case so that it rejects
	the old, buggy behavior.

2010-04-16  Jim Meyering  <meyering@redhat.com>

	build: update gnulib submodule to latest

	tests: test for the no-newline-at-EOF bug
	* tests/no-newline-at-eof: New file.
	* tests/Makefile.am (TESTS): Add it.

	diff: fix a regression when at least one input lacks a newline-at-EOF,
	and the final hunk plus context-length aligns exactly with the end
	of the newline-lacking file.  Diff would fail to output the required
	"\ No newline at end of file" line, thus rendering the output invalid.
	This bug appears to have been introduced by 2006-05-07
	commit 58d0483b, "(find_identical_ends): Fix huge performance bug...",
	at least to the extent that reverting that change fixes the bug.
	Considering the stated effect of that change and lack of metrics,
	reverting it is not an option, so here we take a more direct approach.

	Given these inputs,

	    printf '\n1'>a; printf '\n0\n\n1'>b

	and running diff like this:

	    ./diff -U1 a b

	for input file "b", the pointer, files[1].linbuf[4][-1], to
	the last byte on the final line was mistakenly pointing at the
	sentinel newline at EOF, rather than at the preceding byte.

	  (gdb) p files[1].linbuf[4][-1]
	  $3 = 10 '\n'

	Thus, this test in the final print_1_line call:

	  if ((!line_flag || line_flag[0]) && limit[-1] != '\n')
	    fprintf (out, "\n\\ %s\n", _("No newline at end of file"));

	would fail, because limit[-1] (which is files[1].linbuf[4][-1])
	was mistakenly '\n', rather than the desired '1'.

	My first thought was simply to adjust the final linbuf[line] setting,
	at the end of io.c's find_and_hash_each_line function function:

	       if (p == bufend)
	-       break;
	+       {
	+         if (current->missing_newline)
	+           --linbuf[line];
	+         break;
	+       }

	But that would make diff misbehave with this input
	(same as above, but with a newline appended to "a"),

	    printf '\n1\n'>a; printf '\n0\n\n1'>b
	    ./diff -U1 a b

	due to the block (100 lines above) that is triggered in that case
	(but not in the both-files-missing-newline case):

	      if (p == bufend
	          && current->missing_newline
	          && ROBUST_OUTPUT_STYLE (output_style))
	        {
	          /* This line is incomplete.  If this is significant,
	             put the line into buckets[-1].  */
	          if (ignore_white_space < IGNORE_SPACE_CHANGE)
	            bucket = &buckets[-1];

	          /* Omit the inserted newline when computing linbuf later.  */
	          p--;
	          bufend = suffix_begin = p;
	        }

	Note how "p" is decremented and "bufend" adjusted.
	When that happens, we certainly don't want to decrement
	"bufend" yet again.

	Since there is no other way to determine at the end whether "bufend"
	was already decremented, add a new variable to serve as witness.

	* NEWS (Bug fixes): Mention it.
	Reported by Timo Juhani Lindfors in http://bugs.debian.org/577832.
	Forwarded by Santiago Vila.

	tests: update init.sh from gnulib
	* tests/init.sh: Update from gnulib.

2010-04-08  Jim Meyering  <meyering@redhat.com>

	build: include cfg.mk and dist-check.mk in the distribution tarball
	* Makefile.am (EXTRA_DIST): Add cfg.mk and dist-check.mk.

	maint: update to latest gnulib
	* cfg.mk (sc_cross_check_PATH_usage_in_tests): Remove rule,
	now that it's in gnulib's maint.mk.
	* gnulib: Update to latest.

2010-04-07  Jim Meyering  <meyering@redhat.com>

	tests: make new PATH-crosschecking syntax-check tighter
	* cfg.mk (sc_cross_check_PATH_usage_in_tests): Use grep's -x (match
	entire line) option with -F.

	tests: pull latest help-version from gzip
	* tests/help-version: Update from gzip.
	* Makefile.am (TESTS_ENVIRONMENT): Export VERSION,
	as required for this new help-version script.

	tests: add syntax-check rule to verify that tests use proper PATH
	* cfg.mk (sc_cross_check_PATH_usage_in_tests): New rule, that is
	useful only in conjunction with the help-version script.

	tests: use path_prepend_ consistently; remove unnecessary VERBOSE check
	* tests/basic: Likewise.
	* tests/binary: Likewise.
	* tests/function-line-vs-leading-space: Likewise.
	* tests/label-vs-func: Likewise.
	* tests/stdin: Likewise.

2010-04-06  Eric Blake  <eblake@redhat.com>

	maint: ignore generated files
	* .gitignore: Ignore recent gnulib additions.

	maint: update to latest bootstrap
	* bootstrap: Copy from gnulib/build-aux.

2010-04-05  Jim Meyering  <meyering@redhat.com>

	tests: get latest init.sh from gnulib
	* tests/init.sh: Update from gnulib.

	build: update gnulib submodule to latest; adapt
	* cfg.mk (local-checks-to-skip): Add new sc_texinfo_acronym, to skip it.

	diff -F/-p: don't depend on locale-specific white-space definition
	* src/context.c: Include "c-ctype.h".
	Use c_isspace, not isspace.

2010-03-18  Jim Meyering  <meyering@redhat.com>

	tests: exercise new behavior of -F RE
	* tests/function-line-vs-leading-space: New file.
	* tests/Makefile.am (TESTS): Add it.

2010-03-18  Yannick Moy  <yannick.moy@adacore.com>

	with -F or -p, emit better function lines: no leading white space
	* src/diff.c (print_context_function): For languages like Ada
	that allow local functions and procedures, the plain context
	function line may start with enough blank characters that the
	function name does not get completely printed in the 40
	characters limit.  This patch solves this problem by removing
	these useless initial blank characters.
	* NEWS (Changes in behavior): Mention this change.

2010-03-17  Jim Meyering  <meyering@redhat.com>

	build: don't require a specific version of help2man
	* bootstrap.conf (buildreq): Bootstrap can't deal with it,
	perhaps because the command name contains a digit.

	build: make bootstrap ensure that help2man is available
	* bootstrap.conf (buildreq): Add help2man.

2010-02-23  Jim Meyering  <meyering@redhat.com>

	tests: test for the "Binary files A and B differ" diagnostic
	* tests/binary: New script.
	* tests/Makefile.am (TESTS): Add it.

	revert 2002 change that removed "Binary " from "files A and B differ"
	With this change, "printf '\0'|diff - /dev/null" now prints
	"Binary files - and /dev/null differ" once again.
	This reverts 2002-06-28 commit a352f0980,
	"(briefly_report): Don't say "Binary files differ", ...".
	* src/analyze.c (briefly_report): Do include the "Binary " prefix
	in the diagnostic, when !brief.
	* NEWS (Changes in behavior): Mention the diagnostic change.
	Reported by Andreas Hoenen in http://bugs.debian.org/570064.

2010-02-14  Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	avoid compilation failure on systems lacking both fork and vfork
	* src/sdiff.c [!HAVE_WORKING_FORK && !HAVE_WORKING_VFORK] (main):
	Pass the right number of arguments to shell_quote_copy.
	* src/util.c [!HAVE_WORKING_FORK && !HAVE_WORKING_VFORK] (begin_output):
	Likewise.

2010-02-11  Jim Meyering  <meyering@redhat.com>

	post-release administrivia
	* NEWS: Add header line for next release.
	* .prev-version: Record previous version.
	* cfg.mk (old_NEWS_hash): Auto-update.

	version 2.9
	* NEWS: Record release date.

	doc: document the release procedure
	* README-release: New file.

2010-02-10  Jim Meyering  <meyering@redhat.com>

	maint: change use of "|" to more maintainable "||" (no semantic change)
	* src/analyze.c (diff_2_files): Using the "||" operator happens to
	be equivalent to using "|" in this case.  It is also clearer and
	less prone to inadvertent bug introduction, in case the variable,
	"changes" were ever to take on a value not in {0,1}.
	Patch by Tim Waugh, via Mike Frysinger.

	portability: avoid "diff - ..." failure at least on *BSD and Solaris
	The new "stdin" test was failing on many types of systems.
	* src/diff.c (compare_files): Guard use of xfreopen (NULL, "rb", ...
	also with O_BINARY, so as to avoid this unnecessary call on
	systems where it's not needed (on some it fails with "Bad address".

	tests: honor VERBOSE
	* tests/basic: Enable "set -x" if $VERBOSE.
	* tests/help-version: Likewise.
	* tests/label-vs-func: Likewise.
	* tests/stdin: Likewise.

2010-02-05  Jim Meyering  <meyering@redhat.com>

	build: update gnulib submodule to latest

	sync with gnulib
	* gl/lib/regcomp.c.diff: Adjust to apply to the latest in gnulib.
	* gnulib: Update submodule to latest.

2010-02-04  Jim Meyering  <meyering@redhat.com>

	build: do not override gnulib-provided AM_CFLAGS options
	Avoid a warning from automake:
	lib/Makefile.am:23: AM_CFLAGS multiply defined in condition TRUE ...
	lib/gnulib.mk:30: ... `AM_CFLAGS' previously defined here
	lib/Makefile.am:18:   `lib/gnulib.mk' included from here

	* lib/Makefile.am (AM_CFLAGS): Append $(WARN_CFLAGS) and
	$(WERROR_CFLAGS), i.e., use "+=", not "=".
	This was introduced via 2009-12-17 commit e58efa5b
	"build: enable warnings and -Werror.",
	but fortunately is not a bug, because the definition
	it would have overridden was always empty.

2010-01-17  Jim Meyering  <meyering@redhat.com>

	maint: add to .gitignore
	* .gitignore: Ignore more.

2010-01-16  Jim Meyering  <meyering@redhat.com>

	doc: add to TODO
	* TODO: Add an item, suggested by Dan Jacobson.

2010-01-13  Jim Meyering  <meyering@redhat.com>

	tests: ensure that an argument of "-" is treated as standard input
	* tests/stdin: New test.
	* tests/Makefile.am (TESTS): Add it.

2010-01-10  Jim Meyering  <meyering@redhat.com>

	tests: now "make distcheck" runs more tests, incl. syntax-check
	* cfg.mk: Include dist-check.mk, from coreutils.
	* Makefile.am (distcheck-hook): Define rule, to hook to...
	* dist-check.mk: New file.

2010-01-09  Jim Meyering  <meyering@redhat.com>

	build: update gnulib to latest, for fixed syntax-check rule

	maint: record updated NEWS hash
	* cfg.mk (old_NEWS_hash): Update to account for GFDL change.

	build: update gnulib submodule to latest

	tests: add a test of basic functionality
	* tests/basic: Start adding tests.
	* tests/Makefile.am (TESTS): Add it.

	maint: udpate GFDL license to 1.3
	* doc/diff.texi: Update to use GFDL version 1.3.

2010-01-04  Eric Blake  <ebb9@byu.net>

	build: allow compilation on cygwin
	* src/Makefile.am (cmp_LDADD): Move LIBICONV...
	(LDADD): ...into global flags, since all programs need it.

2010-01-03  Jim Meyering  <meyering@redhat.com>

	maint: record update-copyright options for this package
	* cfg.mk: Next time, just run "make update-copyright".

	tests: prepend ../src, not "." to PATH
	* tests/help-version: Correct PATH.

2010-01-01  Jim Meyering  <meyering@redhat.com>

	maint: update all FSF copyright year lists to include 2010
	Use this command:
	git ls-files |grep -vE '^(\..*|COPYING|gnulib)$' |xargs \
	env UPDATE_COPYRIGHT_USE_INTERVALS=1 build-aux/update-copyright

2009-12-31  Jim Meyering  <meyering@redhat.com>

	maint: newer gnulib; don't hard-code my GPG key ID
	* cfg.mk (gpg_key_ID): Remove definition, now that maint.mk automates it.
	* gnulib: Update to latest.

	tests: exercise diff -p's function-name matching
	* tests/label-vs-func: New file.
	* tests/Makefile.am (TESTS): Add label-vs-func.
	Reported by Simon Arlott <simon@fire.lp0.eu>
	http://article.gmane.org/gmane.linux.kernel.janitors/14260

	tests: use gnulib's init.sh
	* tests/Makefile.am (EXTRA_DIST): Add init.sh.
	Remove test-lib.sh.
	* tests/init.sh: New file.
	* tests/test-lib.sh: Remove file.
	* tests/help-version: Use init.sh, not test-lib.sh.

2009-11-28  Jim Meyering  <meyering@redhat.com>

	maint: don't let trailing spaces in diffs perturb make syntax-check
	* .x-sc_space_tab: New file.

2009-11-22  Jim Meyering  <meyering@redhat.com>

	build: enable warnings and -Werror.
	* src/Makefile.am (AM_CFLAGS): Enable warnings and -Werror.
	Set to this: $(WARN_CFLAGS) $(WERROR_CFLAGS)
	* lib/Makefile.am (AM_CFLAGS): Similarly, but use this:
	$(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
	* configure.ac (GNULIB_WARN_CFLAGS): Don't turn off -Wuninitialized.

	build: avoid a warning from gnulib's sh-quote.c
	* gl/lib/sh-quote.c.diff: New file, to avoid a warning.

	maint: avoid warnings via patched versions of gnulib's regex functions
	* gl/lib/regcomp.c.diff: New file.
	* gl/lib/regex_internal.c.diff: Likewise.
	* gl/lib/regex_internal.h.diff: Likewise.
	* gl/lib/regexec.c.diff: Likewise.

	build: update gnulib submodule to latest

2009-11-20  Eric Blake  <ebb9@byu.net>

	build: ignore more files
	* .gitignore: Add config.cache, *.exe.

	build: fix test run on cygwin
	This, plus a gnulib update for xalloc-die-tests, are necessary
	for make check to pass on cygwin.

	* tests/Makefile.am (built_programs): Ignore $(EXEEXT).
	* src/Makefile.am (paths.h): Add missing dependency.

2009-11-20  Jim Meyering  <meyering@redhat.com>

	maint: remove vestiges of nanosleep
	* src/Makefile.am (LDADD): Remove $(LIB_NANOSLEEP), now
	that we no longer use the nanosleep module.
	Spotted by Eric Blake.

	maint: don't pull in gnulib's nanosleep unnecessarily
	* bootstrap.conf (gnulib_modules): Remove nanosleep.  Not needed.
	Spotted by Eric Blake.

	maint: cfg.mk: remove factored-out ftp host/dir definitions
	* cfg.mk (gnu_ftp_host-alpha, gnu_ftp_host-beta gnu_ftp_host-stable):
	(gnu_rel_host, url_dir_list): Remove definitions.  The defaults,
	now provided by maint.mk, are the same.
	* gnulib: Update for latest, including those maint.mk additions.

	build: link with now-required libraries
	* src/Makefile.am (LDADD): Add gnulib-required libraries.
	(cmp_LDADD): Add $(LIBICONV), for cmp's use of proper_name_utf8.

	maint: lib/xfreopen.c contains translatable strings
	* po/POTFILES.in: Add lib/xfreopen.c.

	maint: remove hard-coded macro definitions provided by intprops.h
	* lib/cmpbuf.c: Include "intprops.h" rather than open-coding macros
	like TYPE_SIGNED and TYPE_MINIMUM.

	maint: add gnulib's announce-gen module
	* bootstrap.conf (gnulib_modules): Add announce-gen

	build: suppress warnings about bindtextdomain and textdomain
	* src/system.h (bindtextdomain, textdomain) [!ENABLE_NLS]: Define away.

	build: use more gnulib modules
	* bootstrap.conf (gnulib_modules): Add mktime, nanosleep, strptime
	and timegm.

	use xfreopen rather than freopen
	* src/cmp.c: Include "xfreopen.h".
	Use xfreopen in place of freopen.
	* src/diff.c Likewise, and...
	(main): Set exit_failure to EXIT_TROUBLE, rather than to 2.
	* src/diff3.c: Likewise.
	* bootstrap.conf (gnulib_modules): Add xfreopen.

	build: enable many warnings
	* configure.ac: Add support for --enable-gcc-warnings.
	* bootstrap.conf (gnulib_modules): Add manywarnings.
	* Makefile.am (AM_CFLAGS): Add $(WARN_CFLAGS) $(WERROR_CFLAGS)

	build: update gnulib submodule to latest

	maint: add an assertion to suppress clang-detected warning
	The clang static analyzer reported that a NULL parent could be
	dereferenced.  However, that cannot happen, because for all callers,
	the parameter, parent, is always non-NULL at that point.
	* src/diff.c: Include <assert.h>.
	Assert that parent is not NULL.

	maint: remove dead assignment from diff3.c
	* src/diff3.c (make_3way_diff): Remove dead assignment.

2009-11-18  Jim Meyering  <meyering@redhat.com>

	build: update gnulib submodule to latest

	maint: hide build commands behind $(AM_V_GEN)
	* src/Makefile.am (paths.h): Use $(AM_V_GEN), and split a long line.
	* man/Makefile.am ($(dist_man1_MANS)): Use $(AM_V_GEN) here, too.

2009-11-16  Jim Meyering  <meyering@redhat.com>

	build: let automake generate better man-installation rules
	* man/Makefile.am (dist_man1_MANS): Rename from dist_man_MANS,
	to enable better automake-generated installation rules.

	admin: ignore all of gnulib-tests
	* .gitignore: Add gnulib-tests

2009-11-16  Eric Blake  <ebb9@byu.net>

	build: avoid link failure when libsigsegv is used
	* src/Makefile.am (LDADD): Link against LIBSIGSEGV.

2009-11-16  Jim Meyering  <meyering@redhat.com>

	maint: define/use PROGRAM_NAME and AUTHORS; use propername module
	* bootstrap.conf (gnulib_modules): Add propername.
	* src/cmp.c (PROGRAM_NAME, AUTHORS): Define.
	(main): Use them in use of version_etc.
	* src/diff.c (PROGRAM_NAME, AUTHORS, main): Likewise.
	* src/diff3.c (PROGRAM_NAME, AUTHORS, main): Likewise.
	* src/sdiff.c (PROGRAM_NAME, AUTHORS, main): Likewise.
	* src/system.h: Include "propername.h".

	maint: no longer define *_FILENO constants
	* src/system.h (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
	Remove definitions.  Now guaranteed by gnulib.

	maint: bug-diffutils@gnu.org is the new bug-reporting address
	* configure.ac (AC_INIT): Use bug-diffutils@..., not bug-gnu-utils
	as the bug-reporting address.
	* NEWS (Administrivia): Mention this.
	* src/cmp.c (usage): Remove hard-coded address.
	Instead, use gnulib's emit_bug_reporting_address function.
	* src/diff.c (usage, option_help_msgid): Likewise.
	* src/diff3.c (usage): Likewise.
	* src/sdiff.c (usage): Likewise.

	sdiff, diff3: exec diff, not $(bindir)/diff
	* src/Makefile.am (paths.h): Emit a definition of DEFAULT_DIFF_PROGRAM
	that is simply "diff" (or whatever $(transform) would convert that to,
	e.g., "gdiff").  This makes it so that tests can work without first
	installing diff, and so that the binaries do not hard-code $(prefix).
	* NEWS (Changes in behavior): Mention this.

2009-11-14  Jim Meyering  <meyering@redhat.com>

	tests: add the first script; hook up gnulib-tests
	* configure.ac (AC_CONFIG_FILES): Add tests/Makefile and
	gnulib-tests/Makefile.
	* tests/help-version: New file, from coreutils.
	* tests/test-lib.sh: Likewise.
	* tests/Makefile.am: New file, from gzip.
	* Makefile.am (SUBDIRS): Add tests and gnulib-tests.
	* tests/t-local.sh: New, empty(for now) file.

2009-11-13  Jim Meyering  <meyering@redhat.com>

	build: require gettext-0.17
	* configure.ac: Require gettext-0.17; it was released two years ago.

	build: correct gettext configure-time support
	* configure.ac: Use AM_GNU_GETTEXT([external], [need-ngettext]),
	rather than AM_GNU_GETTEXT([external], [need-formatstring-macros]).
	Reported by Martin Jacobs in
	http://thread.gmane.org/gmane.comp.parsers.bison.bugs/3181

2009-11-12  Jim Meyering  <meyering@redhat.com>

	build: generalize autoheader check
	* bootstrap: Look for AC_CONFIG_HEADER as well as AC_CONFIG_HEADERS.

	maint: use a git submodule for gnulib
	* .gitmodules: New file, to track gnulib.
	* gnulib: New file, created by running this:
	git submodule add git://git.sv.gnu.org/gnulib.git gnulib

	maint: tell git what it can ignore
	* .gitignore: Ignore generated files.

2009-11-11  Jim Meyering  <meyering@redhat.com>

	build: generate ChangeLog (from git logs) into distribution tarball
	* Makefile.am (dist-hook, gen-ChangeLog): New rules.
	(gen_start_date): Define.
	* bootstrap.conf (gnulib_modules): Add gitlog-to-changelog.

	admin: update all copyright notices to include the year 2009

	maint/sc: enable the m4 quote check
	* m4/vararrays.m4 (AC_C_VARARRAYS): Quote AC_DEFINE argument.
	* cfg.mk (local-checks-to-skip): Add sc_m4_quote_check.

	build: rely on gnulib's progname module
	* bootstrap.conf (gnulib_modules): Add progname.
	* cfg.mk (local-checks-to-skip): Add sc_program_name.
	* src/cmp.c: Include progname.h.
	(program_name): Remove declaration.
	(main): Call set_program_name.
	* src/diff.c (main): Likewise.
	* src/diff3.c (main): Likewise.
	* src/sdiff.c (main): Likewise.
	* src/diff.h (program_name): Remove extern declaration.

	maint/sc: enable the space-TAB check
	* doc/diagmeet.note: Use no TABs.
	* ms/config.sed: Use TAB-space, not space-TAB in [].
	* cfg.mk (local-checks-to-skip): Remove sc_space_tab.

	build: rely on gnulib's mbrtowc module
	* bootstrap.conf (gnulib_modules): Add mbrtowc.
	* src/side.c [!HAVE_MBRTOWC]: Remove now-useless code,
	since gnulib guarantees working <wchar.h> and mbrtowc.
	* cfg.mk (local-checks-to-skip): Remove sc_prohibit_HAVE_MBRTOWC.

	maint/sc: enable check for unmarked diagnostics
	* cfg.mk (local-checks-to-skip): Remove sc_unmarked_diagnostics.
	* src/dir.c (diff_dirs): Mark a diagnostic for translation.

	maint/sc: enable two config.h-checking rules
	* cfg.mk (local-checks-to-skip): Remove sc_require_config_h and
	sc_require_config_h_first.
	(config_h_header): Define.

	maint/sc: enable the po check
	* cfg.mk (local-checks-to-skip): Add sc_po_check.
	* po/POTFILES.in: Update.

	maint/sc: use STREQ, not strcmp(a,b) == 0
	Run this command:
	  git grep -l 'strcmp *([^=]*== *0'|xargs \
	    perl -pi -e 's/\bstrcmp( *\(.*?\)) *== *0/STREQ$1/g'
	and then add the new definition.
	* src/system.h (STREQ): Define.
	* src/cmp.c (main): Use STREQ, not strcmp.
	* src/diff.c (main, compare_files): Likewise.
	* src/diff3.c (main): Likewise.
	* src/sdiff.c (expand_name): Likewise.
	* cfg.mk (local-checks-to-skip): Add sc_prohibit_strcmp.

	maint/sc: enforce "file system" spelling
	* src/system.h: Spell it as two words, not one.
	* ms/config.sed: Likewise.
	* cfg.mk (local-checks-to-skip): Remove sc_file_system.

	maint/sc: enable check for CVS keyword expansion
	* doc/diff.texi: Remove $Id$.
	* cfg.mk (local-checks-to-skip): Remove sc_prohibit_cvs_keyword.

	maint: record previous version
	* .prev-version: New file.

	maint/sc: enable check for duplicate "the"; fix one
	* NEWS: s/the the/the/.
	Adjust style to fit what some of the hooks and release tools expect.
	* cfg.mk (local-checks-to-skip): Remove sc_the_the.
	(old_NEWS_hash): Update.

	maint/sc: remove cast of xmalloc return value
	* lib/prepargs.c (prepend_default_options): Remove useless cast.
	* cfg.mk (local-checks-to-skip): Remove sc_cast_of_x_alloc_return_value.

	maint: rename ChangeLog to ChangeLog-2008
	* ChangeLog-2008: Rename from ChangeLog.
	* Makefile.am (EXTRA_DIST): Add ChangeLog-2008.
	* .gitignore: Ignore ChangeLog.

	maint/sc: remove useless if-before-free tests
	* src/diff.c (compare-files): Remove useless if stmts.
	* src/dir.c (diff_dirs): Likewise.
	* cfg.mk (local-checks-to-skip): Remove sc_avoid_if_before_free.

	maint: require newer automake, new non-major version string, dist-xz
	* configure.ac: Drop -cvs suffix.  Switch to git-based format.
	Distribute xz-compressed tarballs, too.
	Require automake-1.11.
	Enable automake's --enable-silent-rules option.

	build: update build/release infrastructure
	* bootstrap: Update from gnulib.
	* bootstrap.conf (gnulib-modules): Add do-release-commit-and-tag,
	git-version-gen, gnu-make, gnu-web-doc-update, gnumakefile, gnupload,
	maintainer-makefile, update-copyright.
	* gnulib-tests/Makefile.am: New file.
	* cfg.mk: New file.
	(local-checks-to-skip): List currently-failing tests,
	so that "syntax-check" passes initially.
	(manual_title): Define.