From 07e543c45f6b85d1e773307c8d064aa6c589a044 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Jun 2005 11:31:12 +0000 Subject: [PATCH] update FSF address git-archimport-id: bonzini@gnu.org--2004b/sed--stable--4.1--patch-49 --- COPYING | 4 ++-- COPYING.DOC | 2 +- basicdefs.h | 2 +- config/help2man | 2 +- config/stdbool.m4 | 2 +- config/texi2dvi | 2 +- doc/sed-in.texi | 4 ++-- doc/sed.texi | 4 ++-- lib/getopt.c | 2 +- lib/getopt.h | 2 +- lib/getopt1.c | 2 +- lib/memchr.c | 2 +- lib/memcmp.c | 2 +- lib/memmove.c | 2 +- lib/obstack.c | 2 +- lib/obstack.h | 4 ++-- lib/regcomp.c | 4 ++-- lib/regex.c | 4 ++-- lib/regex_.h | 4 ++-- lib/regex_internal.c | 4 ++-- lib/regex_internal.h | 4 ++-- lib/regexec.c | 4 ++-- lib/stdbool_.h | 2 +- lib/strerror.c | 2 +- lib/strverscmp.c | 2 +- lib/utils.c | 2 +- lib/utils.h | 2 +- sed/compile.c | 2 +- sed/execute.c | 2 +- sed/fmt.c | 2 +- sed/mbcs.c | 2 +- sed/regexp.c | 2 +- sed/sed.c | 2 +- sed/sed.h | 2 +- testsuite/bug-regex10.c | 4 ++-- testsuite/bug-regex11.c | 4 ++-- testsuite/bug-regex12.c | 4 ++-- testsuite/bug-regex13.c | 4 ++-- testsuite/bug-regex14.c | 4 ++-- testsuite/bug-regex21.c | 4 ++-- testsuite/bug-regex7.c | 4 ++-- testsuite/bug-regex8.c | 4 ++-- testsuite/bug-regex9.c | 4 ++-- testsuite/runptests.c | 4 ++-- testsuite/tst-boost.c | 4 ++-- testsuite/tst-pcre.c | 4 ++-- testsuite/tst-regex.c | 4 ++-- testsuite/tst-rxspencer.c | 9 +++++---- 48 files changed, 75 insertions(+), 74 deletions(-) diff --git a/COPYING b/COPYING index d60c31a..623b625 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. diff --git a/COPYING.DOC b/COPYING.DOC index b42936b..1a86456 100644 --- a/COPYING.DOC +++ b/COPYING.DOC @@ -2,7 +2,7 @@ Version 1.1, March 2000 Copyright (C) 2000 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/basicdefs.h b/basicdefs.h index 02f61f8..b6f6c63 100644 --- a/basicdefs.h +++ b/basicdefs.h @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #ifndef BASICDEFS_H #define BASICDEFS_H diff --git a/config/help2man b/config/help2man index 5d4377b..abf3259 100755 --- a/config/help2man +++ b/config/help2man @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. # Written by Brendan O'Dea # Available from ftp://ftp.gnu.org/gnu/help2man/ diff --git a/config/stdbool.m4 b/config/stdbool.m4 index 23f4954..3ffe22c 100644 --- a/config/stdbool.m4 +++ b/config/stdbool.m4 @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# 02110-1301, USA. # This macro is only needed in autoconf <= 2.54. Newer versions of autoconf # have this macro built-in. diff --git a/config/texi2dvi b/config/texi2dvi index 010b586..3cb607a 100755 --- a/config/texi2dvi +++ b/config/texi2dvi @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, you can either send email to this # program's maintainer or write to: The Free Software Foundation, -# Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA. +# Inc.; 51 Franklin Street, Fifth Floor; Boston, MA 02110-1301, USA. # # Original author: Noah Friedman . # diff --git a/doc/sed-in.texi b/doc/sed-in.texi index 7d35999..654d31a 100644 --- a/doc/sed-in.texi +++ b/doc/sed-in.texi @@ -44,7 +44,7 @@ either version 1.1, or (at your option) any later version. You should have received a copy of the @acronym{GNU} Free Documentation License along with @value{SSED}; see the file @file{COPYING.DOC}. If not, write to the Free Software Foundation, 59 Temple Place - Suite -330, Boston, MA 02111-1307, USA. +330, Boston, MA 02110-1301, USA. There are no Cover Texts and no Invariant Sections; this text, along with its equivalent in the printed manual, constitutes the Title Page. @@ -65,7 +65,7 @@ Copyright @copyright{} 1998, 1999 Free Software Foundation, Inc. Published by the Free Software Foundation, @* 59 Temple Place - Suite 330 @* -Boston, MA 02111-1307, USA +Boston, MA 02110-1301, USA @end titlepage diff --git a/doc/sed.texi b/doc/sed.texi index 86c35d7..95d7b0c 100644 --- a/doc/sed.texi +++ b/doc/sed.texi @@ -45,7 +45,7 @@ either version 1.1, or (at your option) any later version. You should have received a copy of the @acronym{GNU} Free Documentation License along with @value{SSED}; see the file @file{COPYING.DOC}. If not, write to the Free Software Foundation, 59 Temple Place - Suite -330, Boston, MA 02111-1307, USA. +330, Boston, MA 02110-1301, USA. There are no Cover Texts and no Invariant Sections; this text, along with its equivalent in the printed manual, constitutes the Title Page. @@ -66,7 +66,7 @@ Copyright @copyright{} 1998, 1999 Free Software Foundation, Inc. Published by the Free Software Foundation, @* 59 Temple Place - Suite 330 @* -Boston, MA 02111-1307, USA +Boston, MA 02110-1301, USA @end titlepage diff --git a/lib/getopt.c b/lib/getopt.c index 395d597..6199501 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ /* This tells Alpha OSF/1 not to define a getopt prototype in . diff --git a/lib/getopt.h b/lib/getopt.h index fb30719..5d1fa4a 100644 --- a/lib/getopt.h +++ b/lib/getopt.h @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #ifndef _GETOPT_H diff --git a/lib/getopt1.c b/lib/getopt1.c index ff25737..99900b3 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H diff --git a/lib/memchr.c b/lib/memchr.c index f48388f..acb2745 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H diff --git a/lib/memcmp.c b/lib/memcmp.c index ace5d40..0eadfc3 100644 --- a/lib/memcmp.c +++ b/lib/memcmp.c @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H diff --git a/lib/memmove.c b/lib/memmove.c index 46de02c..262beed 100644 --- a/lib/memmove.c +++ b/lib/memmove.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ /* Last ditch effort to support memmove: if user doesn't have diff --git a/lib/obstack.c b/lib/obstack.c index f67625d..d349446 100644 --- a/lib/obstack.c +++ b/lib/obstack.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + Boston, MA 02110-1301, USA. */ #include "obstack.h" diff --git a/lib/obstack.h b/lib/obstack.h index 71736e3..f77825c 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ /* Summary: diff --git a/lib/regcomp.c b/lib/regcomp.c index 4fe5d5c..dd11bb3 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, int length, reg_syntax_t syntax); diff --git a/lib/regex.c b/lib/regex.c index 7a4f304..60b7300 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/lib/regex_.h b/lib/regex_.h index b2d9a62..99e7214 100644 --- a/lib/regex_.h +++ b/lib/regex_.h @@ -16,8 +16,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #ifndef _REGEX_H #define _REGEX_H 1 diff --git a/lib/regex_internal.c b/lib/regex_internal.c index c3295a8..fd6ebe8 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ static void re_string_construct_common (const char *str, int len, re_string_t *pstr, diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 299c6e9..0a55cf3 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #ifndef _REGEX_INTERNAL_H #define _REGEX_INTERNAL_H 1 diff --git a/lib/regexec.c b/lib/regexec.c index 636396e..b077c20 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, int n) internal_function; diff --git a/lib/stdbool_.h b/lib/stdbool_.h index 69f6ef7..4af0517 100644 --- a/lib/stdbool_.h +++ b/lib/stdbool_.h @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #ifndef _STDBOOL_H #define _STDBOOL_H diff --git a/lib/strerror.c b/lib/strerror.c index 5a666d2..96bf6ec 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + Boston, MA 02110-1301, USA. */ #include "config.h" diff --git a/lib/strverscmp.c b/lib/strverscmp.c index 93d7160..11933c3 100644 --- a/lib/strverscmp.c +++ b/lib/strverscmp.c @@ -16,7 +16,7 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + Boston, MA 02110-1301, USA. */ #if HAVE_CONFIG_H # include diff --git a/lib/utils.c b/lib/utils.c index dbabebb..440a895 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #include "config.h" diff --git a/lib/utils.h b/lib/utils.h index 921795d..10e7780 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #include diff --git a/sed/compile.c b/sed/compile.c index cbf3a84..74278af 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ /* compile.c: translate sed source into internal form */ diff --git a/sed/execute.c b/sed/execute.c index 6ccf944..8b70874 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #undef EXPERIMENTAL_DASH_N_OPTIMIZATION /*don't use -- is very buggy*/ #define INITIAL_BUFFER_SIZE 50 diff --git a/sed/fmt.c b/sed/fmt.c index 693b523..611c2c2 100644 --- a/sed/fmt.c +++ b/sed/fmt.c @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ /* GNU fmt was written by Ross Paterson . */ diff --git a/sed/mbcs.c b/sed/mbcs.c index fe471f2..06e58dd 100644 --- a/sed/mbcs.c +++ b/sed/mbcs.c @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #include "sed.h" #include diff --git a/sed/regexp.c b/sed/regexp.c index bffbfb6..039c326 100644 --- a/sed/regexp.c +++ b/sed/regexp.c @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #include "sed.h" diff --git a/sed/sed.c b/sed/sed.c index 3b86ac4..c12bd28 100644 --- a/sed/sed.c +++ b/sed/sed.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #include "sed.h" diff --git a/sed/sed.h b/sed/sed.h index 11c4be1..a78d470 100644 --- a/sed/sed.h +++ b/sed/sed.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/testsuite/bug-regex10.c b/testsuite/bug-regex10.c index 5cb0146..ec5b925 100644 --- a/testsuite/bug-regex10.c +++ b/testsuite/bug-regex10.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include #include diff --git a/testsuite/bug-regex11.c b/testsuite/bug-regex11.c index 0db7bdc..e43e860 100644 --- a/testsuite/bug-regex11.c +++ b/testsuite/bug-regex11.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/bug-regex12.c b/testsuite/bug-regex12.c index 77f33f0..d73c810 100644 --- a/testsuite/bug-regex12.c +++ b/testsuite/bug-regex12.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/bug-regex13.c b/testsuite/bug-regex13.c index 1c8efd6..9f57e3b 100644 --- a/testsuite/bug-regex13.c +++ b/testsuite/bug-regex13.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/bug-regex14.c b/testsuite/bug-regex14.c index 0a3a41e..168435b 100644 --- a/testsuite/bug-regex14.c +++ b/testsuite/bug-regex14.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/bug-regex21.c b/testsuite/bug-regex21.c index 1446410..463e8d4 100644 --- a/testsuite/bug-regex21.c +++ b/testsuite/bug-regex21.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/bug-regex7.c b/testsuite/bug-regex7.c index 4459459..a81cad7 100644 --- a/testsuite/bug-regex7.c +++ b/testsuite/bug-regex7.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include #include diff --git a/testsuite/bug-regex8.c b/testsuite/bug-regex8.c index 8383e01..8e1d557 100644 --- a/testsuite/bug-regex8.c +++ b/testsuite/bug-regex8.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include #include diff --git a/testsuite/bug-regex9.c b/testsuite/bug-regex9.c index 4ddc0e1..cc77d74 100644 --- a/testsuite/bug-regex9.c +++ b/testsuite/bug-regex9.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/runptests.c b/testsuite/runptests.c index 4d43180..985b1db 100644 --- a/testsuite/runptests.c +++ b/testsuite/runptests.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include #include diff --git a/testsuite/tst-boost.c b/testsuite/tst-boost.c index 5d41c12..117ac9b 100644 --- a/testsuite/tst-boost.c +++ b/testsuite/tst-boost.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/tst-pcre.c b/testsuite/tst-pcre.c index 777c99d..c865091 100644 --- a/testsuite/tst-pcre.c +++ b/testsuite/tst-pcre.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/tst-regex.c b/testsuite/tst-regex.c index f29fc92..57d3ab8 100644 --- a/testsuite/tst-regex.c +++ b/testsuite/tst-regex.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" diff --git a/testsuite/tst-rxspencer.c b/testsuite/tst-rxspencer.c index 5dcb23b..be4d55a 100644 --- a/testsuite/tst-rxspencer.c +++ b/testsuite/tst-rxspencer.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #include "config.h" @@ -188,7 +188,8 @@ check_match (regmatch_t *rm, int idx, const char *string, return 1; } - if (strncmp (string + rm[idx].rm_so, match + 1, strlen (match + 1) ?: 1)) + if (strncmp (string + rm[idx].rm_so, match + 1, strlen (match + 1) + ? strlen (match + 1) : 1)) { printf ("%s rm[%d] not matching %s\n", fail, idx, match); return 1; @@ -299,7 +300,7 @@ test (const char *pattern, int cflags, const char *string, int eflags, if (p != NULL) *p = '\0'; } - ret = check_match (rm, n, string, matches ?: "-", fail); + ret = check_match (rm, n, string, matches ? matches : "-", fail); if (p) { *p = ',';