summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am4
-rw-r--r--lib/allocsa.c7
-rw-r--r--lib/allocsa.h7
-rw-r--r--lib/asprintf.c7
-rw-r--r--lib/daemon.c4
-rw-r--r--lib/error.c7
-rw-r--r--lib/error.h7
-rw-r--r--lib/exit.h7
-rw-r--r--lib/exitfail.c6
-rw-r--r--lib/exitfail.h6
-rw-r--r--lib/fnmatch_.h7
-rw-r--r--lib/fnmatch_loop.c7
-rw-r--r--lib/getpass.c7
-rw-r--r--lib/getpass.h7
-rw-r--r--lib/mailcap.c3
-rw-r--r--lib/malloc.c7
-rw-r--r--lib/mbswidth.c7
-rw-r--r--lib/mbswidth.h7
-rw-r--r--lib/mu_asprintf.h7
-rw-r--r--lib/mu_dbm.c3
-rw-r--r--lib/mu_dbm.h3
-rw-r--r--lib/obstack.c7
-rw-r--r--lib/obstack.h7
-rw-r--r--lib/realloc.c7
-rw-r--r--lib/setenv.c7
-rw-r--r--lib/setenv.h7
-rw-r--r--lib/snprintf.c7
-rw-r--r--lib/snprintf.h7
-rw-r--r--lib/stdbool.h9
-rw-r--r--lib/stdbool_.h7
-rw-r--r--lib/unsetenv.c7
-rw-r--r--lib/utmp.c7
-rw-r--r--lib/vasprintf.c7
-rw-r--r--lib/vasprintf.h7
-rw-r--r--lib/xalloc.h7
-rw-r--r--lib/xalloc_die.c3
-rw-r--r--lib/xmalloc.c7
-rw-r--r--lib/xsize.h7
-rw-r--r--lib/xstrtol.c7
-rw-r--r--lib/xstrtol.h7
40 files changed, 147 insertions, 111 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 64d2cf4a8..20dda5f8d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,8 +14,8 @@
##
## 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
noinst_LTLIBRARIES = libmailutils.la
diff --git a/lib/allocsa.c b/lib/allocsa.c
index 61e7a4e34..c2341a998 100644
--- a/lib/allocsa.c
+++ b/lib/allocsa.c
@@ -12,9 +12,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/allocsa.h b/lib/allocsa.h
index 5ae49e507..e9eec711d 100644
--- a/lib/allocsa.h
+++ b/lib/allocsa.h
@@ -12,9 +12,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef _ALLOCSA_H
#define _ALLOCSA_H
diff --git a/lib/asprintf.c b/lib/asprintf.c
index 5935c53e6..380ac029e 100644
--- a/lib/asprintf.c
+++ b/lib/asprintf.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/daemon.c b/lib/daemon.c
index 77000be2e..25e51a62a 100644
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -1,7 +1,7 @@
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -13,7 +13,7 @@
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/lib/error.c b/lib/error.c
index 6b3662d61..da0e06fd5 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -12,9 +12,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
diff --git a/lib/error.h b/lib/error.h
index 8ed63595f..30fc8873e 100644
--- a/lib/error.h
+++ b/lib/error.h
@@ -12,9 +12,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef _ERROR_H
#define _ERROR_H 1
diff --git a/lib/exit.h b/lib/exit.h
index 4e8d46516..23bb12908 100644
--- a/lib/exit.h
+++ b/lib/exit.h
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef _EXIT_H
#define _EXIT_H
diff --git a/lib/exitfail.c b/lib/exitfail.c
index 2ae5f6955..186be4fb9 100644
--- a/lib/exitfail.c
+++ b/lib/exitfail.c
@@ -13,9 +13,9 @@
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,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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. */
#if HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/exitfail.h b/lib/exitfail.h
index cf5ab7195..26f141ec6 100644
--- a/lib/exitfail.h
+++ b/lib/exitfail.h
@@ -13,8 +13,8 @@
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,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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. */
extern int volatile exit_failure;
diff --git a/lib/fnmatch_.h b/lib/fnmatch_.h
index 87e661f72..b0cc2396c 100644
--- a/lib/fnmatch_.h
+++ b/lib/fnmatch_.h
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef _FNMATCH_H
# define _FNMATCH_H 1
diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index 7cea5a76e..0348e2af6 100644
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
/* Match STRING against the filename pattern PATTERN, returning zero if
it matches, nonzero if not. */
diff --git a/lib/getpass.c b/lib/getpass.c
index 4f520aef3..a6f37a650 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#if HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/getpass.h b/lib/getpass.h
index 650212649..f9410284e 100644
--- a/lib/getpass.h
+++ b/lib/getpass.h
@@ -12,9 +12,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef GETPASS_H
#define GETPASS_H
diff --git a/lib/mailcap.c b/lib/mailcap.c
index a4f805b54..cb0c8ecb0 100644
--- a/lib/mailcap.c
+++ b/lib/mailcap.c
@@ -13,7 +13,8 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils; 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 */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/malloc.c b/lib/malloc.c
index ca04c57cd..2372ca66f 100644
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
/* written by Jim Meyering */
diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index a51176026..8baa68902 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
/* Written by Bruno Haible <haible@clisp.cons.org>. */
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 4fcdb2096..2cc7c4178 100644
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#include <stddef.h>
diff --git a/lib/mu_asprintf.h b/lib/mu_asprintf.h
index 5f141e25c..0d2f0ffd6 100644
--- a/lib/mu_asprintf.h
+++ b/lib/mu_asprintf.h
@@ -9,9 +9,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.
- You should have received a copy of the GNU Library General Public License
- along with GNU Mailutils; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ You should have received a copy of the GNU Library General
+ Public License along with GNU Mailutils; if not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA */
#ifndef MUASPRINTF_H
#define MUASPRINTF_H
diff --git a/lib/mu_dbm.c b/lib/mu_dbm.c
index 22c812b5d..c2ab7f6c7 100644
--- a/lib/mu_dbm.c
+++ b/lib/mu_dbm.c
@@ -13,7 +13,8 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils; 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 */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/mu_dbm.h b/lib/mu_dbm.h
index 5ee4d4259..2be981916 100644
--- a/lib/mu_dbm.h
+++ b/lib/mu_dbm.h
@@ -13,7 +13,8 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils; 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 */
#include <mailutils/stream.h>
diff --git a/lib/obstack.c b/lib/obstack.c
index 63396131c..d3fe7a796 100644
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -14,9 +14,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/obstack.h b/lib/obstack.h
index 46a1cb781..e949fd4cc 100644
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -17,9 +17,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
/* Summary:
diff --git a/lib/realloc.c b/lib/realloc.c
index 14fec075f..c03b354ae 100644
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
/* written by Jim Meyering */
diff --git a/lib/setenv.c b/lib/setenv.c
index 320469b86..ae023c758 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#if HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/setenv.h b/lib/setenv.h
index 7ac5ae645..d8d5060e0 100644
--- a/lib/setenv.h
+++ b/lib/setenv.h
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#if HAVE_SETENV || HAVE_UNSETENV
diff --git a/lib/snprintf.c b/lib/snprintf.c
index 9a4edc1f5..2f10e4bc6 100644
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -12,9 +12,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/snprintf.h b/lib/snprintf.h
index a72f74d63..cf594aa9e 100644
--- a/lib/snprintf.h
+++ b/lib/snprintf.h
@@ -12,9 +12,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef SNPRINTF_H
#define SNPRINTF_H
diff --git a/lib/stdbool.h b/lib/stdbool.h
index d1fe7c11a..034e7c20c 100644
--- a/lib/stdbool.h
+++ b/lib/stdbool.h
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef _STDBOOL_H
#define _STDBOOL_H
@@ -71,7 +72,7 @@
(see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
enum; this ensures that '_Bool' promotes to 'int'. */
#if !(defined __cplusplus || defined __BEOS__)
-# if !0
+# if !1
# if defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1)
/* Avoid stupid "warning: _Bool is a keyword in ISO C99". */
# define _Bool signed char
diff --git a/lib/stdbool_.h b/lib/stdbool_.h
index e33715a61..0e2396e27 100644
--- a/lib/stdbool_.h
+++ b/lib/stdbool_.h
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef _STDBOOL_H
#define _STDBOOL_H
diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index 31c299e46..02c8f9de9 100644
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#if HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/utmp.c b/lib/utmp.c
index 8511cd260..e22498f57 100644
--- a/lib/utmp.c
+++ b/lib/utmp.c
@@ -12,9 +12,10 @@ WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+You should have received a copy of the GNU General Public
+Licensealong with this program; if not, write to the Free
+SoftwareFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301 USA. */
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/vasprintf.c b/lib/vasprintf.c
index ba94c64ba..263aa3655 100644
--- a/lib/vasprintf.c
+++ b/lib/vasprintf.c
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/lib/vasprintf.h b/lib/vasprintf.h
index fdd831f20..2f41f9578 100644
--- a/lib/vasprintf.h
+++ b/lib/vasprintf.h
@@ -11,9 +11,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifndef _VASPRINTF_H
#define _VASPRINTF_H
diff --git a/li