diff options
author | Erik Andersen <andersen@codepoet.org> | 2000-01-20 19:32:32 +0000 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 2000-01-20 19:32:32 +0000 |
commit | 8ad12e32c89c0b9e8c6da35e23398d4a97f7f601 (patch) | |
tree | 6c7776a7867dc45f7ebe463a0f292fab175883e0 | |
parent | 4581b4cdd99590bb243a1b4a558aeceadd3b155b (diff) | |
download | busybox-w32-8ad12e32c89c0b9e8c6da35e23398d4a97f7f601.tar.gz busybox-w32-8ad12e32c89c0b9e8c6da35e23398d4a97f7f601.tar.bz2 busybox-w32-8ad12e32c89c0b9e8c6da35e23398d4a97f7f601.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
-rwxr-xr-x | applets/busybox.mkll | 2 | ||||
-rwxr-xr-x | busybox.mkll | 2 |
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 | ||
9 | for def in ${LIST}; do | 9 | for 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 | ||
9 | for def in ${LIST}; do | 9 | for 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 |