Author: wmb Date: 2007-08-06 03:11:12 +0200 (Mon, 06 Aug 2007) New Revision: 527 Modified: ofw/inet/http.fth ofw/inet/httpdpkg.fth ofw/inetv6/http.fth ofw/inetv6/httpdpkg.fth Log: More changes to ensure that base doesn't change. Modified: ofw/inet/http.fth =================================================================== --- ofw/inet/http.fth 2007-08-06 01:02:44 UTC (rev 526) +++ ofw/inet/http.fth 2007-08-06 01:11:12 UTC (rev 527) @@ -122,9 +122,9 @@ : parse-line ( adr len -- ) save-input 2>r 2>r 2>r -1 set-input - push-decimal - parse-word ['] http-tags search-wordlist if execute then - pop-base + parse-word ['] http-tags search-wordlist if + push-decimal ['] execute catch pop-base throw + then 2r> 2r> 2r> restore-input ; @@ -276,7 +276,7 @@ mount 0= bootnet-debug if ." HTTP: " - dup if ." Succeded" else ." Failed!" then cr + dup if ." Succeeded" else ." Failed!" then cr then else 2drop true Modified: ofw/inet/httpdpkg.fth =================================================================== --- ofw/inet/httpdpkg.fth 2007-08-06 01:02:44 UTC (rev 526) +++ ofw/inet/httpdpkg.fth 2007-08-06 01:11:12 UTC (rev 527) @@ -212,11 +212,7 @@ sbuf r> ( $3 ) ; -: create-num$ ( len -- num$ ) - base @ >r decimal ( len ) ( r: base ) - num>ascii ( num$ ) - r> base ! ( num$ ) -; +: create-num$ ( len -- num$ ) push-decimal num>ascii pop-base ; : get-type ( adr len -- c ) 0 -rot Modified: ofw/inetv6/http.fth =================================================================== --- ofw/inetv6/http.fth 2007-08-06 01:02:44 UTC (rev 526) +++ ofw/inetv6/http.fth 2007-08-06 01:11:12 UTC (rev 527) @@ -136,9 +136,9 @@ : parse-line ( adr len -- ) save-input 2>r 2>r 2>r -1 set-input - push-decimal - parse-word ['] http-tags search-wordlist if execute then - pop-base + parse-word ['] http-tags search-wordlist if + push-decimal ['] execute catch pop-base throw + then 2r> 2r> 2r> restore-input ; Modified: ofw/inetv6/httpdpkg.fth =================================================================== --- ofw/inetv6/httpdpkg.fth 2007-08-06 01:02:44 UTC (rev 526) +++ ofw/inetv6/httpdpkg.fth 2007-08-06 01:11:12 UTC (rev 527) @@ -212,11 +212,7 @@ sbuf r> ( $3 ) ; -: create-num$ ( len -- num$ ) - base @ >r decimal ( len ) ( r: base ) - num>ascii ( num$ ) - r> base ! ( num$ ) -; +: create-num$ ( len -- num$ ) push-decimal num>ascii pop-base ; : get-type ( adr len -- c ) 0 -rot