randomconfig fixes
authorDenis Vlasenko <vda.linux@googlemail.com>
Tue, 5 Aug 2008 17:43:29 +0000 (17:43 -0000)
committerDenis Vlasenko <vda.linux@googlemail.com>
Tue, 5 Aug 2008 17:43:29 +0000 (17:43 -0000)
libbb/read.c
runit/chpst.c

index 9f6bfcd1b815fa8f54bb923a17820deb41b786a8..815007c1e985686c6cd5737d7dfba2900ffef91f 100644 (file)
@@ -338,12 +338,16 @@ int FAST_FUNC open_zipped(const char *fname)
                        /* .gz and .bz2 both have 2-byte signature, and their
                         * unpack_XXX_stream want this header skipped. */
                        xread(fd, &magic, 2);
+#if ENABLE_FEATURE_SEAMLESS_GZ
 #if BB_MMU
                        xformer = unpack_gz_stream;
 #else
                        xformer_prog = "gunzip";
 #endif
-                       if (magic[0] != 0x1f || magic[1] != 0x8b) {
+#endif
+                       if (!ENABLE_FEATURE_SEAMLESS_GZ
+                        || magic[0] != 0x1f || magic[1] != 0x8b
+                       ) {
                                if (!ENABLE_FEATURE_SEAMLESS_BZ2
                                 || magic[0] != 'B' || magic[1] != 'Z'
                                ) {
index 24d1d6e2c81b24129dd4abf976d33864ea0d7c06..6e5180b913ab053bf6593a8631ffc34e47d574be 100644 (file)
@@ -174,9 +174,9 @@ int chpst_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int chpst_main(int argc UNUSED_PARAM, char **argv)
 {
        struct bb_uidgid_t ugid;
-       char *set_user;
-       char *env_user;
-       char *env_dir;
+       char *set_user = set_user; /* for compiler */
+       char *env_user = env_user;
+       char *env_dir = env_dir;
        char *root;
        char *nicestr;
        unsigned limita;