domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
John Crispin
2014-06-02 12:43:22 +00:00
parent a866b7eb9d
commit f933a741a9
18 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/adm5120/base-files/lib/upgrade/platform.sh
View File

@@ -10,7 +10,7 @@ RAMFS_COPY_DATA=/lib/adm5120.sh
platform_check_image() { platform_check_image() {
local magic="$(get_magic_word "$1")" local magic="$(get_magic_word "$1")"
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$board_name" in case "$board_name" in
"ZyXEL"*|"Compex WP54 family") "ZyXEL"*|"Compex WP54 family")

2
target/linux/adm8668/base-files/lib/upgrade/platform.sh
View File

@@ -1,6 +1,6 @@
PART_NAME=linux PART_NAME=linux
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
# u-boot # u-boot

2
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View File

@@ -111,7 +111,7 @@ platform_check_image() {
local magic="$(get_magic_word "$1")" local magic="$(get_magic_word "$1")"
local magic_long="$(get_magic_long "$1")" local magic_long="$(get_magic_long "$1")"
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$board" in case "$board" in
all0315n | \ all0315n | \

2
target/linux/atheros/base-files/lib/upgrade/platform.sh
View File

@@ -31,7 +31,7 @@ platform_find_kernelpart() {
} }
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
# Combined Image # Combined Image

2
target/linux/au1000/base-files/lib/upgrade/platform.sh
View File

@@ -2,7 +2,7 @@ KERNEL_IMG="openwrt-au1000-au1500-vmlinux.bin"
ROOTFS_IMG="openwrt-au1000-au1500-root.fs" ROOTFS_IMG="openwrt-au1000-au1500-root.fs"
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
6f70) 6f70)
( get_image "$1" | tar -tf - $KERNEL_IMG >/dev/null && \ ( get_image "$1" | tar -tf - $KERNEL_IMG >/dev/null && \

2
target/linux/avr32/base-files/lib/upgrade/platform.sh
View File

@@ -7,7 +7,7 @@ PART_NAME=firmware
platform_check_image() { platform_check_image() {
local magic="$(get_magic_long "$1")" local magic="$(get_magic_long "$1")"
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
[ "$magic" != "27051956" ] && { [ "$magic" != "27051956" ] && {
echo "Invalid image type." echo "Invalid image type."

2
target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
View File

@@ -1,7 +1,7 @@
PART_NAME=firmware PART_NAME=firmware
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
# .trx files # .trx files

2
target/linux/brcm63xx/base-files/lib/upgrade/platform.sh
View File

@@ -1,6 +1,6 @@
PART_NAME=linux PART_NAME=linux
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
3600|3700|3800) 3600|3700|3800)
# 6348GW-11 boards use openwrt-96348GW-11-squashfs-cfe.bin files # 6348GW-11 boards use openwrt-96348GW-11-squashfs-cfe.bin files

2
target/linux/cns21xx/base-files/lib/upgrade/platform.sh
View File

@@ -11,7 +11,7 @@ platform_check_image() {
local board=$(get_board_name) local board=$(get_board_name)
local magic="$(get_magic_word "$1")" local magic="$(get_magic_word "$1")"
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$board" in case "$board" in
nsb3ast) nsb3ast)

2
target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
View File

@@ -69,7 +69,7 @@ platform_check_image() {
local magic="$(get_magic_word "$1")" local magic="$(get_magic_word "$1")"
local magic_long="$(get_magic_long "$1")" local magic_long="$(get_magic_long "$1")"
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$board" in case "$board" in
laguna) laguna)

2
target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
View File

@@ -93,7 +93,7 @@ platform_check_image() {
local kern_part_size=0x$(platform_find_part_size "$kernelpart") 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) 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 case "$board" in
avila | cambria ) avila | cambria )

2
target/linux/lantiq/base-files/lib/upgrade/platform.sh
View File

@@ -1,7 +1,7 @@
PART_NAME=firmware PART_NAME=firmware
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
# uImage # uImage

2
target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
View File

@@ -28,7 +28,7 @@ platform_check_image() {
local board=$(mpc85xx_board_name) local board=$(mpc85xx_board_name)
local magic="$(get_magic_long "$1")" local magic="$(get_magic_long "$1")"
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case $board in case $board in
tl-wdr4900-v1) tl-wdr4900-v1)

2
target/linux/ppc40x/base-files/lib/upgrade/platform.sh
View File

@@ -11,7 +11,7 @@ platform_check_image() {
local board=$(ppc40x_board_name) local board=$(ppc40x_board_name)
local magic="$(get_magic_word "$1")" local magic="$(get_magic_word "$1")"
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$board" in case "$board" in
kilauea | openrb | magicbox) kilauea | openrb | magicbox)

2
target/linux/ramips/base-files/lib/upgrade/platform.sh
View File

@@ -11,7 +11,7 @@ platform_check_image() {
local board=$(ramips_board_name) local board=$(ramips_board_name)
local magic="$(get_magic_long "$1")" local magic="$(get_magic_long "$1")"
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$board" in case "$board" in
3g-6200n | \ 3g-6200n | \

2
target/linux/x86/base-files/lib/upgrade/platform.sh
View File

@@ -14,7 +14,7 @@ x86_get_rootfs() {
} }
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
eb48|eb63) return 0;; eb48|eb63) return 0;;

2
target/linux/x86/olpc/base-files/lib/upgrade/platform.sh
View File

@@ -1,5 +1,5 @@
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
48eb) return 0;; 48eb) return 0;;

2
target/linux/x86_64/base-files/lib/upgrade/platform.sh
View File

@@ -14,7 +14,7 @@ x86_get_rootfs() {
} }
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in case "$(get_magic_word "$1")" in
eb48|eb63) return 0;; eb48|eb63) return 0;;