aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-04-21 16:26:30 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-04-21 17:39:11 +0200
commite6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a (patch)
tree0962142ac9830312cd3df52994db41e8ac47c73c /findutils
parent5598bdf0d3d46a865a4d23785e2d09e6db9be420 (diff)
downloadbusybox-w32-e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a.tar.gz
busybox-w32-e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a.tar.bz2
busybox-w32-e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a.zip
libbb: make bb_common_bufsiz1 1 kbyte, add capability to use bss tail for it
The config item is FEATURE_USE_BSS_TAIL. When it is off (default): function old new delta read_config 210 228 +18 doCommands 2279 2294 +15 ipneigh_list_or_flush 763 772 +9 ipaddr_list_or_flush 1256 1261 +5 display_process_list 1301 1306 +5 conspy_main 1378 1383 +5 do_lzo_compress 352 355 +3 do_lzo_decompress 565 567 +2 push 46 44 -2 inetd_main 2136 2134 -2 uevent_main 421 418 -3 addLines 97 92 -5 bb_common_bufsiz1 8193 1024 -7169 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 8/5 up/down: 62/-7181) Total: -7119 bytes text data bss dec hex filename 829850 4086 9080 843016 cdd08 busybox_old 829901 4086 1904 835891 cc133 busybox_unstripped FEATURE_USE_BSS_TAIL=y: read_config 210 228 +18 doCommands 2279 2294 +15 ipneigh_list_or_flush 763 772 +9 ipaddr_list_or_flush 1256 1261 +5 display_process_list 1301 1306 +5 conspy_main 1378 1383 +5 do_lzo_compress 352 355 +3 do_lzo_decompress 565 567 +2 inetd_main 2136 2134 -2 bb_common_bufsiz1 8193 - -8193 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 8/1 up/down: 62/-8195) Total: -8133 bytes text data bss dec hex filename 829850 4086 9080 843016 cdd08 busybox_old 829911 4086 880 834877 cbd3d busybox_unstripped FIXME: setup_common_bufsiz() calls are missing. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'findutils')
-rw-r--r--findutils/find.c3
-rw-r--r--findutils/grep.c3
-rw-r--r--findutils/xargs.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/findutils/find.c b/findutils/find.c
index a0d4853de..32d830337 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -342,6 +342,7 @@
342 342
343#include <fnmatch.h> 343#include <fnmatch.h>
344#include "libbb.h" 344#include "libbb.h"
345#include "common_bufsiz.h"
345#if ENABLE_FEATURE_FIND_REGEX 346#if ENABLE_FEATURE_FIND_REGEX
346# include "xregex.h" 347# include "xregex.h"
347#endif 348#endif
@@ -421,7 +422,7 @@ struct globals {
421 recurse_flags_t recurse_flags; 422 recurse_flags_t recurse_flags;
422 IF_FEATURE_FIND_EXEC_PLUS(unsigned max_argv_len;) 423 IF_FEATURE_FIND_EXEC_PLUS(unsigned max_argv_len;)
423} FIX_ALIASING; 424} FIX_ALIASING;
424#define G (*(struct globals*)&bb_common_bufsiz1) 425#define G (*(struct globals*)bb_common_bufsiz1)
425#define INIT_G() do { \ 426#define INIT_G() do { \
426 BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ 427 BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
427 /* we have to zero it out because of NOEXEC */ \ 428 /* we have to zero it out because of NOEXEC */ \
diff --git a/findutils/grep.c b/findutils/grep.c
index dece90c58..a669ac80b 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -58,6 +58,7 @@
58//config: Print the specified number of context lines (-C). 58//config: Print the specified number of context lines (-C).
59 59
60#include "libbb.h" 60#include "libbb.h"
61#include "common_bufsiz.h"
61#include "xregex.h" 62#include "xregex.h"
62 63
63 64
@@ -201,7 +202,7 @@ struct globals {
201 llist_t *pattern_head; /* growable list of patterns to match */ 202 llist_t *pattern_head; /* growable list of patterns to match */
202 const char *cur_file; /* the current file we are reading */ 203 const char *cur_file; /* the current file we are reading */
203} FIX_ALIASING; 204} FIX_ALIASING;
204#define G (*(struct globals*)&bb_common_bufsiz1) 205#define G (*(struct globals*)bb_common_bufsiz1)
205#define INIT_G() do { \ 206#define INIT_G() do { \
206 BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ 207 BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
207} while (0) 208} while (0)
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 69f83b128..bfbd94960 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -66,6 +66,7 @@
66//kbuild:lib-$(CONFIG_XARGS) += xargs.o 66//kbuild:lib-$(CONFIG_XARGS) += xargs.o
67 67
68#include "libbb.h" 68#include "libbb.h"
69#include "common_bufsiz.h"
69 70
70/* This is a NOEXEC applet. Be very careful! */ 71/* This is a NOEXEC applet. Be very careful! */
71 72
@@ -100,7 +101,7 @@ struct globals {
100 const char *eof_str; 101 const char *eof_str;
101 int idx; 102 int idx;
102} FIX_ALIASING; 103} FIX_ALIASING;
103#define G (*(struct globals*)&bb_common_bufsiz1) 104#define G (*(struct globals*)bb_common_bufsiz1)
104#define INIT_G() do { \ 105#define INIT_G() do { \
105 G.eof_str = NULL; /* need to clear by hand because we are NOEXEC applet */ \ 106 G.eof_str = NULL; /* need to clear by hand because we are NOEXEC applet */ \
106 IF_FEATURE_XARGS_SUPPORT_REPL_STR(G.repl_str = "{}";) \ 107 IF_FEATURE_XARGS_SUPPORT_REPL_STR(G.repl_str = "{}";) \