diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-08-16 20:14:46 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-08-16 20:14:46 +0200 |
commit | 0ef64bdb40c54681e8dd5ab8df42ac88e4ab1d4a (patch) | |
tree | d8a71a3f044857bd36569f535815002367389b29 /procps | |
parent | 0d555fc951fa09b2f7efb4b445a468a4bcc262f1 (diff) | |
download | busybox-w32-0ef64bdb40c54681e8dd5ab8df42ac88e4ab1d4a.tar.gz busybox-w32-0ef64bdb40c54681e8dd5ab8df42ac88e4ab1d4a.tar.bz2 busybox-w32-0ef64bdb40c54681e8dd5ab8df42ac88e4ab1d4a.zip |
*: make GNU licensing statement forms more regular
This change retains "or later" state! No licensing _changes_ here,
only form is adjusted (article, space between "GPL" and "v2" and so on).
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps')
-rw-r--r-- | procps/Kbuild.src | 2 | ||||
-rw-r--r-- | procps/free.c | 2 | ||||
-rw-r--r-- | procps/fuser.c | 2 | ||||
-rw-r--r-- | procps/iostat.c | 2 | ||||
-rw-r--r-- | procps/kill.c | 2 | ||||
-rw-r--r-- | procps/mpstat.c | 2 | ||||
-rw-r--r-- | procps/nmeter.c | 11 | ||||
-rw-r--r-- | procps/pgrep.c | 2 | ||||
-rw-r--r-- | procps/pidof.c | 2 | ||||
-rw-r--r-- | procps/ps.c | 2 | ||||
-rw-r--r-- | procps/renice.c | 2 | ||||
-rw-r--r-- | procps/sysctl.c | 2 | ||||
-rw-r--r-- | procps/top.c | 2 | ||||
-rw-r--r-- | procps/uptime.c | 2 | ||||
-rw-r--r-- | procps/watch.c | 2 |
15 files changed, 20 insertions, 19 deletions
diff --git a/procps/Kbuild.src b/procps/Kbuild.src index c41f12b15..791d65670 100644 --- a/procps/Kbuild.src +++ b/procps/Kbuild.src | |||
@@ -2,7 +2,7 @@ | |||
2 | # | 2 | # |
3 | # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> | 3 | # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> |
4 | # | 4 | # |
5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. | 5 | # Licensed under GPLv2, see file LICENSE in this source tree. |
6 | 6 | ||
7 | lib-y:= | 7 | lib-y:= |
8 | 8 | ||
diff --git a/procps/free.c b/procps/free.c index db70712cf..be65f46f1 100644 --- a/procps/free.c +++ b/procps/free.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 version 2, see the file LICENSE in this tarball. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | /* getopt not needed */ | 10 | /* getopt not needed */ |
diff --git a/procps/fuser.c b/procps/fuser.c index 85523c31c..addf1a7d8 100644 --- a/procps/fuser.c +++ b/procps/fuser.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright 2004 Tony J. White | 5 | * Copyright 2004 Tony J. White |
6 | * | 6 | * |
7 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "libbb.h" | 10 | #include "libbb.h" |
diff --git a/procps/iostat.c b/procps/iostat.c index 05c758b6c..5d829861e 100644 --- a/procps/iostat.c +++ b/procps/iostat.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com> | 5 | * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com> |
6 | * | 6 | * |
7 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | //applet:IF_IOSTAT(APPLET(iostat, _BB_DIR_BIN, _BB_SUID_DROP)) | 10 | //applet:IF_IOSTAT(APPLET(iostat, _BB_DIR_BIN, _BB_SUID_DROP)) |
diff --git a/procps/kill.c b/procps/kill.c index 1d343edff..4ed94b0ec 100644 --- a/procps/kill.c +++ b/procps/kill.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>. | 5 | * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>. |
6 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | 6 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> |
7 | * | 7 | * |
8 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "libbb.h" | 11 | #include "libbb.h" |
diff --git a/procps/mpstat.c b/procps/mpstat.c index bf0f593f7..575c77e98 100644 --- a/procps/mpstat.c +++ b/procps/mpstat.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com> | 5 | * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com> |
6 | * | 6 | * |
7 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | //applet:IF_MPSTAT(APPLET(mpstat, _BB_DIR_BIN, _BB_SUID_DROP)) | 10 | //applet:IF_MPSTAT(APPLET(mpstat, _BB_DIR_BIN, _BB_SUID_DROP)) |
diff --git a/procps/nmeter.c b/procps/nmeter.c index 930585695..6111e4baf 100644 --- a/procps/nmeter.c +++ b/procps/nmeter.c | |||
@@ -1,9 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | ** Licensed under the GPL v2, see the file LICENSE in this tarball | 2 | * Licensed under GPLv2, see file LICENSE in this source tree. |
3 | ** | 3 | * |
4 | ** Based on nanotop.c from floppyfw project | 4 | * Based on nanotop.c from floppyfw project |
5 | ** | 5 | * |
6 | ** Contact me: vda.linux@googlemail.com */ | 6 | * Contact me: vda.linux@googlemail.com */ |
7 | */ | ||
7 | 8 | ||
8 | //TODO: | 9 | //TODO: |
9 | // simplify code | 10 | // simplify code |
diff --git a/procps/pgrep.c b/procps/pgrep.c index 45de8bcda..5d388a87d 100644 --- a/procps/pgrep.c +++ b/procps/pgrep.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (C) 2007 Loic Grenie <loic.grenie@gmail.com> | 5 | * Copyright (C) 2007 Loic Grenie <loic.grenie@gmail.com> |
6 | * | 6 | * |
7 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | #include "xregex.h" | 10 | #include "xregex.h" |
diff --git a/procps/pidof.c b/procps/pidof.c index bf5e7841a..49e469ca5 100644 --- a/procps/pidof.c +++ b/procps/pidof.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 version 2, see the file LICENSE in this tarball. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "libbb.h" | 10 | #include "libbb.h" |
diff --git a/procps/ps.c b/procps/ps.c index a3220a926..305381eb9 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Fix for SELinux Support:(c)2007 Hiroshi Shinji <shiroshi@my.email.ne.jp> | 6 | * Fix for SELinux Support:(c)2007 Hiroshi Shinji <shiroshi@my.email.ne.jp> |
7 | * (c)2007 Yuichi Nakamura <ynakam@hitachisoft.jp> | 7 | * (c)2007 Yuichi Nakamura <ynakam@hitachisoft.jp> |
8 | * | 8 | * |
9 | * Licensed under the GPL version 2, see the file LICENSE in this tarball. | 9 | * Licensed under GPLv2, see file LICENSE in this source tree. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "libbb.h" | 12 | #include "libbb.h" |
diff --git a/procps/renice.c b/procps/renice.c index ea5fc703e..81ee89cfb 100644 --- a/procps/renice.c +++ b/procps/renice.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (C) 2005 Manuel Novoa III <mjn3@codepoet.org> | 5 | * Copyright (C) 2005 Manuel Novoa III <mjn3@codepoet.org> |
6 | * | 6 | * |
7 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | /* Notes: | 10 | /* Notes: |
diff --git a/procps/sysctl.c b/procps/sysctl.c index fc601d637..20b372c54 100644 --- a/procps/sysctl.c +++ b/procps/sysctl.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright 1999 George Staikos | 5 | * Copyright 1999 George Staikos |
6 | * | 6 | * |
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | * | 8 | * |
9 | * Changelog: | 9 | * Changelog: |
10 | * v1.01 - added -p <preload> to preload values from a file | 10 | * v1.01 - added -p <preload> to preload values from a file |
diff --git a/procps/top.c b/procps/top.c index ec8437442..fd758099e 100644 --- a/procps/top.c +++ b/procps/top.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * Copyright (C) 1994-1996 Charles L. Blake. | 28 | * Copyright (C) 1994-1996 Charles L. Blake. |
29 | * Copyright (C) 1992-1998 Michael K. Johnson | 29 | * Copyright (C) 1992-1998 Michael K. Johnson |
30 | * | 30 | * |
31 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 31 | * Licensed under GPLv2, see file LICENSE in this source tree. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "libbb.h" | 34 | #include "libbb.h" |
diff --git a/procps/uptime.c b/procps/uptime.c index d9aa1d037..5c48795bf 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 version 2, see the file LICENSE in this tarball. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
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, |
diff --git a/procps/watch.c b/procps/watch.c index a1cde9ea0..36f71c469 100644 --- a/procps/watch.c +++ b/procps/watch.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (C) 2001 by Michael Habermann <mhabermann@gmx.de> | 5 | * Copyright (C) 2001 by Michael Habermann <mhabermann@gmx.de> |
6 | * Copyrigjt (C) Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) | 6 | * Copyrigjt (C) Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) |
7 | * | 7 | * |
8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /* BB_AUDIT SUSv3 N/A */ | 11 | /* BB_AUDIT SUSv3 N/A */ |