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

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")

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

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 | \

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

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 && \

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."

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

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

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)

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)

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 )

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

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)

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)

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 | \

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;;

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;;

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;;