Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/scripts

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

Location:

branches/2.2.9/mindi-busybox/scripts

Files:

• Kbuild (modified) (1 diff)
• Kbuild.src (added)
• Makefile.IMA (modified) (3 diffs)
• Makefile.build (modified) (2 diffs)
• Makefile.clean (modified) (1 diff)
• Makefile.host (modified) (2 diffs)
• Makefile.lib (modified) (3 diffs)
• basic/.gitignore (added)
• basic/docproc.c (modified) (4 diffs)
• basic/fixdep.c (modified) (4 diffs)
• basic/split-include.c (modified) (2 diffs)
• bb_release (added)
• bloat-o-meter (modified) (1 diff)
• checkhelp.awk (modified) (2 diffs)
• checkstack.pl (modified) (1 diff)
• cleanup_printf2puts (modified) (1 diff)
• echo.c (added)
• find_stray_common_vars (modified) (1 diff)
• find_stray_empty_lines (added)
• fix_ws.sh (added)
• gen_build_files.sh (added)
• kconfig/.gitignore (added)
• kconfig/Makefile (modified) (4 diffs)
• kconfig/check.sh (added)
• kconfig/conf.c (modified) (2 diffs)
• kconfig/confdata.c (modified) (11 diffs)
• kconfig/gconf.c (modified) (1 diff)
• kconfig/lex.zconf.c_shipped (modified) (5 diffs)
• kconfig/lxdialog/.gitignore (added)
• kconfig/lxdialog/BIG.FAT.WARNING (modified) (1 diff)
• kconfig/lxdialog/Makefile (modified) (1 diff)
• kconfig/lxdialog/check-lxdialog.sh (modified) (3 diffs)
• kconfig/mconf.c (modified) (7 diffs)
• kconfig/menu.c (modified) (1 diff)
• kconfig/qconf.cc (modified) (2 diffs)
• kconfig/util.c (modified) (3 diffs)
• kconfig/zconf.hash.c_shipped (modified) (1 diff)
• kconfig/zconf.l (modified) (3 diffs)
• kconfig/zconf.tab.c_shipped (modified) (2 diffs)
• kconfig/zconf.y (modified) (3 diffs)
• memusage (added)
• mkconfigs (modified) (2 diffs)
• mkdiff_obj (added)
• mkdiff_obj_bloat (added)
• mkmakefile (modified) (1 diff)
• objsizes (modified) (1 diff)
• randomtest (added)
• randomtest.loop (added)
• sample_pmap (added)
• showasm (modified) (2 diffs)
• test_make_O (added)
• test_make_clean (added)
• trylink (modified) (2 diffs)

branches/2.2.9/mindi-busybox/scripts/Kbuild

@@ +1 @@
+# DO NOT EDIT. This file is generated from Kbuild.src
 ###
 # scripts contains sources for various helper programs used throughout

branches/2.2.9/mindi-busybox/scripts/Makefile.IMA

@@ -1 +1 @@
 # This is completely unsupported.
+#
+# Uasge: make -f scripts/Makefile.IMA
+#
 # Fix COMBINED_COMPILE upstream (in the Kbuild) and propagate
 # the changes back
@@ -7 +10 @@
 obj     := $(objtree)
 
+# Look for make include files relative to root of kernel src
+MAKEFLAGS += --include-dir=$(srctree)
+
 default: busybox
+
 include .config
