aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-01-20 19:32:32 +0000
committererik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-01-20 19:32:32 +0000
commit697dd0b5521d7abeca2a0bded3baccb9b1cee795 (patch)
tree6c7776a7867dc45f7ebe463a0f292fab175883e0
parent1e0681dc0d2337d0ca380662527165931c083d05 (diff)
downloadbusybox-w32-697dd0b5521d7abeca2a0bded3baccb9b1cee795.tar.gz
busybox-w32-697dd0b5521d7abeca2a0bded3baccb9b1cee795.tar.bz2
busybox-w32-697dd0b5521d7abeca2a0bded3baccb9b1cee795.zip
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 git-svn-id: svn://busybox.net/trunk/busybox@321 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rwxr-xr-xapplets/busybox.mkll2
-rwxr-xr-xbusybox.mkll2
2 files changed, 2 insertions, 2 deletions
diff --git a/applets/busybox.mkll b/applets/busybox.mkll
index facb6e8ac..151f5c325 100755
--- a/applets/busybox.mkll
+++ b/applets/busybox.mkll
@@ -8,7 +8,7 @@ LIST="$(sed -n '/^#define/{s/^#define //p;}' $DF)"
8 8
9for def in ${LIST}; do 9for def in ${LIST}; do
10 i=`sed -n 's/^#ifdef \<'$def'\>.*\/\/\(.*$\)/\/\1\//gp' $MF` 10 i=`sed -n 's/^#ifdef \<'$def'\>.*\/\/\(.*$\)/\/\1\//gp' $MF`
11 j=`sed -n '/^#ifdef '$def'.*/,/^#endif/{ s/.*\"\(.*\)\".*/\1/gp; }' $MF` 11 j=`sed -n '/^#ifdef '$def'[ ].*/,/^#endif/{ s/.*\"\(.*\)\".*/\1/gp; }' $MF`
12 for k in $j; do 12 for k in $j; do
13 echo $i$k 13 echo $i$k
14 done 14 done
diff --git a/busybox.mkll b/busybox.mkll
index facb6e8ac..151f5c325 100755
--- a/busybox.mkll
+++ b/busybox.mkll
@@ -8,7 +8,7 @@ LIST="$(sed -n '/^#define/{s/^#define //p;}' $DF)"
8 8
9for def in ${LIST}; do 9for def in ${LIST}; do
10 i=`sed -n 's/^#ifdef \<'$def'\>.*\/\/\(.*$\)/\/\1\//gp' $MF` 10 i=`sed -n 's/^#ifdef \<'$def'\>.*\/\/\(.*$\)/\/\1\//gp' $MF`
11 j=`sed -n '/^#ifdef '$def'.*/,/^#endif/{ s/.*\"\(.*\)\".*/\1/gp; }' $MF` 11 j=`sed -n '/^#ifdef '$def'[ ].*/,/^#endif/{ s/.*\"\(.*\)\".*/\1/gp; }' $MF`
12 for k in $j; do 12 for k in $j; do
13 echo $i$k 13 echo $i$k
14 done 14 done