target/linux/*/base-files/lib/upgrade/platform.sh - wrong check for ARGC

ARGC is a 'C-ism', but not known/valid in shell-syntax - insert the correct
var $# (=number of args) here. under normal conditions this had no impact,
but we should at least correct it. the error was observable like this:

root@box:~ [ -e "/etc/functions.sh" ] && . /etc/functions.sh
root@box:~ [ -e "/lib/functions.sh" ] && . /lib/functions.sh
root@box:~ . /lib/upgrade/platform.sh
root@box:~ . /lib/upgrade/common.sh
root@box:~ platform_check_image /tmp/myfirmware.bin
ash: bad number
root@box:~ echo $?
0

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
SVN-Revision: 40915

diff --git a/target/linux/adm5120/base-files/lib/upgrade/platform.sh b/target/linux/adm5120/base-files/lib/upgrade/platform.sh
index f067089fa176fa1aa539ecf6d95f38381c52c071..fab2b3d7950ff5ae2a1b514396b510af5ae8410f 100644 (file)
--- a/target/linux/adm5120/base-files/lib/upgrade/platform.sh
+++ b/target/linux/adm5120/base-files/lib/upgrade/platform.sh
@@ -10,7 +10,7 @@ RAMFS_COPY_DATA=/lib/adm5120.sh
 platform_check_image() {
        local magic="$(get_magic_word "$1")"
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$board_name" in
        "ZyXEL"*|"Compex WP54 family")

diff --git a/target/linux/adm8668/base-files/lib/upgrade/platform.sh b/target/linux/adm8668/base-files/lib/upgrade/platform.sh
index 583fa2e1dff310aec0a50582dc6711d065daef23..98e47ade31869c7b7e73aac00cead9ffe6cfafe2 100644 (file)
--- a/target/linux/adm8668/base-files/lib/upgrade/platform.sh
+++ b/target/linux/adm8668/base-files/lib/upgrade/platform.sh
@@ -1,6 +1,6 @@
 PART_NAME=linux
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
                # u-boot

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 37ceea6073e8963a0db12fc9acf700b573782f9d..dfec1336fcdb28aaed4dee5d4a26b767333fecc7 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -111,7 +111,7 @@ platform_check_image() {
        local magic="$(get_magic_word "$1")"
        local magic_long="$(get_magic_long "$1")"
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$board" in
        all0315n | \

diff --git a/target/linux/atheros/base-files/lib/upgrade/platform.sh b/target/linux/atheros/base-files/lib/upgrade/platform.sh
index d4daaacb95119a87770432cbe73672275ea68d81..d44b8fad80962d08c60193aa4c9f788cf0369426 100644 (file)
--- a/target/linux/atheros/base-files/lib/upgrade/platform.sh
+++ b/target/linux/atheros/base-files/lib/upgrade/platform.sh
@@ -31,7 +31,7 @@ platform_find_kernelpart() {
 }
 
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
                # Combined Image

diff --git a/target/linux/au1000/base-files/lib/upgrade/platform.sh b/target/linux/au1000/base-files/lib/upgrade/platform.sh
index 71744e610bee086efb8c80e6f4bd4463f3dcf413..1a9d151c8a282bd6fde26ffda4a218c5c975ace5 100644 (file)
--- a/target/linux/au1000/base-files/lib/upgrade/platform.sh
+++ b/target/linux/au1000/base-files/lib/upgrade/platform.sh
@@ -2,7 +2,7 @@ KERNEL_IMG="openwrt-au1000-au1500-vmlinux.bin"
 ROOTFS_IMG="openwrt-au1000-au1500-root.fs"
 
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
        case "$(get_magic_word "$1")" in
                6f70)
                        ( get_image "$1" | tar -tf - $KERNEL_IMG >/dev/null && \

diff --git a/target/linux/avr32/base-files/lib/upgrade/platform.sh b/target/linux/avr32/base-files/lib/upgrade/platform.sh
index 00ad863d1bd358b3dfcaadf406dd3a6985bad2e9..403a851c092e17abc6a8ee8c8f59df4599153c4f 100755 (executable)
--- a/target/linux/avr32/base-files/lib/upgrade/platform.sh
+++ b/target/linux/avr32/base-files/lib/upgrade/platform.sh
@@ -7,7 +7,7 @@ PART_NAME=firmware
 platform_check_image() {
        local magic="$(get_magic_long "$1")"
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        [ "$magic" != "27051956" ] && {
                echo "Invalid image type."

diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index 644f3c1e66c37c542b277e35c788aacf7675a251..48885b16329ce33fb06f20f680cf822504c74275 100644 (file)
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -1,7 +1,7 @@
 PART_NAME=firmware
 
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
                # .trx files

diff --git a/target/linux/brcm63xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm63xx/base-files/lib/upgrade/platform.sh
index 63ab77418ca826db3d335768477dd534a3d58104..5c9e2c25f74ae782c080f00a77cf17264767ba27 100644 (file)
--- a/target/linux/brcm63xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm63xx/base-files/lib/upgrade/platform.sh
@@ -1,6 +1,6 @@
 PART_NAME=linux
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
        case "$(get_magic_word "$1")" in
                3600|3700|3800)
                        # 6348GW-11 boards use openwrt-96348GW-11-squashfs-cfe.bin files

diff --git a/target/linux/cns21xx/base-files/lib/upgrade/platform.sh b/target/linux/cns21xx/base-files/lib/upgrade/platform.sh
index 52aa789f5b1cb45ded2860b520721e2c230a377d..fd9bd289969275354e0db11d1d6e47d9cb406347 100755 (executable)
--- a/target/linux/cns21xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/cns21xx/base-files/lib/upgrade/platform.sh
@@ -11,7 +11,7 @@ platform_check_image() {
        local board=$(get_board_name)
        local magic="$(get_magic_word "$1")"
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$board" in
        nsb3ast)

diff --git a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
index 599099181d72b31aa21330da08d031394f4a28cb..6d94a5384d64cd1f8a0a5351fdf0d340d5b72922 100644 (file)
--- a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
@@ -69,7 +69,7 @@ platform_check_image() {
        local magic="$(get_magic_word "$1")"
        local magic_long="$(get_magic_long "$1")"
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$board" in
        laguna)

diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
index d10d93437048e3d06760a42f775a70d3ef669f8d..508a167419edf1a405b23d9ae15d4c5575a9ad47 100644 (file)
--- a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
@@ -93,7 +93,7 @@ platform_check_image() {
        local kern_part_size=0x$(platform_find_part_size "$kernelpart")
        local kern_length=0x$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null)
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$board" in
        avila | cambria )

diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/base-files/lib/upgrade/platform.sh
index dc5bbe252ebbc9ece386795149de988cede41da1..841566ea93dc559e2963c3682fe18db14e3966e8 100755 (executable)
--- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh
+++ b/target/linux/lantiq/base-files/lib/upgrade/platform.sh
@@ -1,7 +1,7 @@
 PART_NAME=firmware
 
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
                # uImage

diff --git a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
index dbd179f5810038d90f40a92c4b062d38b7fc2b73..d95ec3013fecc2de0826d39c26828520648267ab 100755 (executable)
--- a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
@@ -28,7 +28,7 @@ platform_check_image() {
        local board=$(mpc85xx_board_name)
        local magic="$(get_magic_long "$1")"
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case $board in
        tl-wdr4900-v1)

diff --git a/target/linux/ppc40x/base-files/lib/upgrade/platform.sh b/target/linux/ppc40x/base-files/lib/upgrade/platform.sh
index ed08cab2a1ed5684e56eee46651705e839d89694..b20b83cd57d23893602578335c3d67817de922da 100644 (file)
--- a/target/linux/ppc40x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ppc40x/base-files/lib/upgrade/platform.sh
@@ -11,7 +11,7 @@ platform_check_image() {
        local board=$(ppc40x_board_name)
        local magic="$(get_magic_word "$1")"
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$board" in
        kilauea | openrb | magicbox)

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 3fdf6252822fb9434d0c7c9faf5bc96c143d4453..190de9fbf1f35400d47df9eb1e8871acc82286b1 100755 (executable)
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -11,7 +11,7 @@ platform_check_image() {
        local board=$(ramips_board_name)
        local magic="$(get_magic_long "$1")"
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$board" in
        3g-6200n | \

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index 9503d5db88f4e8b470e5950aaf6293433bcfe0a9..a2dd20a8810902661f54623fb6a55d7b4e6e07ff 100644 (file)
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -14,7 +14,7 @@ x86_get_rootfs() {
 }
 
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
                eb48|eb63) return 0;;

diff --git a/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh b/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh
index ffd0b93ab47ddf572e1019703c55ae17d1febf35..c90a4ce1c412f82823e8dd8c93c80363b48994b8 100644 (file)
--- a/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh
@@ -1,5 +1,5 @@
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
                48eb) return 0;;

diff --git a/target/linux/x86_64/base-files/lib/upgrade/platform.sh b/target/linux/x86_64/base-files/lib/upgrade/platform.sh
index 9503d5db88f4e8b470e5950aaf6293433bcfe0a9..a2dd20a8810902661f54623fb6a55d7b4e6e07ff 100644 (file)
--- a/target/linux/x86_64/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86_64/base-files/lib/upgrade/platform.sh
@@ -14,7 +14,7 @@ x86_get_rootfs() {
 }
 
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
                eb48|eb63) return 0;;