aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-09-22 02:52:41 +0000
committerRob Landley <rob@landley.net>2006-09-22 02:52:41 +0000
commite9a7a6212b5881bd29ee5936b492f4d8899df8bb (patch)
treeba1df1897eef7f654781e15b48fb55c6918e9465
parent05592ac00c987a181d675cd821a981040ae5b988 (diff)
downloadbusybox-w32-e9a7a6212b5881bd29ee5936b492f4d8899df8bb.tar.gz
busybox-w32-e9a7a6212b5881bd29ee5936b492f4d8899df8bb.tar.bz2
busybox-w32-e9a7a6212b5881bd29ee5936b492f4d8899df8bb.zip
Change license statements (and clean up headers) on some of the files that
Erik or I are primary copyright holders on.
Diffstat
-rw-r--r--applets/individual.c2
-rw-r--r--editors/sed.c2
-rw-r--r--findutils/find.c2
-rw-r--r--init/halt.c4
-rw-r--r--init/init_shared.c7
-rw-r--r--loginutils/deluser.c7
-rw-r--r--miscutils/last.c2
-rw-r--r--miscutils/time.c14
-rw-r--r--procps/free.c5
-rw-r--r--procps/pidof.c11
-rw-r--r--procps/ps.c15
-rw-r--r--procps/uptime.c6
-rw-r--r--util-linux/dmesg.c2
-rw-r--r--util-linux/freeramdisk.c2
-rw-r--r--util-linux/mdev.c2
-rw-r--r--util-linux/mkswap.c2
-rw-r--r--util-linux/pivot_root.c5
-rw-r--r--util-linux/swaponoff.c5
-rw-r--r--util-linux/switch_root.c5
-rw-r--r--util-linux/umount.c5
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 @@
2 * 2 *
3 * Copyright 2005 Rob Landley <rob@landley.net 3 * Copyright 2005 Rob Landley <rob@landley.net
4 * 4 *
5 * Licensed under GPLv2 or later, see file License in this tarball for details 5 * Licensed under GPL version 2, see file LICENSE in this tarball for details
6 */ 6 */
7 7
8const char *bb_applet_name; 8const char *bb_applet_name;
diff --git a/editors/sed.c b/editors/sed.c
index f8e3720b5..98437585c 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -10,7 +10,7 @@
10 * 10 *
11 * MAINTAINER: Rob Landley <rob@landley.net> 11 * MAINTAINER: Rob Landley <rob@landley.net>
12 * 12 *
13 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 13 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
14 */ 14 */
15 15
16/* Code overview. 16/* 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 @@
7 * Reworked by David Douthitt <n9ubh@callsign.net> and 7 * Reworked by David Douthitt <n9ubh@callsign.net> and
8 * Matt Kraai <kraai@alumni.carnegiemellon.edu>. 8 * Matt Kraai <kraai@alumni.carnegiemellon.edu>.
9 * 9 *
10 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 10 * Licensed under the GPL version 2, see the file LICENSE in this tarball.
11 */ 11 */
12 12
13#include "busybox.h" 13#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 @@
4 * 4 *
5 * Copyright 2006 by Rob Landley <rob@landley.net> 5 * Copyright 2006 by Rob Landley <rob@landley.net>
6 * 6 *
7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 7 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
8 */ 8 */
9 9
10#include "busybox.h" 10#include "busybox.h"
11#include <signal.h>
12#include <sys/reboot.h> 11#include <sys/reboot.h>
13#include <unistd.h>
14 12
15int halt_main(int argc, char *argv[]) 13int halt_main(int argc, char *argv[])
16{ 14{
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 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 7 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
8 */ 8 */
9 9
10#include "busybox.h" 10#include "busybox.h"
11#include <signal.h>
12#include <stdlib.h>
13#include <sys/types.h>
14#include <unistd.h>
15#include <getopt.h>
16#include <sys/reboot.h> 11#include <sys/reboot.h>
17#include <sys/syslog.h> 12#include <sys/syslog.h>
18#include "init_shared.h" 13#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 @@
6 * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org> 6 * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
7 * Unified with delgroup by Tito Ragusa <farmatito@tiscali.it> 7 * Unified with delgroup by Tito Ragusa <farmatito@tiscali.it>
8 * 8 *
9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 9 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
10 * 10 *
11 */ 11 */
12 12
13#include <sys/stat.h>
14#include <unistd.h>
15#include <stdio.h>
16#include <stdlib.h>
17#include <string.h>
18#include "busybox.h" 13#include "busybox.h"
19 14
20/* where to start and stop deletion */ 15/* 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 @@
4 * 4 *
5 * Copyright (C) 2003-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 2003-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 7 * Licensed under the GPL version 2, see the file LICENSE in this tarball.
8 */ 8 */
9 9
10#include "busybox.h" 10#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 @@
2/* `time' utility to display resource usage of processes. 2/* `time' utility to display resource usage of processes.
3 Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc. 3 Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc.
4 4
5 Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 5 Licensed under GPL version 2, see file LICENSE in this tarball for details.
6*/ 6*/
7/* Originally written by David Keppel <pardo@cs.washington.edu>. 7/* Originally written by David Keppel <pardo@cs.washington.edu>.
8 Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>. 8 Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>.
@@ -10,20 +10,8 @@
10*/ 10*/
11 11
12#include "busybox.h" 12#include "busybox.h"
13#include <stdlib.h>
14#include <stdio.h>
15#include <signal.h>
16#include <errno.h>
17#include <getopt.h>
18#include <string.h>
19#include <limits.h>
20#include <unistd.h>
21#include <sys/types.h> /* For pid_t. */
22#include <sys/wait.h>
23#include <sys/param.h> /* For getpagesize, maybe. */
24 13
25#define TV_MSEC tv_usec / 1000 14#define TV_MSEC tv_usec / 1000
26#include <sys/resource.h>
27 15
28/* Information on the resources used by a child process. */ 16/* Information on the resources used by a child process. */
29typedef struct { 17typedef 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 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 7 * Licensed under the GPL version 2, see the file LICENSE in this tarball.
8 */ 8 */
9 9
10/* getopt not needed */ 10/* getopt not needed */
11 11
12#include "busybox.h" 12#include "busybox.h"
13#include <stdio.h>
14#include <errno.h>
15#include <stdlib.h>
16 13
17int free_main(int argc, char **argv) 14int free_main(int argc, char **argv)
18{ 15{
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 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 7 * Licensed under the GPL version 2, see the file LICENSE in this tarball.
8 */ 8 */
9 9
10#include "busybox.h" 10#include "busybox.h"
11#include <stdio.h>
12#include <stdlib.h>
13#include <errno.h>
14#include <unistd.h>
15#include <signal.h>
16#include <ctype.h>
17#include <string.h>
18#include <sys/types.h>
19#include <unistd.h>
20 11
21#if ENABLE_FEATURE_PIDOF_SINGLE 12#if ENABLE_FEATURE_PIDOF_SINGLE
22#define _SINGLE_COMPL(a) a 13#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 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 7 * Licensed under the GPL version 2, see the file LICENSE in this tarball.
8 */ 8 */
9 9
10#include "busybox.h" 10#include "busybox.h"
11#include <stdio.h>
12#include <stdlib.h>
13#include <unistd.h>
14#include <dirent.h>
15#include <errno.h>
16#include <fcntl.h>
17#include <ctype.h>
18#include <string.h>
19#include <termios.h>
20#include <sys/ioctl.h>
21#if ENABLE_SELINUX
22#include <selinux/selinux.h> /* for is_selinux_enabled() */
23#endif
24 11
25int ps_main(int argc, char **argv) 12int ps_main(int argc, char **argv)
26{ 13{
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 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 7 * Licensed under the GPL version 2, see the file LICENSE in this tarball.
8 */ 8 */
9 9
10/* This version of uptime doesn't display the number of users on the system, 10/* This version of uptime doesn't display the number of users on the system,
@@ -16,10 +16,6 @@
16/* getopt not needed */ 16/* getopt not needed */
17 17
18#include "busybox.h" 18#include "busybox.h"
19#include <stdio.h>
20#include <time.h>
21#include <errno.h>
22#include <stdlib.h>
23 19
24#ifndef FSHIFT 20#ifndef FSHIFT
25# define FSHIFT 16 /* nr of bits of precision */ 21# 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 @@
6 * Copyright 2006 Rob Landley <rob@landley.net> 6 * Copyright 2006 Rob Landley <rob@landley.net>
7 * Copyright 2006 Bernhard Fischer <rep.nop@aon.at> 7 * Copyright 2006 Bernhard Fischer <rep.nop@aon.at>
8 * 8 *
9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 9 * Licensed under GPLv2, see file LICENSE in this tarball for details.
10 */ 10 */
11 11
12#include "busybox.h" 12#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 @@
6 * Adjusted a bit by Erik Andersen <andersen@codepoet.org> 6 * Adjusted a bit by Erik Andersen <andersen@codepoet.org>
7 * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it> 7 * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
8 * 8 *
9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 9 * Licensed under GPLv2, see file LICENSE in this tarball for details.
10 */ 10 */
11 11
12#include "busybox.h" 12#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 @@
6 * Copyright 2005 Rob Landley <rob@landley.net> 6 * Copyright 2005 Rob Landley <rob@landley.net>
7 * Copyright 2005 Frank Sorenson <frank@tuxrocks.com> 7 * Copyright 2005 Frank Sorenson <frank@tuxrocks.com>
8 * 8 *
9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 9 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
10 */ 10 */
11 11
12#include "busybox.h" 12#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 @@
3 * 3 *
4 * Copyright 2006 Rob Landley <rob@landley.net> 4 * Copyright 2006 Rob Landley <rob@landley.net>
5 * 5 *
6 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 6 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
7 */ 7 */
8 8
9#include <busybox.h> 9#include <busybox.h>
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 @@
6 * pivot_root syscall stubbed by Erik Andersen, so it will compile 6 * pivot_root syscall stubbed by Erik Andersen, so it will compile
7 * regardless of the kernel being used. 7 * regardless of the kernel being used.
8 * 8 *
9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 9 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
10 */ 10 */
11#include <stdlib.h>
12#include <stdio.h>
13#include <errno.h>
14#include "busybox.h" 11#include "busybox.h"
15 12
16extern int pivot_root(const char * new_root,const char * put_old); 13extern 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 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 7 * Licensed under the GPL version 2, see the file LICENSE in this tarball.
8 */ 8 */
9 9
10#include "busybox.h" 10#include "busybox.h"
11#include <mntent.h> 11#include <mntent.h>
12#include <dirent.h>
13#include <errno.h>
14#include <string.h>
15#include <sys/swap.h> 12#include <sys/swap.h>
16 13
17 14
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 @@
3 * 3 *
4 * Switch from rootfs to another filesystem as the root of the mount tree. 4 * Switch from rootfs to another filesystem as the root of the mount tree.
5 * 5 *
6 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 6 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
7 */ 7 */
8 8
9#include "busybox.h" 9#include "busybox.h"
10#include <fcntl.h>
11#include <string.h>
12#include <sys/vfs.h> 10#include <sys/vfs.h>
13#include <unistd.h>
14 11
15 12
16// Make up for header deficiencies. 13// 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 @@
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * Copyright (C) 2005 by Rob Landley <rob@landley.net> 6 * Copyright (C) 2005 by Rob Landley <rob@landley.net>
7 * 7 *
8 * This program is licensed under the GNU General Public license (GPL) 8 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
9 * version 2 or later, see http://www.fsf.org/licensing/licenses/gpl.html
10 * or the file "LICENSE" in the busybox source tarball for the full text.
11 *
12 */ 9 */
13 10
14#include "busybox.h" 11#include "busybox.h"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-18 10:54:08 +0000