-ifdef CONFIG_FEATURE_COMPRESS_USAGE
-usage_stuff = include/usage_compressed.h
-endif
-
-# pull in the config stuff
-lib-all-y := applets/applets.o
-lib-y:=
-include procps/Kbuild
-lib-all-y += $(patsubst %,procps/%,$(sort $(lib-y)))
-lib-y:=
-include networking/Kbuild
-lib-all-y += $(patsubst %,networking/%,$(sort $(lib-y)))
-lib-y:=
-include networking/udhcp/Kbuild
-lib-all-y += $(patsubst %,networking/udhcp/%,$(sort $(lib-y)))
-lib-y:=
-include networking/libiproute/Kbuild
-lib-all-y += $(patsubst %,networking/libiproute/%,$(sort $(lib-y)))
-lib-y:=
-include loginutils/Kbuild
-lib-all-y += $(patsubst %,loginutils/%,$(sort $(lib-y)))
-lib-y:=
-include archival/Kbuild
-lib-all-y += $(patsubst %,archival/%,$(sort $(lib-y)))
-lib-y:=
-include archival/libunarchive/Kbuild
-lib-all-y += $(patsubst %,archival/libunarchive/%,$(sort $(lib-y)))
-lib-y:=
-include applets/Kbuild
-lib-all-y += $(patsubst %,applets/%,$(sort $(lib-y)))
-lib-y:=
-include e2fsprogs/Kbuild
-lib-all-y += $(patsubst %,e2fsprogs/%,$(sort $(lib-y)))
-lib-y:=
-#include e2fsprogs/old_e2fsprogs/Kbuild
-#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/%,$(sort $(lib-y)))
-#lib-y:=
-#include e2fsprogs/old_e2fsprogs/ext2fs/Kbuild
-#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/ext2fs/%,$(sort $(lib-y)))
-#lib-y:=
-#include e2fsprogs/old_e2fsprogs/blkid/Kbuild
-#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/blkid/%,$(sort $(lib-y)))
-#lib-y:=
-#include e2fsprogs/old_e2fsprogs/uuid/Kbuild
-#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/uuid/%,$(sort $(lib-y)))
-#lib-y:=
-#include e2fsprogs/old_e2fsprogs/e2p/Kbuild
-#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/e2p/%,$(sort $(lib-y)))
-#lib-y:=
-include debianutils/Kbuild
-lib-all-y += $(patsubst %,debianutils/%,$(sort $(lib-y)))
-lib-y:=
-include runit/Kbuild
-lib-all-y += $(patsubst %,runit/%,$(sort $(lib-y)))
-lib-y:=
-include modutils/Kbuild
-lib-all-y += $(patsubst %,modutils/%,$(sort $(lib-y)))
-lib-y:=
-include miscutils/Kbuild
-lib-all-y += $(patsubst %,miscutils/%,$(sort $(lib-y)))
-lib-y:=
-include coreutils/libcoreutils/Kbuild
-lib-all-y += $(patsubst %,coreutils/libcoreutils/%,$(sort $(lib-y)))
-lib-y:=
-include coreutils/Kbuild
-lib-all-y += $(patsubst %,coreutils/%,$(sort $(lib-y)))
-lib-y:=
-include sysklogd/Kbuild
-lib-all-y += $(patsubst %,sysklogd/%,$(sort $(lib-y)))
-lib-y:=
-include shell/Kbuild
-lib-all-y += $(patsubst %,shell/%,$(sort $(lib-y)))
-lib-y:=
-include console-tools/Kbuild
-lib-all-y += $(patsubst %,console-tools/%,$(sort $(lib-y)))
-lib-y:=
-include findutils/Kbuild
-lib-all-y += $(patsubst %,findutils/%,$(sort $(lib-y)))
-lib-y:=
-include util-linux/Kbuild
-lib-all-y += $(patsubst %,util-linux/%,$(sort $(lib-y)))
-lib-y:=
-include init/Kbuild
-lib-all-y += $(patsubst %,init/%,$(sort $(lib-y)))
-lib-y:=
-include libpwdgrp/Kbuild
-lib-all-y += $(patsubst %,libpwdgrp/%,$(sort $(lib-y)))
-lib-y:=
-include editors/Kbuild
-lib-all-y += $(patsubst %,editors/%,$(sort $(lib-y)))
-lib-y:=
-include selinux/Kbuild
-lib-all-y += $(patsubst %,selinux/%,$(sort $(lib-y)))
-lib-y:=
-include scripts/Kbuild
-lib-all-y += $(patsubst %,scripts/%,$(sort $(lib-y)))
-lib-y:=
-include libbb/Kbuild
-lib-all-y += $(patsubst %,libbb/%,$(sort $(lib-y)))
-lib-y:=
-
-include Makefile.flags
-ifndef BB_VER
-BB_VER:=""
-endif
-
-CPPFLAGS+= -D"KBUILD_STR(s)=\#s" #-Q
-
-HOSTCC = gcc
+
+# Cross compiling and selecting different set of gcc/bin-utils
+ifeq ($(CROSS_COMPILE),)
+CROSS_COMPILE := $(subst ",,$(CONFIG_CROSS_COMPILER_PREFIX))
+endif
+
+ifneq ($(CROSS_COMPILE),)
+SUBARCH := $(shell echo $(CROSS_COMPILE) | cut -d- -f1)
+else
+SUBARCH := $(shell uname -m)
+endif
+SUBARCH := $(shell echo $(SUBARCH) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+                                         -e s/arm.*/arm/ -e s/sa110/arm/ \
+                                         -e s/s390x/s390/ -e s/parisc64/parisc/ \
+                                         -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
+ARCH ?= $(SUBARCH)
+
+ifndef HOSTCC
+HOSTCC = cc
+endif
 AS              = $(CROSS_COMPILE)as
 CC              = $(CROSS_COMPILE)gcc
@@ -128 +46 @@
 OBJDUMP         = $(CROSS_COMPILE)objdump
 
+CFLAGS   := $(CFLAGS)
+CPPFLAGS += -D"KBUILD_STR(s)=\#s" #-Q
+
+# We need some generic definitions
+include $(srctree)/scripts/Kbuild.include
+
+include Makefile.flags
+
+-include $(srctree)/arch/$(ARCH)/Makefile
+ifdef CONFIG_FEATURE_COMPRESS_USAGE
+usage_stuff = include/usage_compressed.h
+endif
+
+ifndef BB_VER
+BB_VER:=""
+endif
+
 WHOLE_PROGRAM:=$(call cc-option,-fwhole-program,)
-busybox: $(usage_stuff)
-    $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) --combine $(WHOLE_PROGRAM) \
+
+# pull in the config stuff
+lib-all-y := applets/applets.o
+lib-y:=
+include procps/Kbuild
+lib-all-y += $(patsubst %,procps/%,$(sort $(lib-y)))
+lib-y:=
+include networking/Kbuild
+lib-all-y += $(patsubst %,networking/%,$(sort $(lib-y)))
+lib-y:=
+include networking/udhcp/Kbuild
+lib-all-y += $(patsubst %,networking/udhcp/%,$(sort $(lib-y)))
+lib-y:=
+include networking/libiproute/Kbuild
+lib-all-y += $(patsubst %,networking/libiproute/%,$(sort $(lib-y)))
+lib-y:=
+include loginutils/Kbuild
+lib-all-y += $(patsubst %,loginutils/%,$(sort $(lib-y)))
+lib-y:=
+include archival/Kbuild
+lib-all-y += $(patsubst %,archival/%,$(sort $(lib-y)))
+lib-y:=
+include archival/libarchive/Kbuild
+lib-all-y += $(patsubst %,archival/libarchive/%,$(sort $(lib-y)))
+lib-y:=
+include applets/Kbuild
+lib-all-y += $(patsubst %,applets/%,$(sort $(lib-y)))
+lib-y:=
+include e2fsprogs/Kbuild
+lib-all-y += $(patsubst %,e2fsprogs/%,$(sort $(lib-y)))
+lib-y:=
+#include e2fsprogs/old_e2fsprogs/Kbuild
+#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/%,$(sort $(lib-y)))
+#lib-y:=
+#include e2fsprogs/old_e2fsprogs/ext2fs/Kbuild
+#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/ext2fs/%,$(sort $(lib-y)))
+#lib-y:=
+#include e2fsprogs/old_e2fsprogs/blkid/Kbuild
+#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/blkid/%,$(sort $(lib-y)))
+#lib-y:=
+#include e2fsprogs/old_e2fsprogs/uuid/Kbuild
+#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/uuid/%,$(sort $(lib-y)))
+#lib-y:=
+#include e2fsprogs/old_e2fsprogs/e2p/Kbuild
+#lib-all-y += $(patsubst %,e2fsprogs/old_e2fsprogs/e2p/%,$(sort $(lib-y)))
+#lib-y:=
+include debianutils/Kbuild
+lib-all-y += $(patsubst %,debianutils/%,$(sort $(lib-y)))
+lib-y:=
+include runit/Kbuild
+lib-all-y += $(patsubst %,runit/%,$(sort $(lib-y)))
+lib-y:=
+include modutils/Kbuild
+lib-all-y += $(patsubst %,modutils/%,$(sort $(lib-y)))
+lib-y:=
+include miscutils/Kbuild
+lib-all-y += $(patsubst %,miscutils/%,$(sort $(lib-y)))
+lib-y:=
+include coreutils/libcoreutils/Kbuild
+lib-all-y += $(patsubst %,coreutils/libcoreutils/%,$(sort $(lib-y)))
+lib-y:=
+include coreutils/Kbuild
+lib-all-y += $(patsubst %,coreutils/%,$(sort $(lib-y)))
+lib-y:=
+include sysklogd/Kbuild
+lib-all-y += $(patsubst %,sysklogd/%,$(sort $(lib-y)))
+lib-y:=
+include shell/Kbuild
+lib-all-y += $(patsubst %,shell/%,$(sort $(lib-y)))
+lib-y:=
+include console-tools/Kbuild
+lib-all-y += $(patsubst %,console-tools/%,$(sort $(lib-y)))
+lib-y:=
+include findutils/Kbuild
+lib-all-y += $(patsubst %,findutils/%,$(sort $(lib-y)))
+lib-y:=
+include util-linux/Kbuild
+lib-all-y += $(patsubst %,util-linux/%,$(sort $(lib-y)))
+lib-y:=
+include util-linux/volume_id/Kbuild
+lib-all-y += $(patsubst %,util-linux/volume_id/%,$(sort $(lib-y)))
+lib-y:=
+include init/Kbuild
+lib-all-y += $(patsubst %,init/%,$(sort $(lib-y)))
+lib-y:=
+include libpwdgrp/Kbuild
+lib-all-y += $(patsubst %,libpwdgrp/%,$(sort $(lib-y)))
+lib-y:=
+include editors/Kbuild
+lib-all-y += $(patsubst %,editors/%,$(sort $(lib-y)))
+lib-y:=
+include printutils/Kbuild
+lib-all-y += $(patsubst %,printutils/%,$(sort $(lib-y)))
+lib-y:=
+include selinux/Kbuild
+lib-all-y += $(patsubst %,selinux/%,$(sort $(lib-y)))
+lib-y:=
+include scripts/Kbuild
+lib-all-y += $(patsubst %,scripts/%,$(sort $(lib-y)))
+lib-y:=
+include libbb/Kbuild
+lib-all-y += $(patsubst %,libbb/%,$(sort $(lib-y)))
+lib-y:=
+
+comma:=,
+busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/autoconf.h
+    $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) \
+        $(patsubst %,-Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS)) \
+        -DGCC_COMBINE=1 \
+        --combine $(WHOLE_PROGRAM) \
         -funit-at-a-time -Wno-error -std=gnu99  \
-        -o $(@)_unstripped $(lib-all-y:.o=.c) \
-        -Wl,--start-group -lcrypt -lm -Wl,--end-group
+        -c -o busybox_unstripped.o \
+        $(lib-all-y:.o=.c)
+
+busybox: busybox_unstripped.o
+    $(srctree)/scripts/trylink \
+        busybox_unstripped \
+        "$(CC) $(CFLAGS_busybox)" \
+        "$(CFLAGS)" \
+        "$(LDFLAGS)" \
+        "busybox_unstripped.o" \
+        "" \
+        "crypt m"
     cp -f $(@)_unstripped $@
     -$(STRIP) -s -R .note -R .comment -R .version $@
 
-applets/usage:
-    $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer      -I$(srctree)/include -o applets/usage applets/usage.c
-include/usage_compressed.h: $(srctree)/include/usage.h applets/usage
+# If .config is newer than include/autoconf.h, someone tinkered
+# with it and forgot to run make oldconfig.
+include/autoconf.h: .config
+    $(MAKE) -f $(srctree)/Makefile silentoldconfig
+
+applets/usage: include/autoconf.h
+    $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I$(srctree)/include -o applets/usage applets/usage.c
+
+applets/applet_tables: include/autoconf.h
+    $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I$(srctree)/include -o applets/applet_tables applets/applet_tables.c
+
+include/usage_compressed.h: include/usage.h applets/usage
     $(srctree)/applets/usage_compressed include/usage_compressed.h applets
 
