base-files: config_get: prevent filename globbing

[openwrt/staging/wigyori.git] / package / base-files / files / lib / functions.sh

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index 318e91856b451e95db03506c3bb9795f69a7b56f..edce75e8ff877aa28adea5b58463a95b19f8f7e2 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -92,7 +92,7 @@ config_unset() {
 # config_get <section> <option>
 config_get() {
        case "$3" in
-               "") eval echo "\${CONFIG_${1}_${2}:-\${4}}";;
+               "") eval echo "\"\${CONFIG_${1}_${2}:-\${4}}\"";;
                *)  eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";;
        esac
 }
@@ -152,22 +152,27 @@ config_list_foreach() {
 
 default_prerm() {
        local root="${IPKG_INSTROOT}"
-       local name
+       local pkgname="$(basename ${1%.*})"
+       local ret=0
 
-       name=$(basename ${1%.*})
-       [ -f "$root/usr/lib/opkg/info/${name}.prerm-pkg" ] && . "$root/usr/lib/opkg/info/${name}.prerm-pkg"
+       if [ -f "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" ]; then
+               ( . "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" )
+               ret=$?
+       fi
 
        local shell="$(which bash)"
-       for i in `cat "$root/usr/lib/opkg/info/${name}.list" | grep "^/etc/init.d/"`; do
+       for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do
                if [ -n "$root" ]; then
                        ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable
                else
                        if [ "$PKG_UPGRADE" != "1" ]; then
                                "$i" disable
                        fi
-                       "$i" stop || /bin/true
+                       "$i" stop
                fi
        done
+
+       return $ret
 }
 
 add_group_and_user() {
@@ -229,10 +234,9 @@ default_postinst() {
        if [ -z "$root" ] && grep -q -s "^/etc/uci-defaults/" "/usr/lib/opkg/info/${pkgname}.list"; then
                . /lib/functions/system.sh
                [ -d /tmp/.uci ] || mkdir -p /tmp/.uci
-               for i in $(sed -ne 's!^/etc/uci-defaults/!!p' "/usr/lib/opkg/info/${pkgname}.list"); do (
-                       cd /etc/uci-defaults
-                       [ -f "$i" ] && . ./"$i" && rm -f "$i"
-               ) done
+               for i in $(grep -s "^/etc/uci-defaults/" "/usr/lib/opkg/info/${pkgname}.list"); do
+                       ( [ -f "$i" ] && cd "$(dirname $i)" && . "$i" ) && rm -f "$i"
+               done
                uci commit
        fi