aboutsummaryrefslogtreecommitdiff
path: root/archival
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 /archival
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 'archival')
-rw-r--r--archival/cpio.c3
-rw-r--r--archival/lzop.c3
-rw-r--r--archival/rpm.c3
-rw-r--r--archival/tar.c1
4 files changed, 7 insertions, 3 deletions
diff --git a/archival/cpio.c b/archival/cpio.c
index 82b3fe5ed..a3036e1ab 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -11,6 +11,7 @@
11 * Only supports new ASCII and CRC formats 11 * Only supports new ASCII and CRC formats
12 */ 12 */
13#include "libbb.h" 13#include "libbb.h"
14#include "common_bufsiz.h"
14#include "bb_archive.h" 15#include "bb_archive.h"
15 16
16//config:config CPIO 17//config:config CPIO
@@ -170,7 +171,7 @@ enum {
170struct globals { 171struct globals {
171 struct bb_uidgid_t owner_ugid; 172 struct bb_uidgid_t owner_ugid;
172} FIX_ALIASING; 173} FIX_ALIASING;
173#define G (*(struct globals*)&bb_common_bufsiz1) 174#define G (*(struct globals*)bb_common_bufsiz1)
174void BUG_cpio_globals_too_big(void); 175void BUG_cpio_globals_too_big(void);
175#define INIT_G() do { \ 176#define INIT_G() do { \
176 G.owner_ugid.uid = -1L; \ 177 G.owner_ugid.uid = -1L; \
diff --git a/archival/lzop.c b/archival/lzop.c
index a5fc01941..1371c9751 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -71,6 +71,7 @@
71//usage: "\n -F Don't store or verify checksum" 71//usage: "\n -F Don't store or verify checksum"
72 72
73#include "libbb.h" 73#include "libbb.h"
74#include "common_bufsiz.h"
74#include "bb_archive.h" 75#include "bb_archive.h"
75#include "liblzo_interface.h" 76#include "liblzo_interface.h"
76 77
@@ -443,7 +444,7 @@ struct globals {
443 chksum_t chksum_in; 444 chksum_t chksum_in;
444 chksum_t chksum_out; 445 chksum_t chksum_out;
445} FIX_ALIASING; 446} FIX_ALIASING;
446#define G (*(struct globals*)&bb_common_bufsiz1) 447#define G (*(struct globals*)bb_common_bufsiz1)
447#define INIT_G() do { } while (0) 448#define INIT_G() do { } while (0)
448//#define G (*ptr_to_globals) 449//#define G (*ptr_to_globals)
449//#define INIT_G() do { 450//#define INIT_G() do {
diff --git a/archival/rpm.c b/archival/rpm.c
index 105394481..079b7a95b 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -29,6 +29,7 @@
29//usage: "\n -qpc List config files" 29//usage: "\n -qpc List config files"
30 30
31#include "libbb.h" 31#include "libbb.h"
32#include "common_bufsiz.h"
32#include "bb_archive.h" 33#include "bb_archive.h"
33#include "rpm.h" 34#include "rpm.h"
34 35
@@ -93,7 +94,7 @@ struct globals {
93 rpm_index **mytags; 94 rpm_index **mytags;
94 int tagcount; 95 int tagcount;
95} FIX_ALIASING; 96} FIX_ALIASING;
96#define G (*(struct globals*)&bb_common_bufsiz1) 97#define G (*(struct globals*)bb_common_bufsiz1)
97#define INIT_G() do { } while (0) 98#define INIT_G() do { } while (0)
98 99
99static void extract_cpio(int fd, const char *source_rpm) 100static void extract_cpio(int fd, const char *source_rpm)
diff --git a/archival/tar.c b/archival/tar.c
index 23ac00e86..caf4363de 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -146,6 +146,7 @@
146 146
147#include <fnmatch.h> 147#include <fnmatch.h>
148#include "libbb.h" 148#include "libbb.h"
149#include "common_bufsiz.h"
149#include "bb_archive.h" 150#include "bb_archive.h"
150/* FIXME: Stop using this non-standard feature */ 151/* FIXME: Stop using this non-standard feature */
151#ifndef FNM_LEADING_DIR 152#ifndef FNM_LEADING_DIR