More copyright and email addr cleanups

6 files changed, 8 insertions, 13 deletions

diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 6c3f3229a..6c28d181d 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -7,8 +7,8 @@
  * Originally adjusted for busybox by Sven Rudolph <sr1@inf.tu-dresden.de>
  * based on gzip sources
  *
- * Adjusted further by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- * to support files as well as stdin/stdout, and to generally behave itself wrt
+ * Adjusted further by Erik Andersen <andersee@debian.org> to support
+ * files as well as stdin/stdout, and to generally behave itself wrt
  * command line handling.
  *
  * General cleanup to better adhere to the style guide and make use of standard
diff --git a/archival/libunarchive/unzip.c b/archival/libunarchive/unzip.c
index 6c3f3229a..6c28d181d 100644
--- a/archival/libunarchive/unzip.c
+++ b/archival/libunarchive/unzip.c
@@ -7,8 +7,8 @@
  * Originally adjusted for busybox by Sven Rudolph <sr1@inf.tu-dresden.de>
  * based on gzip sources
  *
- * Adjusted further by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- * to support files as well as stdin/stdout, and to generally behave itself wrt
+ * Adjusted further by Erik Andersen <andersee@debian.org> to support
+ * files as well as stdin/stdout, and to generally behave itself wrt
  * command line handling.
  *
  * General cleanup to better adhere to the style guide and make use of standard
diff --git a/libbb/README b/libbb/README
index 0e36f84b6..d1886aeab 100644
--- a/libbb/README
+++ b/libbb/README
@@ -5,11 +5,9 @@ libbb is BusyBox's utility library.  This all used to be in a single file
 not carefully fix up the copyright and licensing information.  I'll do that for
 the next release.
 
-For now, justtrust me that a bunch of people have worked on this stuff, 
+For now, just trust me that a bunch of people have worked on this stuff, 
 and it is all GPL'ed.
 
         Erik Andersen 
-        <andersen@lineo.com>
-        <andersee@debian.org>
         <andersee@codepoet.org>
 
diff --git a/libbb/libc5.c b/libbb/libc5.c
index 20295fd4b..df622f65b 100644
--- a/libbb/libc5.c
+++ b/libbb/libc5.c
@@ -78,8 +78,7 @@ ssize_t getline(char **linebuf, size_t *n, FILE *file)
  * Copyright (c) 1991, 1993
  *      The Regents of the University of California.  All rights reserved.
  *
- * Modified for uClibc by Erik Andersen 
- *        <andersee@debian.org>, <andersen@lineo.com>
+ * Modified for uClibc by Erik Andersen <andersee@debian.org>
  *
  * The uClibc Library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License as
diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index cf5b838a1..7b2a1ca51 100644
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -2,10 +2,8 @@
 /*
  * simplify_path implementation for busybox
  *
- *
  * Copyright (C) 2001  Manuel Novoa III  <mjn3@opensource.lineo.com>
  *
- *
  * 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 2 of the License, or
diff --git a/libbb/unzip.c b/libbb/unzip.c
index 6c3f3229a..6c28d181d 100644
--- a/libbb/unzip.c
+++ b/libbb/unzip.c
@@ -7,8 +7,8 @@
  * Originally adjusted for busybox by Sven Rudolph <sr1@inf.tu-dresden.de>
  * based on gzip sources
  *
- * Adjusted further by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- * to support files as well as stdin/stdout, and to generally behave itself wrt
+ * Adjusted further by Erik Andersen <andersee@debian.org> to support
+ * files as well as stdin/stdout, and to generally behave itself wrt
  * command line handling.
  *
  * General cleanup to better adhere to the style guide and make use of standard