summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--NEWS2
-rw-r--r--README2
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--inp.c12
-rw-r--r--patchlevel.h2
7 files changed, 28 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 51e05d1..8922fe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
diff --git a/NEWS b/NEWS
index 41c8012..8750752 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Changes in version 2.5.8: bug fixes only.
+
Changes in version 2.5.7:
* patch -D now outputs preprocessor lines without comments, as required
diff --git a/README b/README
index 6206918..db63301 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ They add support for:
* making GNU Emacs-style backup files
* improved interaction with RCS and SCCS
* the GNU conventions for option parsing and configuring and compilation.
- * better POSIX.2 compliance
+ * better POSIX compliance
They also fix some bugs. See the NEWS and ChangeLog files for details.
Tutorial-style documentation for patch is included in the GNU
diff --git a/configure b/configure
index b54ccea..64553c1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for patch 2.5.7.
+# Generated by GNU Autoconf 2.53 for patch 2.5.8.
#
# Report bugs to <bug-patch@gnu.org>.
#
@@ -262,8 +262,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='patch'
PACKAGE_TARNAME='patch'
-PACKAGE_VERSION='2.5.7'
-PACKAGE_STRING='patch 2.5.7'
+PACKAGE_VERSION='2.5.8'
+PACKAGE_STRING='patch 2.5.8'
PACKAGE_BUGREPORT='bug-patch@gnu.org'
ac_unique_file="patch.c"
@@ -768,7 +768,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures patch 2.5.7 to adapt to many kinds of systems.
+\`configure' configures patch 2.5.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -830,7 +830,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of patch 2.5.7:";;
+ short | recursive ) echo "Configuration of patch 2.5.8:";;
esac
cat <<\_ACEOF
@@ -914,7 +914,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-patch configure 2.5.7
+patch configure 2.5.8
generated by GNU Autoconf 2.53
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -929,7 +929,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by patch $as_me 2.5.7, which was
+It was created by patch $as_me 2.5.8, which was
generated by GNU Autoconf 2.53. Invocation command line was
$ $0 $@
@@ -7934,7 +7934,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by patch $as_me 2.5.7, which was
+This file was extended by patch $as_me 2.5.8, which was
generated by GNU Autoconf 2.53. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7993,7 +7993,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-patch config.status 2.5.7
+patch config.status 2.5.8
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index b8134c5..a37a3a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
# 02111-1307, USA.
AC_PREREQ(2.53)
-AC_INIT(patch, 2.5.7, bug-patch@gnu.org)
+AC_INIT(patch, 2.5.8, bug-patch@gnu.org)
AC_CONFIG_SRCDIR(patch.c)
AC_CONFIG_HEADER(config.h:config.hin)
AC_ARG_PROGRAM
diff --git a/inp.c b/inp.c
index 6195f3f..8fe5462 100644
--- a/inp.c
+++ b/inp.c
@@ -1,6 +1,6 @@
/* inputting files to be patched */
-/* $Id: inp.c,v 1.23 2002/05/28 07:12:03 eggert Exp $ */
+/* $Id: inp.c,v 1.24 2002/06/03 05:35:40 eggert Exp $ */
/* Copyright (C) 1986, 1988 Larry Wall
Copyright (C) 1991, 1992, 1993, 1997, 1998, 1999, 2002 Free Software
@@ -105,26 +105,26 @@ scan_input (char *filename)
static void
report_revision (int found_revision)
{
- revision = quotearg (revision);
+ char const *rev = quotearg (revision);
if (found_revision)
{
if (verbosity == VERBOSE)
- say ("Good. This file appears to be the %s version.\n", revision);
+ say ("Good. This file appears to be the %s version.\n", rev);
}
else if (force)
{
if (verbosity != SILENT)
say ("Warning: this file doesn't appear to be the %s version -- patching anyway.\n",
- revision);
+ rev);
}
else if (batch)
fatal ("This file doesn't appear to be the %s version -- aborting.",
- revision);
+ rev);
else
{
ask ("This file doesn't appear to be the %s version -- patch anyway? [n] ",
- revision);
+ rev);
if (*buf != 'y')
fatal ("aborted");
}
diff --git a/patchlevel.h b/patchlevel.h
index a49f30a..d4a5a24 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1 +1 @@
-#define PATCH_VERSION "2.5.7"
+#define PATCH_VERSION "2.5.8"