[openfirmware] [commit] r3205 - cpu/x86/pc/olpc/via

[repository service]

Author: quozl
Date: Mon Aug 20 12:37:59 2012
New Revision: 3205
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3205

Log:
OLPC - fs-update, use zdata file size not spec file size for sanity-check, #12055

Modified:
   cpu/x86/pc/olpc/via/fsupdate.fth

Modified: cpu/x86/pc/olpc/via/fsupdate.fth
==============================================================================
--- cpu/x86/pc/olpc/via/fsupdate.fth	Mon Aug 20 12:21:04 2012	(r3204)
+++ cpu/x86/pc/olpc/via/fsupdate.fth	Mon Aug 20 12:37:59 2012	(r3205)
@@ -133,6 +133,7 @@
    then                       ( )                ( r: )
 ;
 
+0 2value file-bytes
 : data:  ( "filename" -- )
    safe-parse-word            ( filename$ )
    nb-zd-#sectors  -1 <>  if  ( filename$ )
@@ -146,11 +147,11 @@
       drop ." Can't open " image-name$ type cr
       true " " ?nand-abort
    then  to filefd            ( )
+   filefd file-size " Can't size file" ?nand-abort  to file-bytes
    linefeed filefd force-line-delimiter
    true to secure-fsupdate?
 ;
 
-0 2value file-bytes
 : size:  ( "bytes" -- )
    ?compare-spec-line
    get-dhex#                              ( d.size )
@@ -308,8 +309,6 @@
 
    ['] open-nand  catch  ?dup  if  .error  security-failure  then  ( adr len )
 
-   [ also nand-commands ] dup s>d to file-bytes [ previous ]
-
 \  clear-context  nand-commands
    t-hms(
    also nand-commands                      ( adr len )