From e9a7a6212b5881bd29ee5936b492f4d8899df8bb Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 22 Sep 2006 02:52:41 +0000 Subject: [PATCH] Change license statements (and clean up headers) on some of the files that Erik or I are primary copyright holders on. --- applets/individual.c | 2 +- editors/sed.c | 2 +- findutils/find.c | 2 +- init/halt.c | 4 +--- init/init_shared.c | 7 +------ loginutils/deluser.c | 7 +------ miscutils/last.c | 2 +- miscutils/time.c | 14 +------------- procps/free.c | 5 +---- procps/pidof.c | 11 +---------- procps/ps.c | 15 +-------------- procps/uptime.c | 6 +----- util-linux/dmesg.c | 2 +- util-linux/freeramdisk.c | 2 +- util-linux/mdev.c | 2 +- util-linux/mkswap.c | 2 +- util-linux/pivot_root.c | 5 +---- util-linux/swaponoff.c | 5 +---- util-linux/switch_root.c | 5 +---- util-linux/umount.c | 5 +---- 20 files changed, 20 insertions(+), 85 deletions(-) diff --git a/applets/individual.c b/applets/individual.c index bc5f528d7..911f760a6 100644 --- a/applets/individual.c +++ b/applets/individual.c @@ -2,7 +2,7 @@ * * Copyright 2005 Rob Landley * - * 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 aa915fa0f..7e3613af4 100644 --- a/findutils/find.c +++ b/findutils/find.c @@ -7,7 +7,7 @@ * Reworked by David Douthitt and * Matt Kraai . * - * 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 d1f561b63..7bd27896c 100644 --- a/init/halt.c +++ b/init/halt.c @@ -4,13 +4,11 @@ * * Copyright 2006 by Rob Landley * - * 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 #include -#include int halt_main(int argc, char *argv[]) { diff --git a/init/init_shared.c b/init/init_shared.c index 0abe72fdf..5e46abf09 100644 --- a/init/init_shared.c +++ b/init/init_shared.c @@ -4,15 +4,10 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 -#include -#include -#include -#include #include #include #include "init_shared.h" diff --git a/loginutils/deluser.c b/loginutils/deluser.c index d93a550fa..0cd4671c8 100644 --- a/loginutils/deluser.c +++ b/loginutils/deluser.c @@ -6,15 +6,10 @@ * Copyright (C) 1999,2000,2001 by John Beppu * Unified with delgroup by Tito Ragusa * - * 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 -#include -#include -#include -#include #include "busybox.h" /* where to start and stop deletion */ diff --git a/miscutils/last.c b/miscutils/last.c index 6e35879f3..9f9f639f2 100644 --- a/miscutils/last.c +++ b/miscutils/last.c @@ -4,7 +4,7 @@ * * Copyright (C) 2003-2004 by Erik Andersen * - * 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 8c7419b58..3f1451c83 100644 --- 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 . Heavily modified by David MacKenzie . @@ -10,20 +10,8 @@ */ #include "busybox.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include /* For pid_t. */ -#include -#include /* For getpagesize, maybe. */ #define TV_MSEC tv_usec / 1000 -#include /* Information on the resources used by a child process. */ typedef struct { diff --git a/procps/free.c b/procps/free.c index 7d8ffa893..84432e0d1 100644 --- a/procps/free.c +++ b/procps/free.c @@ -4,15 +4,12 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 -#include -#include int free_main(int argc, char **argv) { diff --git a/procps/pidof.c b/procps/pidof.c index 5b28f3b86..c686245ea 100644 --- a/procps/pidof.c +++ b/procps/pidof.c @@ -4,19 +4,10 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include #if ENABLE_FEATURE_PIDOF_SINGLE #define _SINGLE_COMPL(a) a diff --git a/procps/ps.c b/procps/ps.c index e4accba3d..62571493d 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -4,23 +4,10 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if ENABLE_SELINUX -#include /* for is_selinux_enabled() */ -#endif int ps_main(int argc, char **argv) { diff --git a/procps/uptime.c b/procps/uptime.c index c1e7af3a5..37c9d449a 100644 --- a/procps/uptime.c +++ b/procps/uptime.c @@ -4,7 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 -#include -#include -#include #ifndef FSHIFT # define FSHIFT 16 /* nr of bits of precision */ diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index c8b3aeeab..682c4f696 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -6,7 +6,7 @@ * Copyright 2006 Rob Landley * Copyright 2006 Bernhard Fischer * - * 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 9e1c453e4..5d110bc4b 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c @@ -6,7 +6,7 @@ * Adjusted a bit by Erik Andersen * Unified with fdflush by Tito Ragusa * - * 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 da4930f27..acc5012d4 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c @@ -6,7 +6,7 @@ * Copyright 2005 Rob Landley * Copyright 2005 Frank Sorenson * - * 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 8c307ec43..2dee5ac18 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c @@ -3,7 +3,7 @@ * * Copyright 2006 Rob Landley * - * 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 diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c index 39a257a19..bd02302c7 100644 --- 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 -#include -#include #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 e75ca7ece..ab754848e 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c @@ -4,14 +4,11 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 -#include -#include -#include #include diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index 411b738f0..1a599073e 100644 --- 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 -#include #include -#include // Make up for header deficiencies. diff --git a/util-linux/umount.c b/util-linux/umount.c index f19586a0d..e4308e547 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -5,10 +5,7 @@ * Copyright (C) 1999-2004 by Erik Andersen * Copyright (C) 2005 by Rob Landley * - * 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"