diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 17:43:29 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 17:43:29 +0000 |
commit | ec73d303225c1ee7d9eacc8e7238eb70835280a4 (patch) | |
tree | aec4beb73e5dd1584009633eb0fb20338fe6b3c3 | |
parent | 0e7f28d674e889737efece7a783496384c823629 (diff) | |
download | busybox-w32-ec73d303225c1ee7d9eacc8e7238eb70835280a4.tar.gz busybox-w32-ec73d303225c1ee7d9eacc8e7238eb70835280a4.tar.bz2 busybox-w32-ec73d303225c1ee7d9eacc8e7238eb70835280a4.zip |
randomconfig fixes
-rw-r--r-- | libbb/read.c | 6 | ||||
-rw-r--r-- | runit/chpst.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libbb/read.c b/libbb/read.c index 9f6bfcd1b..815007c1e 100644 --- a/libbb/read.c +++ b/libbb/read.c | |||
@@ -338,12 +338,16 @@ int FAST_FUNC open_zipped(const char *fname) | |||
338 | /* .gz and .bz2 both have 2-byte signature, and their | 338 | /* .gz and .bz2 both have 2-byte signature, and their |
339 | * unpack_XXX_stream want this header skipped. */ | 339 | * unpack_XXX_stream want this header skipped. */ |
340 | xread(fd, &magic, 2); | 340 | xread(fd, &magic, 2); |
341 | #if ENABLE_FEATURE_SEAMLESS_GZ | ||
341 | #if BB_MMU | 342 | #if BB_MMU |
342 | xformer = unpack_gz_stream; | 343 | xformer = unpack_gz_stream; |
343 | #else | 344 | #else |
344 | xformer_prog = "gunzip"; | 345 | xformer_prog = "gunzip"; |
345 | #endif | 346 | #endif |
346 | if (magic[0] != 0x1f || magic[1] != 0x8b) { | 347 | #endif |
348 | if (!ENABLE_FEATURE_SEAMLESS_GZ | ||
349 | || magic[0] != 0x1f || magic[1] != 0x8b | ||
350 | ) { | ||
347 | if (!ENABLE_FEATURE_SEAMLESS_BZ2 | 351 | if (!ENABLE_FEATURE_SEAMLESS_BZ2 |
348 | || magic[0] != 'B' || magic[1] != 'Z' | 352 | || magic[0] != 'B' || magic[1] != 'Z' |
349 | ) { | 353 | ) { |
diff --git a/runit/chpst.c b/runit/chpst.c index 24d1d6e2c..6e5180b91 100644 --- a/runit/chpst.c +++ b/runit/chpst.c | |||
@@ -174,9 +174,9 @@ int chpst_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | |||
174 | int chpst_main(int argc UNUSED_PARAM, char **argv) | 174 | int chpst_main(int argc UNUSED_PARAM, char **argv) |
175 | { | 175 | { |
176 | struct bb_uidgid_t ugid; | 176 | struct bb_uidgid_t ugid; |
177 | char *set_user; | 177 | char *set_user = set_user; /* for compiler */ |
178 | char *env_user; | 178 | char *env_user = env_user; |
179 | char *env_dir; | 179 | char *env_dir = env_dir; |
180 | char *root; | 180 | char *root; |
181 | char *nicestr; | 181 | char *nicestr; |
182 | unsigned limita; | 182 | unsigned limita; |