diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-21 18:18:48 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-21 18:18:48 +0200 |
commit | 47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5 (patch) | |
tree | 05127e986021176649f2dd660a92ef8b8e107e92 /archival | |
parent | e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a (diff) | |
download | busybox-w32-47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5.tar.gz busybox-w32-47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5.tar.bz2 busybox-w32-47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5.zip |
*: add most of the required setup_common_bufsiz() calls
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r-- | archival/cpio.c | 1 | ||||
-rw-r--r-- | archival/lzop.c | 2 | ||||
-rw-r--r-- | archival/rpm.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/archival/cpio.c b/archival/cpio.c index a3036e1ab..3b1550720 100644 --- a/archival/cpio.c +++ b/archival/cpio.c | |||
@@ -174,6 +174,7 @@ struct globals { | |||
174 | #define G (*(struct globals*)bb_common_bufsiz1) | 174 | #define G (*(struct globals*)bb_common_bufsiz1) |
175 | void BUG_cpio_globals_too_big(void); | 175 | void BUG_cpio_globals_too_big(void); |
176 | #define INIT_G() do { \ | 176 | #define INIT_G() do { \ |
177 | setup_common_bufsiz(); \ | ||
177 | G.owner_ugid.uid = -1L; \ | 178 | G.owner_ugid.uid = -1L; \ |
178 | G.owner_ugid.gid = -1L; \ | 179 | G.owner_ugid.gid = -1L; \ |
179 | } while (0) | 180 | } while (0) |
diff --git a/archival/lzop.c b/archival/lzop.c index 1371c9751..4afa21889 100644 --- a/archival/lzop.c +++ b/archival/lzop.c | |||
@@ -445,7 +445,7 @@ struct globals { | |||
445 | chksum_t chksum_out; | 445 | chksum_t chksum_out; |
446 | } FIX_ALIASING; | 446 | } FIX_ALIASING; |
447 | #define G (*(struct globals*)bb_common_bufsiz1) | 447 | #define G (*(struct globals*)bb_common_bufsiz1) |
448 | #define INIT_G() do { } while (0) | 448 | #define INIT_G() do { setup_common_bufsiz(); } while (0) |
449 | //#define G (*ptr_to_globals) | 449 | //#define G (*ptr_to_globals) |
450 | //#define INIT_G() do { | 450 | //#define INIT_G() do { |
451 | // SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); | 451 | // SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); |
diff --git a/archival/rpm.c b/archival/rpm.c index 079b7a95b..83160f975 100644 --- a/archival/rpm.c +++ b/archival/rpm.c | |||
@@ -95,7 +95,7 @@ struct globals { | |||
95 | int tagcount; | 95 | int tagcount; |
96 | } FIX_ALIASING; | 96 | } FIX_ALIASING; |
97 | #define G (*(struct globals*)bb_common_bufsiz1) | 97 | #define G (*(struct globals*)bb_common_bufsiz1) |
98 | #define INIT_G() do { } while (0) | 98 | #define INIT_G() do { setup_common_bufsiz(); } while (0) |
99 | 99 | ||
100 | static void extract_cpio(int fd, const char *source_rpm) | 100 | static void extract_cpio(int fd, const char *source_rpm) |
101 | { | 101 | { |