add common functions for the new config file format

[openwrt.git] / package / base-files / default / etc / functions.sh

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 14f5011..858dc28 100755 (executable)
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -1,63 +1,63 @@
-#!/bin/ash
-
+#!/bin/sh
 alias debug=${DEBUG:-:}
 
-# allow env to override nvram
-nvram () {
-  if [ -x /usr/sbin/nvram ]; then
-    case $1 in
-      get) eval "echo \${$2:-\$(command nvram get $2)}";;
-      *) command nvram $*;;
-    esac
-  else
-    case $1 in
-      get) eval "echo \${$2:-\${DEFAULT_$2}}";;
-      *);;
-    esac
-  fi  
-}
-
 # valid interface?
 if_valid () (
   ifconfig "$1" >&- 2>&- ||
   [ "${1%%[0-9]}" = "br" ] ||
-  {
-    [ "${1%%[0-9]}" = "vlan" ] && ( 
-      i=${1#vlan}
-      hwname=$(nvram get vlan${i}hwname)
-      hwaddr=$(nvram get ${hwname}macaddr)
-      [ -z "$hwaddr" ] && return 1
-
-      vif=$(ifconfig -a | awk '/^eth.*'$hwaddr'/ {print $1; exit}' IGNORECASE=1)
-      debug "# vlan$i => $vif"
-
-      $DEBUG ifconfig $vif up
-      $DEBUG vconfig add $vif $i 2>&-
-    )
-  } ||
   { debug "# missing interface '$1' ignored"; false; }
 )
 
-bitcount () {
-  local c=$1
-  echo $((
-  c=((c>> 1)&0x55555555)+(c&0x55555555),
-  c=((c>> 2)&0x33333333)+(c&0x33333333),
-  c=((c>> 4)&0x0f0f0f0f)+(c&0x0f0f0f0f),
-  c=((c>> 8)&0x00ff00ff)+(c&0x00ff00ff),
-  c=((c>>16)&0x0000ffff)+(c&0x0000ffff)
-  ))
+hotplug_dev() {
+       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
 }
 
-valid_netmask () {
-  return $((-($1)&~$1))
+config_cb() {
+       return 0
+}
+option_cb() {
+       return 0
 }
 
-ip2int () (
-  set $(echo $1 | tr '\.' ' ')
-  echo $(($1<<24|$2<<16|$3<<8|$4))
-)
+config () {
+       config_cb "$@"
+       _C=$((${_C:-0} + 1))
+       export CONFIG_SECTION="${2:-cfg${_C}}"
+       export CONFIG_${CONFIG_SECTION}_TYPE="$1"
+}
+
+option () {
+       local varname="$1" ; shift
+       export CONFIG_${CONFIG_SECTION}_${varname}="$*"
+       option_cb "$varname" "$*"
+}
+
+config_clear() {
+       [ -z "$CONFIG_SECTION" ] && return
+       for oldsetting in `set | grep ^CONFIG_${CONFIG_SECTION}_ | \
+               sed -e 's/\(.*\)=.*$/\1/'` ; do 
+               unset $oldsetting 
+       done
+       unset CONFIG_SECTION
+}
+
+config_load() {
+       local CD=""
+       if [ \! -e "$1" -a -e "/etc/config/$1" ]; then
+               cd /etc/config && local CD=1
+       fi
+       [ -e "$1" ] && . $1
+       ${CD:+cd - >/dev/null}
+       ${CONFIG_SECTION:+config_cb}
+}
+
+config_get() {
+       case "$3" in
+               "") eval "echo \${CONFIG_${1}_${2}}";;
+               *) eval "$1=\"\${CONFIG_${2}_${3}}\"";;
+       esac
+}
 
-int2ip () {
-  echo $(($1>>24&255)).$(($1>>16&255)).$(($1>>8&255)).$(($1&255))
+config_set() {
+       export CONFIG_${1}_${2}="${3}"
 }