/lib/functions.sh: remove jffs2_mark_erase()
[openwrt.git] / package / base-files / files / lib / functions.sh
index b3e406c..018fe2c 100755 (executable)
@@ -1,14 +1,12 @@
 #!/bin/sh
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
+# Copyright (C) 2010 Vertical Communications
 
 
 debug () {
        ${DEBUG:-:} "$@"
 }
-mount() {
-       busybox mount "$@"
-}
 
 # newline
 N="
@@ -19,10 +17,6 @@ NO_EXPORT=1
 LOAD_STATE=1
 LIST_SEP=" "
 
-hotplug_dev() {
-       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
-}
-
 append() {
        local var="$1"
        local value="$2"
@@ -40,21 +34,6 @@ list_contains() {
        [ "${val%% $str *}" != "$val" ]
 }
 
-list_remove() {
-       local var="$1"
-       local remove="$2"
-       local val
-
-       eval "val=\" \${$var} \""
-       val1="${val%% $remove *}"
-       [ "$val1" = "$val" ] && return
-       val2="${val##* $remove }"
-       [ "$val2" = "$val" ] && return
-       val="${val1## } ${val2%% }"
-       val="${val%% }"
-       eval "export ${NO_EXPORT:+-n} -- \"$var=\$val\""
-}
-
 config_load() {
        [ -n "$IPKG_INSTROOT" ] && return 0
        uci_load "$@"
@@ -127,19 +106,6 @@ config_unset() {
        config_set "$1" "$2" ""
 }
 
-config_clear() {
-       local SECTION="$1"
-       local oldvar
-
-       list_remove CONFIG_SECTIONS "$SECTION"
-       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
-
-       for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
-               sed -e 's/\(.*\)=.*$/\1/'` ; do
-               unset $oldvar
-       done
-}
-
 # config_get <variable> <section> <option> [<default>]
 # config_get <section> <option>
 config_get() {
@@ -173,17 +139,17 @@ config_set() {
 }
 
 config_foreach() {
-       local function="$1"
+       local ___function="$1"
        [ "$#" -ge 1 ] && shift
-       local type="$1"
+       local ___type="$1"
        [ "$#" -ge 1 ] && shift
        local section cfgtype
 
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
                config_get cfgtype "$section" TYPE
-               [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
-               eval "$function \"\$section\" \"\$@\""
+               [ -n "$___type" -a "x$cfgtype" != "x$___type" ] && continue
+               eval "$___function \"\$section\" \"\$@\""
        done
 }
 
@@ -200,12 +166,12 @@ config_list_foreach() {
        [ -z "$len" ] && return 0
        while [ $c -le "$len" ]; do
                config_get val "${section}" "${option}_ITEM$c"
-               eval "$function \"\$val\" \"$@\""
+               eval "$function \"\$val\" \"\$@\""
                c="$(($c + 1))"
        done
 }
 
-load_modules() {
+insert_modules() {
        [ -d /etc/modules.d ] && {
                cd /etc/modules.d
                sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
@@ -220,59 +186,149 @@ include() {
        done
 }
 
-find_mtd_part() {
+find_mtd_index() {
        local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
+       local INDEX="${PART##mtd}"
+
+       echo ${INDEX}
+}
+
+find_mtd_part() {
+       local INDEX=$(find_mtd_index "$1")
        local PREFIX=/dev/mtdblock
 
-       PART="${PART##mtd}"
        [ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
-       echo "${PART:+$PREFIX$PART}"
+       echo "${INDEX:+$PREFIX$INDEX}"
 }
 
-strtok() { # <string> { <variable> [<separator>] ... }
-       local tmp
-       local val="$1"
-       local count=0
+find_mtd_chardev() {
+       local INDEX=$(find_mtd_index "$1")
+       local PREFIX=/dev/mtd
 
-       shift
+       [ -d /dev/mtd ] && PREFIX=/dev/mtd/
+       echo "${INDEX:+$PREFIX$INDEX}"
+}
 
-       while [ $# -gt 1 ]; do
-               tmp="${val%%$2*}"
+mtd_get_mac_ascii()
+{
+       local mtdname="$1"
+       local key="$2"
+       local part
+       local mac_dirty
+
+       part=$(find_mtd_part "$mtdname")
+       if [ -z "$part" ]; then
+               echo "mtd_get_mac_ascii: partition $mtdname not found!" >&2
+               return
+       fi
 
-               [ "$tmp" = "$val" ] && break
+       mac_dirty=$(strings "$part" | sed -n 's/^'"$key"'=//p')
 
-               val="${val#$tmp$2}"
+       # "canonicalize" mac
+       [ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
+}
 
-               export ${NO_EXPORT:+-n} "$1=$tmp"; count=$((count+1))
-               shift 2
-       done
+mtd_get_blob()
+{
+       local mtdname="$1"
+       local offset="$2"
+       local count="$3"
+       local firmware="$4"
+       local part
+
+       part=$(find_mtd_part "$mtdname")
+       if [ -z "$part" ]; then
+               echo "mtd_get_blob: partition $mtdname not found!" >&2
+               return 1
+       fi
 
-       if [ $# -gt 0 -a -n "$val" ]; then
-               export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))
+       dd if=$part of=$firmware bs=1 skip=$offset count=$count 2>/dev/null || {
+               echo "mtd_get_blob: failed to extract $firmware from $part" >&2
+               return 1
+       }
+}
+
+mtd_get_mac_binary() {
+       local mtdname="$1"
+       local offset="$2"
+       local part
+
+       part=$(find_mtd_part "$mtdname")
+       if [ -z "$part" ]; then
+               echo "mtd_get_mac_binary: partition $mtdname not found!" >&2
+               return
        fi
 
-       return $count
+       dd bs=1 skip=$offset count=6 if=$part 2>/dev/null | hexdump -v -n 6 -e '5/1 "%02x:" 1/1 "%02x"'
 }
 
+mtd_get_part_size() {
+       local part_name=$1
+       local first dev size erasesize name
+       while read dev size erasesize name; do
+               name=${name#'"'}; name=${name%'"'}
+               if [ "$name" = "$part_name" ]; then
+                       echo $((0x$size))
+                       break
+               fi
+       done < /proc/mtd
+}
 
-jffs2_mark_erase() {
-       local part="$(find_mtd_part "$1")"
-       [ -z "$part" ] && {
-               echo Partition not found.
-               return 1
-       }
-       echo -e "\xde\xad\xc0\xde" | mtd -qq write - "$1"
+macaddr_add() {
+       local mac=$1
+       local val=$2
+       local oui=${mac%:*:*:*}
+       local nic=${mac#*:*:*:}
+
+       nic=$(printf "%06x" $((0x${nic//:/} + $val & 0xffffff)) | sed 's/^\(.\{2\}\)\(.\{2\}\)\(.\{2\}\)/\1:\2:\3/')
+       echo $oui:$nic
+}
+
+macaddr_setbit_la()
+{
+       local mac=$1
+
+       printf "%02x:%s" $((0x${mac%%:*} | 0x02)) ${mac#*:}
 }
 
-uci_apply_defaults() {
-       cd /etc/uci-defaults || return 0
-       files="$(ls)"
-       [ -z "$files" ] && return 0
-       mkdir -p /tmp/.uci
-       for file in $files; do
-               ( . "./$(basename $file)" ) && rm -f "$file"
+macaddr_2bin()
+{
+       local mac=$1
+
+       echo -ne \\x${mac//:/\\x}
+}
+
+macaddr_canonicalize()
+{
+       local mac="$1"
+       local canon=""
+
+       [ ${#mac} -gt 17 ] && return
+       [ -n "${mac//[a-fA-F0-9\.: -]/}" ] && return
+
+       for octet in ${mac//[\.:-]/ }; do
+               case "${#octet}" in
+               1)
+                       octet="0${octet}"
+                       ;;
+               2)
+                       ;;
+               4)
+                       octet="${octet:0:2} ${octet:2:2}"
+                       ;;
+               12)
+                       octet="${octet:0:2} ${octet:2:2} ${octet:4:2} ${octet:6:2} ${octet:8:2} ${octet:10:2}"
+                       ;;
+               *)
+                       return
+                       ;;
+               esac
+               canon=${canon}${canon:+ }${octet}
        done
-       uci commit
+
+       [ ${#canon} -ne 17 ] && return
+
+       printf "%02x:%02x:%02x:%02x:%02x:%02x" 0x${canon// / 0x} 2>/dev/null
 }
 
 group_add() {
@@ -302,6 +358,7 @@ user_add() {
        [ -f "${IPKG_INSTROOT}/etc/passwd" ] || return 1
        [ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd
        echo "${name}:x:${uid}:${gid}:${desc}:${home}:${shell}" >> ${IPKG_INSTROOT}/etc/passwd
+       echo "${name}:x:0:0:99999:7:::" >> ${IPKG_INSTROOT}/etc/shadow
        rc=$?
        [ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd
        return $rc
@@ -311,29 +368,4 @@ user_exists() {
        grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/passwd
 }
 
-
-pi_include() {
-       if [ -f "/tmp/overlay/$1" ]; then
-               . "/tmp/overlay/$1"
-       elif [ -f "$1" ]; then
-               . "$1"
-       elif [ -d "/tmp/overlay/$1" ]; then
-               if [ -n "$(ls /tmp/overlay/$1/*.sh 2>/dev/null)" ]; then
-                       for src_script in /tmp/overlay/$1/*.sh; do
-                               . "$src_script"
-                       done
-               fi
-       elif [ -d "$1" ]; then
-               if [ -n "$(ls $1/*.sh 2>/dev/null)" ]; then
-                       for src_script in $1/*.sh; do
-                               . "$src_script"
-                       done
-               fi
-       else
-               echo "WARNING: $1 not found"
-               return 1
-       fi
-       return 0
-}
-
 [ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh