From 6739376e541e95aebfc739f1f0611c8a49fbff5f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 8 Feb 2006 21:16:49 +0000 Subject: [PATCH] call fflush after every output line in the webif translator and add some fixes for the firmware upgrade page SVN-Revision: 3195 --- openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh | 6 +++--- openwrt/package/webif/src/webif-page.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) 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 f5a2f1ae70..c27be439b0 100755 --- a/openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh +++ b/openwrt/package/webif/files/www/cgi-bin/webif/upgrade.sh @@ -22,7 +22,7 @@ empty "$FORM_submit" || empty "$FORM_firmware" || { UPGRADE=1 ;; 57353447|57353453|57353473) # WRT54G(S) - echo "@TR<>: Cybertan BIN =< @TR<> " + echo "@TR<>: Cybertan BIN => @TR<> " strip_cybertan echo "@TR<>.
" UPGRADE=1 @@ -45,7 +45,7 @@ empty "$FORM_submit" || empty "$FORM_firmware" || { @TR<>: - @TR<>
+ @TR<>
@TR<> @@ -66,7 +66,7 @@ empty "$FORM_submit" || empty "$FORM_firmware" || { ERASE="${FORM_erase_fs:+-e linux }" ERASE="$ERASE${FORM_erase_nvram:+-e nvram }" cp /bin/busybox /tmp/ - echo -n '@TR<> ' + echo '@TR<>' # 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 "@TR<>." }' exit diff --git a/openwrt/package/webif/src/webif-page.c b/openwrt/package/webif/src/webif-page.c index fd6f6e1280..9d0222f6fa 100644 --- a/openwrt/package/webif/src/webif-page.c +++ b/openwrt/package/webif/src/webif-page.c @@ -240,6 +240,7 @@ nomatch: while (!feof(f) && (fgets(buf, LINE_BUF - 1, f)) != NULL) { fprintf(stdout, "%s", translate_line(buf)); + fflush(stdout); } return 0; -- 2.30.2