Change license statements (and clean up headers) on some of the files that

Erik or I are primary copyright holders on.

diff --git a/applets/individual.c b/applets/individual.c
index bc5f528..911f760 100644 (file)
--- a/applets/individual.c
+++ b/applets/individual.c
@@ -2,7 +2,7 @@
  *
  * Copyright 2005 Rob Landley <rob@landley.net
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details
  */
 
 const char *bb_applet_name;

diff --git a/editors/sed.c b/editors/sed.c
index f8e3720..9843758 100644 (file)
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -10,7 +10,7 @@
  *
  * MAINTAINER: Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 /* Code overview.

diff --git a/findutils/find.c b/findutils/find.c
index aa915fa..7e3613a 100644 (file)
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -7,7 +7,7 @@
  * Reworked by David Douthitt <n9ubh@callsign.net> and
  *  Matt Kraai <kraai@alumni.carnegiemellon.edu>.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
 #include "busybox.h"

diff --git a/init/halt.c b/init/halt.c
index d1f561b..7bd2789 100644 (file)
--- a/init/halt.c
+++ b/init/halt.c
@@ -4,13 +4,11 @@
  *
  * Copyright 2006 by Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"
-#include <signal.h>
 #include <sys/reboot.h>
-#include <unistd.h>
 
 int halt_main(int argc, char *argv[])
 {

diff --git a/init/init_shared.c b/init/init_shared.c
index 0abe72f..5e46abf 100644 (file)
--- a/init/init_shared.c
+++ b/init/init_shared.c
@@ -4,15 +4,10 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"
-#include <signal.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <getopt.h>
 #include <sys/reboot.h>
 #include <sys/syslog.h>
 #include "init_shared.h"

diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index d93a550..0cd4671 100644 (file)
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -6,15 +6,10 @@
  * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
  * Unified with delgroup by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  *
  */
 
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "busybox.h"
 
 /* where to start and stop deletion */

diff --git a/miscutils/last.c b/miscutils/last.c
index 6e35879..9f9f639 100644 (file)
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
 #include "busybox.h"

diff --git a/miscutils/time.c b/miscutils/time.c
index 8c7419b..3f1451c 100644 (file)
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -2,7 +2,7 @@
 /* `time' utility to display resource usage of processes.
    Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc.
 
-   Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+   Licensed under GPL version 2, see file LICENSE in this tarball for details.
 */
 /* Originally written by David Keppel <pardo@cs.washington.edu>.
    Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>.
@@ -10,20 +10,8 @@
 */
 
 #include "busybox.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <errno.h>
-#include <getopt.h>
-#include <string.h>
-#include <limits.h>
-#include <unistd.h>
-#include <sys/types.h> /* For pid_t. */
-#include <sys/wait.h>
-#include <sys/param.h> /* For getpagesize, maybe.  */
 
 #define TV_MSEC tv_usec / 1000
-#include <sys/resource.h>
 
 /* Information on the resources used by a child process.  */
 typedef struct {

diff --git a/procps/free.c b/procps/free.c
index 7d8ffa8..84432e0 100644 (file)
--- a/procps/free.c
+++ b/procps/free.c
@@ -4,15 +4,12 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
 /* getopt not needed */
 
 #include "busybox.h"
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
 
 int free_main(int argc, char **argv)
 {

diff --git a/procps/pidof.c b/procps/pidof.c
index 5b28f3b..c686245 100644 (file)
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -4,19 +4,10 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
 #include "busybox.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #if ENABLE_FEATURE_PIDOF_SINGLE
 #define _SINGLE_COMPL(a) a

diff --git a/procps/ps.c b/procps/ps.c
index e4accba..6257149 100644 (file)
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -4,23 +4,10 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
 #include "busybox.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <string.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#if ENABLE_SELINUX
-#include <selinux/selinux.h>  /* for is_selinux_enabled()  */
-#endif
 
 int ps_main(int argc, char **argv)
 {

diff --git a/procps/uptime.c b/procps/uptime.c
index c1e7af3..37c9d44 100644 (file)
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
 /* This version of uptime doesn't display the number of users on the system,
@@ -16,10 +16,6 @@
 /* getopt not needed */
 
 #include "busybox.h"
-#include <stdio.h>
-#include <time.h>
-#include <errno.h>
-#include <stdlib.h>
 
 #ifndef FSHIFT
 # define FSHIFT 16              /* nr of bits of precision */

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index c8b3aee..682c4f6 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -6,7 +6,7 @@
  * Copyright 2006 Rob Landley <rob@landley.net>
  * Copyright 2006 Bernhard Fischer <rep.nop@aon.at>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"

diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 9e1c453..5d110bc 100644 (file)
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -6,7 +6,7 @@
  * Adjusted a bit by Erik Andersen <andersen@codepoet.org>
  * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index da4930f..acc5012 100644 (file)
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -6,7 +6,7 @@
  * Copyright 2005 Rob Landley <rob@landley.net>
  * Copyright 2005 Frank Sorenson <frank@tuxrocks.com>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"

diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 8c307ec..2dee5ac 100644 (file)
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include <busybox.h>

diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 39a257a..bd02302 100644 (file)
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -6,11 +6,8 @@
  * pivot_root syscall stubbed by Erik Andersen, so it will compile
  *     regardless of the kernel being used.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
 #include "busybox.h"
 
 extern int pivot_root(const char * new_root,const char * put_old);

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index e75ca7e..ab75484 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -4,14 +4,11 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
 #include "busybox.h"
 #include <mntent.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
 #include <sys/swap.h>
 
 

diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 411b738..1a59907 100644 (file)
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -3,14 +3,11 @@
  *
  * Switch from rootfs to another filesystem as the root of the mount tree.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"
-#include <fcntl.h>
-#include <string.h>
 #include <sys/vfs.h>
-#include <unistd.h>
 
 
 // Make up for header deficiencies.

diff --git a/util-linux/umount.c b/util-linux/umount.c
index f19586a..e4308e5 100644 (file)
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -5,10 +5,7 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2005 by Rob Landley <rob@landley.net>
  *
- * This program is licensed under the GNU General Public license (GPL)
- * version 2 or later, see http://www.fsf.org/licensing/licenses/gpl.html
- * or the file "LICENSE" in the busybox source tarball for the full text.
- *
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"