aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-07-15 20:49:32 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-07-15 20:49:32 +0200
commita3df2fa5250730c84ea0e5ad839f44435888818e (patch)
treefec8ea72b27f8ef1f379edd03dcb24220aac01f3 /libbb
parent2c1258c620c5847649367394439cc10d0331d211 (diff)
downloadbusybox-w32-a3df2fa5250730c84ea0e5ad839f44435888818e.tar.gz
busybox-w32-a3df2fa5250730c84ea0e5ad839f44435888818e.tar.bz2
busybox-w32-a3df2fa5250730c84ea0e5ad839f44435888818e.zip
config: merge "Busybox Settings" and "Busybox Library Tuning" into one menu
Tweak a few help texts while at it Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/Config.src13
-rw-r--r--libbb/common_bufsiz.c1
2 files changed, 8 insertions, 6 deletions
diff --git a/libbb/Config.src b/libbb/Config.src
index c51640305..16c79dbf0 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -3,7 +3,7 @@
3# see scripts/kbuild/config-language.txt. 3# see scripts/kbuild/config-language.txt.
4# 4#
5 5
6menu "Busybox Library Tuning" 6comment "Library Tuning"
7 7
8INSERT 8INSERT
9 9
@@ -66,7 +66,7 @@ config FEATURE_FAST_TOP
66 bool "Faster /proc scanning code (+100 bytes)" 66 bool "Faster /proc scanning code (+100 bytes)"
67 default n # all "fast or small" options default to small 67 default n # all "fast or small" options default to small
68 help 68 help
69 This option makes top (and ps) ~20% faster (or 20% less CPU hungry), 69 This option makes top and ps ~20% faster (or 20% less CPU hungry),
70 but code size is slightly bigger. 70 but code size is slightly bigger.
71 71
72config FEATURE_ETC_NETWORKS 72config FEATURE_ETC_NETWORKS
@@ -302,13 +302,17 @@ config FEATURE_VERBOSE_CP_MESSAGE
302 default n 302 default n
303 help 303 help
304 Error messages with this feature enabled: 304 Error messages with this feature enabled:
305
305 $ cp file /does_not_exist/file 306 $ cp file /does_not_exist/file
306 cp: cannot create '/does_not_exist/file': Path does not exist 307 cp: cannot create '/does_not_exist/file': Path does not exist
307 $ cp file /vmlinuz/file 308 $ cp file /vmlinuz/file
308 cp: cannot stat '/vmlinuz/file': Path has non-directory component 309 cp: cannot stat '/vmlinuz/file': Path has non-directory component
310
309 If this feature is not enabled, they will be, respectively: 311 If this feature is not enabled, they will be, respectively:
312
310 cp: cannot create '/does_not_exist/file': No such file or directory 313 cp: cannot create '/does_not_exist/file': No such file or directory
311 cp: cannot stat '/vmlinuz/file': Not a directory 314 cp: cannot stat '/vmlinuz/file': Not a directory
315
312 This will cost you ~60 bytes. 316 This will cost you ~60 bytes.
313 317
314config FEATURE_USE_SENDFILE 318config FEATURE_USE_SENDFILE
@@ -376,7 +380,4 @@ config FEATURE_HWIB
376 bool "Support infiniband HW" 380 bool "Support infiniband HW"
377 default y 381 default y
378 help 382 help
379 Support for printing infiniband addresses in 383 Support for printing infiniband addresses in network applets.
380 network applets.
381
382endmenu
diff --git a/libbb/common_bufsiz.c b/libbb/common_bufsiz.c
index 2847eb57d..f1124ba0e 100644
--- a/libbb/common_bufsiz.c
+++ b/libbb/common_bufsiz.c
@@ -19,6 +19,7 @@
19//config: 19//config:
20//config: At link time, "text" is padded to a full page. At runtime, all "text" 20//config: At link time, "text" is padded to a full page. At runtime, all "text"
21//config: pages are mapped RO and executable. 21//config: pages are mapped RO and executable.
22//config:
22//config: "Data" starts on the next page boundary, but is not padded 23//config: "Data" starts on the next page boundary, but is not padded
23//config: to a full page at the end. "Bss" starts wherever "data" ends. 24//config: to a full page at the end. "Bss" starts wherever "data" ends.
24//config: At runtime, "data" pages are mapped RW and they are file-backed 25//config: At runtime, "data" pages are mapped RW and they are file-backed