do not version-control ChangeLog; instead, generate it from git log

With this change, all ChangeLog entries going forward are generated
into a file named ChangeLog in each distribution tarball.
ChangeLog entries prior to today's date are in ChangeLog-2011.
* Makefile.am (gen-ChangeLog): New rule.
(dist-hook): Depend on it.
(EXTRA_DIST): Add ChangeLog-2011.
* ChangeLog-2011: Renamed from ChangeLog
* ChangeLog: Remove file.
* .gitignore: Ignore ChangeLog.
* bootstrap.conf: Ensure that ChangeLog exists.
(gnulib_modules): Add gitlog-to-changelog.

1 files changed, 3681 insertions, 0 deletions

diff --git a/ChangeLog-2011 b/ChangeLog-2011
new file mode 100644
index 0000000..87e7fce
--- /dev/null
+++ b/ChangeLog-2011
@@ -0,0 +1,3681 @@
+2011-03-17  Jim Meyering  <meyering@redhat.com>
+
+	don't version-control ChangeLog; instead, generate it from git log
+	* Makefile.am (gen-ChangeLog): New rule.
+	* .gitignore: List ChangeLog.
+
+2011-02-20  Jim Meyering  <meyering@redhat.com>
+
+	maint: remove unnecessary tests before free
+	There is no longer any need to avoid "free(NULL)" (since SunOS 4),
+	so replace each "if (P) free (P);" with "free (P);".
+	* src/inp.c (get_input_file): Remove unnecessary test-before-free.
+	* src/patch.c (get_some_switches): Likewise.
+	* src/pch.c (intuit_diff_type, pch_swap): Likewise.
+
+2011-02-17  Jim Meyering  <meyering@redhat.com>
+	and Andreas Gruenbacher <agruen@linbit.com>
+
+	don't warn twice about the same invalid file name
+	* src/pch.c (name_is_valid): Don't warn about the same name twice.
+	* tests/bad-filenames (emit_patch): Exercise the new code.
+
+2011-02-16  Andreas Gruenbacher <agruen@linbit.com>
+
+	* src/pch.c (name_is_valid): New function.
+	(intuit_diff_type, best_name): Use name_is_valid() here.
+	(strip_leading_slashes): Remove name validation tests from here.
+	* tests/bad-filenames: Add more tests for covering more of the
+	file name guessing corner cases in intuit_diff_type(), update the
+	existing tests.
+	* NEWS: Update.
+
+2011-02-15  Andreas Gruenbacher <agruen@linbit.com>
+
+	* src/patch.c (main): Fix use of initialized outst and add an
+	additional assert.  Reported by Jim Meyering.
+
+2011-02-03  Ozan Çağlayan <ozan@pardus.org.tr>
+
+	Create directory test case
+	* tests/create-delete: New test case creating a file in a new
+	sub-directory (bug fixed on 2010-12-04).
+
+2011-02-03  Andreas Gruenbacher <agruen@linbit.com>
+
+	Also check if the input file is seekable if a filename is given (-i)
+	* src/pch.c (open_patch_file): Also check if the input file is
+	seekable if a filename is given (-i).
+	* tests/pipe: New file.  Test this.
+	* tests/Makefile.am (TESTS): Add it.
+
+2011-02-03  Jim Meyering  <meyering@redhat.com>
+
+	doc: mention the fix for CVE-2010-4651
+	* NEWS: Mention the fix.
+
+2011-02-01  Jim Meyering  <meyering@redhat.com>
+	and Andreas Gruenbacher <agruen@linbit.com>
+
+	Do not let a malicious patch create files above current directory
+	This addresses CVE-2010-4651, reported by Jakub Wilk.
+	https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2010-4651
+	* src/util.c (strip_leading_slashes): Reject absolute file names and
+	file names containing a component of "..".
+	* tests/bad-filenames: New file.  Test for this.
+	* tests/Makefile.am (TESTS): Add it.
+
+2010-12-04  Andreas Gruenbacher <agruen@linbit.com>
+
+	* src/util.c (make_tempfile): Create missing directories when
+	necessary.
+
+2010-10-29  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/util.c: USE_XATTR is defined to 0 or 1, so we need to use #if
+	instead of #ifdef.
+
+2010-10-27  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/util.c (set_file_attributes): Always expect the mode argument to
+	be set when FA_MODE is specified.
+	(create_backup_copy): Update accordingly.
+
+	* src/patch.c (main): Set all file attributes of the temporary output
+	file before renaming it over the final output file (possibly replacing
+	the input file).  Pass the input file name to set_file_attributes().
+	* src/util.c (set_file_attributes): When enabled (USE_XATTR), also
+	copy extended attributes including attributes which define
+	permissions.
+	(copy_attr_error, copy_attr_quote, copy_attr_free, copy_attr_check,
+	copy_attr): Helper functions for copying extended attributes.
+	* m4/xattr.m4 (gl_FUNC_XATTR): Import from coreutils.
+	* src/Makefile.am (patch_LDADD): Add $(LIB_XATTR) here.
+	* bootstrap.conf: Use the gnulib verror module.
+
+2010-10-26  Andreas Gruenbacher  <agruen@suse.de>
+
+	* configure.ac: Remove obsolete checks for mktemp.
+
+2010-10-20  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/patch.c (print_header_line): Remove obsolete comment.
+
+2010-10-14  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/pch.c (there_is_another_patch): Set p_strip_trailing_cr
+	to false if no_strip_trailing_cr is set independent of the verbosity.
+	This broke the --binary option in combination with --silent.
+
+2010-10-05  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/util.c: Add a maybe_quoted parameter to fetchname.
+	* src/pch.c: Only recognize quited filename in the "diff --git"
+	format, at least for now.
+	* tests/quoted-filenames: Update accordingly.
+	* NEWS: Update accordingly.
+
+2010-09-17  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/inp.c (scan_input): Remove double quotearg().
+
+	* src/patch.c (main): Generate the "patching file" message here.  When
+	the input and output file name is not he same, include both names in
+	the message.
+	* src/inp.c (scan_input): Previously the "patching file" message was
+	generated here.
+	* tests/unmodified-files, tests/copy-rename: Update.
+
+	* NEWS: Document that "diff --git" criss-cross renames are broken
+	still.
+	* tests/criss-cross: Test case currently expected to fail.
+
+	* tests/criss-cross: Add copy-after-modify test case.
+
+2010-09-16  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/patch.c (open_outfile): New function.
+	(init_output): Split into open_outfile() and the rest.
+
+	* src/pch.c (do_ed_script): Add inname, outname, and
+	outname_needs_removal arguments.  This isolates TMPOUTNAME and
+	TMPOUTNAME_needs_removal to patch.c.
+	* src/patch.c (main): Update do_ed_script() call.
+
+	* bootstrap.conf: Use the gnulib tempname module.
+	* src/util.c (make_tempfile): New function.
+
+	* src/inp.c (plan_b): Compute TMPINNAME with make_tempfile() if needed
+	instead of precomputing it in src/patch.c (main).
+
+	* src/pch.c (open_patch_file): Compute TMPPATNAME with make_tempfile()
+	if needed instead of precomputing it in src/patch.c (main).
+
+	* src/patch.c (abort_hunk_unified): Replace unnecessary local variable.
+
+	* src/patch.c (main): Compute TMPREJNAME with make_tempfile() only if
+	needed.
+	(abort_hunk, init_reject): Pass through the output file name, and base
+	TMPREJNAME on it.
+
+	* src/patch.c (main): Compute TMPOUTNAME with make_tempfile().
+	(make_temp): Remove obsolete function.
+
+2010-07-27  Tim Waugh  <twaugh@redhat.com>
+
+	* src/patch.c: Stops "patch --get 1" from segfaulting.
+
+2010-05-11  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/patch.c: The read-only file check was not done for ed scripts;
+	fix this.
+
+2010-05-06  Andreas Gruenbacher  <agruen@suse.de>
+
+	* tests/corrupt-reject-files, tests/crlf-handling: On Solaris, cat's
+	-e option is only effective if -v is specified as well.
+
+	* tests/test-lib.sh: Ignore error messages when cleaning up after a
+	test has finished.
+
+2010-05-05  Andreas Gruenbacher  <agruen@suse.de>
+
+	* tests/test-lib.sh: Only use GNU diff when available.
+	* tests/dash-o-append: Fix the expected result.
+
+	* tests/create-delete: Do not use 'diff' here.
+	* tests/merge: Require GNU diff.
+
+	* bootstrap.conf: Use the gnulib unistd module.
+
+	* bootstrap.conf: Use the gnulib mkdir module.
+	* m4/mkdir.m4: Delete.
+
+2010-05-04  Eric Blake  <eblake@redhat.com>
+
+	* src/pch.c (includes): Add <io.h> for setmode.
+	(intuit_diff_type): Avoid 8-bit problems.
+	* src/util.c (parse_name): Likewise.
+	* src/util.h (skip_spaces): Likewise.
+
+2010-05-04  Andreas Gruenbacher  <agruen@suse.de>
+
+	* tests/read-only-files: Remove the superuser test, and instead try
+	out if a read-only file can be written to.
+
+	* tests/test-lib.sh: Create temporary directories in builddir; this
+	removes the need to do it safely: some systems do not have mktemp -d.
+
+	* configure.ac, tests/Makefile: Remove $(TEST_SHELL) and use $(SHELL)
+	instead.
+
+	* src/version.c: Put the Free Software Foundation copyright first.
+	* tests/read-only-files: Skip when run as superuser: even files
+	without write permissions would be writable.
+
+	* src/util.c (create_backup): Document patch's backup file logic.
+	(create_backup, create_backup_copy): Add a flag to remember the backup
+	file; use when a patch deletes a file.
+	(move_file, copy_file): Better error messages.
+	* tests/Makefile.am (TESTS): Remove remember-backup-files-2.
+	* tests/remember-backup-files: Add tests from remember-backup-files-2.
+	* tests/symlinks: Add a symlink backup file test.
+
+	* tests/test-lib.sh: Flag tests with missing pre-requirements as
+	SKIPped instead of PASSed.  Do not use GNU diff extensions, but
+	still require a diff that understands "-u".
+	* tests: Do not unnecessarily require GNU diff in a lot of tests.
+	Make the sed utility optional.
+
+	* src/pch.c (intuit_diff_type): Remove left-over debugging code.
+
+	* src/pch.c (maybe_reverse): Allow to create and delete empty files.
+	(sha1_says_nonexistent): New function for recognizing the sha1
+	checksums of nonexistent and empty files.
+	(skip_hex_digits): New helper function for skipping [0-9a-z].
+	(intuit_diff_type): Parse the sha1 checksums in index lines.
+	* tests/Makefile.am (XFAIL_TESTS): Remove empty-files.
+
+2010-05-03  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/pch.c (intuit_diff_type): Fix a bug where the reversed-patch
+	check would wrongly pick the last name instead of the best name.
+	* src/create-delete: Add test cases for that.
+
+2010-05-02  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/pch.c (fetchmode): Document that the "diff --git" format does
+	not store file permissions of symlinks.
+	* src/util.c (set_file_attributes): Since we don't have symlink file
+	permissions, don't try to set them even on systems where we could.
+
+	* tests/symlinks: Improve the backup file tests.
+
+2010-05-02  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/Makefile.am (patch_LDADD): Add $(LIB_CLOCK_GETTIME) here, after
+	libpatch.a, so that clock_gettime is properly resolved on systems on
+	which the library order matters.
+
+	* NEWS: Update.
+	* gnulib: Update to latest.
+	* bootstrap: Update from gnulib.
+
+	* src/patch.c (main): Refuse to patch read-only files, or at least warn
+	when patching such files with --force or --batch.
+	* patch.man: Document the changed behavior.
+	* tests/read-only-files: Split read-only file test case off from
+	tests/remember-backup-files.
+	* tests/Makefile.am: Add new test case.
+
+2010-04-29  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/patch.c (main): Support git diffs which copy or rename files.
+	* tests/copy-rename: New test case.
+	* tests/Makefile.am (TESTS): Add test case.
+
+	* src/patch.c (main): Convert outname into a char const *.
+	* src/util.ch (create_backup, move_file, removedirs): Take char const *
+	filenames.
+	* src/util.c (makedirs): Take a char const * filename.
+	(makedirs, removedirs): Take char const * filenames.  Create and
+	modify a copy of the filename.
+
+	* src/pch.c (p_copy, p_rename): New variables.
+	(pch_copy, pch_rename): New functions.
+	(intuit_diff_type): Parse the "copy from", "copy to", "rename from",
+	and "rename to" headers.
+	* src/util.c (fetchname): Return the fetched name per reference (after
+	freeing the previous name if any).  Also free the previous timestamp
+	string if any.
+
+	* src/patch.c (main): When a git diff includes a file mode change,
+	change to the new mode.
+	* src/util.c (set_file_attributes): Add a mode parameter.
+	* tests/file-modes: New test case.
+	* tests/Makefile.am (TESTS): Add test case.
+
+	* src/patch.c (main): Support git symlink diffs.
+	* tests/symlinks: Add git symlink diff test cases.
+
+	* src/pch.c (intuit_diff_type, there_is_another_patch): Pass up the
+	file type.
+	* src/patch.c (main): Check for consistent file types.
+
+	* src/pch.c (intuit_diff_type): Only check for reversed patches when
+	the input file type matches the patch file type.
+
+	* src/util.c (move_file): Remove test which is always true.
+
+2010-04-28  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/pch.c (p_mode): New variable.
+	(fetchmode, pch_mode): New functions.
+	(intuit_diff_type): Recognize git diffs which contain no hunks.
+	Parse and store the file modes in the "index", "old mode",
+	"new mode", "deleted file mode", and "new file mode" headers.
+
+	* src/util.c (copy_file): Require the mode parameter to include the
+	file type.  Use that to decide whether to copy a regular file or a
+	symlink.
+	(create_backup): Refuse to back up files which are neither a regular
+	file nor a symlink.
+	(move_file): Add support for turning a temporary output file into a
+	symlink.
+	* src/patch.c (move_file, copy_file): Pass down the file type.
+	* src/pch.h (prefix_components): Do not follow symlinks.
+
+	* src/inp.c (get_input_file): Add a mode parameter specifying the
+	input file type (which can be either S_IFREG or S_IFLNK).  The file
+	type must match this mode parameter; for symbolic links, the --get
+	option is not supported.
+	(scan_input): Abort when plan_a() cannot handle a symbolic link.
+	Say when patching a symbolic link instead of a regular file.
+	(plan_a): Add support for reading symbolic links.
+	* src/patch.c: For now, always tell get_input_file() to read regular
+	files.
+	* bootstrap.conf: Use the gnulib readlink module.
+
+	* src/util.h (enum file_attributes): New type.
+	(set_file_attributes): New function.
+	* src/util.c (set_file_attributes): Move the code for setting file
+	attributes here from create_backup_copy() and make it usable from
+	patch.c as well.  Make it symlink safe.  In addition, also preserve
+	the file owner when permitted.
+	(create_backup_copy): Use set_file_attributes().
+	* src/patch.c (main): Use set_file_attributes().
+	* bootstrap.conf: Use the gnulib lchmod module.
+
+2010-04-27  Andreas Gruenbacher  <agruen@suse.de>
+
+	* bootstrap: Update from gnulib.
+
+	* tests/Makefile.am (TESTS_ENVIRONMENT): Portability fix.
+
+	* src/bestmatch.h (bestmatch): Fix an off-by-one error causing an
+	out-of-bounds array access.
+
+	* configure.ac (gl_CHECK_TYPE_STRUCT_UTIMBUF), m4/utimbuf.m4: Remove;
+	utimbuf is no longer used.
+
+	* src/util.h: Include <backupfile.h> here and not in each C file
+	individually; this avoids a warning in merge.c with some compilers.
+
+	* src/common.h: Do not redefine __attribute__ when it is already
+	defined.
+
+	* configure.ac: Do not use grep -q.
+
+2010-04-27  Daniel Richard G. <skunk@iskunk.org>
+
+	* src/common.h (enum diff): Remove the trailing comma.
+	* src/patch.c (main): Do not use non-constant expressions in an array
+	initializer.
+
+	* src/bestmatch.h: Do not use variable-length arrays.
+
+2010-04-26  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/inp.c (get_input_file), src/pch.c (there_is_another_patch,
+	intuit_diff_type): Use lstat instead of stat.  This causes patch to
+	refuse patching symlinks (get_input_file() will refuse to read them).
+	* src/util.c (create_backup): Refuse to create backups of symlinks.
+	* tests/symlinks: New test case.
+	* tests/Makefile.am (TESTS): Add test case.
+	* bootstrap.conf: Use the gnulib lstat module.
+
+	* src/pch.c (intuit_diff_type): Only check for reversed patches when
+	the input file is patchable in the first place.
+
+	* src/pch.c (get_input_file): If an input file is not a regular file,
+	only skip the patch instead of aborting.
+	* src/patch.c (main): If get_input_file() fails, skip the patch.
+
+2010-04-25  Andreas Gruenbacher  <agruen@suse.de>
+
+	* bootstrap.conf: Use the gnulib fcntl-h and sys_stat modules.
+	* src/common.h: Remove the declarations provided by gnulib sys_stat.
+	Always include fcntl.h (and depend on gnulib fcntl-h).
+	* src/util.h: Remove duplicate include of <timespec.h>.
+	* configure.ac: Remove obsolete checks for fcntl.h and utime.h.
+
+	* src/common.h, src/patch.c, src/util.c, src/util.h: Do not declare
+	variables as "volatile" unnecessarily.
+
+2010-04-24  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/inp.c, src/patch.c, src/pch.c, src/util.c: Stop declaring
+	local variables as "register" all over the place: a decent compiler
+	will do a good enough job of place variables into registers where it
+	makes sense.
+
+2010-04-23  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.man: Describe the fixed behavior of --set-time and --set-utc
+	for timestamps that include time zones.
+	* NEWS: Update.
+
+2010-04-22  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/common.h (enum diff): New enumeration GIT_BINARY_DIFF.
+	* src/pch.c (intuit_diff_type): Recognize git binary patches.
+	* src/patch.c (main): Complain when fed git binary patches.
+	* tests/git-binary-diff: New test case.
+	* tests/Makefile.am (TESTS): Add test case.
+
+	* src/pch.c (intuit_diff_type): Parse filenames in "diff --git" lines.
+	* src/util.c (parse_name): New helper function for parsing unquoted or
+	quoted filenames.
+	* src/util.h (parse_name): Declare.
+	(skip_spaces): New helper function for skipping spaces in a string.
+
+	* src/pch.c (intuit_diff_type): Make sure we don't leak file names
+	even when fed weird input.
+
+	* src/util.c (parse_c_string): New function.
+	(fetchname): Add support for quoted filenames.
+	* tests/quoted-filenames: New test case.
+	* tests/Makefile.am (TESTS): Add test case.
+
+	* src/util.c (fetchname): Untangle the name and timestamp parsing.
+
+	* src/util.c (strip_leading_slashes): Make this a separate function.
+	(fetchname): Use strip_leading_slashes() here.
+
+2010-04-21  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/patch.c (main): Support nanosecond timestamps.  Replaqce utime()
+	with utimens().
+	* src/util.c (create_backup_copy): Preserve nanosecond timestamps.
+	Replace utime() with utimens().
+	* src/util.h: Remove the utime() related declarations, and include
+	the utimens() and nanosecond related headers instead.
+	* bootstrap.conf: Add the stat-time and utimens modules.
+
+	* src/Makefile.am (patch_SOURCES): Remove maketime.c, maketime.h,
+	partime.c, and partime.h.
+	(patch_LDFLAGS): Add LIB_CLOCK_GETTIME for clock_gettime().
+	* src/util.c: Replace maketime.h and partime.h with getdate.h.
+	(fetchname): Replace str2time() with get_date().  Sanitize the test
+	for epoch timestamps.
+	* src/patch.c (main): When --set-utc is given, set the TZ environment
+	variable to UTC so that get_date() will default to UTC timestamps.
+	* tests/preserve-mode-and-timestamp: Switching to get_date() revealed
+	that str2time() was ignoring timezones.  In order to test --set-utc
+	now that get_date() fixes this, we must use timestamps that do not
+	include timestamps here.
+	* bootstrap.conf: Add the clock-time, getdate, gettime, and setenv
+	modules.
+
+2010-04-20  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/pch.h (pch_timestamp): Return timestamp as struct timespec
+	instead of time_t.
+	* src/pch.c: Use struct timespec instead of time_t.  A tv_sec value
+	of -1 indicates "no timestamp".
+	* src/util.h (fetchname): Return timestamp as struct timespec
+	instead of time_t.
+	* src/util.c (fetchname): str2time() does not give us nanoseconds; set
+	them to zero for now.
+	* src/patch.c (main): Only use the seconds in timestamps for now.
+	* bootstrap.conf: Add the time module for getting struct timespec
+	declared on old hosts.
+
+	* src/util.c (quote_system_arg): Add a replacement for
+	quote_system_arg() which uses quotearg's shell quoting style.
+	* src/Makefile.am (patch_SOURCES): Remove quotesys.c and quotesys.h.
+	* src/quotesys.c, src/quotesys.h: Delete.
+
+	* src/util.c (fetchname): Cosmetic fix.
+
+2010-04-19  Ludovic Courtès <ludo@gnu.org>
+
+	* src/Makefile.am (patch_SOURCES): Remove the obsolete diffseq.h to
+	fix "make dist".
+
+2010-04-18  Andreas Gruenbacher  <agruen@suse.de>
+
+	* Globally rename type LINENUM to lin (as in diffutils).
+
+	* src/patch.c (Argv): Change type to char ** so that we can pass Argv
+	to getopt_long without warning.
+	* src/maketime.c (maketime): Fix year overflow check.
+
+	* diffseq: Use the gnulib version instead of a private copy.
+
+	* gnulib: Update to latest.
+
+2010-04-15  Andreas Gruenbacher  <agruen@suse.de>
+
+	* tests/merge: Use the sed commands i, a, and c in their standard form
+	instead of relying on a GNU extension, and pass sed a script (-f)
+	instead of a list of commands via -e.
+	Some versions of sed don't support expressions like /^\(\|foo\)$/.
+	* tests/corrupt-reject-files: Use the more widely available -e switch
+	instead of -A.
+	* tests/crlf-handling: Likewise.
+	* tests/preserve-mode-and-timestamp: Use touch -t instead of touch -d.
+	Some non-GNU versions of date can't show a file's timestamp.
+
+	* Makefile.am: Add rules for generating .version and for including
+	.tarball-version in dist tarballs.
+
+2010-04-12  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/util.c: Fix the use of HAVE_UTIME_H.
+	* src/pch.c (EDITOR_PROGRAM): Rename from ed_PROGRAM.
+	* configure.ac (EDITOR_PROGRAM): Rename from ed_PROGRAM.
+
+	* configure.ac: Add automake and gnulib macros, replace several
+	obsolete macros.
+	* Makefile.am, lib/Makefile.am, src/Makefile.am, tests/Makefile.am:
+	Add for automake.
+	* autogen.sh, INSTALL, Makefile.in, mkinstalldirs, update-version.sh:
+	Obsolete; remove.
+	* README-hacking: Import from diffutils, replace cvs with git.
+	* build-aux: Move gnulib auxiliary files here from the top-level
+	directory.
+	* gnulib: Add gnulib git submodule.
+	* bootstrap, bootstrap.conf: Import from gnulib and adjust.
+	* gl/lib: Remove gnulib files from the repository; they are now
+	imported into lib/ from gnulib as needed.
+	* tests/test-lib.sh: Use $abs_top_builddir exported from
+	tests/Makefile.am here instead of $PWD.
+	* m4/utimbuf.m4: This macro has been removed from gnulib. Add it here
+	for now; this will be replaced by gnulib's utimens module soon.
+
+	* tests/test-lib.sh: Some versions of mktemp require a filename
+	template; use one.  Provide a seq replacement on platforms which don't
+	have seq.
+
+	* configure.ac: Minimum versions required: automake-1.11.1,
+	autoconf-2.65.
+
+2010-02-21  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/merge.c: When a hunk has fewer suffix than prefix context lines,
+	try matching to the end of the file instead of doing a "greedy match":
+	this allows to detect already-applied inserts at the end of the file.
+	* tests/merge: Add test cases for this.
+
+2010-02-17  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.man: Clarify the description of the -N option.
+
+2010-01-15  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/bestmatch.h, src/diffseq.h, src/inp.c, src/maketime.c,
+	src/merge.c, src/partime.c, src/pch.c, src/util.c: No longer use
+	"continue" as the only instruction in a loop body: at least one
+	compiler chokes on this in combination with variable-length arrays
+	as in src/bestmatch.h.
+
+	* gl/lib/strndup.c: HAVE_DECL_STRNLEN is either 0 or 1 so we need
+	to test for it with #if, not #ifdef.
+	* gl/lib/xstrndup.c: Likewise for HAVE_DECL_STRNDUP.
+
+2010-01-11  Andreas Gruenbacher  <agruen@suse.de>
+
+	*  src/util.c (fetchname): Do not allow timestamps in Index lines.
+
+2010-01-04  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/util.c (create_backup_copy): Try to preserve the owning group
+	in backup files.
+
+2010-01-03  Matthew Burgess <matthew@linuxfromscratch.org>
+
+	* tests/crlf-handling:  Skip another ed-dependent test.
+
+2010-01-02  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/bestmatch.h, src/common.h, src/diffseq.h, src/inp.c, src/inp.h,
+	src/maketime.c, src/maketime.h, src/merge.c, src/partime.c,
+	src/partime.h, src/patch.c, src/pch.c, src/pch.h, src/quotesys.c,
+	src/util.c, src/util.h, src/version.c: Add year 2010 to copyright
+	notice.  Replace the GPLv2 license template with the GPLv3 license
+	template.
+
+	* src/patch.c (main): Compare the input file's group ID with the
+	effective group ID to determine if a chown() is necessary, not the
+	effective user ID.
+
+2010-01-01  Andreas Gruenbacher  <agruen@suse.de>
+
+	* Makefile.in (LIBSRCS, LIBM4FILES): Add the missing files strnlen.c,
+	strnlen.m4, and safe-read.m4.
+
+2009-12-30  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.man: Clarify the description of the -F / --fuzz option.
+
+	* NEWS: Version 2.6.1 released.
+
+	* src/pch.c: coding style fix (syntactic).
+
+2009-12-29  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/patch.c (longopts, get_some_switches): Add an optional argument
+	to the --merge option to choose the output formats for conflicts.
+	* patch.man: Document the new optional argument of --merge.
+	* src/merge.c (merge_hunk): Implement diff3-style conflicts.
+	* src/common.h (conflict_style): This global variable determines the
+	output format for conflicts.
+	* tests/merge: Add test cases for the diff3 output format.
+
+	* patch.man: Try to improve the documentation of patch's CRLF handling
+	behavior.
+
+2009-12-28  Andreas Gruenbacher  <agruen@suse.de>
+
+	* tests/create-delete: Clean up a syntactic glitch.
+
+	* src/pch.c: When the input files to diff have CRLF line endings, the
+	'<' and '>' lines of normal-style diffs will have CRLF endings even
+	when the patch itself has not been CRLF mangled.  Do not assume a
+	mangled patch in this case.
+	* tests/crlf-handling: Update test case to cover this case.
+
+	* configure.ac (gl_FUNC_STRNDUP, gl_FUNC_STRNLEN): Add here.
+	* gl/m4/strndup.m4 (gl_HEADER_STRING_H_DEFAULTS): Don't use gnulib's
+	strings.h replacement for now, it is too complicated to add right now.
+	* gl/lib/xstrndup.c: Instead of using gl_HEADER_STRING_H_DEFAULTS,
+	declare strndup here on systems which don't have it.
+	* gl/lib/strndup.c: Instead of using gl_HEADER_STRING_H_DEFAULTS,
+	declare strnlen here on systems which don't have it.
+	* gl/lib/strnlen.c: Import from gnulib.
+
+	* Makefile.in (getopt.h, GETOPT_H): Generate getopt.h in the top-level
+	directory if needed.
+	(stdbool.h, STDBOOL_H): Likewise -- this should fix stdbool.h
+	generation on platforms which don't provide this header.
+	(argmatch.$(OBJEXT)): Add missing $(STDBOOL_H) dependency.
+
+	* install-sh: Make executable.
+
+2009-12-22  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/version.c (copyright_string): Add year 2009.
+
+	* src/pch.c (intuit_diff_type): Add some clarifying comments.
+
+	* src/pch.c (intuit_diff_type): Fix regression introduced after patch
+	2.5.9: when none of the filenames in the old, new, and index headers
+	exists, patch chose the wrong filename (bug 28367).
+	(maybe_reverse): Return if the patch looks reversed, not if this
+	function toggled the reverse flag.
+	* tests/filename-choice: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+2009-11-24  Bert Wesarg <bert.wesarg@googlemail.com>
+
+	* configure.ac: It looks like the . command does not pass the
+	arguments to the update-version.sh script [on some platforms].  Invoke
+	with sh instead.
+
+2009-11-21  Peter Breitenlohner <peb@mppmu.mpg.de>
+
+	* Makefile.in: Make the test suite work for a VPATH build.
+
+2009-11-14  Andreas Gruenbacher  <agruen@suse.de>
+
+	* update-version.sh: Platform compatibility fixes.
+
+2009-11-12  Andreas Gruenbacher  <agruen@suse.de>
+
+	* NEWS: Version 2.6 released.
+
+2009-10-27  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.man: Fix typo (reported by Vytautas Šaltenis).
+
+	* src/merge.c: Clarify the message when (part of) a hunk cannot be
+	merged.
+	* tests/merge: Adapt the test case.
+
+2009-09-04  Andreas Gruenbacher  <agruen@suse.de>
+
+	* Makefile.in (LIBSRCS, LIBHDRS, LIBM4FILES): Add the gnulib which
+	were imported on 2009-06-05 here as well.
+
+	* src/partime.c (main): Try to preserve the owning group of patched
+	files.
+
+2009-07-19  Andreas Gruenbacher  <agruen@suse.de>
+
+	* gl/lib/full-write.c, gl/lib/safe-write.c, gl/lib/full-write.h,
+	gl/lib/safe-write.h, gl/m4/safe-write.m4, gl/m4/ssize_t.m4:
+	Import full_write() and its prerequesites from gnulib.
+	* Makefile.in (LIBSRCS, LIBHDRS, LIBM4FILES): Add new files.
+	Add new dependencies.
+	* configure.ac (gl_SAFE_WRITE): Needef for full_write().
+	* src/util.c: Include full-write.h.
+	(copy_to_fd): use full_write() instead of write().
+
+	* src/partime.c: The -m option hasn't been officially allocated yet.
+	Use only the long form for now (--merge).
+
+2009-06-15  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/util.c (move_file): Don't fail when removing nonexistent
+	files: this condition is already checked in maybe_reverse().
+
+2009-06-05  Andreas Gruenbacher  <agruen@suse.de>
+
+	* gl/lib/getopt_int.h, gl/lib/strndup.c, gl/m4/strndup.m4: Add
+	some missing gnulib files.
+	* Makefile.in (GETOPT_H): Include subdirectory (gl/lib/) when
+	using the gnulib version.
+
+	* src/patch.c: When sending output to stdout, use dup2 to redirect
+	messages to stderr; simply assigning stderr to stdout doesn't work on
+	some platforms.
+	* gl/lib/dup2.c, gl/m4/dup2.m4: Import from gnulib.
+
+	* gl/lib/rename.c, gl/m4/rename.m4: Import from gnulib for platforms
+	like Mingw.
+
+2009-05-12  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/merge.c (locate_merge): Make sure to return a line number
+	bigger than last_frozen_line.
+
+	* src/patch.c (explicit_inname): New variable.
+	(get_some_switches): Set to true when the filename to patch has been
+	specified on the command line.
+	(reinitialize_almost_everything): Do not reset the input filename
+	between patches when it has been specified on the command line.
+	* tests/inname: New test case.
+	* Makefile.in: Add test case.
+
+2009-04-11  Vincent Legoll <vincent.legoll@gmail.com>
+
+	* src/patch.c (main): Always set patch_get to 0 unless PATCH_GET is
+	set.
+	* patch.man: Update accordingly.
+
+2009-04-11  Andreas Gruenbacher  <agruen@suse.de>
+
+	* update-version.sh, configure.ac, Makefile.in: Portability
+	improvements.
+
+2009-04-08  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/patch.c (create_output_file): Add support for sending output
+	to standard output.
+	(main): Allow -o -.  Remove redundant check.
+	* patch.man: Document the new use of -o.
+
+	* src/pch.c (there_is_another_patch): Allow special characters in
+	filenames read interactively.
+
+	* src/util.c (fetchname): Don't forget to NUL terminate ptimestr.
+
+2009-04-07  Andreas Gruenbacher  <agruen@suse.de>
+
+	* src/util.c (file_id_hasher): Adapt to Gnulib type change.
+	* Makefile.in: Fix out-of-tree builds.
+	(dist): Optionally also create bzip2 and xz tarballs.
+	* NEWS: Update.
+
+	* patch.man: Replace "systems like DOS" with "Windows". Spelling.
+
+	Preserve timestamps in reject files.
+	* src/pch.c (p_timestr): New variable.
+	(intuit_diff_type): Set p_timestr here through fetchname().
+	(pch_timestr): New function.
+	* src/pch.h (pch_timestr): Declare.
+	* src/util.c (fetchname): Return the timestamp as string when asked to.
+	* src/util.h (fetchname): Update declaration.
+	* tests/preserve-c-function-names, tests/reject-format: Update.
+
+2009-04-06  Andreas Gruenbacher  <agruen@suse.de>
+
+	Fix the "patch would create" fix from 2009-03-28.
+	* src/pch.c (maybe_reverse): New function.
+	(intuit_diff_type): Move the check back here from
+	there_is_another_patch(), but compute it using maybe_reverse().  If
+	an input file name has been specified, do this check here as well.
+	* src/patch.c (main): Only set outname if we are not skipping the
+	patch.
+	* src/inp.c (get_input_file): We may get here without a file to read
+	as well now; don't abort in this case.
+	* tests/create-delete: Add test cases covering the previously-broken
+	code paths.
+
+	* Makefile.in (MISC): Add config.guess and config.sub.
+
+	* src/partime.c (parse_pattern_letter): Fix for timestamps with
+	seconds > 59.5 from Christian Franke.
+
+2009-04-05  Andreas Gruenbacher  <agruen@suse.de>
+
+	* util.c (create_backup): We also need to create base directories
+	with a --prefix without slashes and a filename with slashes. A
+	--suffix cannot contain slashes, though.
+	* merge.c (merge_hunk): Add missing outstate->zero_output = false.
+
+	Move all source and header files into src/.
+	* Makefile.in, tests/test-lib.sh, configure.ac: Update accordingly.
+	Move all Gnulib files below gl/, and all other source and header
+	files into src/.
+	* Makefile.in, tests/test-lib.sh, configure.ac, autogen.sh: Update
+	accordingly.
+	* m4/st_mtim.m4: Remove (obsolete since 2009-03-28).
+
+	Update to the latest version of Gnulib.
+	* config.guess, config.sub, gl/lib/getopt.hin, gl/lib/mbrtowc.c,
+	gl/lib/stripslash.c, gl/lib/verify.h, gl/lib/xstrndup.c,
+	gl/lib/xstrndup.h, gl/m4/argmatch.m4, gl/m4/double-slash-root.m4,
+	gl/m4/gettext.m4, gl/m4/inline.m4, gl/m4/minmax.m4,
+	gl/m4/xstrndup.m4: New files.
+	* gl/lib/argmatch.c, gl/lib/argmatch.h, gl/lib/backupfile.c,
+	gl/lib/backupfile.h, gl/lib/basename.c, gl/lib/dirname.c,
+	gl/lib/dirname.h, gl/lib/error.c, gl/lib/error.h, gl/lib/exitfail.c,
+	gl/lib/exitfail.h, gl/lib/getopt.c, gl/lib/getopt1.c, gl/lib/gettext.h,
+	gl/lib/hash.c, gl/lib/hash.h, gl/lib/malloc.c, gl/lib/memchr.c,
+	gl/lib/quote.c, gl/lib/quote.h, gl/lib/quotearg.c, gl/lib/quotearg.h,
+	gl/lib/realloc.c, gl/lib/strcasecmp.c, gl/lib/strncasecmp.c,
+	gl/lib/unlocked-io.h, gl/lib/xalloc.h, gl/lib/xmalloc.c: Modified.
+	* gl/m4/backupfile.m4, gl/m4/d-ino.m4, gl/m4/dirname.m4, gl/m4/dos.m4,
+	gl/m4/error.m4, gl/m4/exitfail.m4, gl/m4/extensions.m4,
+	gl/m4/getopt.m4, gl/m4/hash.m4, gl/m4/malloc.m4, gl/m4/mbrtowc.m4,
+	gl/m4/mbstate_t.m4, gl/m4/memchr.m4, gl/m4/onceonly.m4, gl/m4/quote.m4,
+	gl/m4/quotearg.m4, gl/m4/realloc.m4, gl/m4/stdbool.m4,
+	gl/m4/unlocked-io.m4, gl/m4/utimbuf.m4, gl/m4/xalloc.m4: Likewise.
+	* install-sh, mkinstalldirs: Likewise.
+	* gl/lib/stdbool.hin: Renamed from gl/lib/stdbool_.h.
+	* gl/lib/getopt.h: Removed (should be generated).
+	* gl/lib/addext.c: Removed from Gnulib.
+
+	Replace memory_fatal() with xalloc_die().  The FILESYSTEM_PREFIX_LEN()
+	macro has been renamed to FILE_SYSTEM_PREFIX_LEN().
+	* src/patch.c (main): Remove xalloc_fail_func (replaced by
+	xalloc_die()).  Work around the missing addext() with
+	find_backup_file_name() plus hacks.
+	* src/util.c (create_backup, version_controller): The new versions of
+	base_name() and dir_name() return malloc'ed buffers.  Adapt.
+	* src/util.h: Replace memory_fatal() with xalloc_die().
+	* src/pch.c: Don't leak memory with strlen (base_name (...)).
+
+	* src/util.c (create_file): Add to_dir_known_to_exist argument and
+	try to create parent directories when set and the create failed with
+	ENOENT.
+	(copy_file, create_backup_copy): Pass the new to_dir_known_to_exist
+	argument through.
+	(create_backup): Don't assume the target directory exists when making
+	a backup copy.
+	* src/util.h (create_file, copy_file): Change the declarations.
+	* src/patch.c, src/pch.c, src/inp.c: In the calls to create_file() and
+	copy_file(), assume the parent directory exists.
+	* tests/unmodified-files: Test the create_backup() fix.
+
+	* src/util.c (create_backup): The new dir_name() and base_name()
+	functions are really counter productive.  Remove them and the bugs
+	that keepeing them here as introduced.
+	* tests/backup-prefix-suffix: Add more regression tests.
+
+	* src/patch.c (locate_hunk): Revert to the original asymmetric hunk
+	behavior (but only anchor hunks starting at line 0 to the start of the
+	file): there is not enough reason to change the historic behavior.
+	* src/merge.c (locate_merge): Add similar asymmetric hunk check here.
+	* tests/asymmetric-hunks: Update accordingly.
+	* patch.man: Document the asymmetric hunk behavior.
+	* NEWS: Update.
+
+	Copyright notice updates.
+	* README, AUTHORS: Updates.
+
+	* patch.man: Document that merging can be slow.
+	* tests/test-lib.sh: Also unset QUOTING_STYLE.
+
+2009-04-04  Andreas Gruenbacher  <agruen@suse.de>
+
+	* pch.c (another_hunk): Add (back) the line number ranges to the
+	debug output.
+	* merge.c (merge_hunk): Likewise.
+	(locate_merge): Add a note about the algorithm's requirements.
+	* util.c (create_backup): Split from move_file.  New LEAVE_ORIGINAL
+	argument for copying instead of renaming.  Don't fail when rename
+	fails with errno == EXDEV; copy and unlink in that case instead.
+	(copy_file): Add debug message.
+	* util.h: Move including <utime.h> etc. here from patch.c.
+	(create_backup): Declare.
+	* patch.c (main): Create backup files even for files which did not
+	actually change; some users of patch rely on the presence of backup
+	files when patch says "patching file".
+	* tests/unmodified-files: Test the patch.c change.  (The EXDEV fix in
+	create_mackup() was tested manually.)
+	* util.c (copy_to_fd, ask): The read() return type is ssize_t.
+
+2009-04-03  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.man: Document the -m or --merge option.  Some minor other
+	changes.
+	* NEWS: Document the asymmetric hunk behavior and the -m or --merge
+	option.
+	* merge.c (locate_merge): Include the number of changes in the debug
+	message.
+	(print_linerange): New function.
+	(merge_result): No longer print line offsets: without exact matches,
+	line numbers are less meaningful.  Output the entire messages here.
+	(merge_hunk): Be silent when merging exact matches unless in
+	--verbose mode.
+	* tests/merge: Add another interesting test case.
+
+	* tests/test-lib.sh: Add have_ed function for checking if ed is
+	available.
+	* tests/crlf-handling, tests/need-filename: Check for ed and skip the
+	ed related tests if we don't have it.
+	* tests/merge: Use sed instead of ed: sed is more readily available.
+
+	* patch.c (locate_hunk): If a hunk starts at a line > 1, it obviously
+	is not from the start of the file.
+	* tests/asymmetric-hunks: Add tests for all possible cases.
+
+2009-04-02  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.c (locate_hunk): Revert the assymmetric hunk fix from
+	2009-03-29.  Instead, allow such hunks to apply only when no
+	more context remains.
+
+	* patch.c (main): Restructure to get rid of some code duplication.
+	(copy_till, similar): Export these functions.
+	* common.h (struct outstate, in_offset, out_offset,
+	last_frozen_line): Move here from patch.c.
+	(apply_hunk, copy_till, similar): Declare here.
+
+	Simple merge support:
+	* configure.ac (ENABLE_MERGE): New --disable-merge option.
+	* patch.c (merge): New variable.
+	(main): New -m and --merge options.  When in merge mode, don't try
+	to reverse patches, and don't try to apply with fuzz.
+	* common.h (merge_hunk): Declare function.
+	* merge.c: New file containing all the merge code.
+	* tests/merge: New test case.
+	* Makefile.in (SRCS): Add merge.c.
+	(OBJS): Add merge.$(OBJEXT) when merge support is enabled.
+	(TESTS): Add test case.
+	(COMPILE): Define ENABLE_MERGE when merge support is enabled.
+
+	Locate hunks to merge more intelligently:
+	* bestmatch.h: Shortest Edit Sequence algorithm.
+	* merge.c (locate_merge, count_fuzz_lines): New functions.
+	(merge_hunk): Replace simple guessing with locate_merge().
+	* Makefile.in (HDRS): Add bestmatch.h.
+	* tests/merge: Only minor improvements up to now.
+
+	* diffseq.h: New file (Gnulib compareseq algorithm).
+	* minmax.h: New file (Gnulib MIN and MAX macros).
+	* Makefile.in (HDRS): Add diffseq.h and minmax.h.
+
+	* COPYING: Update to GPL version 3 because of diffseq.h.
+
+	* diffseq.h: When an EQUAL_IDX macro is defined, use that instead
+	of EQUAL.  This macro takes vector indexes instead of elements as
+	arguments.
+
+	Better merge support:
+	* patch.c, common.h (apply_hunk): Make static again.
+	* merge.c (compute_changes): New function for computing the
+	difference between lines in a hunk and lines in the input file.
+	(merge_result): We may have more than one result per hunk now.
+	(merge_hunk): Merge the hunk with the compute_changes() result.
+	* tests/merge: Better results now.
+
+	* merge.c: Add license header.
+
+	* merge.c (locate_merge): The number of changes allowed permits a
+	higher maximum merge position (max_where).
+	* tests/merge: Add a test for this case.
+
+	* merge.c (merge_hunk): Add two missing checks that were leading into
+	failed assertions.
+	* tests/merge: Add test cases for each of these checks.
+
+	* Makefile.in (install, uninstall): DESTDIR specifies a prefix to
+	the root directory to install into.
+	(installdirs): Merge with install.
+
+2009-04-01  Andreas Gruenbacher  <agruen@suse.de>
+
+	* tests/test-lib.sh: When $GDB is set, run patch in gdbserver
+	for debugging.
+	* pch.c (another_hunk): Make the debug output easier to read.
+
+2009-03-31  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.c: Split last_offset into in_offset and out_offset and
+	count line numbers properly.
+	* tests/line-numbers: Without the fixes, this test case goes
+	horribly wrong.
+	* Makefile.in (TESTS): Add test case.
+
+2009-03-30  Jim Meyering  <meyering@redhat.com>
+
+	tests: accommodate ls' "alternate access control method" indicator
+	ls can output an additional byte after a file's permissions string,
+	e.g., rather than "rwxr--r-- ..." it can output "rwxr--r--+ ..."
+	or "rwxr--r--. ..." to indicate the presence of an ACL.
+	* tests/create-delete: Adjust sed filter to accommodate that.
+	* tests/preserve-mode-and-timestamp: Likewise.
+
+2009-03-30  Andreas Gruenbacher  <agruen@suse.de>
+
+	* tests/test-lib.sh: Unset environment variables that influence
+	the behavior of patch.
+	* util.c (move_file): Add debug message when files have been seen
+	already.  Fix leftover "empty uneadable" debug message.
+
+	* patch.c (main): Print newline earlier.
+	* util.c (copy_file): Add debug message.
+
+2009-03-29  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.c (locate_hunk): Hunks that have fewer or more lines of
+	context at the beginning than at the end can match anywhere; the
+	assumption that this can only occur at the beginning or end of the
+	file is wrong. Remove those checks.
+	* tests/asymmetric-hunks: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* util.c (move_file): Create backup files of nonexisting files with
+	the default mode instead of mode 0: files with mode 0 cause too many
+	problems with applications which do not expect unreadable files.
+	* tests/create-delete: Test for this.
+
+	* Makefile.in (BROKEN_TESTS): Test cases which fail.
+
+2009-03-28  Andreas Gruenbacher  <agruen@suse.de>
+
+	* pch.c (intuit_diff_type): Rename need_filename argument to
+	need_header.  Omit superfluous "missing header" warnings.
+
+	When remembering files including timestamps, we need to update the
+	timestamps after appending to a file.  This causes problems on some
+	systems where the timestamps returned by fstat() after appending are
+	not up to date, yes.  We only remember timestamps as a compatibility
+	hack with non-POSIX systems that do not have unique inode numbers;
+	drop this hack instead.
+	* timespec.h, m4/timespec.m4: Remove.
+	* util.c: Remove timespec.h and all uses of struct timespec.
+	(append_to_file): Remove REMEMBER argument; no need to update known
+	files anymore.
+	* util.h (append_to_file): Update definition.
+	* Makefile.in: Remove timespec.h and m4/timespec.m4.
+
+	* common.h (origsuff): New variable.
+	* patch.c (main): Remember when -z was used.
+	* util.c (contains_slash): New function.
+	(move_file): Enforce simple backup mode and compute the backup file
+	name here if -B, -Y, or -z is used.  Fix the case where -B or -Y is
+	combined with -z.
+	* patch.man: Document this change.
+	* tests/backup-prefix-suffix: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* tests/munged-context-format: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* util.c (vsay): New function for use in say(), etc.
+	(ok_to_reverse): Use vsay() here instead of fprintf() to ensure
+	flushing.
+
+	* pch.c (there_is_another_patch): Move the "patch would create" test
+	here from intuit_diff_type() after asking for the filename to patch.
+	* inp.c (get_input_file): No need to report when the file is missing;
+	this is done in there_is_another_patch() already.
+	* patch.c (main): No need to report when a patch attempts to create
+	an exiting file, either.
+
+2009-03-25  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.c (main): Avoid replacing files when nothing has changed.
+	* tests/unmodified-files: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* patch.c (main): New apply_empty_patch variable. When applying an
+	empty patch to a file and -o is given, copy the input file to the
+	output file.
+
+2009-03-24  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.c (abort_hunk_unified, abort_hunk_context): Preserve
+	Index lines in reject files as well.
+	* tests/reject-format: Test this change.
+
+	* configure.ac (TEST_SHELL): New substitution.
+	* Makefile.in (TEST_SHELL): New variable.
+	(HAVE__BOOL): New variable.
+	(hash.$(OBJEXT)): Add $(STDBOOL_H) dependency.
+	* tests/test-lib.sh: Use expr for arithmetic operations. Check for
+	working "echo -n" and BASH_LINENO.  Replace printf with echo.
+	* tests/preserve-mode-and-timestamp: Ignore leading "+" in ls output.
+	* tests: Remove !shebang line from tests and make them non-executable.
+	Replace printf with echo.
+
+2009-03-23  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.c (intuit_diff_type): When looking for an ed or normal
+	patch, don't look for filename headers.  (Those formats don't
+	have any.)
+	* pch.c (there_is_another_patch): Don't suggest to use -p with
+	normal format diffs for the same reason.
+
+2009-03-22  Andreas Gruenbacher  <agruen@suse.de>
+
+	* NEWS: Update for alpha release.
+
+	* patch.c (main): Always initialize the known files table.
+	Move new reject files into place; append to known ones.
+	* util.c (file_already_seen): Export.
+	(move_file): Remember all files, not only backup files.
+	(append_to_file): When asked to remember a file, remember
+	the state *after* appending. (The timestamps will change!)
+	* tests/remember-reject-files: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* common.h (no_strip_trailing_cr): New variable.
+	* patch.c: Use no_strip_trailing_cr.  Option --binary no longer
+	a no-op on POSIX systems.
+	* patch.man: Document change of --binary.
+	* pch.c (there_is_another_patch): Check no_strip_trailing_cr.
+	* tests/crlf-handling: Add --binary tests here.
+
+	* patch.c (apply_hunk): Use fputs() in simple fprintf()
+	situations.
+
+	* patch.c (main): Require filename in patch if none specified on
+	the command line and posixly_correct is false.
+	* pch.c (intuit_diff_type): While we still don't have a filename,
+	don't look for hunks.
+	(there_is_another_patch): Pass need_filename through.
+	* tests/need-filename: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* pch.c (intuit_diff_type): Check for garbage after what looks
+	like a normal format command.
+	* tests/normal-garbage: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* Makefile.in (bindir): Define as @bindir@.
+	(DISTFILES_CLEAN): Move DISTFILES here which must not be remade by
+	the dist target.
+	(MISC): Add missing tests/test-lib.sh and update-version.sh.
+	(check, $(TESTS)): Make each test depend on all so that they can be
+	run individually.
+	(maintainer-clean): Also remove patch-*.tar.gz and patch-*.tar.gz.sig.
+	(dist): Add PV directory level.  Add reminder to self how to upload.
+	* configure.ac: Silence "missing datarootdir" warning.
+
+	* tests/crlf-handling: Add test for "diff -p" context with a CRLF
+	ine ending.
+
+2009-03-21  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.c (main): With -r, instead of moving the global reject
+	file into place, copy the first reject into the file, and
+	append all the rest.  Discard rejects with -r -.
+	* patch.man: Document the latter.
+	* util.c (copy_to_fd): New function.
+	(copy_file): Use that.
+	(append_to_file): New function.
+	* util.h (append_to_file): Add function declaration.
+	* tests/global-reject-files: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* patch.man: Minor fix.
+
+	* pch.c (another_hunk, pch_swap): Always add the '^' hunk end
+	marker: apply_hunk() and abort_hunk_unified() rely on it.
+	(pch_char): Explain when this returns '\n'.
+	* util.c: Remove unused include <version.h>.
+
+2009-03-20  Andreas Gruenbacher  <agruen@suse.de>
+
+	* patch.c: New option --reject-format=FORMAT.
+	(abort_hunk_context): Rename from abort_hunk().
+	(abort_hunk_unified, abort_hunk, mangled_patch,
+	print_unidiff_range): New functions.
+	* patch.man: Document this.
+	* pch.c, pch.h (pch_normalize): New function.
+	* tests/reject-format: New test case.
+	* Makefile.in (TESTS): Add test case.
+	* tests/preserve-c-function-names: Update.
+
+	* pch.c (p_name): New variable.
+	(intuit_diff_type): Save the old, new, and index filenames.
+	(pch_char): Return either of the saved filenames.
+	* pch.h: Move enum nametype here from pch.c.  Declare pch_name().
+	* patch.c (abort_hunk, abort_hunk_unified, abort_hunk_context):
+	New HEADER and REVERSE arguments.
+	(print_header_line): New function.
+	(abort_hunk_unified, abort_hunk_context): Use it.
+	* tests/corrupt-reject-files, tests/preserve-c-function-names,
+	tests/reject-format: Update.
+
+	* patch.c (main): No longer set reject file modes to the modes of the
+	files they are assiciated with: the previous behavior is inconsistent
+	with global reject files (-r), which are not associated with any
+	particular file.
+	* tests/preserve-mode-and-timestamp: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* Makefile.in (DISTFILES): Add the files from DISTFILES_M4,
+	DISTFILES_PC, DISTFILES_PC_DJGPP.
+	(DISTFILES_M4, DISTFILES_PC, DISTFILES_PC_DJGPP): Remove.
+	(distclean): Also remove config.hin~ and autom4te.cache/.
+	(maintainer-clean): Also remove aclocal.m4, config.hin, configure.
+	(dist): Make work for DISTFILES in subdirectories.  Normalize and
+	sort DISTFILES.
+
+	* Makefile.in (MISC): Add VERSION.
+	(FORCE): New target.
+	(VERSION): Recompute automatically from repository.
+	(configure): Depend on VERSION.  Regenerate with --force: autoconf
+	does not recognize the dependency between VERSION and ocnfigure.
+	(config.hin): Regenerate with --force.
+	(maintainer-clean): Also remove VERSION.
+	* configure.ac: Compute PACKAGE_VERSION from repository.
+	* update-version.sh: New file.
+
+	* README-alpha: New file.
+	* Makefile.in (dist): Add README-alpha when appropriate.
+
+	* Makefile.in (M4FILES): Rename from ACINCLUDE_INPUTS.
+	(aclocal.m4): Recompute with aclocal.
+
+	* tests/test-lib.sh: Add library for simple test scripts.
+	* tests/crlf-handling, tests/remember-backup-files: New test cases.
+	* Makefile.in (TESTS): New variable.  Add test cases.
+	(check): Replace the dummy test target with running all TESTS.
+
+	* pch.c, pch.h (pch_c_function): New function.
+	* pch.c (p_c_function): New variable.
+	(another_hunk): Preserve the "diff -p" output.
+	* patch.c (abort_hunk): Use pch_c_function().
+	* tests/preserve-c-function-names: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* util.c (savebuf): Return NULL if size == 0.
+	* pch.c (another_hunk): Check size for size != 0 before checking
+	savebuf()'s return value.
+	* tests/no-newline-triggers-assert: New test case.
+	* Makefile.in (TESTS): Add test case.
+
+	* tests/corrupt-reject-files: new test case for Jim Meyering's
+	2007-08-26 fix.
+	* Makefile.in (TESTS): Add test case.
+
+2009-03-19  Andreas Gruenbacher  <agruen@suse.de>
+
+	Imported from Paul Eggert's working directory:
+	* exitfail.c, exitfail, m4/exitfail.m4: Import from gnulib.
+	* hash.c, hash.h, m4/hash.m4: Likewise.
+	* m4/extensions.m4: Likewise.
+	* timespec.h, m4/timespec.m4: Likewise.
+	* m4/st_mtim.m4: New file.
+	* configure.ac: Update.
+	* common.h: Include <limits.h> unconditionally.  Include <stdint.h>
+	if we have it.
+	* inp.c (plan_b, ifetch): Remove unnecessary casts.
+	* maketime.c, partime.c: Include <limits.h>, <stdlib.h>, <time.h>
+	unconditionally.  Convert from K&R to ANSI C.
+	* maketime.h, partime.h: Convert from K&R to ANSI C.
+	* pch.c (p_indent, pget_line, intuit_diff_type): Use size_t for
+	indents.
+	* util.c: Assume we have vfprintf().
+	(NUM_SIGS): Cast to int in.
+	(fatal_exit_handler): Replace obsolescent AC_RETSIGTYPE.
+	* Various files: Update copyright notices.
+
+2007-08-26  Jim Meyering  <jim@meyering.net>
+
+	* pch.c (another_hunk): Avoid an off-by-one error that would
+	result in NUL bytes in .rej files.
+
+2004-07-21  Paul Eggert  <eggert@twinsun.com>
+
+	* Makefile.in (SRCS): Move hash.c here from LIBSRCS.
+	(exitfail.$(OBJEXT), patch.$(OBJEXT), xmalloc.$(OBJEXT)):
+	Depend on exitfail.h.
+	(hash.$(OBJEXT), util.$(OBJEXT)): Depend on hash.h.
+	* util.c: Whitespace cleanup in file_id.
+
+2004-07-19  Stepan Kasal  <kasal@ucw.cz>
+
+	* pch.c (get_ed_command_letter): Allow commands without address.
+
+2003-11-10  Manu B  <manubee@users.sourceforge.net>
+
+	Trivial change to port to mingw, which declares mkdir in unistd.h.
+	* m4/mkdir.m4 (PATCH_FUNC_MKDIR_TAKES_ONE_ARG): Include unistd.h.
+	* common.h (mkdir): Define after including unistd.h.
+
+2003-09-11  Paul Eggert  <eggert@twinsun.com>
+
+	* pch.c (do_ed_script): Adjust to copy_file signature change.
+
+	* Makefile.in (STDBOOL_H): New macro.  All uses of @STDBOOL_H@ changed.
+	(SRCS): Add exitfail.c.
+	(OBJS): Add exitfail.$(OBJEXT).
+	(HDRS): Add exitfail.h.
+	(stdbool.h): Use $@, as gnulib now suggests.
+	(ACINCLUDE_INPUTS): Add exitfail.m4, extensions.m4.
+	* common.h: Include <string.h>, <stdlib.h> unconditionally.
+	* configure.ac (gl_USE_SYSTEM_EXTENSIONS): Use this instead
+	of AC_GNU_SOURCE.
+	(gl_EXITFAIL): Add.
+	* patch.c: Include exitfail.h.
+	(main): Set exit_failure, not xalloc_exit_failure.
+
+	* inp.c (get_input_file): Clear cs if dry run.
+
+	* util.c (fetchname): Handle missing timestamps better.
+
+	* Makefile.in (LIBSRCS): Add hash.c.
+	(OBJS): Add hash.$(OBJEXT).
+	(HDRS): Add hash.h.
+	(MISC): Add timespec.h.
+	(ACINCLUDE_INPUTS): Add hash.m4, st_mtim.m4, timespec.m4
+	(util.$(OBJEXT): Depend on timespec.h.
+	* configure.ac (gl_HASH, gl_TIMESPEC): Add.
+	* patch.c (spew_output): New output arg, to contain status of output
+	file.
+	(main): Use it to get status of output file, and pass this to
+	move_file as needed.  Initialize hash table.
+	* util.c (file_id): New type.
+	(file_id_hasher, file_id_comparator, init_backup_hash_table,
+	insert_file, file_already_seen): New functions.
+	(file_id_table): New var.
+	(move_file): New arg FROMST; all uses changed.
+	Do not backup a file that's already been patched.
+	Keep track of files that have been patched.
+	(copy_file): New arg TOST; all uses changed.
+	* util.h (copy_file, move_file): Adjust decls as per above.
+	(init_backup_hash_table): New decl.
+
+
+2003-07-05  Paul Eggert  <eggert@twinsun.com>
+
+	* Makefile.in (check): Add a trivial check that "patch --help" works.
+	From a suggestion by Ed Avis.
+
+2003-07-02  Paul Eggert  <eggert@twinsun.com>
+
+	* pch.c (intuit_diff_type): If a unified-diff header line contains
+	trailing CR, strip CR from each body line.  This corrects a bug
+	introduced in the 2003-05-18 patch.  Bug reported by Andreas
+	Gruenbacher.
+
+	* mkdir.c, rmdir.c, m4/rmdir.m4: Remove; we no longer
+	need to worry about ancient hosts that lack these functions.
+
+	* addext.c, backupfile.c, backupfile.h, dirname.h, m4/backupfile.m4,
+	m4/onceonly.m4, m4/quote.m4, malloc.c, quote,c, quote.h, realloc.c,
+	strcasecmp.c, xalloc.h, xmalloc.c: Sync with gnulib.
+	* stdbool_.h: Renamed from stdbool.h.in; all uses changed.
+	This renaming is imported from gnulib.
+	* m4/strcase.m4: New file, imported from gnulib.
+
+	* Makefile.in (LIBSRCS): Remove mkdir.c and rmdir.c.
+	(stdbool.h): Put output into temporary file and then rename it;
+	this change is imported from gnulib.
+	(mostlyclean): Clean stdbool.h-t too.
+	(ACINCLUDE_INPUTS): Remove rmdir.m4.  Add strcase.m4.
+	* configure.ac (gl_FUNC_RMDIR): Remove.
+	(jm_PREREQ_ADDEXT): Remove; now down by gl_BACKUPFILE.
+	(gl_STRCASE, gl_XALLOC): Add.
+	(AC_REPLACE_FUNCS): Remove mkdir, strcasecmp.
+
+2003-05-20  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, configure.ac (AC_INIT): Version 2.5.9 released.
+
+	* Makefile.in (HDRS): Add gettext.h.
+
+	Use bool, not int, for booleans.
+
+	* pch.c (pch_says_nonexistent): Returns int, not bool.
+
+	* configure.ac: Add AM_STDBOOL_H.
+
+	* Makefile.in (MISC): Add stdbool.h.in.
+	(stdbool.h): New rule.
+	(ACINCLUDE_INPUTS): Add stdbool.m4.
+	(mostlyclean): Remove stdbool.h.
+	(COMMON): New macro; use it instead of common.h for dependencies.
+
+	* common.h: Include <stdbool.h>.
+	Remove TRUE, FALSE, bool.  All uses changed to standard names.
+
+	* common.h (reverse, set_time, set_utc):
+	Use bool, not int, for booleans.
+	* pch.c (p_strip_trailing_cr, p_pass_comments_through,
+	prefix_components, pget_line, re_patch,
+	there_is_another_patch, intuit_diff_type, scan_linenum,
+	another_hunk, pget_line, pch_timestamp): Likewise.
+	* inp.h (ifetch): Likewise.
+	* util.c (move_file, version_controller, version_get, ok_to_reverse,
+	set_signals): Likewise.
+	* inp.c (report_revision, get_input_file, plan_a, plan_b, ifetch):
+	Likewise.
+	* util.h (ok_to_reverse, version_controller, version_get,
+	move_file, set_signals): Likewise.
+	* pch.h (another_hunk, pch_says_nonexistent, pch_timestamp):
+	Likewise.
+	* patch.c (struct outstate, numeric_string, make_backups,
+	backup_if_mismatch, remove_empty_files,
+	reverse_flag_specified, main, reinitialize_almost_everything,
+	get_some_switches, apply_hunk, init_output, copy_till):
+	Likewise.
+
+2003-05-18  Paul Eggert  <eggert@twinsun.com>
+
+	* pch.c (p_pass_comments_through): New var.
+	(pget_line): Accept new arg for pass_comments_through.
+	All callers changed.
+	(there_is_another_patch): Do not suggest -p for ed diffs.
+	(intuit_diff_type): Check ed command for correct syntax.
+	Do not set p_strip_trailing_cr merely because a -p line contains a CR.
+	(get_ed_command_letter): New function.
+	(do_ed_script): Use it.  Do not treat '#' data lines as comments in ed
+	scripts.
+
+	* util.c (move_file):
+	Don't assume that when 'rename(A,B)' succeeds then A no
+	longer exists.  This is not true of POSIX 1003.1-2001 rename when A
+	and B are links to the same file.
+	(fetchname): Fix test for file names with internal spaces.
+
+	* version.c: Don't include patchlevel.h.
+	(version): Use PACKAGE_NAME and PACKAGE_VERSION instead of obsolete
+	PROGRAM_NAME and PATCH_VERSION.
+	(copyright_string): Bump to 2003.
+
+	* common.h (FILESYSTEM_PREFIX_LEN, ISSLASH):
+	Remove; now done by 'configure'.
+	(PROGRAM_NAME): Remove; now done by 'configure' as PACKAGE_NAME.
+
+	* patch.c: Do not include <exitfail.h>.
+	(main): Set xalloc_exit_failure, not exit_failure.
+	Add "&& !skip_rest_of_patch" when deciding to continue ed scripts.
+	(option_help): Use PACKAGE_BUGREPORT rather than hardcoding.
+
+	* configure.ac (AC_PREREQ): Bump to 2.57.
+	(AC_GNU_SOURCE): Add, early on.
+	(gl_BACKUPFILE, gl_DIRNAME, gl_ERROR, gl_FUNC_MEMCHR, gl_FUNC_RMDIR,
+	gl_GETOPT, gl_PREREQ_XMALLOC, gl_QUOTE, gl_QUOTEARG): Add.
+	(jm_PREREQ_ADDEXT): Add, with definition.
+	(jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, jm_PREREQ_MEMCHR,
+	jm_PREREQ_QUOTEARG): Remove.
+	(AC_REPLACE_FUNCS): Remove memchr, rename, rmdir).
+	(jm_FUNC_GLIBC_UNLOCKED_IO, jm_AC_DOS): Add.
+	(jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Do not call directly.
+	(AC_OUTPUT): Use new style, with AC_CONFIG_FILES.
+
+	Update to current CVS gnulib.
+
+	* exitfail.c, exitfail.h, patchlevel.h, rename.c, m4/c-bs-a.m4,
+	m4/jm-glibc-io.m4, m4/prereq.m4: Remove.
+	* m4/backupfile.m4, m4/dirname.m4, m4/dos.m4, m4/getopt.m4,
+	m4/memchr.m4, m4/onceonly.m4, m4/quote.m4, m4/quotearg.m4,
+	m4/rmdir.m4, m4/unlocked-io.m4, m4/xalloc.m4: New files.
+	* Makefile.in (LIBSRCS): Move error.c here from SRCS.
+	Remove rename.c.
+	(OBJS): Remove error.$(OBJEXT).
+	(HDRS): Remove exitfail.h, patchlevel.h.
+	(ACINCLUDE_INPUTS): Remove c-bs-a.m4, jm-glibc-io.m4, prereq.m4.
+	Add backupfile.m4, dirname.m4, dos.m4, getopt.m4, memchr.m4,
+	onceonly.m4, quote.m4, quotearg.m4, rmdir.m4, unlocked-io.m4,
+	xalloc.m4.
+	(patchlevel.h): Remove.  All uses removed.
+	(argmatch.$(OBJEXT), error.$(OBJEXT), quotesys.$(OBJEXT)),
+	xmalloc.$(OBJEXT)): Depend on gettext.h.
+	(dirname.$(OBJEXT), quote.$(OBJEXT), strncasecmp.$(OBJEXT)): New rules.
+	(patch.$(OBJEXT), xmalloc.$(OBJEXT)): Remove exitfail.h.
+	(rename.$(OBJEXT)): Remove.
+	(version.$(OBJEXT)): Remove util.h.
+	(xmalloc.$(OBJEXT)): Add error.h.
+
+2002-11-23  Paul Eggert  <eggert@twinsun.com>
+
+	* patch.c (main): Don't check for zero-sized file after 'ed'
+	when skipping patch.  From Michael Fedrowitz.
+
+2002-06-03  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.ac (AC_OUTPUT): Use new form, with AC_CONFIG_FILES,
+	instead of obsolescent form.  Patch from Art Haas.
+
+	* pch.c (intuit_diff_type): Do not warn about trailing white space
+	after Prereq: word.  Bug reported by Mike Castle.
+
+2002-06-02  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, configure.ac (AC_INIT): Version 2.5.8 released.
+
+	* README: POSIX.2 -> POSIX.
+	* inp.c (report_revision): Don't modify 'revision', since
+	it gets freed later.  Bug reported by Mike Castle.
+
+2002-05-30  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, configure.ac (AC_INIT): Version 2.5.7 released.
+
+	* Makefile.in (MISC): Remove README-alpha.
+	(patchlevel.h): Depend on configure, not configure.ac.
+
+	* INSTALL: Upgrade to Autoconf 2.53 version.
+
+2002-05-28  Paul Eggert  <eggert@twinsun.com>
+
+	* patch.c (end_defined, apply_hunk): Output #endif without
+	the comment, as POSIX 1003.1-2001 requires.
+
+	* pch.c (there_is_another_patch): Flush stderr after perror.
+
+	* NEWS, configure.ac (AC_INIT): Version 2.5.6 released.
+
+	* strcasecmp.c, strncasecmp.c: New files, taken from fileutils.
+	* config.guess, config.sub: Remove.
+	* Makefile.in (LIBSRCS): Add strcasecmp.c, strncasecmp.c.
+	(MISC): Remove config.guess, config.sub.
+
+	The code already assumes C89 or better, so remove K&R stuff.
+	* common.h (volatile): Remove.
+	(GENERIC_OBJECT): Remove; all uses changed to 'void'.
+	(PARAMS): Remove; all uses changed to prototypes.
+	* configure.ac (AC_PROG_CC_STDC): Add.
+	* util.c (vararg_start): Remove.  All uses changed to va_start.
+	Always include <stdarg.h>.
+
+	* configure.ac (AC_CANONICAL_HOST): Remove.
+	(AC_REPLACE_FUNCS): Add strncasecmp.
+	(AC_CHECK_DECLS): Add mktemp.
+
+	* patch.c (main): Remove useless prototype decl.
+	(mktemp): Don't declare if HAVE_DECL_MKTEMP || defined mktemp.
+	(make_temp): Now accepts char, not int.
+
+2002-05-26  Paul Eggert  <eggert@twinsun.com>
+
+	* patch.c (not_defined): Prepend newline.  All uses changed.
+	(apply_hunk): Fix bug: -D was outputting #ifdef when it should
+	have been outputting #ifndef.  Bug report and partial fix by
+	Jason Short.
+
+	* pch.c (intuit_diff_type): When reading an ed diff, don't use
+	indent and trailing-CR-ness of "." line; instead, use that of the
+	command.  Bug reported by Anthony Towns; partial fix by Michael
+	Fedrowitz.
+	(intuit_diff_type): If the index line exists, don't report a
+	missing header.  Fix by Chip Salzenberg.
+
+2002-05-26  Alessandro Rubini  <rubini@gnu.org>
+
+	* patch.c (locate_hunk): Fixed updating of last_offset.
+
+2002-05-25  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, README: Diffutils doc is up to date now.
+	Bug reporting address is now <bug-patch@gnu.org>.
+	* README: Describe '--disable-largefile'.
+
+	* NEWS-alpha, dirname.c, dirname.h, exitfail.c, exitfail.h,
+	quote.c, quote.h, unlocked-io.h: New files, taken from diffutils
+	and fileutils.
+
+	* argmatch.c: [STDC_HEADERS]: Include stdlib.h, for 'exit'.
+
+	* addext.c, argmatch.c, argmatch.h, backupfile.c, basename.c:
+	Update from diffutils and fileutils.
+
+	* ansi2knr.1, ansi2knr.c: Remove.
+
+	* common.h: HAVE_SETMODE && O_BINARY -> HAVE_SETMODE_DOS.
+	* patch.c (usage): Likewise.
+	* pch.c (open_patch_file): Likewise.
+
+	* configure.ac: Renamed from configure.in.  Add copyright notice.
+	(AC_PREREQ): Bump to 2.53.
+	(AC_INIT): Use 2.5x style.
+	(AC_CONFIG_SRCDIR): Add.
+	(PACKAGE, VERSION): Remove.
+	(AC_C_PROTOTYPES): Use this instead of AM_C_PROTOTYPES.
+	(jm_CHECK_TYPE_STRUCT_UTIMBUF): Use this instead of jm_STRUCT_UTIMBUF.
+	(jm_PREREQ_ADDEXT, jm_PREREQ_DIRNAME, jm_PREREQ_ERROR,
+	jm_PREREQ_MEMCHR, jm_PREREQ_QUOTEARG): Add.
+	(AC_CHECK_DECLS): Add free, getenv, malloc.
+	(AC_CHECK_FUNCS): Remove setmode.
+	(AC_FUNC_SETMODE_DOS): Add.
+	(jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Use this instead of
+	jm_STRUCT_DIRENT_D_INO.
+
+	* Makefile.in (OBJEXT): New var.
+	(PACKAGE_NAME): Renamed from PACKAGE.  All uses changed.
+	(PACKAGE_VERSION): Renamed from VERSION.  All uses changed.
+	(U): Remove.  All uses of "$U.o" changed to ".$(OBJEXT)".
+	(LIBSRCS): REmove getopt.c getopt1.c.  Add mkdir.c, rmdir.c.
+	(SRCS): Add dirname.c, exitfail.c, getopt.c, getopt1.c, quote.c.
+	Remove mkdir.c.
+	(OBJS): Keep in sync with SRCS.
+	(HDRS): Remove basename.h.
+	Add dirname.h, exitfail.h, quote.h, unlocked-io.h.
+	(MISC, configure, config.hin, patchlevel.h):
+	configure.ac renamed from configure.in.
+	(MISC): Add README-alpha. Remove ansi2knr.1, ansi2knr.c.
+	(.c.$(OBJEXT)): Renamed from .c.o.
+	(ACINCLUDE_INPUTS): Add c-bs-a.m4, error.m4, jm-glibc-io.m4,
+	mbstate_t.m4, mkdir.m4, mbrtowc.m4, prereq.m4, setmode.m4.
+	Remove ccstdc.m4, inttypes_h.m4, largefile.m4, protos.m4.
+	(mostlyclean): Don't clean ansi2knr.
+	(ansi2knr.o, ansi2knr): Remove.
+	Redo dependencies.
+
+	* patch.c: Include <exitfail.h>.
+	(main): Initialize exit_failure.
+
+	* patch.man: Update copyright notice.
+
+	* pch.c, util.c: Include <dirname.h>, not <basename.h>.
+
+	* version.c (copyright_string): Update copyright notice.
+
+2002-02-17  Paul Eggert  <eggert@twinsun.com>
+
+	* partime.c (parse_pattern_letter): Don't overrun buffer if it
+	contains only alphanumerics.  Bug reported by Winni
+	<Winni470@gmx.net>.
+
+2001-07-28  Paul Eggert  <eggert@sic.twinsun.com>
+
+	* util.c (fetchname), NEWS:
+	Allow file names with internal spaces, so long as they
+	don't contain tabs.
+
+	* pch.c (intuit_diff_type): Do not allow Prereq with multiple words.
+
+	* configure.in (AC_PREREQ): Bump to 2.50.
+	(AC_CHECK_FUNCS): Remove fseeko.
+	(AC_FUNC_FSEEKO): Add.
+	* Makefile.in (ACINCLUDE_INPUTS):
+	Remove largefile.m4; no longer needed with Autoconf 2.50.
+
+2001-02-07  "Tony E. Bennett" <tbennett@nvidia.com>
+
+	* util.c (PERFORCE_CO): New var.
+	(version_controller): Support Perforce.
+	* patch.man: Document this.
+
+2000-06-30  Paul Eggert  <eggert@sic.twinsun.com>
+
+	* patch.man: Ignore comment lines.
+
+	* NEWS, pch.c: Ignore lines beginning with "#".
+
+1999-10-24  Paul Eggert  <eggert@twinsun.com>
+
+	* pch.c (another_hunk): Report a fatal error if a regular
+	context hunk's pattern has a different number of unchanged
+	lines than the replacement.
+
+1999-10-18  Paul Eggert  <eggert@twinsun.com>
+
+	* patch.c (main): If we skipped an ed patch, exit with nonzero status.
+
+1999-10-17  Paul Eggert  <eggert@twinsun.com>
+
+	* patch.c (main): Apply do_ed_script even if dry_run, because
+	we need to make progress on the patch file.
+	* pch.c (do_ed_script): If skip_rest_of_patch is nonzero,
+	gobble up the patch without any other side effect.
+
+1999-10-12  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, README: New bug reporting address.
+	* NEWS: Report change in 2.5.4 that we forgot to document.
+	* README: Document `configure --disable-largefile'.
+
+	* basename.c, COPYING, getopt.c, getopt.h, getopt1.c, m4/largefile.m4:
+	Update to latest version.
+	* Makefile.in (basename$U.o): Depend on basename.h.
+	(config.hin): Depend on $(srcdir)/aclocal.m4.
+
+	* ansi2knr.c, maketime.c, mkinstalldirs, partime.c: Fix $Id.
+
+	FreeBSD has an unrelated setmode function; work around this.
+	* common.h (binary_transput): Don't declare unless O_BINARY.
+	* patch.c (option_help, get_some_switches):
+	Don't use setmode unless O_BINARY.
+	* pch.c (open_patch_file): Don't invoke setmode unless O_BINARY.
+
+	Fix incompatiblities with error.c.
+	* common.h (program_name): Now XTERN char *, for compatibility
+	with error.c.  All uses changed.
+	(PROGRAM_NAME): New macro.
+	(PARAMS): Use ANSI C version only if defined PROTOTYPES
+	|| (defined __STDC__ && __STDC__), for compatibilty with error.c.
+	* util.c (vararg_start): Likewise.
+	* patch.c (program_name): Remove.
+	(main): Initialize program_name.
+	* version.c (version): Print PROGRAM_NAME, not program_name.
+
+	Accommodate mingw32 port, which has one-argument mkdir (yuck!)
+	and no geteuid.
+	* m4/mkdir.m4: New file.
+	* Makefile.in (ACINCLUDE_INPUTS): Add $(M4DIR)/mkdir.m4.
+	* configure.in (AC_CHECK_FUNCS): Add geteuid, getuid.
+	(PATCH_FUNC_MKDIR_TAKES_ONE_ARG): Add.
+	* common.h (mkdir): Define if mkdir takes one arg.
+	(geteuid): New macro, if not already defined.
+
+1999-10-11  Christopher R. Gabriel  <cgabriel@tin.it>
+
+	* patch.c (option_help): Updated bug report address
+	* configure.in (VERSION): Version 2.5.5 released.
+
+1999-09-01  Paul Eggert  <eggert@twinsun.com>
+
+	* patch.c (main): Default simple_backup_suffix to ".orig".
+
+1999-10-08  Paul Eggert  <eggert@twinsun.com>
+
+	* patch.man: Make it clear that `patch -o F' should not be
+	used if F is one of the files to be patched.
+
+1999-08-30  Paul Eggert  <eggert@twinsun.com>
+
+	Version 2.5.4 fixes a few minor bugs, converts C sources to
+	ANSI prototypes, and modernizes auxiliary sources and autoconf
+	scripts.
+
+	* configure.in (VERSION): Version 2.5.4 released.
+	(AC_CANONICAL_HOST): Add.
+	(AC_SYS_LARGEFILE): Add, replacing inline code.
+	(AC_EXEEXT): Add.
+	(jm_AC_HEADER_INTTYPES_H): Add, replacing inline code.
+	(AC_TYPE_PID_T): Add.
+	(jm_STRUCT_UTIMBUF): Add, replacing inline code.
+	(HAVE_MEMCHR): Remove obsolescent test; nobody uses NetBSD 1.0 now.
+	(getopt_long): Append $U to object file basenames.
+	(AC_CHECK_FUNCS): Add fseeko, setmode.  Remove mkdir.
+	(AC_REPLACE_FUNCS): Add mkdir, rmdir.
+	(jm_STRUCT_DIRENT_D_INO): Add, replacing inline code.
+
+	* Makefile.in (EXEEXT): New macro.
+	(mandir): New macro.
+	(man1dir): Define in terms of mandir.
+	(SRCS): Add mkdir.c, rmdir.c.
+	(OBJS): Change .o to $U.o for addext, argmatch, backupfile, basename,
+	error, inp, patch ,,pch, quotearg, util, version, xmalloc.
+	(HDRS): Add basename.h, patchlevel.h.
+	(MISC): Add ansi2knr.1, config.guess, config.sub.
+	(MISC, config.hin): Remove acconfig.h; no longer needed.
+	(DISTFILES_M4): New macro.
+	(all): patch -> patch$(EXEEXT).
+	(patch$(EXEEXT)): Renamed from patch.  All uses changed.
+	(uninstall): Remove manual page.
+	(configure): Depend on aclocal.m4.
+	(M4DIR, ACINCLUDE_INPUTS): New macros.
+	($(srcdir)/aclocal.m4): New rule.
+	(patchlevel.h): Depend on configure.in, not Makefile,
+	since we now distribute it.
+	(distclean): Don't remove patchlevel.h.
+	(dist): Distribute $(DISTFILES_M4).
+	(addext_.c argmatch_.c backupfile_.c basename_.c error_.c
+	getopt_.c getopt1_.c inp_.c malloc_.c mkdir_.c patch_.c pch_.c
+	rename_.c util_.c version_.c xmalloc_.c): Depend on ansi2knr.
+	Update dependencies to match sources.
+
+	* common.h (_LARGEFILE_SOURCE): Remove; now autoconfigured.
+	(file_offset): Depend on HAVE_FSEEKO, not _LFS_LARGEFILE.
+
+	* patch.c (version_control_context): New variable.
+	Convert to ANSI prototypes.
+	Adjust to new argmatch calling convention.
+	Similarly for get_version.
+	Complain about creating an existing file only if
+	pch_says_nonexistent returns 2 (not merely nonzero).
+	Similarly for time mismatch check.
+	(get_some_switches): Adjust to new get_version calling convention.
+	Similarly for argmatch.
+
+	* pch.c (<basename.h>): Include.
+	(intuit_diff_type): Improve quality of test for empty file.
+	(another_hunk): Don't assume off_t is no longer than long.
+
+	* util.h (backup_type): New decl.
+	* util.c (<basename.h>): Include.
+	(move_file): Adjust to new find_backup_file_name convention.
+	(doprogram, mkdir, rmdir): Remove; now in separate files.
+	(fetchame): Match "/dev/null", not NULL_DEVICE.
+	Ignore names that don't have enough slashes to strip off.
+
+	* version.c: Update copyright notice.
+
+1998-03-20  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.5.3.
+	* quotearg.h (quotearg_quoting_options):
+	Remove; it ran afoul of the Borland C compiler.
+	Its address is now represented by the null pointer.
+	* quotearg.c (default_quoting_options):
+	Renamed from quotearg_quoting_options,
+	and now static instead of extern.
+	(clone_quoting_options, get_quoting_style, set_quoting_style,
+	set_char_quoting, quotearg_buffer):
+	Use default_quoting_options when passed a null pointer.
+	* patch.c (main, get_some_switches):
+	Pass a null pointer instead of address of quotearg_quoting_options.
+
+1998-03-17  Paul Eggert  <eggert@twinsun.com>
+
+	* patch.c (option_help): Update bug reporting address to gnu.org.
+	* patch.man: Fix copyright and bug reporting address.
+
+1998-03-16  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.5.2.
+	(AC_CHECK_FUNCS): Add strerror.
+	(jm_FUNC_MALLOC, jm_FUNC_REALLOC): Add.
+	(AM_C_PROTOTYPES): Add.
+
+	* NEWS, patch.c (longopts, get_some_switches), patch.man:
+	Add --quoting-style, --posix options.
+
+	* Makefile.in (LIBSRCS): Add malloc.c, realloc.c.
+	(SRCS): Add error.c, quotesys.c, xmalloc.c.
+	(OBJS): Likewise.
+	(HDRS): Add error.h, quotesys.h, xalloc.h.
+	(MISC): Add AUTHORS, aclocal.m4, ansi2knr.c.
+	(clean): Use mostlyclean rule.
+	(argmatch.o, inp.o, patch.o, pch.o): Now also depends on quotearg.h.
+	(inp.o, patch.o, util.o): Now also depends on xalloc.h.
+	(error.o, quotearg.o, quotesys.o, xmalloc.o,
+	ansi2knr.o, ansi2knr, quotearg_.c, .c_.c): New rules.
+	(U): New macro.
+	(OBJS, quotearg$U.o): Rename quotearg.o to quotearg$U.o.
+	(mostlyclean): Remove ansi2knr, *_.c.
+	(.SUFFIXES): Add _.c.
+
+	* acconfig.h (PROTOTYPES): New undef.
+
+	* acconfig.h, configure.in (HAVE_INTTYPES_H, malloc, realloc):
+	New macros.
+
+	* aclocal.m4, error.c, error.h, malloc.c,
+	quotearg.h, quotearg.c, realloc.c, xalloc.h, xmalloc.c: New files.
+
+	* argmatch.c: Include <sys/types.h> before <argmatch.h>.
+	Include <quotearg.h>.
+
+	* argmatch.c (invalid_arg),
+	inp.c (scan_input, report_revision, too_many_lines, get_input_file,
+	plan_a),
+	patch.c (main, get_some_switches, numeric_string),
+	pch.c (open_patch_file, intuit_diff_type, do_ed_script):
+	util.c (move_file, create_file, copy_file, version_get, removedirs):
+	Quote output operands properly.
+
+	* common.h: Include <inttypes.h> if available.
+	(CHAR_BIT, TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM,
+	CHAR_MAX, INT_MAX, LONG_MIN, SIZE_MAX, O_EXCL): New macros.
+	(TMPINNAME_needs_removal, TMPOUTNAME_needs_removal,
+	TMPPATNAME_needs_removal): New variables.
+	(xmalloc): Remove decl; now in xalloc.h.
+
+	* inp.c: Include <quotearg.h>, <xalloc.h>.
+
+	* inp.c (get_input_file),
+	pch.c (intuit_diff_type),
+	util.c (version_controller):
+	Don't do diff operation if diffbuf is null; used by ClearCase support.
+
+	* inp.c (plan_b),
+	patch.c (init_reject),
+	pch.c (open_patch_file, do_ed_script):
+	Create temporary file with O_EXCL to avoid races.
+
+	* patch.c: Include <quotearg.h>, <xalloc.h>.
+	(create_output_file, init_output): New open_flags arg.
+	All callers changed.
+	(init_reject): No longer takes filename arg.  All callers changed.
+	(remove_if_needed): New function.
+	(cleanup): Use it to remove temporary files only if needed.
+	(TMPREJNAME_needs_removal): New var.
+	(main): Set xalloc_fail_func to memory_fatal; needed for xalloc.
+	Initialize quoting style from QUOTING_STYLE.
+	(longopts, get_some_switches): Offset longarg options by CHAR_MAX,
+	not 128; this is needed for EBCDIC ports.
+
+	* patch.c (main, locate_hunk, abort_hunk, spew_output),
+	pch.c (there_is_another_patch, intuit_diff_type, malformed,
+	another_hunk):
+	The LINENUM type now might be longer than long,
+	so print and read line numbers more carefully.
+
+	* patch.c (main),
+	pch.c (there_is_another_patch):
+	util.c (fetchname):
+	strippath now defaults to -1, so that we can distinguish unset
+	value from largest possible.
+
+	* patch.man: Clarify how file name is chosen from candidates.
+
+	* pch.c: Include <quotearg.h>.
+	(p_strip_trailing_cr): New variable.
+	(scan_linenum): New function.
+	(pget_line, re_patch, there_is_another_patch, intuit_diff_type,
+	get_line): Strip trailing CRs from context diffs that need this.
+	(best_name): Use SIZE_MAX instead of (size_t) -1 for max size_t.
+
+	* quotesys.c, quotearg.h: Renamed from quotearg.c and quotearg.h.
+	All uses changed.
+	* quotesys.h (__QUOTESYS_P): Renamed from __QUOTEARG_P.
+
+	* util.c: Include <quotearg.h>, <xalloc.h>.
+	(raise): Don't define if already defined.
+	(move_file): New arg from_needs_removal.  All callers changed.
+	(copy_file): New arg to_flags.  All callers changed.
+	(CLEARTOOL_CO): New constant.
+	(version_controller): Add ClearCase support.
+	(format_linenum): New function.
+	(fetchname): Allow any POSIX.1 time zone spec, which means
+	any local time offset in the range -25:00 < offset < +26:00.
+	Ignore the name if it doesn't have enough slashes to strip off.
+	(xmalloc): Remove; now in xmalloc.c.
+
+	* util.h (LINENUM_LENGTH_BOUND): New macro.
+	(format_linenum): New decl.
+
+	* version.c (copyright_string): Update years of copyrights.
+
+1997-09-03  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.5.1.
+	* inp.c (re_input): Don't free buffers twice when input is garbled.
+	* patch.c (main): If skipping patch and Plan A fails, don't
+	bother trying Plan B.
+
+1997-08-31  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Version 2.5 released.
+
+1997-07-21  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.4.4.
+	* pch.c (there_is_another_patch), NEWS: Report an error if the patch
+	input contains garbage but no patches.
+
+	* pch.c (open_patch_file):
+	Check for patch file too long (i.e., its size
+	doesn't fit in a `long', and LFS isn't available).
+
+	* inp.c (plan_a):
+	Cast malloc return value, in case malloc returns char *.
+
+1997-07-16  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.4.3.
+
+	* NEWS, patch.man, pch.c (intuit_diff_type, get_line, pget_line):
+	Now demangles RFC 934 encapsulation.
+	* pch.c (p_rfc934_nesting): New var.
+
+	* pch.c (intuit_diff_type): Don't bother to check file names carefully
+	if we're going to return NO_DIFF.
+
+	* inp.c (plan_a): Count the number of lines before allocating
+	pointer-to-line buffer; this reduces memory requirements
+	considerably (roughly by a factor of 5 on 32-bit hosts).
+	Decrease `size' only when read unexpectedly reports EOF.
+	(i_buffer): New var.
+	(too_many_lines): New fn.
+	(re_input): Free i_buffer if using plan A.
+	Free buffers unconditionally; they can't be zero.
+
+	* inp.c (plan_a, plan_b): Check for overflow of line counter.
+
+	* pch.c (malformed), util.h (memory_fatal, read_fatal, write_fatal):
+	Declare as noreturn.
+
+1997-07-10  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.4.2.
+
+	* util.c (ok_to_reverse), NEWS: The default answer is now `n';
+	this is better for Emacs.
+
+	* Makefile.in (dist): Use cp -p, not ln;
+	some hosts do the wrong thing with ln if the source is a symbolic link.
+
+	* patch.man: Fix typo: -y -> -Y.
+
+1997-07-05  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.4.1.
+
+	* patch.c: (main, get_some_switches), NEWS, patch.man:
+	Version control is now independent of whether backups are made.
+	* patch.c (option_help): Put version control options together.
+	(get_some_switches): With CVS 1.9 hack, treat -b foo like -b -z foo,
+	not just -z foo.  This change is needed due to recent change in -z.
+	* backupfile.c (find_backup_file_name):
+	backup_type == none causes undefined behavior;
+	this undoes the previous change to this file.
+
+	* patch.c (locate_hunk): Fix bug when locating context diff hunks
+	near end of file with nonzero fuzz.
+
+	* util.c (move_file): Don't assume that ENOENT is reported when both
+	ENOENT and EXDEV apply; this isn't true with DJGPP, and
+	Posix doesn't require it.
+
+	* pch.c (there_is_another_patch):
+	Suggest -p when we can't intuit a file.
+
+1997-06-19  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Version 2.4 released.
+	* NEWS: Patch is now verbose when patches do not match exactly.
+
+1997-06-17  Paul Eggert  <eggert@twinsun.com>
+
+	* pc/djgpp/configure.sed (config.h): Remove redundant $(srcdir).
+
+	* configure.in (VERSION): Bump to 2.3.9.
+	* patch.c (main): By default, warn about hunks that succeed
+	with nonzero offset.
+	* patch.man: Add LC_ALL=C advice for making patches.
+	* pc/djgpp/configure.sed (config.h): Fix paths to dependent files.
+
+1997-06-17  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.3.8.
+
+	* pch.c (open_patch_file): Test stdin for fseekability.
+	(intuit_diff_type): Missing context diff headers are now warnings,
+	not errors; some people use patches with them (e.g. when retrying
+	rejects).
+
+	* patch.c (struct outstate):
+	New type, collecting together some output state vars.
+	(apply_hunk, copy_till, spew_output, init_output): Use it.
+	Keep track of whether some output has been generated.
+	(backup_if_mismatch): New var.
+	(ofp): Remove, in favor of local struct outstate vars.
+	(main): Use struct outstate.  Initialize backup_if_mismatch to
+	be the inverse of posixly_correct.  Keep track of whether mismatches
+	occur, and use this to implement backup_if_mismatch.
+	Report files that are not empty after patching, but should be.
+	(longopts, option_help, get_some_switches): New options
+	--backup-if-mismatch, --no-backup-if-mismatch.
+	(get_some_switches): -B, -Y, -z no longer set backup_type.
+	* backupfile.c (find_backup_file_name):
+	Treat backup_type == none like simple.
+
+	* Makefile.in (CONFIG_HDRS):
+	Remove var; no longer needed by djgpp port.
+	(DISTFILES_PC_DJGPP): Rename pc/djgpp/config.sed to
+	pc/djgpp/configure.sed; remove pc/djgpp/config.h in favor of
+	new file that edits it, called pc/djgpp/config.sed.
+	* pc/djgpp/configure.bat: Rename config.sed to configure.sed.
+	* pc/djgpp/configure.sed (CONFIG_HDRS): Remove.
+	(config.h): Add rule to build this from config.hin and
+	pc/djgpp/config.sed.
+	* pc/djgpp/config.sed:
+	Convert from .h file to .sed script that generates .h file.
+
+	* NEWS: Describe --backup-if-mismatch, --no-backup-if-mismatch.
+	* patch.man:
+	Describe new options --backup-if-mismatch, --no-backup-if-mismatch
+	and their ramifications.  Use unreadable backup to represent
+	nonexistent file.
+
+1997-06-12  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.3.7.
+	(AC_CHECK_FUNCS): Add `raise'.
+
+	* Makefile.in (inp.o): No longer depends on quotearg.h.
+
+	* common.h (outfile): New decl (was private var named `output').
+	(invc): New decl.
+	(GENERIC_OBJECT): Renamed from VOID.
+	(NULL_DEVICE, TTY_DEVICE): New macros.
+
+	* patch.c (output): Remove; renamed to `outfile' and moved to common.h.
+	(main): `failed' is count, not boolean.
+	Say "Skipping patch." when deciding to skip patch.
+	(get_some_switches): Set invc when setting inname.
+
+	* inp.c: Do not include <quotearg.h>.
+	(SCCSPREFIX, GET, GET_LOCKED, SCCSDIFF1, SCCSDIFF2, SCCSDIFF3,
+	RCSSUFFIX, CHECKOUT, CHECKOUT_LOCKED, RCSDIFF1, RCSDIFF2):
+	Move to util.c.
+	(get_input_file): Invoke new functions version_controller and
+	version_get to simplify this code.
+	(plan_b): "/dev/tty" -> NULL_DEVICE
+
+	* pch.h (pch_timestamp): New decl.
+	* pch.c (p_timestamp): New var; takes over from global timestamp array.
+	(pch_timestamp): New function to export p_timestamp.
+	(there_is_another_patch): Use blander wording when you can't intuit
+	the file name.
+	Say "Skipping patch." when deciding to skip patch.
+	(intuit_diff_type): Look for version-controlled but nonexistent files
+	when intuiting file names; set invc accordingly.
+	Ignore Index: line if either old or new line is present, and if
+	POSIXLY_CORRECT is not set.
+	(do_ed_script): Flush stdout before invoking popen, since it may
+	send output to stdout.
+
+	* util.h (version_controller, version_get): New decls.
+	* util.c: Include <quotearg.h> earlier.
+	(raise): New macro, if ! HAVE_RAISE.
+	(move_file): Create empty unreadable file when backing up a nonexistent
+	file.
+	(DEV_NULL): New constant.
+	(SCCSPREFIX, GET. GET_LOCKED, SCCSDIFF1, SCCSDIFF2,
+	RCSSUFFIX, CHECKOUT, CHECKOUT_LOCKED, RCSDIFF1): Moved here from inp.c.
+	(version_controller, version_get): New functions.
+	(ask): Look only at /dev/tty for answers; and when standard output is
+	not a terminal and ! posixly_correct, don't even look there.
+	Remove unnecessary fflushes of stdout.
+	(ok_to_reverse): Say "Skipping patch." when deciding to skip patch..
+	(sigs): SIGPIPE might not be defined.
+	(exit_with_signal): Use `raise' instead of `kill'.
+	(systemic): fflush stdout before invoking subsidiary command.
+
+	* patch.man: Document recent changes.
+	Add "COMPATIBILITY ISSUES" section.
+
+	* NEWS: New COMPATIBILITY ISSUES for man page.
+	Changed verbosity when fuzz is found.
+	File name intuition is changed, again.
+	Backups are made unreadable when the file did not exist.
+
+	* pc/djgpp/config.h (HAVE_STRUCT_UTIMBUF): Define.
+	(HAVE_RAISE): New macro.
+	(HAVE_UTIME_H): Define.
+	(TZ_is_unset): Do not define; it's not a serious problem with `patch'
+	to have TZ be unset in DOS.
+
+1997-06-08  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.3.6.
+	(AC_CHECK_HEADERS): Add utime.h.
+	* acconfig.h, configure.in, pc/djgpp/config.h (HAVE_STRUCT_UTIMBUF):
+	New macro.
+	* pc/djgpp/config.h (HAVE_UTIME_H, TZ_is_unset): New macros.
+
+	* NEWS, patch.man: Describe new -Z, -T options, new numeric
+	option for -G, retired -G, and more verbose default behavior
+	with fuzz.
+
+	* pch.c (intuit_diff_type): Record times reported for files in headers.
+	Remove head_says_nonexistent[x], since it's now equivalent to
+	!timestamp[x].
+	* util.h (fetchname): Change argument head_says_nonexistent to
+	timestamp.
+	* util.c: #include <partime.h> for TM_LOCAL_ZONE.
+	Don't include <time.h> since common.h now includes it.
+	(ok_to_reverse): noreverse and batch cases now output regardless of
+	verbosity.
+	(fetchname): Change argument head_says_nonexistent to pstamp, and
+	store header timestamp into *pstamp.
+	If -T or -Z option is given, match time stamps more precisely.
+	(ask): Remove unnecessary close of ttyfd.
+	When there is no terminal at all, output a newline to make the
+	output look nicer.  After reporting EOF, flush stdout;
+	when an input error, report the error type.
+
+	* inp.c (get_input_file):
+	Ask user whether to get file if patch_get is negative.
+
+	* Makefile.in (clean): Don't clean */*.o; clean core* and *core.
+
+1997-06-04  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.3.5.
+
+	* util.c (ok_to_reverse):
+	Be less chatty if verbosity is SILENT and we don't
+	have to ask the user.  If force is nonzero, apply the patch anyway.
+
+	* pch.c (there_is_another_patch):
+	Before skipping rest of patch, skip to
+	the patch start, so that another_hunk can skip it properly.
+	(intuit_diff_type): Slight wording change for missing headers, to
+	regularize with other diagnostics.  Fix off-by-one error when setting
+	p_input_line when scanning the first hunk to check for deleted files.
+
+1997-06-03  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.3.4.
+
+	* NEWS: Now matches more generously against nonexistent or empty files.
+
+	* pch.c (there_is_another_patch): Move warning about not being
+	able to intuit file names here from skip_to.
+	(intuit_diff_type): Fatal error if we find a headless unified
+	or context diff.
+
+	* util.c (ask): Null-terminate buffer properly even if it grew.
+	(fetchname): No need to test for null first argument.
+
+1997-06-02  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.3.3.
+	* pch.c (p_says_nonexistent, pch_says_nonexistent): Is now 1 for empty,
+	2 for nonexistent.
+	(intuit_diff_type): Set p_says_nonexistent according to new meaning.
+	Treat empty files like nonexistent files when reversing.
+	(skip_to): Output better diagnostic when we can't intuit a file name.
+	* patch.c (main):
+	Count bytes, not lines, when testing whether a file is empty,
+	since it may contain only non-newline chars.
+	pch_says_nonexistent now returns 2 for nonexistent files.
+
+1997-06-01  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.3.2.
+	* pch.c (open_patch_file):
+	Fix bug when computing size of patch read from a pipe.
+
+1997-05-30  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.3.1.
+
+	* Makefile.in (transform, patch_name): New vars,
+	for proper implementation of AC_ARG_PROGRAM.
+	(install, uninstall): Use them.
+	(install-strip): New rule.
+	* pc/djgpp/config.sed (program_transform_name): Set to empty.
+
+1997-05-30  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION), NEWS: Version 2.3 released.
+	* patch.man: Fix two font typos.
+	* util.c (doprogram): Fix misspelled decl.
+
+1997-05-26  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.2.93.
+
+	* pch.c (open_patch_file):
+	Fatal error if binary_transput and stdin is a tty.
+
+	* pc/djgpp/config.sed (chdirsaf.c):
+	Use sed instead of cp, since cp might not be installed.
+	* pc/djgpp/configure.bat:
+	Prepend %srcdir% to pathname of config.sed, for crosscompiles.
+
+1997-05-25  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.2.92.
+	(D_INO_IN_DIRENT): New macro.
+	* pc/djgpp/config.h, acconfig.h (D_INO_IN_DIRENT): New macro.
+	* backupfile.c (REAL_DIR_ENTRY):
+	Depend on D_INO_IN_DIRENT, not _POSIX_VERSION.
+
+	* addext.c (addext): Adjust slen when adjusting s for DOS 8.3 limit.
+	Do not use xxx.h -> xxxh~ hack.
+
+	* util.c: (move_file): Avoid makedirs test when possible even
+	if FILESYSTEM_PREFIX_LEN (p) is nonzero.  Don't play
+	case-changing tricks to come up with backup file name; it's
+	not portable to case-insensitive file systems.
+	* common.h (ISLOWER): Remove.
+
+	* inp.c (scan_input): Don't use Plan A if (debug & 16).
+
+	* patch.c (shortopts): Add -g, -G.
+	(longopts): --help now maps to 132, not 'h', to avoid confusion.
+	(get_some_switches): Likewise.
+	Don't invoke setmode on input if --binary; wait until needed.
+	Don't ever invoke setmode on stdout.
+	* pch.c (open_patch_file): Setmode stdin to binary if binary_transput.
+
+	* patch.man: Fix documentation of backup file name to match behavior.
+	Add advice for ordering of patches of derived files.
+	Add /dev/tty to list of files used.
+	* README: Adjust instructions for building on DOS.
+	* pc/djgpp/README: Remove tentative wording.
+	* NEWS: The DOS port is now tested.
+	Backup file names are no longer computed by switching case.
+
+	* pc/chdirsaf.c (ERANGE): Include <errno.h> to define it.
+	(restore_wd): chdir unconditionally.
+	(chdir_safer): Invoke atexit successfully at most once.
+	* pc/djgpp/config.sed: Use chdirsaf.o, not pc/chdirsaf.o.
+	Replace CONFIG_HDRS, don't append.
+	Use $(srcdir) in CONFIG_STATUS.
+	Don't apply $(SHELL) to $(CONFIG_STATUS).
+	Append rules for chdirsaf.o, chdirsaf.c; clean chdirsaf.c at the end.
+	* pc/djgpp/configure.bat: Append CR to each line; DOS needs this.
+	Don't use | as sed s delimiter; DOS can't handle it.
+
+1997-05-21  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.2.91.
+
+	* pch.c (another_hunk):
+	Fix bug with computing size of prefix and suffix context
+	with ordinary context diffs.  Report malformed patch if a unified diff
+	has nothing but context.
+
+	* inp.c (get_input_file):
+	Use patch_get, not backup_type, to decide whether to
+	get from RCS or SCCS.  Use the word `get' in diagnostics.
+	* patch.c (main): Initialize patch_get from PATCH_GET.
+	Omit DEFAULT_VERSION_CONTROL hook; it just leads to nonstandarization.
+	(longopts, option_help, get_some_switches): Add support for -g, -G.
+	(option_help): Add bug report address.
+	* common.h (patch_get): New decl.
+	* patch.man: Add -g and -G options; use `get' instead of `check out'.
+	Add PATCH_GET.  Recommend -Naur instead of -raNU2 for diff.
+	* NEWS: Describe -g, -G, PATCH_GET.
+
+	* version.c (copyright_string): Use only most recent copyright year,
+	as per GNU standards.
+
+	* Makefile.in (DISTFILES_PC): Remove pc/quotearg.c.
+	* pc/djgpp/config.sed: Remove unnecessary hooks for quotearg and SHELL.
+
+1997-05-18  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Increase to 2.2.9.
+	(AC_TYPE_MODE_T): Add.
+
+	* pch.h (another_hunk): New parameter REV.
+	* pch.c (hunkmax): Now of type LINENUM.
+	(malformed): Add decl.
+	(there_is_another_patch): Skip inname-detection if skip_rest_of_patch.
+	(intuit_diff_type): To determine whether file appears to have been
+	deleted, look at replacement, not pattern.
+	If there is a mismatch between existence of file and whether the
+	patch claims to change whether the file exists, ask whether to
+	reverse the patch.
+	(another_hunk): New parameter REV specifying whether to reverse the
+	hunk.  All callers changed.
+	(do_ed_script): Add assertion to ensure input file exists.
+
+	* util.h (create_file): New function.
+	(copy_file): Now takes mode, not struct stat.
+	(makedirs): No longer exported.
+	(move_file): Now takes mode, not struct stat.
+	* util.c (makedirs): No longer exported.
+	(move_file): Accept mode of destination, not struct stat.
+	All callers changed.
+	Quote file names in diagnostics.
+	Create parent dir of destination if necessary.
+	Don't use ENOTDIR.
+	Don't unlink source; it will be unlinked later.
+	Unlink destination if FROM is zero.
+	(create_file): New function.
+	(copy_file): Accept mode of destination, not struct stat.
+	All callers changed.
+	Use create_file to create file.
+	(ok_to_reverse): Moved here from patch.c.  Now accepts format and args;
+	all callers changed.
+	(mkdir): 2nd arg is now mode_t, for better compatibility.
+	(replace_slashes): Ignore slashes at the end of the filename.
+
+	* common.h (noreverse): New decl.
+	(ok_to_reverse): Remove decl.
+
+	* patch.c (noreverse): Now extern.
+	(main): New environment var PATCH_VERSION_CONTROL overrides VERSION_CONTROL.
+	Don't assert(hunk) if we're skipping the patch; we may not have any hunks.
+	When removing a file, back it up if backups are desired.
+	Don't chmod output file if input file did not exist.
+	chmod rej file to input file's mode minus executable bits.
+	(locate_hunk): Go back to old way of a single fuzz parameter, but
+	handle it more precisely: context diffs with partial contexts
+	can only match file ends, since the partial context can occur
+	only at the start or end of file.
+	All callers changed.
+	(create_output_file): Use create_file to create files.
+	(ok_to_reverse): Move to util.c.
+
+	* inp.c (scan_input, get_input_file): Quote file names in diagnostics.
+	(get_input_file): Set inerrno if it's not already set.
+	Don't create file; it's now the caller's responsibility.
+	(plan_b): Use /dev/null if input size is zero, since it might not exist.
+	Use create_file to create temporary file.
+
+	* NEWS: Add PATCH_VERSION_CONTROL; DOS port is untested.
+
+	* pc/djgpp/config.h: Add comment for mode_t.
+
+	* pc/djgpp/README: Note that it's not tested.
+
+	* patch.man: PATCH_VERSION_CONTROL overrides VERSION_CONTROL.
+
+1997-05-15  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in: Add AC_PREREQ(2.12).
+	(VERSION): Bump to 2.2.8.
+	(ed_PROGRAM): Rename from ED_PROGRAM.
+
+	* pch.c (prefix_components): Support DOS file names better.
+	Fix typo that caused fn to almost always yield 0.
+
+	* util.c (<time.h>, <maketime.h>): Include.
+	(move_file, copy_file): Add support for DOS filenames.
+	Preserve mode of input files when creating temp files.
+	Add binary file support.
+	(doprogram, rmdir): New functions.
+	(mkdir): Use doprogram.
+	(replace_slashes): Add support for DOS filenames.
+	(removedirs): New function.
+	(init_time)): New function.
+	(initial_time): New var.
+	(fetchname): Add support for deleted files, DOS filenames.
+
+	* basename.c (FILESYSTEM_PREFIX_LEN, ISSLASH):
+	New macros, for DOS port.
+	(base_name): Use them.
+
+	* addext.c (HAVE_DOS_FILE_NAMES): New macro.
+	<limits.h>: Include if HAVE_LIMITS_H.
+	(addext): Handle hosts with DOS file name limits.
+
+	* common.h (LONG_MIN): New macro.
+	(FILESYSTEM_PREFIX_LEN, ISSLASH): New macros, for DOS port.
+	(ok_to_create_file): Remove.
+	(reverse): Now int.
+	(ok_to_reverse): New function decl.
+	(O_WRONLY, _O_BINARY, O_BINARY, O_CREAT, O_TRUNC): New macros.
+	(binary_transput): New var decl.
+
+	* Makefile.in (ed_PROGRAM): Renamed from ED_PROGRAM.
+	(CONFIG_HDRS, CONFIG_STATUS): New vars.
+	(SRCS): Add maketime.c, partime.c.
+	(OBJS): Likewise.
+	(HDRS): Add maketime.h, partime.h.
+	(DISTFILES_PC, DISTFILES_PC_DJGPP): New vars.
+	(Makefile, config.status): Use CONFIG_STATUS, not config.status.
+	(clean): Remove */*.o.
+	(dist): Add pc and pc/djgpp subdirectories.
+	($(OBJS)): Depend on $(CONFIG_HDRS) instead of config.h.
+	(maketime.o, partime.o): New rules.
+	(util.o): Depend on maketime.h.
+
+	* patch.c (main):
+	Call init_time.  Add DEFAULT_VERSION_CONTROL hook for people who
+	prefer the old ways.  Build temp file names before we might invoke cleanup.
+	Add support for deleted files and clean up the patch-swapping code a bit.
+	Delete empty ancestors of deleted files.
+	When creating temporaries, use file modes of original files.
+	(longopts, get_some_switches): New option --binary.
+	(get_some_switches): Report non-errno errors with `fatal', not `pfatal'.
+	(create_output_file): New function, which preserves modes of original files
+	and supports binary transput.
+	(init_output, init_reject): Use it.
+	(ok_to_reverse): New function.
+	(TMPDIR): New macro.
+	(make_temp): Use $TMPDIR, $TMP, $TEMP, or TMPDIR, whichever comes first.
+
+	* pch.c (p_says_nonexistent): New var.
+	(open_patch_file): Add binary transput support.
+	Apply stat to file names retrieved from user.
+	Reject them if they don't exist.
+	(intuit_diff_type): Add support for deleting files.
+	Don't treat trivial directories any differently.
+	Avoid stating the same file twice in common case of context diffs.
+	(prefix_components): Don't treat trivial directories any differently.
+	Add support for DOS filenames.
+	(pch_says_nonexistent): New function.
+	(do_ed_script): Preserve mode of input files when creating temp files.
+	Add support for binary transput.
+
+	* pch.h (pch_says_nonexistent): New decl.
+
+	* util.h (replace_slashes): No longer exported.
+	(fetchname): Add support for deleted files.
+	(copy_file, move_file): Add support for preserving file modes.
+	(init_time, removedirs): New functions.
+
+	* argmatch.c: Converge with fileutils.
+
+	* backupfile.c: Converge with fileutils.
+	(find_backup_file_name): Treat .~N~ suffix just like any other suffix
+	when handling file names that are too long.
+
+	* inp.c:
+	In messages, put quotes around file names and spaces around "--".
+	(get_input_file): Allow files to be deleted.  Do the expense of
+	makedirs only if we can't create the file.
+	(plan_a, plan_b): Add support for binary transput.
+
+	* pc/chdirsaf.c, pc/djgpp/README, pc/djgpp/config.h, pc/djgpp/config.sed, pc/djgpp/configure.bat, pc/quotearg.c:
+	New file.
+
+	* NEWS:
+	New methods for removing files; adjust file name intuition again.
+	Add description of MS-DOS and MS-Windows ports.
+
+	* patch.man:
+	Simplify file name intuition slightly (no distinction for trivial dirs).
+	Add --binary.  Describe how files and directories are deleted.
+	Suggest diff -a.  Include caveats about what context diffs cannot represent.
+
+1997-05-06  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Now 2.2.7.
+	(CPPFLAGS, LDFLAGS, LIBS): If the user has not set any of these vars,
+	prefer support for large files if available.
+
+	* common.h (_LARGEFILE_SOURCE): Define.
+	(file_offset): New typedef.
+	(file_seek, file_tell): New macros.
+
+	* patch.c (main):
+	Remove empty files by default unless POSIXLY_CORRECT is set.
+
+	* util.c, util.h (Fseek):
+	Use file_offset instead of long, for portability to large-file hosts.
+
+	* pch.c: (p_base, p_start, next_intuit_at, skip_to, open_patch_file,
+	intuit_diff_type, another_hunk, incomplete_line, do_ed_script):
+	Use file_offset instead of long, for portability to large-file hosts.
+	(prefix_components): Renamed from path_name_components; count only
+	nontrivial prefix components, and take a 2nd EXISTING arg.
+	(existing_prefix_components): Remove; subsumed by prefix_components.
+	(intuit_diff_type): When creating files, try for the creation of the
+	fewest directories.
+
+	* configure.in (VERSION): Now 2.2.6.
+
+	* pch.c (existing_prefix_components): New function.
+	(intuit_diff_type): When creating a file, use a name whose existing
+	directory prefix contains the most nontrivial path name components.
+	(best_name): Don't check for null 2nd arg.
+
+	* util.h (replace_slashes): New decl.
+
+	* util.c (replace_slashes): Now external.
+	(fetchname): Don't assume chars are nonnegative.
+
+	* patch.man:
+	When creating a file, use a name whose existing directory prefix
+	contains the most nontrivial path name components.
+	Add advice for creating patches and applying them.
+
+1997-05-06  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Now 2.2.6.
+
+	* pch.c (existing_prefix_components): New function.
+	(intuit_diff_type): When creating a file, use a name whose existing
+	directory prefix contains the most nontrivial path name components.
+	(best_name): Don't check for null 2nd arg.
+
+	* util.h (replace_slashes): New decl.
+	* util.c (replace_slashes): Now external.
+	(fetchname): Don't assume chars are nonnegative.
+
+	* patch.man:  Describe above change to pch.c.
+	Add advice for creating patches and applying them.
+
+1997-05-05  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Update to 2.2.5.
+
+	* quotearg.h, quotearg.c: New files.
+	* Makefile.in (SRCS, OBJS, HDRS): Mention new files.
+	(inp.o, util.o): Now depends on quotearg.h.
+	(quotearg.o): New makefile rule.
+
+	* common.h (posixly_correct): New var.
+	* patch.c (main): Initialize it.
+	If ! posixly_correct, default backup type is now `existing'.
+	SIMPLE_BACKUP_SUFFIX no longer affects backup type.
+	(backup): Remove var.
+
+	* util.h: (countdirs): Remove.
+	(systemic): New decl.
+	* util.c (move_file): Try making the parent directory of TO
+	if backup prefix or suffix contain a slash.
+	(ask): Remove arbitrary limit on size of result.
+	(systemic): New function.
+	(mkdir): Work even if arg contains shell metacharacters.
+	(replace_slashes): Return 0 if none were replaced.
+	Don't replace slash after . or .. since it's redundant.
+	(countdirs): Remove.
+	(makedirs): Ignore mkdir failures.
+
+	* NEWS, patch.man: More POSIXLY_CORRECT adjustments.
+	Describe new rules for how file names are intuited.
+
+1997-04-17  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Version 2.2 released.
+
+	* Makefile.in (config.hin):
+	Remove before building; we always want the timestamp updated.
+
+	* inp.c (get_input_file):
+	Look for RCS files only if backup_type == numbered_existing.
+
+	* NEWS, patch.man:
+	Remove mention of never-implemented -V rcs and -V sccs options.
+	* patch.man: `pathname' -> `file name'
+	Correct the description of how file names are found in diff headers.
+	Clarify the distinction between ordinary and unified context diffs.
+
+1997-04-13  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Update to 2.1.7.
+
+	* patch.c (numeric_optarg): New function.
+	(get_some_switches): Use it.
+
+	* pch.c (intuit_diff_type): When creating a file, prefer a name whose
+	existing dir prefix is the longest.
+
+	* util.h (countdirs): New function.
+	* util.c (replace_slashes, countdirs): New functions.
+	(makedirs): Use replace_slashes, to be more like countdirs.
+
+	* patch.man: Explain -pN vs -p N.  Recommend --new-file.
+	Explain possible incompatibility with strip count.
+
+1997-04-10  Paul Eggert  <eggert@twinsun.com>
+
+	* configure.in (VERSION): Bump to 2.1.6.
+	(AC_CHECK_HEADERS): Remove stdlib.h (i.e. remove HAVE_STDLIB_H).
+
+	* Makefile.in: (HDRS, patchlevel.h, TAGS, distclean, maintainer-clean):
+	Don't distribute patchlevel.h; let the user do it.
+	This works around some obscure (possibly nonexistent?) `make' bugs.
+
+	* common.h (program_name): extern, not XTERN.
+	(<stdlib.h>): Include if STDC_HEADERS, not if HAVE_STDLIB_H.
+	(atol, getenv, malloc, realloc): Don't worry whether they're #defined.
+
+	* patch.c (get_some_switches):
+	Add special hack for backwards compatibility with CVS 1.9.
+	(-B, -Y, -z): Now set backup_type = simple.
+
+	* NEWS: Fix misspellings; minor reformatting.
+	* README: Report POSIX.2 compliance.
+
+1997-04-06  Paul Eggert  <eggert@twinsun.com>
+
+	Move all old RCS $Log entries into ChangeLog.
+	#include all files with < >, not " ".
+
+	* addext.c, argmatch.c, argmatch.h, memchr.c, install-sh:
+	New files.
+	* EXTERN.h, INTERN.h: Removed.
+	* config.hin: Renamed from config.h.in.
+
+	* acconfig.h (NODIR): Remove.
+	(HAVE_MEMCHR): Add.
+
+	* configure.in (AC_ARG_PROGRAM, AC_PROG_MAKE_SET, HAVE_MEMCHR): Add.
+	(AC_CHECK_HEADERS): Replaces obsolescent AC_HAVE_HEADERS.
+	Add stdlib.h, string.h, unistd.h, varargs.h.
+	Delete obsolete call to AC_UNISTD_H.
+	(AC_CONFIG_HEADER): Rename config.h.in to config.hin.
+	(AC_C_CONST): Replaces obsolescent AC_CONST.
+	(AC_CHECK_FUNC): Check for getopt_long; define LIBOBJS and substitute
+	for it accordingly.
+	(AC_CHECK_FUNCS): Replaces obsolescent AC_HAVE_FUNCS.
+	Add _doprintf, isascii, mktemp, sigaction, sigprocmask, sigsetmask.
+	Remove strerror.
+	(AC_FUNC_CLOSEDIR_VOID, AC_FUNC_VPRINTF): Add.
+	(AC_HEADER_DIRENT): Replaces obsolescent AC_DIR_HEADER.
+	(AC_HEADER_STDC): Replaces obsolescent AC_STDC_HEADERS.
+	(AC_SYS_LONG_FILE_NAMES): Replaces obsolescent AC_LONG_FILE_NAMES.
+	(AC_TYPE_OFF_T): Replaces obsolescent AC_OFF_T.
+	(AC_TYPE_SIGNAL): Replaces obsolescent AC_RETSIGTYPE.
+	(AC_TYPE_SIZE_T): Replaces obsolescent AC_SIZE_T.
+	(AC_XENIX_DIR): Remove.
+	(ED_PROGRAM): New var.
+	(NODIR): Remove.
+	(PACKAGE, VERSION): New vars; substitute them with AC_SUBST.
+
+	* Makefile.in: Conform to current GNU build standards.
+	Redo dependencies.  Use library getopt_long if available.
+	Use `&&' instead of `;' inside shell commands where applicable;
+	GNU make requires this.
+	Use double-colon rules for actions that do not build files.
+	(@SET_MAKE@): Added.
+	(CFLAGS, LDFLAGS, prefix, exec_prefix): Base on @ versions of symbols.
+	(COMPILE, CPPFLAGS, DEFS, ED_PROGRAM, LIBOBJS, LIBSRCS, PACKAGE,
+	VERSION): New symbols.
+	(SRCS, OBJS, HDRS, MISC): Add new files.
+	(man1dir): Renamed from mandir.
+	(man1ext): Renamed from manext.
+	(patch): Put -o first.
+	(install): Use $(transform) to allow program to be renamed by configure.
+	(patchlevel.h): Build from $(VERSION).
+	(dist): Get version number from $(VERSION) and package name from
+	$(PACKAGE).
+	(TAGS): Scan $(HDRS).
+	(maintainer-clean): Renamed from realclean.  Remove patchlevel.h.
+
+	* backupfile.h (simple_backup_suffix): Now const *.
+	(find_backup_file_name, base_name, get_version): Args are now const *.
+	(base_name): New decl.
+	* backupfile.c (<config.h>): Include only if HAVE_CONFIG_H.
+	(<argmatch.h>): Include.
+	(<string.h>): Include if HAVE_STRING_H, not if STDC_HEADERS.
+	(<strings.h>): Include if !HAVE_STRING_H.
+	(<unistd.h>): Do not include.
+	(<dirent.h>): Redo include as per current autoconf standards.
+	(<limits.h>): Include if HAVE_LIMITS_H. Define CHAR_BIT if not defined.
+	(NLENGTH): Now returns size_t.
+	(CLOSEDIR, INT_STRLEN_BOUND): New macros.
+	(ISDIGIT): Use faster method.
+	(find_backup_file_name): No longer depends on NODIR.
+	Remove redundant code.
+	(make_version_name): Remove; do it more portably.
+	(max_backup_version): Args are now const *.
+	(version_number): Simplify digit checking.
+	(basename, concat, dirname): Remove.
+	(argmatch, invalid_arg): Move to argmatch.c.  Simplify test for
+	ambiguous args.  When reporting an error, use program_name not "patch".
+	(addext): Move to addext.c.  Treat all negative values from pathconf
+	like -1.  Always use long extension if it fits, even if the filesystem
+	does not support long file names.
+	(backup_types): Now const.
+
+	* common.h, inp.h (XTERN): Renamed from EXT to avoid collision
+	with errno.h reserved name space.
+
+	* common.h (DEBUGGING): Now an integer; default is 1.
+	(enum diff): New type.
+	(diff_type): Use it instead of small integers.
+	(CONTEXT_DIFF, NORMAL_DIFF, ED_DIFF, NEW_CONTEXT_DIFF, UNI_DIFF):
+	Now enumerated values instead of macros.
+	(NO_DIFF): New enumerated value (used instead of 0).
+	(volatile): Default to the empty string if __STDC__ is not defined.
+	(<signal.h>): Do not include.
+	(Chmod, Close, Fclose, Fflush, Fputc, Signal, Sprintf, Strcat,
+	Strcpy, Unlink, Write): Remove these macros; casts to void are
+	not needed for GNU coding standards.
+	(INITHUNKMAX): Move to pch.c.
+	(malloc, realloc, INT_MIN, MAXLINELEN, strNE, strnNE,
+	Reg1, Reg2, Reg3, Reg4, Reg5, Reg6, Reg7, Reg8, Reg9, Reg10, Reg11,
+	Reg12, Reg13, Reg14, Reg15, Reg16): Remove these macros.
+	(S_IXOTH, S_IWOTH, S_IROTH, S_IXGRP, S_IWGRP,
+	S_IRGRP, S_IXUSR, S_IWUSR, S_IRUSR, O_RDONLY, O_RDWR):
+	Define these macros, if not defined.
+	(CTYPE_DOMAIN, ISLOWER, ISSPACE, ISDIGIT, PARAMS): New macros.
+	(instat): Renamed from filestat; used for input file now.
+	(bufsize, using_plan_a, debug, strippath): Not statically initialized.
+	(debug): #define to 0 if not DEBUGGING, so that users of `debug'
+	no longer need to be surrounded by `#if DEBUGGING'.
+	(out_of_mem, filec, filearg, outname, toutkeep, trejkeep): Remove.
+	(inname, inerrno, dry_run, origbase): New variables.
+	(origprae): Now const*.
+	(TMPOUTNAME, TMPINNAME, TMPPATNAME): Now const*volatile.
+	(verbosity): New variable; subsumes `verbose'.
+	(DEFAULT_VERBOSITY, SILENT, VERBOSE): Values in a new enum.
+	(verbose): Removed.
+	(VOID): Use `#ifdef __STDC__' instead of`#if __STDC__',
+	for consistency elsewhere.
+	(__attribute__): New macro (empty if not a recent GCC).
+	(fatal_exit): Renamed from my_exit.
+	(errno): Don't define if STDC_HEADERS.
+	(<string.h>): Include if either STDC_HEADERS or HAVE_STRING_H.
+	(memcmp, memcpy): Define if !STDC_HEADERS && !HAVE_STRING_H
+	&& !HAVE_MEMCHR.
+	(<stdlib.h>): Include if HAVE_STDLIB_H, not if STDC_HEADERS.
+	(atol, getenv, malloc, realloc, lseek): Declare only if not defined
+	as a macro.
+	(popen, strcpy, strcat, mktemp): Do not declare.
+	(lseek): Declare to yield off_t, not long.
+	(<fcntl.h>): Include only if HAVE_FCNTL_H.
+
+	* inp.h (get_input_file): New decl.
+	* inp.c (SCCSPREFIX, GET, GET_LOCKED, SCCSDIFF, RCSSUFFIX, CHECKOUT,
+	CHECKOUT_LOCKED, RCSDIFF): Moved here from common.h.
+	(i_ptr): Now char const **.
+	(i_size): Remove.
+	(TIBUFSIZE_MINIMUM): Define only if not already defined.
+	(plan_a, plan_b): Arg is now const *.
+	(report_revision): Declare before use.  It's now the caller's
+	responsibility to test whether revision is 0.
+	(scan_input, report_revision, get_input_file):
+	Be less chatty unless --verbose.
+	(get_input_file): New function, split off from plan_a.
+	Reuse file status gotten by pch if possible.  Allow for dry run.
+	Use POSIX bits for creat, not number.  Check for creation and
+	close failure, and use fstat not stat.  Use memcpy not strncpy.
+	(plan_a): Rewrite for speed.
+	Caller now assigns result to using_plan_a.
+	Don't bother reading empty files; during dry runs they might not exist.
+	Use ISSPACE, not isspace.
+	(plan_b): Allow for dry runs.  Use ISSPACE, and handle sign extension
+	correctly on arg.  Use POSIX symbol for open arg.
+
+	* patch.c (backup, output, patchname, program_name): New vars.
+	(last_frozen_line): Moved here from inp.h.
+	(TMPREJNAME): Moved here from common.h.
+	(optind_last): Removed.
+	(do_defines, if_defined, not_defined, else_defined, end_defined):
+	Now char const.  Prepend with \n (except for not_defined) to
+	allow for files ending in non-newline.
+	(Argv): Now char*const*.
+	(main, get_some_switches): Exit status 0 means success,
+	1 means hunks were rejected, 2 means trouble.
+	(main, locate_hunk, patch_match): Keep track of patch prefix context
+	separately from suffix context; this fixes several bugs.
+	(main): Initialize bufsize, strippath.
+	Be less chatty unless --verbose.
+	No more NODIR; always have version control available.
+	Require environment variables to be nonempty to have effect.
+	Add support for --dry-run, --output, --verbose.
+	Invoke get_input_file first, before deciding among do_ed_script,
+	plan_a, or plan_b.
+	Clear ofp after closing it, to keep discipline that ofp is either
+	0 or open, to avoid file descriptor leaks.  Conversely, rejfp doesn't
+	need this trick since static analysis is enough to show when it
+	needs to be closed.
+	Don't allow file-creation patches to be applied to existing files.
+	Misordered hunks are now not fatal errors; just go on to the next file.
+	It's a fatal error to fall back on plan B when --output is given,
+	since the moving hand has writ.
+	Add support for binary files.
+	Check for I/O errors.
+	chmod output file ourselves, rather than letting move_file do it;
+	this saves global state.
+	Use better grammar when outputting hunks messages, e.g. avoid
+	`1 hunks'.
+	(main, reinitialize_almost_everything):
+	Remove support for multiple file arguments.
+	Move get_some_switches call from reinitialize_almost_everything
+	to main.
+	(reinitialize_almost_everything): No need to reinitialize things
+	that are no longer global variables, e.g. outname.
+	(shortopts): Remove leading "-"; it's no longer important to
+	return options and arguments in order.  '-b' no longer takes operand.
+	-p's operand is no longer optional.  Add -i, -Y, -z.  Remove -S.
+	(longopts): --suffix is now pared with -z, not -b.  --backup now
+	means -b.  Add --input, --basename-prefix, --dry-run, --verbose.
+	Remove --skip.  --strip's operand is now required.
+	(option_help): New variable.  Use style of current coding standards.
+	Change to match current option set.
+	(usage): Use it.
+	(get_some_switches): Get all switches, since `+' is defunct.
+	New options -i, -Y, -z, --verbose, --dry-run.
+	Option -S removed.
+	-b now means backup (backup_type == simple), not simple_backup_suffix.
+	-B now implies backup, and requires nonempty operand.
+	-D no longer requires first char of argument to be an identifier.
+	`-o -' is now disallowed (formerly output to regular file named "-").
+	-p operand is now required.
+	-v no longer needs to cleanup (no temp files can exist at that point).
+	-V now implies backup.
+	Set inname, patchname from file name arguments, if any;
+	do not set filearg.  It's now an error if extra operands are given.
+	(abort_junk): Check for write errors in reject file.
+	(apply_hunk, copy_till): Return error flag, so that failure to apply
+	out-of-order hunk is no longer fatal.
+	(apply_hunk): New arg after_newline,
+	for patching files not ending in newline.
+	Cache ofp for speed.  Check for write errors.
+	(OUTSIDE, IN_IFNDEF, IN_IFDEF, IN_ELSE): Now part of an enumerated type
+	instead of being #defined to small integers.
+	Change while-do to do-while when copying !-part for R_do_defines,
+	since condition is always true the first time through the loop.
+	(init_output, init_reject): Arg is now const *.
+	(copy_till, spew_output): Do not insert ``missing'' newlines;
+	propagate them via new after_newline argument.
+	(spew_output): Nothing to copy if last_frozen_line == input lines.
+	Do not close (ofp) if it's null.
+	(dump_line): Remove.
+	(similar): Ignore presence or absence of trailing newlines.
+	Check for only ' ' or '\t', not isspace (as per POSIX.2).
+	(make_temp): Use tmpnam if mktemp is not available.
+	(cleanup): New function.
+	(fatal_exit): Use it.  Renamed from my_exit.
+	Take signal to exit with, not exit status (which is now always 2).
+
+	* pch.h, pch.c (pch_prefix_context, pch_suffix_context):
+	New fns replacing pch_context.
+	(another_hunk): Now yields int, not bool; -1 means out of memory.
+	Now takes difftype as argument.
+	(pch_write_line): Now returns boolean indicating whether we're after
+	a newline just after the write, for supporting non-text files.
+	* pch.c (isdigit): Remove; use ISDIGIT instead.
+	(INITHUNKMAX): Moved here from common.h.
+	(p_context): Removed.  We need to keep track of the pre- and post-
+	context separately, in:
+	(p_prefix_context, p_suffix_context): New variables.
+	(bestguess): Remove.
+	(open_patch_file): Arg is now char const *.
+	Copy file a buffer at a time, not a char at a time, for speed.
+	(grow_hunkmax): Now returns success indicator.
+	(there_is_another_patch, skip_to, another_hunk, do_ed_script):
+	Be less chatty unless --verbose.
+	(there_is_another_patch):
+	Avoid infinite loop if user input keeps yielding EOF.
+	(intuit_diff_type): New returns enum diff, not int.
+	Strip paths as they're being fetched.
+	Set ok_to_create_file correctly even if patch is reversed.
+	Set up file names correctly with unidiff output.
+	Use algorithm specified by POSIX 1003.2b/D11 to deduce
+	name of file to patch, with the exception of patches
+	that can create files.
+	(skip_to): Be verbose if !inname, since we're about to ask the
+	user for a file name and the context will help the user choose.
+	(another_hunk): Keep context as LINENUM, not int.
+	If the replacement is missing, calculate its context correctly.
+	Don't assume input ends in newline.
+	Keep track of patch prefix context separately from suffix context;
+	this fixes several bugs.
+	Don't assume blank lines got chopped if the replacement is missing.
+	Report poorly-formed hunks instead of aborting.
+	Do not use strcpy on overlapping strings; it's not portable.
+	Work even if lines are incomplete.
+	Fix bugs associated with context-less context hunks,
+	particularly when patching in reverse.
+	(pget_line): Now takes just 1 arg; instead of second arg,
+	just examine using_plan_a global.  Return -1 if we ran out
+	of memory.
+	(do_ed_script): Now takes output FILE * argument.
+	Take name of editor from ED_PROGRAM instead of hardwiring /bin/ed.
+	Don't bother unlinking TMPOUTNAME.
+	Check for popen failure.
+	Flush pipe to check for output errors.
+	If ofp is nonzero, copy result to it, instead of trying to
+	move the result.
+
+	* util.h, util.c (say1, say2, say3, say4, fatal1, fatal2, fatal3,
+	fatal4, pfatal1, pfatal2, pfatal3, pfatal4, ask1, ask2, ask3, ask4):
+	Remove; replaced with following.
+	(ask, say, fatal, pfatal): New stdarg functions.
+	(fetchname): Remove last, `assume_exists' parameter.
+	(savebuf, savestr, move_file, copy_file): Args are now const *.
+	(exit_with_signal): New function, for proper process status if
+	a signal is received as per POSIX.2.
+	(basename): Rename to `base_name' and move to backupfile.
+	* util.c (<signal.h>): Include here, not in common.h.
+	(vararg_start): New macro.
+	(va_dcl, va_start, va_arg, va_end): Define if neither <stdarg.h>
+	nor <varargs.h> are available.
+	(SIGCHLD): Define to SIGCLD if SIGCLD is defined and
+	SIGCHLD isn't.
+	(private_strerror): Remove.
+	(move_file): Remove option of moving to stdout.
+	Add support for -Y, -z.
+	Don't assume chars in file name are nonnegative.
+	Use copy_file if rename fails due to EXDEV;
+	report failure if rename fails for any other reason.
+	(copy_file, makedirs): Use POSIX symbols for permissions.
+	(copy_file): Open source before destination.
+	(remove_prefix): New function.
+	(vfprintf): New function, if !HAVE_VPRINTF.
+	(afatal, apfatal, zfatal, zpfatal, errnum): Remove.
+	(fatal, pfatal, say): New functions that use stdarg.
+	All callers changed.
+	(zask): Renamed from `ask'.  Now uses stdarg.  Output to stdout,
+	and read from /dev/tty, or if that cannot be opened, from
+	stderr, stdout, stdin, whichever is first a tty.
+	Print "EOF" when an EOF is read.  Do not echo input.
+	(sigs): New array.
+	(sigset_t, sigemptyset, sigmask, sigaddset, sigismember, SIG_BLOCK,
+	SIG_UNBLOCK, SIG_SETMASK, sigprocmask, sigblock, sigsetmask):
+	Define substitutes if not available.
+	(initial_signal_mask, signals_to_block): New vars.
+	(fatal_exit_handler): New function, if !HAVE_SIGACTION.
+	(set_signals, ignore_signals): Use sigaction and sigprocmask style
+	signal-handling if possible; it doesn't lose signals.
+	(set_signals): Default SIGCHLD to work around SysV fork+wait bug.
+	(mkdir): First arg is now const *.
+	(makedirs): Handle multiple adjacent slashes correctly.
+	(fetchname): Do not worry about whether the file exists
+	(that is now the caller's responsibility).
+	Treat a sequence of one or more slashes like one slash.
+	Do not unstrip leading directories if they all exist and if
+	no -p option was given; POSIX doesn't allow this.
+	(memcmp): Remove (now a macro in common.h).
+
+	* version.c (copyright_string, free_software_msgid, authorship_msgid):
+	New constants.
+	(version): Use them.  Use program_name instead of hardwiring it.
+
+	* patch.man: Generate date from RCS Id.
+	Rewrite to match the above changes.
+
+Fri Jul 30 02:02:51 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* configure.in (AC_HAVE_FUNCS): Add mkdir.
+
+	* common.h (Chmod, Fputc, Write, VOID): New macros.
+	(malloc, realloc): Yield `VOID *', not `char *'.
+
+	* util.h (makedirs): Omit `striplast' argument.  Remove `aask'.
+
+	* inp.c (plan_a): Remove fixed internal buffer.  Remove lint.
+
+	* util.c (set_signals, ignore_signals): Trap SIGTERM, too.
+	(makedirs): Removed fixed internal buffer.  Omit `striplast' argument.
+	(mkdir): New function, if !HAVE_MKDIR.
+	(fetchname): Remove fixed internal buffer.
+	Remove lint from various functions.
+
+	* patch.c, pch.c: Remove lint.
+
+Thu Jul 29 20:52:07 1993  David J. MacKenzie  (djm@wookumz.gnu.ai.mit.edu)
+
+	* Makefile.in (config.status): Run config.status --recheck, not
+	configure, to get the right args passed.
+
+Thu Jul 29 07:46:16 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* The following changes remove all remaining fixed limits on memory,
+	and fix bugs in patch's handling of null bytes and files that do not
+	end in newline.  `Patch' now works on binary files.
+
+	* backupfile.c (find_backup_file_name): Don't dump core if malloc fails.
+
+	* EXTERN.h, INTERN.h (EXITING): New macro.
+	* backupfile.[ch], patch.c, pch.c: Add PARAMS to function declarations.
+
+	* common.h (bool): Change to int, so ANSI C prototype promotion works.
+	(CANVARARG): Remove varargs hack; it wasn't portable.
+	(filearg): Now a pointer, not an array, so that it can be reallocated.
+	(GET*, SCCSDIFF, CHECKOUT*, RCSDIFF): Quote operands to commands.
+	(my_exit): Declare here.
+	(BUFFERSIZE, Ctl, filemode, Fseek, Fstat, Lseek, MAXFILEC, MAXHUNKSIZE,
+	Mktemp, myuid, Null, Nullch, Nullfp, Nulline, Pclose, VOIDUSED): Remove.
+	All invokers changed.
+	(Argc, Argv, *define[sd], last_offset, maxfuzz, noreverse, ofp,
+	optind_last, rejfp, rejname): No longer externally visible; all
+	definers changed.
+	(INT_MAX, INT_MIN, STD*_FILENO, SEEK_SET): Define if the underlying
+	system doesn't.  Include <limits.h> for this.
+
+	* configure.in: Add limits.h, memcmp.  Delete getline.
+
+	* inp.c (tibufsize): New variable; buffers grow as needed.
+	(TIBUFSIZE_MINIMUM): New macro.
+	(report_revision): New function.
+	(plan_a): Do not search patch as a big string, since that fails
+	if it contains null bytes.
+	Prepend `./' to filenames starting with `-', for RCS and SCCS.
+	If file does not match default RCS/SCCS version, go ahead and patch
+	it anyway; warn about the problem but do not report a fatal error.
+	(plan_b): Do not use a fixed buffer to read lines; read byte by byte
+	instead, so that the lines can be arbitrarily long.  Do not search
+	lines as strings, since they may contain null bytes.
+	(plan_a, plan_b): Report I/O errors.
+
+	* inp.c, inp.h (rev_in_string): Remove.
+	(ifetch): Yield size of line too, since strlen no longer applies.
+	(plan_a, plan_b): No longer exported.
+
+	* patch.c (abort_hunk, apply_hunk, patch_match, similar):
+	Lines may contain NUL and need not end in newline.
+	(copy_till, dump_line): Insert newline if appending after partial line.
+	All invokers changed.
+	(main, get_some_switches, apply_hunk): Allocate *_define[ds], filearg,
+	rejname dynamically.
+	(make_temp): New function.
+	(main): Use it.
+	(main, spew_output, dump_line) Check for I/O errors.
+
+	* pch.c (open_patch_file): Don't copy stdin to a temporary file if
+	it's a regular file, since we can seek on it directly.
+	(open_patch_file, skip_to, another_hunk): The patch file may contain
+	NULs.
+	(another_hunk): The patch file may contain lines starting with '\',
+	which means the preceding line lacked a trailing newline.
+	(pgetline): Rename to pget_line.
+	(get_line, incomplete_line, pch_write_line): New functions.
+	(pch_line_len): Return size_t, not short; lines may be very long.
+	(do_ed_script): Check for I/O errors.  Allow scripts to contain
+	'i' and 's' commands, too.
+
+	* pch.h (pfp, grow_hunkmax, intuit_diff_type, next_intuit_at, skip_to,
+	pfetch, pgetline): No longer exported.
+	(pch_write_line): New declaration.
+	(getline): Removed.
+
+	* util.c (move_file, fetchname): Use private stat buffer, so that
+	filestat isn't lost.  Check for I/O errors.
+	(savestr): Use savebuf.
+	(zask): Use STD*_FILENO instead of 0, 1, 2.
+	(fetchname): strip_leading defaults to INT_MAX instead of 957 (!).
+	(memcmp): Define if !HAVE_MEMCMP.
+
+	* util.c, util.h (say*, fatal*, pfatal*, ask*): Delete; these
+	pseudo-varargs functions weren't ANSI C.  Replace by macros
+	that invoke [fs]printf directly, and invoke new functions
+	[az]{say,fatal,pfatal,ask} before and after.
+	(savebuf, read_fatal, write_fatal, memory_fatal, Fseek): New functions.
+	(fatal*): Output trailing newline after message.  All invokers changed.
+
+	* version.c (version): Don't exit.
+
+	* Makefile.in (SRCS): Remove getline.c.
+
+Thu Jul 22 15:24:24 1993  David J. MacKenzie  (djm@goldman.gnu.ai.mit.edu)
+
+	* EXTERN.h, INTERN.h (PARAMS): Define.
+	* backupfile.h, common.h, inp.h, pch.h, util.h: Use.
+	* backupfile.c: Include EXTERN.h.
+
+Wed Jul 21 13:14:05 1993  David J. MacKenzie  (djm@goldman.gnu.ai.mit.edu)
+
+	* getline.c: New file.
+	* configure.in: Check for getline (GNU libc has it).
+	* pch.c: Use it instead of fgets.
+	(pgetline): Renamed from pgets.  Change callers.
+	* pch.h: Change decl.
+
+	* pch.c (pgets): Tab adjusts by 8 - (indent % 8), not % 7.
+	Be consistent with similar code in pch.c::intuit_diff_type.
+
+	* common.h (MEM): Typedef removed.
+	inp.c, pch.c, util.c: Use size_t instead of MEM.
+	inp.c, pch.c: Use off_t.
+	configure.in: Add AC_SIZE_T and AC_OFF_T.
+
+	* common.h: Make buf a pointer and add a bufsize variable.
+	* util.c, pch.c, inp.c: Replace sizeof buf with bufsize.
+	* patch.c: malloc buf to bufsize bytes.
+
+Tue Jul 20 20:40:03 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* common.h (BUFFERSIZE): Grow it to 8k too, just in case.
+	(buf): Turn `buf' back into an array; making it a pointer broke
+	things seriously.
+	* patch.c (main): Likewise.
+
+Tue Jul 20 20:02:40 1993  David J. MacKenzie  (djm@goldman.gnu.ai.mit.edu)
+
+	* Move Reg[1-16] and CANVARARG decls from config.h.in to common.h.
+	* acconfig.h: New file.
+	* Makefile (HDRS): Add it.
+
+Tue Jul 20 16:35:27 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* Makefile.in: Remove alloca.[co]; getopt no longer needs it.
+	* configure.in (AC_ALLOCA): Remove.
+
+	* util.c (set_signals, ignore_signals): Do nothing if SIGHUP
+	and SIGINT aren't defined.
+
+Tue Jul 20 17:59:56 1993  David J. MacKenzie  (djm@goldman.gnu.ai.mit.edu)
+
+	* patch.c (main): Call xmalloc, not malloc.  xmalloc buf.
+	* common.h: Declare xmalloc.  Make buf a pointer, not an array.
+
+	* util.c (xmalloc): Call fatal1, not fatal.
+
+	* common.h [MAXLINELEN]: Bump from 1k to 8k.
+
+Thu Jul  8 19:56:16 1993  David J. MacKenzie  (djm@goldman.gnu.ai.mit.edu)
+
+	* Makefile.in (installdirs): New target.
+	(install): Use it.
+	(Makefile, config.status, configure): New targets.
+
+Wed Jul  7 13:25:40 1993  David J. MacKenzie  (djm@goldman.gnu.ai.mit.edu)
+
+	* patch.c (get_some_switches, longopts): Recognize --help
+	option, and call usage.
+	(usage): New function.
+
+Fri Jun 25 07:49:45 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* backupfile.c (find_backup_file_name): Don't use .orig if
+	numbered_existing with no existing numbered backup.
+	(addext):  Don't use ext if !HAVE_LONG_FILE_NAMES,
+	even if it would fit.  This matches patch's historical behavior.
+	(simple_backup_suffix): Default to ".orig".
+	* patch.c (main): Just use that default.
+
+Tue Jun 15 22:32:14 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* config.h.in (HAVE_ALLOCA_H): This #undef was missing.
+	* Makefile.in (info, check, installcheck): New rules.
+
+Sun Jun 13 14:31:29 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* config.h.in (index, rindex): Remove unused macro
+	definitions; they get in the way when porting to AIX.
+	* config.h.in, configure.in (HAVE_STRING_H): Remove unused defn.
+
+Thu Jun 10 21:13:47 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* patchlevel.h: PATCH_VERSION 2.1.
+	(The name `patch-2.0.12g12' is too long for traditional Unix.)
+
+	* patchlevel.h (PATCH_VERSION): Renamed from PATCHLEVEL.
+	Now contains the entire patch version number.
+	* version.c (version): Use it.
+
+Wed Jun  9 21:43:23 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* common.h: Remove declarations of index and rindex.
+	* backupfile.c: Likewise.
+	(addext, basename, dirname): Avoid rindex.
+
+Tue Jun  8 15:24:14 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* inp.c (plan_a): Check that RCS and working files are not the
+	same.  This check is needed on hosts that do not report file
+	name length limits and have short limits.
+
+Sat Jun  5 22:56:07 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* Makefile.in (.c.o): Put $(CFLAGS) after other options.
+	(dist): Switch from .z to .gz.
+
+Wed Jun  2 10:37:15 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* backupfile.c (find_backup_file_name): Initialize copy of
+	file name properly.
+
+Mon May 31 21:55:21 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* patchlevel.h: Patch level 12g11.
+
+	* pch.c (p_Char): Renamed from p_char, which is a system type
+	in Tex XD88's <sys/types.h>.
+
+	* backupfile.c: Include "config.h" first, so that `const' is
+	treated consistently in system headers.
+
+Mon May 31 16:06:23 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* patchlevel.h: Patch level 12g10.
+
+	* configure.in: Add AC_CONST.
+	* config.h.in: Add `const'.
+	* Makefile.in (.c.o): Add -DHAVE_CONFIG_H.
+	(getopt.o getopt1.o): Depend on config.h.
+
+	* util.c (xmalloc): New function; alloca.c needs this.
+
+Mon May 31 00:49:40 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* patchlevel.h: PATCHLEVEL 12g9.
+
+	* backupfile.c, backupfile.h (addext): New function.
+	It uses pathconf(), if available, to determine maximum file
+	name length.
+	* patch.c (main): Use it for reject file name.
+	* common.h (ORIGEXT): Moved to patch.c.
+	* config.h.in (HAVE_PATHCONF): New macro.
+	* configure.in: Define it.
+
+	* Makefile.in (dist): Use gzip, not compress.
+
+Sat May 29 09:42:18 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* patch.c (main): Use pathconf to decide reject file name.
+	* common.h (REJEXT): Remove.
+
+	* inp.c (plan_a): Don't lock the checked-out file if `patch -o'
+	redirected the output elsewhere.
+	* common.h (CHECKOUT_LOCKED, GET_LOCKED): New macros.  GET and
+	CHECKOUT now just checkout unlocked copies.
+
+Fri May 28 08:44:50 1993  Paul Eggert  (eggert@twinsun.com)
+
+	* backupfile.c (basename): Define even if NODIR isn't defined.
+	* patch.c (main): Ask just once to apply a reversed patch.
+
+Tue Nov 24 08:09:04 1992  David J. MacKenzie  (djm@goldman.gnu.ai.mit.edu)
+
+	* config.h.in, common.h: Use HAVE_FCNTL_H and HAVE_STRING_H
+	instead of USG.
+
+	* backupfile.c: Use SYSDIR and NDIR instead of USG.
+	Define direct as dirent, not vice-versa.
+
+Wed Sep 16 17:11:48 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* patch.c (get_some_switches): optc should be int, not char.
+
+Tue Sep 15 00:36:46 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* patchlevel.h: PATCHLEVEL 12g8.
+
+Mon Sep 14 22:01:23 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* Makefile.in: Add uninstall target.
+
+	* util.c (fatal, pfatal): Add some asterisks to make fatal
+	messages stand out more.
+
+Tue Aug 25 22:13:36 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* patch.c (main, get_some_switches), common.h, inp.c (plan_a,
+	plan_b), pch.c (there_is_another_patch): Add -t --batch
+	option, similar to -f --force.
+
+Mon Jul 27 11:27:07 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* common.h: Define SCCSDIFF and RCSDIFF.
+	* inp.c (plan_a): Use them to make sure it's safe to check out
+	the default RCS or SCCS version.
+	From Paul Eggert.
+
+Mon Jul 20 14:10:32 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* util.h: Declare basename.
+	* inp.c (plan_a), util.c (fetchname): Use it to isolate the
+	leading path when testing for RCS and SCCS files.
+
+Fri Jul 10 16:03:23 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* util.c (makedirs): Only make the directories that don't exist.
+	From chip@tct.com (Chip Salzenberg).
+
+Wed Jul  8 01:20:56 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* patch.c (main): Open ofp after checking for ed script.
+	Close ofp and rejfp before trying plan B.
+	From epang@sfu.ca (Eugene Pang).
+
+	* util.c (fatal, pfatal): Print "patch: " before message.
+	* pch.c, inp.c, patch.c, util.c: Remove "patch: " from the
+	callers that had it.
+
+	* common.h (myuid): New variable.
+	* patch.c (main): Initialize it.
+	* inp.c (myuid): Function removed.
+	(plan_a): Use the variable, not the function.
+
+	* patch.c: Add back -E --remove-empty-files option.
+
+Tue Jul  7 23:19:28 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* inp.c (myuid): New function.
+	(plan_a): Call it.  Optimize stat calls.  Be smarter about
+	detecting checked out RCS and SCCS files.
+	From Paul Eggert (eggert@twinsun.com).
+
+	* inp.c, util.c, patch.c: Don't bother checking for stat() > 0.
+
+Mon Jul  6 13:01:52 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* util.c (move_file): Use rename instead of link and copying.
+
+	* util.c (pfatal): New function.
+	* util.h: Declare it and pfatal[1-4] macros.
+	* various files: Use it instead of fatal where appropriate.
+
+	* common.h, patch.c: Replace Arg[cv]_last with optind_last.
+
+	* patch.c (main, get_some_switches): Use getopt_long.  Update
+	usage message.
+	(nextarg): Function removed.
+
+	* Rename FLEXFILENAMES to HAVE_LONG_FILE_NAMES,
+	VOIDSIG to RETSIGTYPE.
+
+	* backupfile.c, common.h: Use STDC header files if available.
+	backupfile.h: Declare get_version.
+
+	* COPYING, COPYING.LIB, INSTALL, Makefile.in, alloca.c,
+	config.h.in, configure, configure.in, getopt.[ch], getopt1.c,
+	rename.c: New files.
+	* Configure, MANIFEST, Makefile.SH, config.H, config.h.SH,
+	malloc.c: Files removed.
+
+	* version.c (version): Don't print the RCS stuff, since we're
+	not updating it regularly.
+
+	* patchlevel.h: PATCHLEVEL 12u7.
+
+	* Makefile.SH (dist): New target.
+	Makedist: File removed.
+
+	* inp.c (plan_a): Check whether the user can write to the
+	file, not whether anyone can write to the file.
+
+Sat Jul  4 00:06:58 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* inp.c (plan_a): Try to check out read-only files from RCS or SCCS.
+
+	* util.c (move_file): If backing up by linking fails, try copying.
+	From cek@sdc.boeing.com (Conrad Kimball).
+
+	* patch.c (get_some_switches): Eliminate -E option; always
+	remove empty output files.
+
+	* util.c (fetchname): Only undo slash removal for relative
+	paths if -p was not given.
+
+	* Makefile.sh: Add mostlyclean target.
+
+Fri Jul  3 23:48:14 1992  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
+
+	* util.c (fetchname): Accept whitespace between `Index:' and filename.
+	Also plug a small memory leak for diffs against /dev/null.
+	From eggert@twinsun.com (Paul Eggert).
+
+	* common.h: Don't define TRUE and FALSE if already defined.
+	From phk@data.fls.dk (Poul-Henning Kamp).
+
+Wed Apr 29 10:19:33 1992  David J. MacKenzie  (djm@churchy.gnu.ai.mit.edu)
+
+	* backupfile.c (get_version): Exit if given a bad backup type.
+
+Fri Mar 27 09:57:14 1992  Karl Berry  (karl at hayley)
+
+	* common.h (S_ISDIR, S_ISREG): define these.
+	* inp.c (plan_a): use S_ISREG, not S_IFREG.
+	* util.c (fetchname): use S_ISDIR, not S_IFDIR.
+
+Mon Mar 16 14:10:42 1992  David J. MacKenzie  (djm@wookumz.gnu.ai.mit.edu)
+
+	* patchlevel.h: PATCHLEVEL 12u6.
+
+Sat Mar 14 13:13:29 1992  David J. MacKenzie  (djm at frob.eng.umd.edu)
+
+	* Configure, config.h.SH: Check for directory header and unistd.h.
+
+	* patch.c (main): If -E was given and output file is empty after
+	patching, remove it.
+	(get_some_switches): Recognize -E option.
+
+	* patch.c (copy_till): Make garbled output an error, not a warning
+	that doesn't change the exit status.
+
+	* common.h: Protect against system declarations of malloc and realloc.
+
+	* Makedist: Add backupfile.[ch].
+
+	* Configure: Look for C library where NeXT and SVR4 put it.
+	Look in /usr/ucb after /bin and /usr/bin for utilities,
+	and look in /usr/ccs/bin, to make SVR4 happier.
+	Recognize m68k predefine.
+
+	* util.c (fetchname): Test of stat return value was backward.
+	From csss@scheme.cs.ubc.ca.
+
+	* version.c (version): Exit with status 0, not 1.
+
+	* Makefile.SH: Add backupfile.[cho].
+	* patch.c (main): Initialize backup file generation.
+	(get_some_switches): Add -V option.
+	* common.h, util,c, patch.c: Replace origext with simple_backup_suffix.
+	* util.c (move_file): Use find_backup_file_name.
+
+Tue Dec  3 11:27:16 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
+
+	* patchlevel.h: PATCHLEVEL 12u5.
+
+	* Makefile.SH: Change clean, distclean, and realclean targets a
+	little so they agree with the GNU coding standards.
+	Add Makefile to addedbyconf, so distclean removes it.
+
+	* Configure: Recognize Domain/OS C library in /lib/libc.
+	From mmuegel@mot.com (Michael S. Muegel).
+
+	* pch.c: Fixes from Wayne Davison:
+	Patch now accepts no-context context diffs that are
+	specified with an assumed one line hunk (e.g.  "*** 10 ****").
+	Fixed a bug in both context and unified diff processing that would
+	put a zero-context hunk in the wrong place (one line too soon).
+	Fixed a minor problem with p_max in unified diffs where it would
+	set p_max to hunkmax unnecessarily (the only adverse effect was to
+	not supply empty lines at eof by assuming they were truncated).
+
+Tue Jul  2 03:25:51 1991  David J. MacKenzie  (djm at geech.gnu.ai.mit.edu)
+
+	* Configure: Check for signal declaration in
+	/usr/include/sys/signal.h as well as /usr/include/signal.h.
+
+	* Configure, common.h, config.h.SH: Comment out the sprintf
+	declaration and tests to determine its return value type.  It
+	conflicts with ANSI C systems' prototypes in stdio.h and the
+	return value of sprintf is never used anyway -- it's always cast
+	to void.
+
+Thu Jun 27 13:05:32 1991  David J. MacKenzie  (djm at churchy.gnu.ai.mit.edu)
+
+	* patchlevel.h: PATCHLEVEL 12u4.
+
+Thu Feb 21 15:18:14 1991  David J. MacKenzie  (djm at geech.ai.mit.edu)
+
+	* pch.c (another_hunk): Fix off by 1 error.  From
+	iverson@xstor.com (Tim Iverson).
+
+Sun Jan 20 20:18:58 1991  David J. MacKenzie  (djm at geech.ai.mit.edu)
+
+	* Makefile.SH (all): Don't make a dummy `all' file.
+
+	* patchlevel.h: PATCHLEVEL 12u3.
+
+	* patch.c (nextarg): New function.
+	(get_some_switches): Use it, to prevent dereferencing a null
+	pointer if an option that takes an arg is not given one (is last
+	on the command line).  From Paul Eggert.
+
+	* pch.c (another_hunk): Fix from Wayne Davison to recognize
+	single-line hunks in unified diffs (with a single line number
+	instead of a range).
+
+	* inp.c (rev_in_string): Don't use `s' before defining it.  From
+	Wayne Davison.
+
+Mon Jan  7 06:25:11 1991  David J. MacKenzie  (djm at geech.ai.mit.edu)
+
+	* patchlevel.h: PATCHLEVEL 12u2.
+
+	* pch.c (intuit_diff_type): Recognize `+++' in diff headers, for
+	unified diff format.  From unidiff patch 1.
+
+Mon Dec  3 00:14:25 1990  David J. MacKenzie  (djm at albert.ai.mit.edu)
+
+	* patch.c (get_some_switches): Make the usage message more
+	informative.
+
+Sun Dec  2 23:20:18 1990  David J. MacKenzie  (djm at albert.ai.mit.edu)
+
+	* Configure: When checking for C preprocessor, look for 'abc.*xyz'
+	instead of 'abc.xyz', so ANSI C preprocessors work.
+
+	* Apply fix for -D from ksb@mentor.cc.purdue.edu (Kevin Braunsdorf).
+
+1990-05-01  Wayne Davison  <davison@dri.com>
+	* patch.c, pch.c: unidiff support added
+
+Wed Mar  7 23:47:25 1990  Jim Kingdon  (kingdon at pogo.ai.mit.edu)
+
+	* pch.c: Call malformed instead of goto malformed
+	(just allows easier debugging).
+
+Tue Jan 23 21:27:00 1990  Jim Kingdon  (kingdon at pogo.ai.mit.edu)
+
+	* common.h (TMP*NAME): Make these char *, not char [].
+	patch.c (main): Use TMPDIR (if present) to set TMP*NAME.
+	common.h: Declare getenv.
+
+Sun Dec 17 17:29:48 1989  Jim Kingdon  (kingdon at hobbes.ai.mit.edu)
+
+	* patch.c (reverse_flag_specified): New variable.
+	(get_some_switches, reinitialize_almost_everything): Use it.
+
+1988-06-22  Larry Wall  <sdcrdcf!lwall>
+	patch12:
+	* common.h: sprintf was declared wrong
+	* patch.c: rindex() wasn't declared
+	* patch.man: now avoids Bell System Logo
+
+1988-06-03  Larry Wall  <sdcrdcf!lwall>
+	patch10:
+	* common.h: support for shorter extensions.
+	* inp.c: made a little smarter about sccs files
+	* patch.c: exit code improved.
+	better support for non-flexfilenames.
+	* patch.man: -B switch was contributed.
+	* pch.c: Can now find patches in shar scripts.
+	Hunks that swapped and then swapped back could core dump.
+
+1987-06-04  Larry Wall  <sdcrdcf!lwall>
+	* pch.c: pch_swap didn't swap p_bfake and p_efake.
+
+1987-02-16  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Short replacement caused spurious "Out of sync" message.
+
+1987-01-30  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Improved diagnostic on sync error.
+	Moved do_ed_script() to pch.c.
+	* pch.c: Improved responses to mangled patches.
+	* pch.h: Added do_ed_script().
+
+1987-01-05  Larry Wall  <sdcrdcf!lwall>
+	* pch.c: New-style context diffs caused double call to free().
+
+1986-11-21  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Fuzz factor caused offset of installed lines.
+
+1986-11-14  Larry Wall  <sdcrdcf!lwall>
+	* pch.c: Fixed problem where a long pattern wouldn't grow the hunk.
+	Also restored p_input_line when backtracking so error messages are
+	right.
+
+1986-11-03  Larry Wall  <sdcrdcf!lwall>
+	* pch.c: New-style delete triggers spurious assertion error.
+
+1986-10-29  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Backwards search could terminate prematurely.
+	* pch.c: Could falsely report new-style context diff.
+
+1986-09-17  Larry Wall  <sdcrdcf!lwall>
+	* common.h, inp.c, inp.h, patch.c, patch.man, pch.c, pch.h,
+	util.h, version.c, version.h:  Baseline for netwide release.
+
+1986-08-01  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Fixes for machines that can't vararg.
+	Added fuzz factor.  Generalized -p.  General cleanup.
+	Changed some %d's to %ld's.  Linted.
+	* patch.man: Documented -v, -p, -F.
+	Added notes to patch senders.
+
+1985-08-15  van%ucbmonet@berkeley
+	Changes for 4.3bsd diff -c.
+
+1985-03-26  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Frozen.
+	* patch.man: Frozen.
+
+1985-03-12  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Now checks for normalness of file to patch.
+	Check i_ptr and i_womp to make sure they aren't null before freeing.
+	Also allow ed output to be suppressed.
+	Changed pfp->_file to fileno(pfp).
+	Added -p option from jromine@uci-750a.
+	Added -D (#ifdef) option from joe@fluke.
+	* patch.man: Documented -p, -D.
+
+1984-12-06  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Made smarter about SCCS subdirectories.
+
+1984-12-05  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Added -l switch to do loose string comparison.
+	* patch.man: Added -l switch, and noted bistability bug.
+
+1984-12-04  Larry Wall  <sdcrdcf!lwall>
+	Branch for sdcrdcf changes.
+	* patch.c: Failed hunk count not reset on multiple patch file.
+	* patch.man: Baseline version.
+
+1984-11-29  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Linted.  Identifiers uniquified.  Fixed i_ptr malloc() bug.
+	Fixed multiple calls to mktemp().  Will now work on machines that can
+	only read 32767 chars.  Added -R option for diffs with new and old
+	swapped.  Various cosmetic changes.
+
+1984-11-09  Larry Wall  <sdcrdcf!lwall>
+	* patch.c: Initial revision
+
+
+Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall.
+
+Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001,
+2002, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+This file is part of GNU Patch.
+
+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 3, or (at your option)
+any later version.
+
+This program is distributed in the hope that they will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.