From 5c8c5a795d31fffc99f29274e3ee81dfe466f315 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 7 Oct 2005 17:52:59 +0000
Subject: [PATCH] some more minor fixes

SVN-Revision: 2066
---
 .../package/webif/files/usr/lib/webif/form.awk    |  1 -
 .../package/webif/files/usr/lib/webif/webif.sh    |  4 ++--
 .../webif/files/www/cgi-bin/webif/upgrade.sh      | 15 ++++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/openwrt/package/webif/files/usr/lib/webif/form.awk b/openwrt/package/webif/files/usr/lib/webif/form.awk
index 554a9090f8..8a3d110e72 100644
--- a/openwrt/package/webif/files/usr/lib/webif/form.awk
+++ b/openwrt/package/webif/files/usr/lib/webif/form.awk
@@ -7,7 +7,6 @@
 
 BEGIN {
 	FS="|"
-	print "<input type=\"hidden\" name=\"submit\" value=\"1\" />"
 }
 
 # trim leading whitespaces 
diff --git a/openwrt/package/webif/files/usr/lib/webif/webif.sh b/openwrt/package/webif/files/usr/lib/webif/webif.sh
index fba768d789..cace65a377 100644
--- a/openwrt/package/webif/files/usr/lib/webif/webif.sh
+++ b/openwrt/package/webif/files/usr/lib/webif/webif.sh
@@ -67,10 +67,10 @@ header() {
 	_saved_title=${ERROR:+: Settings not saved}
 	_saved_title=${_saved_title:-$SAVED}
 	_head="${3:+<div class=\"settings-block-title\"><h2>$3$_saved_title</h2></div>}"
-	_form="${5:+<form enctype=\"multipart/form-data\" action=\"$5\" method=\"post\">}"
+	_form="${5:+<form enctype=\"multipart/form-data\" action=\"$5\" method=\"post\"><input type="hidden" name="submit" value="1" />}"
 	_savebutton="${5:+<p><input type=\"submit\" name=\"action\" value=\"Save changes\" /></p>}"
 	_categories=$(categories $1)
-	_subcategories=${2:+$(subcategories $1 $2)}
+	_subcategories=${2:+$(subcategories "$1" "$2")}
 
 	update_changes
 	cat <<EOF
diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh b/openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh
index 4aae81fdab..6de13d3309 100755
--- a/openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh
+++ b/openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/haserl -u
 <? 
 . /usr/lib/webif/webif.sh
-header "System" "Firmware upgrade" "Firmware Upgrade"
+header "System" "Firmware upgrade" "Firmware upgrade"
 
 strip_cybertan() {
 	dd if="$FORM_firmware" of=/tmp/upgrade.bin bs=32 skip=1 2>/dev/null
@@ -60,13 +60,14 @@ strip_cybertan() {
 	</form>
 <?el?>
 <?
-	ERASE=""
-	[ "$FORM_erase_fs" = 1 ] && ERASE="-e linux "
-	[ "$FORM_erase_nvram" = 1 ] && ERASE="$ERASE -e nvram "
+	ERASE="${FORM_erase_fs:+-e linux }"
+	ERASE="$ERASE${FORM_erase_nvram:+-e nvram }"
+	cp /bin/busybox /tmp/
+	echo -n 'Upgrading... '
+	# FIXME: probably a race condition (with the reboot), but it seems to work
+	mtd -r $ERASE write /tmp/upgrade.bin linux 2>&- | awk 'END { print "done." }'
+	exit
 ?>
-Upgrading... 
-<? mtd -r $ERASE write /tmp/upgrade.bin linux 2>&- >&- ?>
-done <br />
 <?fi?>
 
 <? footer ?>
-- 
2.30.2