Fix a namespace aliasing problem wereby du and dutmp, or

rm and rmmod symlinks would be created when only du or rm
was included.
 -Erik

diff --git a/applets/busybox.mkll b/applets/busybox.mkll
index facb6e8ac2b4a7a9796a7884eea7bac84ae1dc88..151f5c32558875c74017be374e59a4e465224f65 100755 (executable)
--- a/applets/busybox.mkll
+++ b/applets/busybox.mkll
@@ -8,7 +8,7 @@ LIST="$(sed -n '/^#define/{s/^#define //p;}' $DF)"
 
 for def in ${LIST}; do
        i=`sed -n 's/^#ifdef \<'$def'\>.*\/\/\(.*$\)/\/\1\//gp' $MF`
-       j=`sed -n '/^#ifdef '$def'.*/,/^#endif/{ s/.*\"\(.*\)\".*/\1/gp; }' $MF`
+       j=`sed -n '/^#ifdef '$def'[      ].*/,/^#endif/{ s/.*\"\(.*\)\".*/\1/gp; }' $MF`
        for k in $j; do
            echo $i$k
        done

diff --git a/busybox.mkll b/busybox.mkll
index facb6e8ac2b4a7a9796a7884eea7bac84ae1dc88..151f5c32558875c74017be374e59a4e465224f65 100755 (executable)
--- a/busybox.mkll
+++ b/busybox.mkll
@@ -8,7 +8,7 @@ LIST="$(sed -n '/^#define/{s/^#define //p;}' $DF)"
 
 for def in ${LIST}; do
        i=`sed -n 's/^#ifdef \<'$def'\>.*\/\/\(.*$\)/\/\1\//gp' $MF`
-       j=`sed -n '/^#ifdef '$def'.*/,/^#endif/{ s/.*\"\(.*\)\".*/\1/gp; }' $MF`
+       j=`sed -n '/^#ifdef '$def'[      ].*/,/^#endif/{ s/.*\"\(.*\)\".*/\1/gp; }' $MF`
        for k in $j; do
            echo $i$k
        done