aboutsummaryrefslogtreecommitdiff
path: root/miscutils/less.c
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 /miscutils/less.c
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 'miscutils/less.c')
-rw-r--r--miscutils/less.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/miscutils/less.c b/miscutils/less.c
index ccdb15fdc..94ecf1686 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -127,6 +127,7 @@
127#include <sched.h> /* sched_yield() */ 127#include <sched.h> /* sched_yield() */
128 128
129#include "libbb.h" 129#include "libbb.h"
130#include "common_bufsiz.h"
130#if ENABLE_FEATURE_LESS_REGEXP 131#if ENABLE_FEATURE_LESS_REGEXP
131#include "xregex.h" 132#include "xregex.h"
132#endif 133#endif
@@ -439,7 +440,8 @@ static int at_end(void)
439 */ 440 */
440static void read_lines(void) 441static void read_lines(void)
441{ 442{
442#define readbuf bb_common_bufsiz1 443#define readbuf bb_common_bufsiz1
444#define sizeof_readbuf COMMON_BUFSIZE
443 char *current_line, *p; 445 char *current_line, *p;
444 int w = width; 446 int w = width;
445 char last_terminated = terminated; 447 char last_terminated = terminated;
@@ -480,7 +482,7 @@ static void read_lines(void)
480 time_t t; 482 time_t t;
481 483
482 errno = 0; 484 errno = 0;
483 eof_error = safe_read(STDIN_FILENO, readbuf, sizeof(readbuf)); 485 eof_error = safe_read(STDIN_FILENO, readbuf, sizeof_readbuf);
484 if (errno != EAGAIN) 486 if (errno != EAGAIN)
485 break; 487 break;
486 t = time(NULL); 488 t = time(NULL);