svn commit: trunk/busybox: libbb runit
vda at busybox.net
vda at busybox.net
Tue Aug 5 17:43:29 UTC 2008
Author: vda
Date: 2008-08-05 10:43:29 -0700 (Tue, 05 Aug 2008)
New Revision: 23053
Log:
randomconfig fixes
Modified:
trunk/busybox/libbb/read.c
trunk/busybox/runit/chpst.c
Changeset:
Modified: trunk/busybox/libbb/read.c
===================================================================
--- trunk/busybox/libbb/read.c 2008-08-05 15:28:05 UTC (rev 23052)
+++ trunk/busybox/libbb/read.c 2008-08-05 17:43:29 UTC (rev 23053)
@@ -338,12 +338,16 @@
/* .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'
) {
Modified: trunk/busybox/runit/chpst.c
===================================================================
--- trunk/busybox/runit/chpst.c 2008-08-05 15:28:05 UTC (rev 23052)
+++ trunk/busybox/runit/chpst.c 2008-08-05 17:43:29 UTC (rev 23053)
@@ -174,9 +174,9 @@
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;
More information about the busybox-cvs
mailing list