qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-03-03 16:07:56 +02:00
Code

avoid eval leaks

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5617 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2006-11-22 21:39:44 +00:00
parent 4c1e0fff7d
commit 0936143bd8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
alias debug=${DEBUG:-:} alias debug=${DEBUG:-:}
# newline # newline
N=" readonly N="
" "
_C=0 _C=0
@ -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 "export -n -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
} }
reset_cb() { reset_cb() {
@ -36,14 +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" export -n "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"
} }
option () { option () {
local varname="$1"; shift local varname="$1"; shift
local value="$*" local value="$*"
eval CONFIG_${CONFIG_SECTION}_${varname}="\$value" export -n "CONFIG_${CONFIG_SECTION}_${varname}=$value"
option_cb "$varname" "$*" option_cb "$varname" "$*"
} }
@ -57,7 +57,7 @@ config_rename() {
for oldvar in `set | grep ^CONFIG_${OLD}_ | \ for oldvar in `set | grep ^CONFIG_${OLD}_ | \
sed -e 's/\(.*\)=.*$/\1/'` ; do sed -e 's/\(.*\)=.*$/\1/'` ; do
newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}" newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}"
eval "$newvar=\${$oldvar}" export -n "$newvar=\${$oldvar}"
unset "$oldvar" unset "$oldvar"
done done
@ -93,7 +93,7 @@ config_load() {
config_get() { config_get() {
case "$3" in case "$3" in
"") eval "echo \"\${CONFIG_${1}_${2}}\"";; "") eval "echo \"\${CONFIG_${1}_${2}}\"";;
*) eval "$1=\"\${CONFIG_${2}_${3}}\"";; *) eval "export -n -- \"$1=\${CONFIG_${2}_${3}}\"";;
esac esac
} }
@ -101,7 +101,7 @@ config_set() {
local section="$1" local section="$1"
local option="$2" local option="$2"
local value="$3" local value="$3"
eval CONFIG_${section}_${option}="\$value" export -n "CONFIG_${section}_${option}=$value"
} }
load_modules() { load_modules() {
@ -137,12 +137,12 @@ strtok() { # <string> { <variable> [<separator>] ... }
val="${val#$tmp$2}" val="${val#$tmp$2}"
eval $1="\$tmp"; count=$((count+1)) export -n "$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)) export -n "$1=$val"; count=$((count+1))
fi fi
return $count return $count