+include/applet_tables.h: include/applets.h
+    applets/applet_tables include/applet_tables.h

branches/2.2.9/mindi-busybox/scripts/Makefile.build

@@ -14 +14 @@
 
 # The filename Kbuild has precedence over Makefile
+# bbox: we also try to include Kbuild file in obj tree first
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
-include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
+include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, \
+        $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, \
+            $(kbuild-dir)/Makefile \
+        ) \
+    )
 
 include scripts/Makefile.lib
@@ -252 +257 @@
 # If the list of objects to link is empty, just create an empty built-in.o
 cmd_link_o_target = $(if $(strip $(obj-y)),\
-              $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
-              rm -f $@; $(AR) rcs $@)
+        $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
+        rm -f $@; $(AR) rcs $@)
 
 $(builtin-target): $(obj-y) FORCE

branches/2.2.9/mindi-busybox/scripts/Makefile.clean

@@ -15 +15 @@
 # The filename Kbuild has precedence over Makefile
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
-include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
+-include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
 
 # Figure out what we need to build from the various variables

branches/2.2.9/mindi-busybox/scripts/Makefile.host

@@ -100 +100 @@
 quiet_cmd_host-csingle  = HOSTCC  $@
       cmd_host-csingle  = $(HOSTCC) $(hostc_flags) -o $@ $< \
-        $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+              $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
 $(host-csingle): %: %.c FORCE
     $(call if_changed_dep,host-csingle)
@@ -154 +154 @@
 targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\
        $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
-

branches/2.2.9/mindi-busybox/scripts/Makefile.lib

@@ -118 +118 @@
 cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags)
 
-ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
+# Seems to be a wrong thing to do. LDFLAGS contains gcc's flags,
+# yet ld_flags is fed to ld.
+#ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
+# Remove the -Wl, prefix from linker options normally passed through gcc
+ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS))
+
 
 # Finds the multi-part object the current object will be linked into
@@ -147 +152 @@
 # ---------------------------------------------------------------------------
 
+# TODO: LDFLAGS usually is supposed to contain gcc's flags, not ld's.
+# but here we feed them to ld!
 quiet_cmd_ld = LD      $@
 cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
@@ -162 +169 @@
 quiet_cmd_gzip = GZIP    $@
 cmd_gzip = gzip -f -9 < $< > $@
-
-

branches/2.2.9/mindi-busybox/scripts/basic/docproc.c

@@ -80 +80 @@
     pid_t pid;
     int ret;
