Merge changes between r17050 and r17194 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@17195 7b3dc134-2b1b-0410-93df-9e9f96275f8d

26 files changed, 52 insertions, 78 deletions

diff --git a/libc/socket/Makefile b/libc/socket/Makefile
index 0e242b579..b5be39a67 100644
--- a/libc/socket/Makefile
+++ b/libc/socket/Makefile
@@ -12,9 +12,8 @@
 # Lesser General Public License for more details.
 
 # 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.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 #
 #	Sub-makefile for socket portion of the library.
diff --git a/libc/socket/accept.c b/libc/socket/accept.c
index dad34cedd..b9df1ac74 100644
--- a/libc/socket/accept.c
+++ b/libc/socket/accept.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/accept4.c b/libc/socket/accept4.c
index 40709d570..7c7e2dd9a 100644
--- a/libc/socket/accept4.c
+++ b/libc/socket/accept4.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/bind.c b/libc/socket/bind.c
index 382e29db1..e87351d55 100644
--- a/libc/socket/bind.c
+++ b/libc/socket/bind.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/bits/socket2.h b/libc/socket/bits/socket2.h
index 5c4cb47a6..d12f06adf 100644
--- a/libc/socket/bits/socket2.h
+++ b/libc/socket/bits/socket2.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _SYS_SOCKET_H
 # error "Never include <bits/socket2.h> directly; use <sys/socket.h> instead."
diff --git a/libc/socket/connect.c b/libc/socket/connect.c
index 55093313c..063a8c94a 100644
--- a/libc/socket/connect.c
+++ b/libc/socket/connect.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/getpeername.c b/libc/socket/getpeername.c
index 6507387bd..9562814e7 100644
--- a/libc/socket/getpeername.c
+++ b/libc/socket/getpeername.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/getsockname.c b/libc/socket/getsockname.c
index b698bdbb7..03d97652e 100644
--- a/libc/socket/getsockname.c
+++ b/libc/socket/getsockname.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/getsockopt.c b/libc/socket/getsockopt.c
index 8f4fa8957..661bcf3ff 100644
--- a/libc/socket/getsockopt.c
+++ b/libc/socket/getsockopt.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/have_sock_cloexec.c b/libc/socket/have_sock_cloexec.c
index 22dccdf72..d57cbcfaa 100644
--- a/libc/socket/have_sock_cloexec.c
+++ b/libc/socket/have_sock_cloexec.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <sys/socket.h>
 #include <kernel-features.h>
diff --git a/libc/socket/isfdtype.c b/libc/socket/isfdtype.c
index ba10912c9..188d516d7 100644
--- a/libc/socket/isfdtype.c
+++ b/libc/socket/isfdtype.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/libc/socket/listen.c b/libc/socket/listen.c
index cbdd8b9d1..0c1af8231 100644
--- a/libc/socket/listen.c
+++ b/libc/socket/listen.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/opensock.c b/libc/socket/opensock.c
index 4a4d5dd38..eae848913 100644
--- a/libc/socket/opensock.c
+++ b/libc/socket/opensock.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <sys/socket.h>
diff --git a/libc/socket/recv.c b/libc/socket/recv.c
index 62af8fedf..43fdcfcde 100644
--- a/libc/socket/recv.c
+++ b/libc/socket/recv.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/recvfrom.c b/libc/socket/recvfrom.c
index 4f6a04507..654d2e93a 100644
--- a/libc/socket/recvfrom.c
+++ b/libc/socket/recvfrom.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/recvmsg.c b/libc/socket/recvmsg.c
index 419415cd7..7cd6ff3dd 100644
--- a/libc/socket/recvmsg.c
+++ b/libc/socket/recvmsg.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/send.c b/libc/socket/send.c
index 14ef9df2a..2b87baea0 100644
--- a/libc/socket/send.c
+++ b/libc/socket/send.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/sendmsg.c b/libc/socket/sendmsg.c
index a4a3cea95..249bb5af3 100644
--- a/libc/socket/sendmsg.c
+++ b/libc/socket/sendmsg.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/sendto.c b/libc/socket/sendto.c
index 55adfe7df..040caf8fa 100644
--- a/libc/socket/sendto.c
+++ b/libc/socket/sendto.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/setsockopt.c b/libc/socket/setsockopt.c
index aca73623f..21824f625 100644
--- a/libc/socket/setsockopt.c
+++ b/libc/socket/setsockopt.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/shutdown.c b/libc/socket/shutdown.c
index 6fb25a4bc..8ce992c47 100644
--- a/libc/socket/shutdown.c
+++ b/libc/socket/shutdown.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/sockatmark.c b/libc/socket/sockatmark.c
index 402ef9b4d..dd11b42a0 100644
--- a/libc/socket/sockatmark.c
+++ b/libc/socket/sockatmark.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/socket.c b/libc/socket/socket.c
index 94e70bc4e..273924a05 100644
--- a/libc/socket/socket.c
+++ b/libc/socket/socket.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/socketpair.c b/libc/socket/socketpair.c
index ad277c00e..7933d44d6 100644
--- a/libc/socket/socketpair.c
+++ b/libc/socket/socketpair.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/libc/socket/sys/socket.h b/libc/socket/sys/socket.h
index 6fb51d7fc..556ae905f 100644
--- a/libc/socket/sys/socket.h
+++ b/libc/socket/sys/socket.h
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef	_SYS_SOCKET_H
 #define	_SYS_SOCKET_H	1
diff --git a/libc/socket/sys/un.h b/libc/socket/sys/un.h
index 1fa10e4fe..e49d552bd 100644
--- a/libc/socket/sys/un.h
+++ b/libc/socket/sys/un.h
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef	_SYS_UN_H
 #define	_SYS_UN_H	1