hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix various variable copying bugs 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5613 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2006-11-22 13:32:24 +00:00
parent 4cdc609d0e
commit 2afcd0174e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/base-files/default/etc/functions.sh
View File

@ -19,7 +19,7 @@ append() {
local value="$2" local value="$2"
local sep="${3:- }" local sep="${3:- }"
eval "$var=\"\${$var:+\${$var}${value:+$sep}}$value\"" eval "$var=\"\${$var:+\${$var}\${value:+\$sep}}\$value\""
} }
reset_cb() { reset_cb() {
@ -36,13 +36,14 @@ config () {
name="${name:-cfg${_C}}" name="${name:-cfg${_C}}"
config_cb "$cfgtype" "$name" config_cb "$cfgtype" "$name"
CONFIG_SECTION="$name" CONFIG_SECTION="$name"
eval CONFIG_${CONFIG_SECTION}_TYPE="$cfgtype" eval CONFIG_${CONFIG_SECTION}_TYPE="\$cfgtype"
} }
option () { option () {
local varname="$1"; shift local varname="$1"; shift
local value="$*"
eval CONFIG_${CONFIG_SECTION}_${varname}="$*" eval CONFIG_${CONFIG_SECTION}_${varname}="\$value"
option_cb "$varname" "$*" option_cb "$varname" "$*"
} }
@ -97,7 +98,10 @@ config_get() {
} }
config_set() { config_set() {
eval CONFIG_${1}_${2}="$3" local section="$1"
local option="$2"
local value="$3"
eval CONFIG_${section}_${option}="\$value"
} }
load_modules() { load_modules() {
@ -133,12 +137,12 @@ strtok() { # <string> { <variable> [<separator>] ... }
val="${val#$tmp$2}" val="${val#$tmp$2}"
eval $1="$tmp"; count=$((count+1)) eval $1="\$tmp"; count=$((count+1))
shift 2 shift 2
done done
if [ $# -gt 0 -a "$val" ]; then if [ $# -gt 0 -a "$val" ]; then
eval $1="$val"; count=$((count+1)) eval $1="\$val"; count=$((count+1))
fi fi
return $count return $count