diff options
Diffstat (limited to 'procps')
-rw-r--r-- | procps/iostat.c | 1 | ||||
-rw-r--r-- | procps/lsof.c | 1 | ||||
-rw-r--r-- | procps/mpstat.c | 11 | ||||
-rw-r--r-- | procps/nmeter.c | 1 | ||||
-rw-r--r-- | procps/pmap.c | 2 | ||||
-rw-r--r-- | procps/pwdx.c | 1 | ||||
-rw-r--r-- | procps/smemcap.c | 9 | ||||
-rw-r--r-- | procps/watch.c | 7 |
8 files changed, 13 insertions, 20 deletions
diff --git a/procps/iostat.c b/procps/iostat.c index fbf685568..8fb4594da 100644 --- a/procps/iostat.c +++ b/procps/iostat.c | |||
@@ -6,7 +6,6 @@ | |||
6 | * | 6 | * |
7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | |||
10 | //config:config IOSTAT | 9 | //config:config IOSTAT |
11 | //config: bool "iostat (7.4 kb)" | 10 | //config: bool "iostat (7.4 kb)" |
12 | //config: default y | 11 | //config: default y |
diff --git a/procps/lsof.c b/procps/lsof.c index 8d3a23cc8..4917cf899 100644 --- a/procps/lsof.c +++ b/procps/lsof.c | |||
@@ -6,7 +6,6 @@ | |||
6 | * | 6 | * |
7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | |||
10 | //config:config LSOF | 9 | //config:config LSOF |
11 | //config: bool "lsof (3.6 kb)" | 10 | //config: bool "lsof (3.6 kb)" |
12 | //config: default y | 11 | //config: default y |
diff --git a/procps/mpstat.c b/procps/mpstat.c index acaff4dc0..7ead1fa7d 100644 --- a/procps/mpstat.c +++ b/procps/mpstat.c | |||
@@ -6,18 +6,17 @@ | |||
6 | * | 6 | * |
7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | |||
10 | //applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP)) | ||
11 | /* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */ | ||
12 | |||
13 | //kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o | ||
14 | |||
15 | //config:config MPSTAT | 9 | //config:config MPSTAT |
16 | //config: bool "mpstat (10 kb)" | 10 | //config: bool "mpstat (10 kb)" |
17 | //config: default y | 11 | //config: default y |
18 | //config: help | 12 | //config: help |
19 | //config: Per-processor statistics | 13 | //config: Per-processor statistics |
20 | 14 | ||
15 | //applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP)) | ||
16 | /* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */ | ||
17 | |||
18 | //kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o | ||
19 | |||
21 | #include "libbb.h" | 20 | #include "libbb.h" |
22 | #include <sys/utsname.h> /* struct utsname */ | 21 | #include <sys/utsname.h> /* struct utsname */ |
23 | 22 | ||
diff --git a/procps/nmeter.c b/procps/nmeter.c index 9463f94dc..166c8ab18 100644 --- a/procps/nmeter.c +++ b/procps/nmeter.c | |||
@@ -5,7 +5,6 @@ | |||
5 | * | 5 | * |
6 | * Contact me: vda.linux@googlemail.com | 6 | * Contact me: vda.linux@googlemail.com |
7 | */ | 7 | */ |
8 | |||
9 | //config:config NMETER | 8 | //config:config NMETER |
10 | //config: bool "nmeter (10 kb)" | 9 | //config: bool "nmeter (10 kb)" |
11 | //config: default y | 10 | //config: default y |
diff --git a/procps/pmap.c b/procps/pmap.c index 5c2d1ad59..c8fa0d280 100644 --- a/procps/pmap.c +++ b/procps/pmap.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * Licensed under GPLv2 or later, see the LICENSE file in this source tree | 7 | * Licensed under GPLv2 or later, see the LICENSE file in this source tree |
8 | * for details. | 8 | * for details. |
9 | */ | 9 | */ |
10 | |||
11 | //config:config PMAP | 10 | //config:config PMAP |
12 | //config: bool "pmap (6 kb)" | 11 | //config: bool "pmap (6 kb)" |
13 | //config: default y | 12 | //config: default y |
@@ -15,6 +14,7 @@ | |||
15 | //config: Display processes' memory mappings. | 14 | //config: Display processes' memory mappings. |
16 | 15 | ||
17 | //applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP)) | 16 | //applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP)) |
17 | |||
18 | //kbuild:lib-$(CONFIG_PMAP) += pmap.o | 18 | //kbuild:lib-$(CONFIG_PMAP) += pmap.o |
19 | 19 | ||
20 | //usage:#define pmap_trivial_usage | 20 | //usage:#define pmap_trivial_usage |
diff --git a/procps/pwdx.c b/procps/pwdx.c index c72cf804a..6009e2aa3 100644 --- a/procps/pwdx.c +++ b/procps/pwdx.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * | 7 | * |
8 | * Licensed under GPLv2, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | |||
11 | //config:config PWDX | 10 | //config:config PWDX |
12 | //config: bool "pwdx (3.5 kb)" | 11 | //config: bool "pwdx (3.5 kb)" |
13 | //config: default y | 12 | //config: default y |
diff --git a/procps/smemcap.c b/procps/smemcap.c index c15fef1c3..81f4cafad 100644 --- a/procps/smemcap.c +++ b/procps/smemcap.c | |||
@@ -7,11 +7,6 @@ | |||
7 | the GNU General Public License version 2 or later, incorporated | 7 | the GNU General Public License version 2 or later, incorporated |
8 | herein by reference. | 8 | herein by reference. |
9 | */ | 9 | */ |
10 | |||
11 | //applet:IF_SMEMCAP(APPLET(smemcap, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
12 | |||
13 | //kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o | ||
14 | |||
15 | //config:config SMEMCAP | 10 | //config:config SMEMCAP |
16 | //config: bool "smemcap (2.5 kb)" | 11 | //config: bool "smemcap (2.5 kb)" |
17 | //config: default y | 12 | //config: default y |
@@ -19,6 +14,10 @@ | |||
19 | //config: smemcap is a tool for capturing process data for smem, | 14 | //config: smemcap is a tool for capturing process data for smem, |
20 | //config: a memory usage statistic tool. | 15 | //config: a memory usage statistic tool. |
21 | 16 | ||
17 | //applet:IF_SMEMCAP(APPLET(smemcap, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
18 | |||
19 | //kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o | ||
20 | |||
22 | #include "libbb.h" | 21 | #include "libbb.h" |
23 | #include "bb_archive.h" | 22 | #include "bb_archive.h" |
24 | 23 | ||
diff --git a/procps/watch.c b/procps/watch.c index e58fd1f11..420e6d3d1 100644 --- a/procps/watch.c +++ b/procps/watch.c | |||
@@ -7,10 +7,6 @@ | |||
7 | * | 7 | * |
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | |||
11 | /* BB_AUDIT SUSv3 N/A */ | ||
12 | /* BB_AUDIT GNU defects -- only option -n is supported. */ | ||
13 | |||
14 | //config:config WATCH | 10 | //config:config WATCH |
15 | //config: bool "watch (4.1 kb)" | 11 | //config: bool "watch (4.1 kb)" |
16 | //config: default y | 12 | //config: default y |
@@ -35,6 +31,9 @@ | |||
35 | //usage: "Mon Dec 17 10:31:42 GMT 2000\n" | 31 | //usage: "Mon Dec 17 10:31:42 GMT 2000\n" |
36 | //usage: "Mon Dec 17 10:31:44 GMT 2000" | 32 | //usage: "Mon Dec 17 10:31:44 GMT 2000" |
37 | 33 | ||
34 | /* BB_AUDIT SUSv3 N/A */ | ||
35 | /* BB_AUDIT GNU defects -- only option -n is supported. */ | ||
36 | |||
38 | #include "libbb.h" | 37 | #include "libbb.h" |
39 | 38 | ||
40 | #define ESC "\033" | 39 | #define ESC "\033" |