-    char real_filename[PATH_MAX + 1];
+    char *real_filename;
+    int rflen;
+
     /* Make sure output generated so far are flushed */
     fflush(stdout);
     switch(pid=fork()) {
         case -1:
-            perror("fork");
+            perror("vfork"+1);
             exit(1);
         case  0:
-            memset(real_filename, 0, sizeof(real_filename));
-            strncat(real_filename, getenv("SRCTREE"), PATH_MAX);
-            strncat(real_filename, KERNELDOCPATH KERNELDOC,
-                    PATH_MAX - strlen(real_filename));
+            rflen  = strlen(getenv("SRCTREE"));
+            rflen += strlen(KERNELDOCPATH KERNELDOC);
+            real_filename = alloca(rflen + 1);
+            strcpy(real_filename, getenv("SRCTREE"));
+            strcat(real_filename, KERNELDOCPATH KERNELDOC);
             execvp(real_filename, svec);
             fprintf(stderr, "exec ");
@@ -167 +170 @@
     char line[MAXLINESZ];
     if (filename_exist(filename) == NULL) {
-        char real_filename[PATH_MAX + 1];
-        memset(real_filename, 0, sizeof(real_filename));
-        strncat(real_filename, getenv("SRCTREE"), PATH_MAX);
-        strncat(real_filename, filename,
-                PATH_MAX - strlen(real_filename));
+        int rflen = strlen(getenv("SRCTREE")) + strlen(filename);
+        char *real_filename = alloca(rflen + 1);
+        strcpy(real_filename, getenv("SRCTREE"));
+        strcat(real_filename, filename);
         sym = add_new_file(filename);
         fp = fopen(real_filename, "r");
@@ -250 +252 @@
 
 /*
- * Document spåecific function(s) in a file.
+ * Document specific function(s) in a file.
  * Call kernel-doc with the following parameters:
  * kernel-doc -docbook -function function1 [-function function2]
@@ -396 +398 @@
     return exitstatus;
 }
-

branches/2.2.9/mindi-busybox/scripts/basic/fixdep.c

@@ -204 +204 @@
 void use_config(char *m, int slen)
 {
-    char s[PATH_MAX];
+    char *s = alloca(slen+1);
     char *p;
 
@@ -226 +226 @@
 {
     /* modified for bbox */
-    char *end_4 = map + len - 4; /* 4 == length of "USE_" */
+    char *end_3 = map + len - 3; /* 3 == length of "IF_" */
     char *end_7 = map + len - 7;
     char *p = map;
@@ -232 +232 @@
     int off;
 
-    for (; p < end_4; p++) {
+    for (; p <= end_3; p++) {
+        /* Find next identifier's beginning */
+        if (!(isalnum(*p) || *p == '_'))
+            continue;
+
+        /* Check it */
         if (p < end_7 && p[6] == '_') {
             if (!memcmp(p, "CONFIG", 6)) goto conf7;
             if (!memcmp(p, "ENABLE", 6)) goto conf7;
-        }
-        /* We have at least 5 chars: for() has
-         * "p < end-4", not "p <= end-4"
-         * therefore we don't need to check p <= end-5 here */
-        if (p[4] == '_')
-            if (!memcmp(p, "SKIP", 4)) goto conf5;
-        /* Ehhh, gcc is too stupid to just compare it as 32bit int */
-        if (p[0] == 'U')
-            if (!memcmp(p, "USE_", 4)) goto conf4;
+            if (!memcmp(p, "IF_NOT", 6)) goto conf7;
+        }
+        /* we have at least 3 chars because of p <= end_3 */
+        /*if (!memcmp(p, "IF_", 3)) ...*/
+        if (p[0] == 'I' && p[1] == 'F' && p[2] == '_') {
+            off = 3;
+            goto conf;
+        }
+
+        /* This identifier is not interesting, skip it */
+        while (p <= end_3 && (isalnum(*p) || *p == '_'))
+            p++;
         continue;
 
-    conf4:  off = 4;
-    conf5:  off = 5;
     conf7:  off = 7;
+    conf:
         p += off;
-        for (q = p; q < end_4+4; q++) {
+        for (q = p; q < end_3+3; q++) {
             if (!(isalnum(*q) || *q == '_'))
                 break;
         }
-        use_config(p, q-p);
+        if (q != p) {
+            use_config(p, q-p);
+        }
     }
 }
@@ -307 +316 @@
     char *end = m + len;
     char *p;
-    char s[PATH_MAX];
+    char *s = alloca(len);
 
     p = memchr(m, ':', len);

branches/2.2.9/mindi-busybox/scripts/basic/split-include.c

@@ -111 +111 @@
     if (line[0] != '#')
         continue;
-    if ((str_config = strstr(line, "CONFIG_")) == NULL)
+    if ((str_config = strstr(line, " CONFIG_")) == NULL)
         continue;
 
-    /* Make the output file name. */
-    str_config += sizeof("CONFIG_") - 1;
+    /* We found #define CONFIG_foo or #undef CONFIG_foo.
+     * Make the output file name. */
+    str_config += sizeof(" CONFIG_") - 1;
     for (itarget = 0; !isspace(str_config[itarget]); itarget++)
     {
@@ -155 +156 @@
 
         /* Write the file. */
-        if ((fp_target = fopen(ptarget, "w" )) == NULL)
+        if ((fp_target = fopen(ptarget,  "w")) == NULL)
         ERROR_EXIT(ptarget);
         fputs(line, fp_target);

branches/2.2.9/mindi-busybox/scripts/bloat-o-meter

@@ -8 +8 @@
 # of the GNU General Public License, incorporated herein by reference.
 
-import sys, os, re
+import sys, os#, re
 
-if len(sys.argv) != 3:
-    sys.stderr.write("usage: %s file1 file2\n" % sys.argv[0])
+def usage():
+    sys.stderr.write("usage: %s [-t] file1 file2\n" % sys.argv[0])
     sys.exit(-1)
 
-for f in sys.argv[1], sys.argv[2]:
-    if not os.path.exists(f):
-        sys.stderr.write("Error: file '%s' does not exist\n" % f)
-        sys.exit(-1)
+f1, f2 = (None, None)
+flag_timing, dashes = (False, False)
 
+for f in sys.argv[1:]:
+    if f.startswith("-"):
+        if f == "--": # sym_args
+            dashes = True
+            break
+        if f == "-t": # timings
+            flag_timing = True
+    else:
+        if not os.path.exists(f):
+            sys.stderr.write("Error: file '%s' does not exist\n" % f)
+            usage()
+        if f1 is None:
+            f1 = f
+        elif f2 is None:
+            f2 = f
+if flag_timing:
+    import time
+if f1 is None or f2 is None:
+    usage()
+
+sym_args = " ".join(sys.argv[3 + flag_timing + dashes:])
 def getsizes(file):
-    sym = {}
-    for l in os.popen("nm --size-sort " + file).readlines():
-        size, type, name = l[:-1].split()
-        if type in "tTdDbBrR":
-            if "." in name: name = "static." + name.split(".")[0]
-            sym[name] = sym.get(name, 0) + int(size, 16)
-    for l in os.popen("readelf -S " + file).readlines():
+    sym, alias, lut = {}, {}, {}
+    #dynsym_filter = re.compile("^\d+:\s+[\dA-Fa-f]+\s+\d+\s+\w+\s+\w+\s+\w+\s+\w+\s+\w+$")
+    for l in os.popen("readelf -W -s %s %s" % (sym_args, file)).readlines():
+        if True:
+            l = l.strip()
+            if not (len(l) and l[0].isdigit() and len(l.split()) == 8):
+                continue
+            num, value, size, typ, bind, vis, ndx, name = l.split()
+            if ndx == "UND": continue # skip undefined
+            if typ in ["SECTION", "FILES"]: continue # skip sections and files
+        #else:
+        #    l = l.strip()
+        #    match = dynsym_filter.match(l)
+        #    if not match: continue
+        #    x, value, size, typ, bind, x, ndx, name = l.split()
+        #    if ndx == "UND": continue # skip undefined
+        #    if typ in ["SECTION", "FILES"]: continue # skip sections and files
+        if "." in name: name = "static." + name.split(".")[0]
+        value = int(value, 16)
+        size = int(size)
+        if vis != "DEFAULT" and bind != "GLOBAL": # see if it is an alias
+            alias[(value, size)] = {"name" : name}
+        else:
+            sym[name] = {"addr" : value, "size":  size}
+            lut[(value, size)] = 0
+    for addr, sz in iter(alias.keys()):
+        # If the non-GLOBAL sym has an implementation elsewhere then
+        # it's an alias, disregard it.
+        if not (addr, sz) in lut:
+            # If this non-GLOBAL sym does not have an implementation at
+            # another address, then treat it as a normal symbol.
+            sym[alias[(addr, sz)]["name"]] = {"addr" : addr, "size": sz}
+    for l in os.popen("readelf -W -S " + file).readlines():
         x = l.split()
-        if len(x)<6 or x[1] != ".rodata": continue
-        sym[".rodata"] = int(x[5], 16)
+        if len(x)<6: continue
+        # Should take these into account too!
+        #if x[1] not in [".text", ".rodata", ".symtab", ".strtab"]: continue
+        if x[1] not in [".rodata"]: continue
+        sym[x[1]] = {"addr" : int(x[3], 16), "size" : int(x[5], 16)}
     return sym
 
-old = getsizes(sys.argv[1])
-new = getsizes(sys.argv[2])
+if flag_timing:
+    start_t1 = int(time.time() * 1e9)
+old = getsizes(f1)
+if flag_timing:
+    end_t1 = int(time.time() * 1e9)
+    start_t2 = int(time.time() * 1e9)
+new = getsizes(f2)
+if flag_timing:
+    end_t2 = int(time.time() * 1e9)
+    start_t3 = int(time.time() * 1e9)
 grow, shrink, add, remove, up, down = 0, 0, 0, 0, 0, 0
 delta, common = [], {}
 
-for a in old:
-    if a in new:
-        common[a] = 1
+for name in iter(old.keys()):
+    if name in new:
+        common[name] = 1
 
 for name in old:
     if name not in common:
         remove += 1
-        down += old[name]
-        delta.append((-old[name], name))
+        sz = old[name]["size"]
+        down += sz
+        delta.append((-sz, name))
 
 for name in new:
     if name not in common:
         add += 1
-        up += new[name]
-        delta.append((new[name], name))
+        sz = new[name]["size"]
+        up += sz
+        delta.append((sz, name))
 
 for name in common:
-        d = new.get(name, 0) - old.get(name, 0)
+        d = new[name].get("size", 0) - old[name].get("size", 0)
         if d>0: grow, up = grow+1, up+d
-        if d<0: shrink, down = shrink+1, down-d
+        elif d<0: shrink, down = shrink+1, down-d
+        else:
+            continue
         delta.append((d, name))
 
 delta.sort()
 delta.reverse()
+if flag_timing:
+    end_t3 = int(time.time() * 1e9)
 
-print "%-48s %7s %7s %+7s" % ("function", "old", "new", "delta")
+print("%-48s %7s %7s %+7s" % ("function", "old", "new", "delta"))
 for d, n in delta:
-    if d: print "%-48s %7s %7s %+7d" % (n, old.get(n,"-"), new.get(n,"-"), d)
-print "-"*78
+    if d:
+        old_sz = old.get(n, {}).get("size", "-")
+        new_sz = new.get(n, {}).get("size", "-")
+        print("%-48s %7s %7s %+7d" % (n, old_sz, new_sz, d))
+print("-"*78)
 total="(add/remove: %s/%s grow/shrink: %s/%s up/down: %s/%s)%%sTotal: %s bytes"\
     % (add, remove, grow, shrink, up, -down, up-down)
-print total % (" "*(80-len(total)))
+print(total % (" "*(80-len(total))))
+if flag_timing:
+    print("\n%d/%d; %d Parse origin/new; processing nsecs" %
+        (end_t1-start_t1, end_t2-start_t2, end_t3-start_t3))
+    print("total nsecs: %d" % (end_t3-start_t1))

branches/2.2.9/mindi-busybox/scripts/checkhelp.awk

@@ -2 +2 @@
 # AWK script to check for missing help entries for config options
 #
-# Copyright (C) 2006 Bernhard Fischer
+# Copyright (C) 2006 Bernhard Reutner-Fischer
 #
 # This file is distributed under the terms and conditions of the
@@ -33 +33 @@
 END {
     for (i = 0; i <= pos; i++) {
-#   printf("%s: help for #%i '%s' == %i\n", file[i], i, conf[i], help[i]);
+#   printf("%s: help for #%i '%s' == %i\n", file[i], i, conf[i], help[i]);
         if (help[i] == 0) {
             printf("%s: No helptext for '%s'\n", file[i], conf[i]);

branches/2.2.9/mindi-busybox/scripts/checkstack.pl

@@ -127 +127 @@
         $addr = "0x$addr";
 
-        my $intro = "$addr $func [$file]:";
+        # bbox: was: my $intro = "$addr $func [$file]:";
+        my $intro = "$func [$file]:";
         my $padlen = 56 - length($intro);
         while ($padlen > 0) {

branches/2.2.9/mindi-busybox/scripts/cleanup_printf2puts

@@ -4 +4 @@
 # printf("abc\n") -> puts("abc"). Beware of fprintf etc...
 
-# BTW, gcc 4.1.2 already does tha same! Can't believe it...
+# BTW, gcc 4.1.2 already does the same! Can't believe it...
 
 grep -lr 'printf\([^%%]*\\n"\)' . | grep '.[ch]$' | xargs -n1 \

branches/2.2.9/mindi-busybox/scripts/find_stray_common_vars

@@ -4 +4 @@
 # This script will show all commons in *.o, sorted by size
 
-find -name '*.o' \
+find ! -path './scripts/*' -a ! -name built-in.o -a -name '*.o' \
 | while read name; do
     b=`basename "$name"`

branches/2.2.9/mindi-busybox/scripts/kconfig/Makefile

@@ -18 +18 @@
     $< Config.in
 
+# Mtime granularity problem.
+# It was observed that these commands:
+# make allnoconfig; sed -i -e '/CONFIG_TRUE/s/.*/CONFIG_TRUE=y/' .config; make
+# sometimes produce busybox with "true" applet still disabled.
+# This is caused by .config updated by sed having mtime which is still
+# equal to (not bigger than) include/autoconf.h's mtime,
+# and thus 2nd make does not regenerate include/autoconf.h.
+# Waiting for 1 second after non-interactive "make XXXXconfig"
+# prevents this from happening.
+#
+# We'd like to detect whether filesystem we are on has coarse mtimes,
+# but can't do it yet, bbox ls hasn't got --full-time.
+#MTIME_IS_COARSE:=@ls --full-time -ld | grep -F .000 >/dev/null
+MTIME_IS_COARSE:=@true
+
 oldconfig: $(obj)/conf
     $< -o Config.in
+    $(MTIME_IS_COARSE) && sleep 1
 
 silentoldconfig: $(obj)/conf
     $< -s Config.in
+    $(MTIME_IS_COARSE) && sleep 1
 
 update-po-config: $(obj)/kxgettext
@@ -47 +64 @@
 randconfig: $(obj)/conf
     $< -r Config.in
+    $(MTIME_IS_COARSE) && sleep 1
 
 allyesconfig: $(obj)/conf
     $< -y Config.in
+    $(MTIME_IS_COARSE) && sleep 1
 
 allnoconfig: $(obj)/conf
     $< -n Config.in
+    $(MTIME_IS_COARSE) && sleep 1
 
 allmodconfig: $(obj)/conf
     $< -m Config.in
+    $(MTIME_IS_COARSE) && sleep 1
 
 defconfig: $(obj)/conf
@@ -64 +85 @@
     $(Q)$< -D $(KBUILD_DEFCONFIG) Config.in
 endif
+    $(MTIME_IS_COARSE) && sleep 1
 
 %_defconfig: $(obj)/conf
     $(Q)$< -D $@ Config.in
+    $(MTIME_IS_COARSE) && sleep 1
 
 # Help text used by make help
@@ -118 +141 @@
 subdir- += lxdialog
 
-# Needed for systems without gettext
-KBUILD_HAVE_NLS := $(shell \
-     if echo "\#include <libintl.h>" | $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \
-     then echo yes ; \
-     else echo no ; fi)
-ifeq ($(KBUILD_HAVE_NLS),no)
-HOSTCFLAGS  += -DKBUILD_NO_NLS
-endif
+# Add environment specific flags
+HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))
 
 # generated files seem to need this to find local include files

branches/2.2.9/mindi-busybox/scripts/kconfig/conf.c

@@ -504 +504 @@
         case 's':
             input_mode = ask_silent;
-            valid_stdin = isatty(0) && isatty(1) && isatty(2);
+            valid_stdin = isatty(0); //bbox: && isatty(1) && isatty(2);
             break;
         case 'd':
@@ -606 +606 @@
     } while (conf_cnt);
     if (conf_write(NULL)) {
-        fprintf(stderr, _("\n*** Error during writing of the busybox configuration.\n\n"));
+        fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
         return 1;
     }

branches/2.2.9/mindi-busybox/scripts/kconfig/confdata.c

@@ -23 +23 @@
 const char conf_def_filename[] = ".config";
 
-const char conf_defname[] = "scripts/defconfig";
+const char conf_defname[] = "/dev/null"; //bbox
 
 const char *conf_confnames[] = {
@@ -71 +71 @@
 {
     struct stat buf;
-    static char fullname[PATH_MAX+1];
+    static char *fullname = NULL;
     char *env, *name;
 
@@ -77 +77 @@
     env = getenv(SRCTREE);
     if (env) {
+        fullname = realloc(fullname, strlen(env) + strlen(name) + 2);
         sprintf(fullname, "%s/%s", env, name);
         if (!stat(fullname, &buf))
@@ -405 +406 @@
                 strftime(buf, sizeof(buf), "#define AUTOCONF_TIMESTAMP "
                     "\"%Y-%m-%d %H:%M:%S\"\n", localtime(&now));
+        } else { /* bbox */
+            strcpy(buf, "#define AUTOCONF_TIMESTAMP \"\"\n");
         }
         fprintf(out_h, "/*\n"
@@ -436 +439 @@
         } else if (!(sym->flags & SYMBOL_CHOICE)) {
             sym_calc_value(sym);
-/* bbox: we want to all syms
+/* bbox: we want to see all syms
             if (!(sym->flags & SYMBOL_WRITE))
                 goto next;
@@ -457 +460 @@
                         /* bbox */
                         fprintf(out_h, "#define ENABLE_%s 0\n", sym->name);
-                        fprintf(out_h, "#define USE_%s(...)\n", sym->name);
-                        fprintf(out_h, "#define SKIP_%s(...) __VA_ARGS__\n", sym->name);
+                        fprintf(out_h, "#define IF_%s(...)\n", sym->name);
+                        fprintf(out_h, "#define IF_NOT_%s(...) __VA_ARGS__\n", sym->name);
                     }
                     break;
@@ -472 +475 @@
                         /* bbox */
                         fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                        fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", sym->name);
-                        fprintf(out_h, "#define SKIP_%s(...)\n", sym->name);
+                        fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                        fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                     }
                     break;
@@ -504 +507 @@
                     /* bbox */
                     fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                    fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", sym->name);
-                    fprintf(out_h, "#define SKIP_%s(...)\n", sym->name);
+                    fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                    fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                 }
                 break;
@@ -516 +519 @@
                         /* bbox */
                         fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                        fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", sym->name);
-                        fprintf(out_h, "#define SKIP_%s(...)\n", sym->name);
+                        fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                        fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                     }
                     break;
@@ -523 +526 @@
             case S_INT:
                 str = sym_get_string_value(sym);
+                if (!str[0])
+                    str = "0";
                 fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
                 if (out_h) {
@@ -528 +533 @@
                     /* bbox */
                     fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                    fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", sym->name);
-                    fprintf(out_h, "#define SKIP_%s(...)\n", sym->name);
+                    fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                    fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                 }
                 break;

branches/2.2.9/mindi-busybox/scripts/kconfig/gconf.c

@@ -742 +742 @@
     GtkWidget *dialog;
     const gchar *intro_text = _(
-        "Welcome to gkc, the GTK+ graphical busybox configuration tool\n"
-        "for Linux.\n"
+        "Welcome to gkc, the GTK+ graphical configuration tool.\n"
         "For each option, a blank box indicates the feature is disabled, a\n"
         "check indicates it is enabled, and a dot indicates that it is to\n"

branches/2.2.9/mindi-busybox/scripts/kconfig/lex.zconf.c_shipped

@@ -785 +785 @@
 {
     int new_size = text_size + size + 1;
+    if (size > 70) {
+        fprintf (stderr, "%s:%d error: Overlong line\n",
+        current_file->name, current_file->lineno);
+    }
+
     if (new_size > text_asize) {
         new_size += START_STRSIZE - 1;
@@ -842 +847 @@
 static int yy_flex_strlen (yyconst char * );
 #endif
+
+//bbox: suppressing "defined but not used" warning
+#define YY_NO_INPUT 1
 
 #ifndef YY_NO_INPUT
@@ -2228 +2236 @@
 FILE *zconf_fopen(const char *name)
 {
-    char *env, fullname[PATH_MAX+1];
+    char *env;
     FILE *f;
 
@@ -2235 +2243 @@
         env = getenv(SRCTREE);
         if (env) {
+            char *fullname = alloca(strlen(env) + strlen(name) + 2);
             sprintf(fullname, "%s/%s", env, name);
             f = fopen(fullname, "r");
@@ -2315 +2324 @@
     return current_pos.file ? current_pos.file->name : "<none>";
 }
-

branches/2.2.9/mindi-busybox/scripts/kconfig/lxdialog/BIG.FAT.WARNING

@@ -1 +1 @@
 This is NOT the official version of dialog.  This version has been
-significantly modified from the original.  It is for use by the Linux
-busybox configuration script.  Please do not bother Savio Lam with
-questions about this program.
+significantly modified from the original.  It was used by the Linux
+kernel configuration script, and subsequently adapted for busybox.
+Please do not bother Savio Lam with questions about this program.

branches/2.2.9/mindi-busybox/scripts/kconfig/lxdialog/Makefile

@@ -13 +13 @@
 PHONY += dochecklxdialog
 $(obj)/dochecklxdialog:
-    $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES)
+    $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)
 
 hostprogs-y := lxdialog

branches/2.2.9/mindi-busybox/scripts/kconfig/lxdialog/check-lxdialog.sh

@@ -5 +5 @@
 ldflags()
 {
-    $cc -print-file-name=libncursesw.so | grep -q /
-    if [ $? -eq 0 ]; then
-        echo '-lncursesw'
-        exit
-    fi
-    $cc -print-file-name=libncurses.so | grep -q /
-    if [ $? -eq 0 ]; then
-        echo '-lncurses'
-        exit
-    fi
-    $cc -print-file-name=libcurses.so | grep -q /
-    if [ $? -eq 0 ]; then
-        echo '-lcurses'
-        exit
-    fi
+    for ext in so a dylib ; do
+        for lib in ncursesw ncurses curses ; do
+            $cc -print-file-name=lib${lib}.${ext} | grep -q /
+            if [ $? -eq 0 ]; then
+                echo "-l${lib}"
+                exit
+            fi
+        done
+    done
     exit 1
 }
@@ -26 +20 @@
 ccflags()
 {
-    if [ -f /usr/include/ncurses/ncurses.h ]; then
+    if [ -f /usr/include/ncursesw/ncurses.h ]; then
+        echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"'
+    elif [ -f /usr/include/ncursesw/curses.h ]; then
+        echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+    elif [ -f /usr/include/ncurses/ncurses.h ]; then
         echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
     elif [ -f /usr/include/ncurses/curses.h ]; then
@@ -43 +41 @@
 # Check if we can link to ncurses
 check() {
-    echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
+        $cc -xc - -o $tmp 2>/dev/null <<'EOF'
+#include CURSES_LOC
+main() {}
+EOF
     if [ $? != 0 ]; then
-        echo " *** Unable to find the ncurses libraries."          1>&2
-        echo " *** make menuconfig require the ncurses libraries"  1>&2
-        echo " *** "                                               1>&2
-        echo " *** Install ncurses (ncurses-devel) and try again"  1>&2
-        echo " *** "                                               1>&2
-        exit 1
+        echo " *** Unable to find the ncurses libraries or the"       1>&2
+        echo " *** required header files."                            1>&2
+        echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
+        echo " *** "                                                  1>&2
+        echo " *** Install ncurses (ncurses-devel) and try again."    1>&2
+        echo " *** "                                                  1>&2
+        exit 1
     fi
 }
 
 usage() {
-    printf "Usage: $0 [-check compiler options|-header|-library]\n"
+    printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n"
 }
 
-if [ $# == 0 ]; then
+if [ $# -eq 0 ]; then
     usage
     exit 1

branches/2.2.9/mindi-busybox/scripts/kconfig/mconf.c

@@ -116 +116 @@
 "Menuconfig supports the use of alternate configuration files for\n"
 "those who, for various reasons, find it necessary to switch\n"
-"between different busybox configurations.\n"
+"between different configurations.\n"
 "\n"
 "At the end of the main menu you will find two options.  One is\n"
@@ -149 +149 @@
 "Optional personality available\n"
 "------------------------------\n"
-"If you prefer to have all of the busybox options listed in a single\n"
+"If you prefer to have all of the options listed in a single\n"
 "menu, rather than the default multimenu hierarchy, run the menuconfig\n"
 "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
@@ -194 +194 @@
 load_config_help[] = N_(
     "\n"
-    "For various reasons, one may wish to keep several different busybox\n"
+    "For various reasons, one may wish to keep several different\n"
     "configurations available on a single machine.\n"
     "\n"
-    "If you have saved a previous configuration in a file other than \n"
-    "busybox's default, entering the name of the file here will allow you\n"
+    "If you have saved a previous configuration in a file other than\n"
+    "default, entering the name of the file here will allow you\n"
     "to modify that configuration.\n"
     "\n"
@@ -208 +208 @@
 save_config_help[] = N_(
     "\n"
-    "For various reasons, one may wish to keep different busybox\n"
+    "For various reasons, one may wish to keep different\n"
     "configurations available on a single machine.\n"
     "\n"
@@ -259 +259 @@
 static char buf[4096], *bufptr = buf;
 static char input_buf[4096];
-static char filename[PATH_MAX+1] = ".config";
+static const char filename[] = ".config";
 static char *args[1024], **argptr = args;
 static int indent;
@@ -1071 +1071 @@
         cprint_init();
         cprint("--yesno");
-        cprint(_("Do you wish to save your new busybox configuration?"));
+        cprint(_("Do you wish to save your new configuration?"));
         cprint("5");
         cprint("60");
@@ -1080 +1080 @@
         if (conf_write(NULL)) {
             fprintf(stderr, _("\n\n"
-                "Error during writing of the busybox configuration.\n"
-                "Your busybox configuration changes were NOT saved."
+                "Error during writing of the configuration.\n"
+                "Your configuration changes were NOT saved."
                 "\n\n"));
             return 1;
         }
         printf(_("\n\n"
-            "*** End of busybox configuration.\n"
-            "*** Execute 'make' to build busybox or try 'make help'."
+            "*** End of configuration.\n"
+            "*** Execute 'make' to build the project or try 'make help'."
             "\n\n"));
     } else {
         fprintf(stderr, _("\n\n"
-            "Your busybox configuration changes were NOT saved."
+            "Your configuration changes were NOT saved."
             "\n\n"));
     }

branches/2.2.9/mindi-busybox/scripts/kconfig/menu.c

@@ -395 +395 @@
     return menu;
 }
-

branches/2.2.9/mindi-busybox/scripts/kconfig/qconf.cc

@@ -1300 +1300 @@
 void ConfigMainWindow::showIntro(void)
 {
-    static char str[] = "Welcome to the qconf graphical busybox configuration tool for Linux.\n\n"
+    static char str[] = "Welcome to the qconf graphical configuration tool.\n\n"
         "For each option, a blank box indicates the feature is disabled, a check\n"
         "indicates it is enabled, and a dot indicates that it is to be compiled\n"
@@ -1317 +1317 @@
 void ConfigMainWindow::showAbout(void)
 {
-    static char str[] = "qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n\n"
-        "Bug reports and feature request can also be entered at http://bugs.busybox.net/\n";
+    static char str[] = "qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n";
 
     QMessageBox::information(this, "qconf", str);

branches/2.2.9/mindi-busybox/scripts/kconfig/util.c

@@ -45 +45 @@
             fprintf(out, "\t%s\n", file->name);
     }
-    fprintf(out, "\n.config include/autoconf.h: $(deps_config)\n\n$(deps_config):\n");
+    fprintf(out,
+        "\n"
+        ".config include/autoconf.h: $(deps_config)\n"
+        "\n"
+        "include/autoconf.h: .config\n" /* bbox */
+        "\n"
+        "$(deps_config):\n");
     fclose(out);
     rename("..config.tmp", name);
@@ -52 +58 @@
 
 
-/* Allocate initial growable sting */
+/* Allocate initial growable string */
 struct gstr str_new(void)
 {
@@ -107 +113 @@
     return gs->s;
 }
-

branches/2.2.9/mindi-busybox/scripts/kconfig/zconf.hash.c_shipped

@@ -229 +229 @@
   return 0;
 }
-

branches/2.2.9/mindi-busybox/scripts/kconfig/zconf.l

@@ -50 +50 @@
 {
     int new_size = text_size + size + 1;
+    if (size > 70) {
+            fprintf (stderr, "%s:%d error: Overlong line\n",
+             current_file->name, current_file->lineno);
+    }
     if (new_size > text_asize) {
         new_size += START_STRSIZE - 1;
@@ -262 +266 @@
 FILE *zconf_fopen(const char *name)
 {
-    char *env, fullname[PATH_MAX+1];
+    char *env;
     FILE *f;
 
@@ -269 +273 @@
         env = getenv(SRCTREE);
         if (env) {
+            char *fullname = alloca(strlen(env) + strlen(name) + 2);
             sprintf(fullname, "%s/%s", env, name);
             f = fopen(fullname, "r");

branches/2.2.9/mindi-busybox/scripts/kconfig/zconf.tab.c_shipped

@@ -1104 +1104 @@
      `yyls': related to locations.
 
-     Refer to the stacks thru separate pointers, to allow yyoverflow
+     Refer to the stacks through separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
@@ -2174 +2174 @@
 #include "symbol.c"
 #include "menu.c"
-
-

branches/2.2.9/mindi-busybox/scripts/kconfig/zconf.y

@@ -14 +14 @@
 #define LKC_DIRECT_LINK
 #include "lkc.h"
-
-#include "zconf.hash.c"
 
 #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
@@ -100 +98 @@
 } if_entry menu_entry choice_entry
 
+%{
+#include "zconf.hash.c"
+%}
+
 %%
 input: stmt_list;
@@ -472 +474 @@
     for_all_symbols(i, sym) {
         sym_check_deps(sym);
-        }
+    }
 
     sym_change_count = 1;

branches/2.2.9/mindi-busybox/scripts/mkconfigs

@@ -27 +27 @@
 #      - lines that use double-quotes must \\-escape-quote them
 
-config="$1"
-if [ $# -lt 1 ]
-then
-    config=.config
-fi
+config=.config
 
+{
 echo "\
 #ifndef _BBCONFIGOPTS_H
@@ -39 +36 @@
  * busybox configuration settings.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * This file is generated automatically by scripts/mkconfigs.
  * Do not edit.
- *
  */
-static const char *const bbconfig_config ="
+static const char bbconfig_config[] ALIGN1 ="
 
-sed 's/\"/\\\"/g' $config | grep "^#\? \?CONFIG_" | awk '{print "\"" $0 "\\n\"";}'
+grep '^#\? \?CONFIG_' "$config" \
+| sed -e 's/\"/\\\"/g' -e 's/^/"/' -e 's/$/\\n"/'
 
 echo ";"
-echo "#endif /* _BBCONFIGOPTS_H */"
+echo "#endif"
+} >"$1"
+
+{
+echo "\
+#ifndef _BBCONFIGOPTS_BZ2_H
+#define _BBCONFIGOPTS_BZ2_H
+/*
+ * busybox configuration settings.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ *
+ * This file is generated automatically by scripts/mkconfigs.
+ * Do not edit.
+ */
+static const char bbconfig_config_bz2[] ALIGN1 = {"
+
+grep '^#\? \?CONFIG_' "$config" \
+| bzip2 -1 | dd bs=2 skip=1 2>/dev/null \
+| od -v -t x1 \
+| sed -e 's/^[^ ]*//' \
+        -e 's/ //g' \
+        -e '/^$/d' \
+        -e 's/\(..\)/0x\1,/g'
+
+echo "};"
+echo "#endif"
+} >"$2"

branches/2.2.9/mindi-busybox/scripts/mkmakefile

@@ -32 +32 @@
 Makefile:;
 
-\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/:
+\$(filter-out all Makefile,\$(MAKECMDGOALS)):
+    \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
+
+%/:
     \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
 EOF

branches/2.2.9/mindi-busybox/scripts/objsizes

@@ -17 +17 @@
 done
 printf "%9d %11d %9d %9d %s\n" $((t_text+t_data)) $t_text $t_data $t_bss "TOTAL"
-} | sort -r
+} | env -uLANG -uLC_ALL sort -r

branches/2.2.9/mindi-busybox/scripts/showasm

@@ -2 +2 @@
 
 # Copyright 2006 Rob Landley <rob@landley.net>
-# Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
 
 # Dumb little utility function to print out the assembly dump of a single
@@ -19 +19 @@
 
 objdump -d $1 | sed -n -e '/./{H;$!d}' -e "x;/^.[0-9a-fA-F]* <$2>:/p"
-

branches/2.2.9/mindi-busybox/scripts/trylink

@@ -3 +3 @@
 debug=false
 
+# Linker flags used:
+#
+# Informational:
+# --warn-common
+# -Map $EXE.map
+# --verbose
+#
+# Optimizations:
+# --sort-common                 reduces padding
+# --sort-section alignment      reduces padding
+# --gc-sections                 throws out unused sections,
+#                               does not work for shared libs
+# -On                           Not used, maybe useful?
+#
+# List of files to link:
+# $l_list                       == --start-group -llib1 -llib2 --end-group
+# --start-group $O_FILES $A_FILES --end-group
+#
+# Shared library link:
+# -shared                       self-explanatory
+# -fPIC                         position-independent code
+# --enable-new-dtags            ?
+# -z,combreloc                  ?
+# -soname="libbusybox.so.$BB_VER"
+# --undefined=lbb_main          Seed name to start pulling from
+#                               (otherwise we'll need --whole-archive)
+# -static                       Not used, but may be useful! manpage:
+#                               "... This option can be used with -shared.
+#                               Doing so means that a shared library
+#                               is being created but that all of the library's
+#                               external references must be resolved by pulling
+#                               in entries from static libraries."
+
+
 try() {
-    added="$1"
-    shift
-    $debug && echo "Trying: $* $added"
-    "$@" $added 2>busybox_ld.err
-}
+    printf "%s\n" "Output of:" >$EXE.out
+    printf "%s\n" "$*" >>$EXE.out
+    printf "%s\n" "==========" >>$EXE.out
+    $debug && echo "Trying: $*"
+    $@ >>$EXE.out 2>&1
+    return $?
+}
+
+check_cc() {
+    local tempname="/tmp/temp.$$.$RANDOM"
+    # Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
+    # "-xc": C language. "/dev/null" is an empty source file.
+    if $CC $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then
+    echo "$1";
+    else
+    echo "$2";
+    fi
+    rm "$tempname".o 2>/dev/null
+}
+
+check_libc_is_glibc() {
+    local tempname="/tmp/temp.$$.$RANDOM"
+    echo "\
+    #include <stdlib.h>
+    /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
+    #if defined(__GLIBC__) && !defined(__UCLIBC__)
+    syntax error here
+    #endif
+    " >"$tempname".c
+    if $CC "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then
+    echo "$2";
+    else
+    echo "$1";
+    fi
+    rm "$tempname".c "$tempname".o 2>/dev/null
+}
+
+EXE="$1"
+CC="$2"
+CFLAGS="$3"
+LDFLAGS="$4"
+O_FILES="$5"
+A_FILES="$6"
+LDLIBS="$7"
+
+# The --sort-section option is not supported by older versions of ld
+SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""`
+
+START_GROUP="-Wl,--start-group"
+END_GROUP="-Wl,--end-group"
+INFO_OPTS="-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"
+
+# gold may not support --sort-common (yet)
+SORT_COMMON=`check_cc "-Wl,--sort-common" ""`
+
+# Static linking against glibc produces buggy executables
+# (glibc does not cope well with ld --gc-sections).
+# See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
+# Note that glibc is unsuitable for static linking anyway.
+# We are removing -Wl,--gc-sections from link command line.
+GC_SECTIONS=`(
+. ./.config
+if test x"$CONFIG_STATIC" = x"y"; then
+    check_libc_is_glibc "" "-Wl,--gc-sections"
+else
+    echo "-Wl,--gc-sections"
+fi
+)`
+
+# The --gc-sections option is not supported by older versions of ld
+if test -n "$GC_SECTIONS"; then
+    GC_SECTIONS=`check_cc "$GC_SECTIONS" ""`
+fi
 
 # Sanitize lib list (dups, extra spaces etc)
-#echo "BBOX_LIB_LIST=$BBOX_LIB_LIST"
-BBOX_LIB_LIST=`echo "$BBOX_LIB_LIST" | xargs -n1 | sort | uniq | xargs`
+LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs`
 
 # First link with all libs. If it fails, bail out
-echo "Trying libraries: $BBOX_LIB_LIST"
-l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
-try "$l_list" "$@" \
+echo "Trying libraries: $LDLIBS"
+# "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
+l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
+test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
+try $CC $CFLAGS $LDFLAGS \
+    -o $EXE \
+    $SORT_COMMON \
+    $SORT_SECTION \
+    $GC_SECTIONS \
+    $START_GROUP $O_FILES $A_FILES $END_GROUP \
+    $l_list \
 || {
-    echo "Failed: $* -Wl,--start-group $l_list -Wl,--end-group"
-    cat busybox_ld.err
+    echo "Failed: $l_list"
+    cat $EXE.out
     exit 1
 }
@@ -27 +135 @@
 # Now try to remove each lib and build without it.
 # Stop when no lib can be removed.
-while test "$BBOX_LIB_LIST"; do
-    $debug && echo "Trying libraries: $BBOX_LIB_LIST"
+while test "$LDLIBS"; do
+    $debug && echo "Trying libraries: $LDLIBS"
     all_needed=true
-    for one in $BBOX_LIB_LIST; do
-    without_one=`echo " $BBOX_LIB_LIST " | sed "s/ $one / /g" | xargs`
+    last_needed=false
+    for one in $LDLIBS; do
+    without_one=`echo " $LDLIBS " | sed "s/ $one / /g" | xargs`
+    # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
     l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-    test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
+    test x"$l_list" != x"" && l_list="$START_GROUP $l_list $END_GROUP"
     $debug && echo "Trying -l options: '$l_list'"
-    if try "$l_list" "$@"; then
-        echo "Library $one is not needed"
-        BBOX_LIB_LIST="$without_one"
-        all_needed=false
+    try $CC $CFLAGS $LDFLAGS \
+        -o $EXE \
+        $SORT_COMMON \
+        $SORT_SECTION \
+        $GC_SECTIONS \
+        $START_GROUP $O_FILES $A_FILES $END_GROUP \
+        $l_list
+    if test $? = 0; then
+        echo " Library $one is not needed, excluding it"
+        LDLIBS="$without_one"
+        all_needed=false
+        last_needed=false
     else
-        echo "Library $one is needed"
+        echo " Library $one is needed, can't exclude it (yet)"
+        last_needed=true
     fi
     done
     # All libs were needed, can't remove any
     $all_needed && break
-    # If there is no space char, the list has just one lib.
-    # I'm not sure that in this case lib really is 100% needed.
-    # Let's try linking without it anyway... thus commented out.
-    #{ echo "$BBOX_LIB_LIST" | grep -q ' '; } || break
+    # Optimization: was the last tried lib needed?
+    if $last_needed; then
+    # Was it the only one lib left? Don't test again then.
+    { echo "$LDLIBS" | grep -q ' '; } || break
+    fi
 done
 
 # Make the binary with final, minimal list of libs
-echo "Final link with: $BBOX_LIB_LIST"
-l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose"
+echo "Final link with: ${LDLIBS:-<none>}"
+l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
+test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP"
 # --verbose gives us gobs of info to stdout (e.g. linker script used)
 if ! test -f busybox_ldscript; then
-    try "$l_list -Wl,--verbose" "$@" >busybox_ld.out
+    try $CC $CFLAGS $LDFLAGS \
+        -o $EXE \
+        $SORT_COMMON \
+        $SORT_SECTION \
+        $GC_SECTIONS \
+        $START_GROUP $O_FILES $A_FILES $END_GROUP \
+        $l_list \
+        $INFO_OPTS \
+    || {
+    cat $EXE.out
+    exit 1
+    }
 else
     echo "Custom linker script 'busybox_ldscript' found, using it"
-    # Add SORT_BY_ALIGNMENT to linker script (found in busybox_ld.out):
+    # Add SORT_BY_ALIGNMENT to linker script (found in $EXE.out):
     #  .rodata         : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) }
     #  *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*)
     #  *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*)
-    # This will eliminate most of the data padding (~3kb).
-    try "$l_list -Wl,--verbose -Wl,-T -Wl,busybox_ldscript" "$@" >busybox_ld.out
-fi
+    # This will eliminate most of the padding (~3kb).
+    # Hmm, "ld --sort-section alignment" should do it too.
+    try $CC $CFLAGS $LDFLAGS \
+        -o $EXE \
+        $SORT_COMMON \
+        $SORT_SECTION \
+        $GC_SECTIONS \
+        -Wl,-T,busybox_ldscript \
+        $START_GROUP $O_FILES $A_FILES $END_GROUP \
+        $l_list \
+        $INFO_OPTS \
+    || {
+    cat $EXE.out
+    exit 1
+    }
+fi
+
+. ./.config
+
+sharedlib_dir="0_lib"
+
+if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
+    mkdir "$sharedlib_dir" 2>/dev/null
+    test -d "$sharedlib_dir" || {
+    echo "Cannot make directory $sharedlib_dir"
+    exit 1
+    }
+    ln -s "libbusybox.so.$BB_VER" "$sharedlib_dir"/libbusybox.so 2>/dev/null
+
+    EXE="$sharedlib_dir/libbusybox.so.${BB_VER}_unstripped"
+    try $CC $CFLAGS $LDFLAGS \
+        -o $EXE \
+        -shared -fPIC \
+        -Wl,--enable-new-dtags \
+        -Wl,-z,combreloc \
+        -Wl,-soname="libbusybox.so.$BB_VER" \
+        -Wl,--undefined=lbb_main \
+        $SORT_COMMON \
+        $SORT_SECTION \
+        $START_GROUP $A_FILES $END_GROUP \
+        $l_list \
+        $INFO_OPTS \
+    || {
+    echo "Linking $EXE failed"
+    cat $EXE.out
+    exit 1
+    }
+    $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o "$sharedlib_dir/libbusybox.so.$BB_VER"
+    chmod a+x "$sharedlib_dir/libbusybox.so.$BB_VER"
+    echo "libbusybox: $sharedlib_dir/libbusybox.so.$BB_VER"
+fi
+
+if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
+    EXE="$sharedlib_dir/busybox_unstripped"
+    try $CC $CFLAGS $LDFLAGS \
+        -o $EXE \
+        $SORT_COMMON \
+        $SORT_SECTION \
+        $GC_SECTIONS \
+        $START_GROUP $O_FILES $END_GROUP \
+        -L"$sharedlib_dir" -lbusybox \
+        $INFO_OPTS \
+    || {
+    echo "Linking $EXE failed"
+    cat $EXE.out
+    exit 1
+    }
+    $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o "$sharedlib_dir/busybox"
+    echo "busybox linked against libbusybox: $sharedlib_dir/busybox"
+fi
+
+if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
+    echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)"
+    gcc -DNAME_MAIN_CNAME -E -include include/autoconf.h include/applets.h \
+    | grep -v "^#" \
+    | grep -v "^$" \
+    > applet_lst.tmp
+    while read name main junk; do
+
+    echo "\
+void lbb_prepare(const char *applet, char **argv);
+int $main(int argc, char **argv);
+
+int main(int argc, char **argv)
+{
+    lbb_prepare(\"$name\", argv);
+    return $main(argc, argv);
+}
+" >"$sharedlib_dir/applet.c"
+
+    EXE="$sharedlib_dir/$name"
+    try $CC $CFLAGS $LDFLAGS "$sharedlib_dir/applet.c" \
+        -o $EXE \
+        $SORT_COMMON \
+        $SORT_SECTION \
+        $GC_SECTIONS \
+        -L"$sharedlib_dir" -lbusybox \
+        -Wl,--warn-common \
+    || {
+        echo "Linking $EXE failed"
+        cat $EXE.out
+        exit 1
+    }
+    rm -- "$sharedlib_dir/applet.c" $EXE.out
+    $STRIP -s --remove-section=.note --remove-section=.comment $EXE
+
+    done <applet_lst.tmp
+fi
+
+# libbusybox.so is needed only for -lbusybox at link time,
+# it is not needed at runtime. Deleting to reduce confusion.
+rm "$sharedlib_dir"/libbusybox.so 2>/dev/null
+exit 0 # or else we may confuse make