Changeset 3202

Timestamp:

Aug 20, 2012 11:44:00 AM (9 months ago)

Author:

quozl

Message:

OLPC - fs-update, sanity-check file size if the zdata file contains a size: header line, abort if invalid, ignore if missing, #12055

File:

• cpu/x86/pc/olpc/via/fsupdate.fth (modified) (3 diffs)

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

@@ -7 +7 @@
    safe-parse-word
    push-hex $number pop-base  " Bad number" ?nand-abort
+;
+
+: get-dhex#  ( -- d )
+   0 safe-parse-word
+   push-hex $dnumber pop-base  " Bad number" ?nand-abort
 ;
 
@@ -146 +151 @@
 ;
 
+0 2value file-bytes
+: size:  ( "bytes" -- )
+   get-dhex#                              ( d.size )
+   file-bytes d<>                         ( invalid? )
+   " Inconsistent size of zdata file" ?nand-abort
+;
+
 : erase-all  ( -- )
    #image-eblocks show-writing
@@ -260 +272 @@
    r/o open-file                       ( fd error? )
    " Can't open file" ?nand-abort      ( fd )
+   dup file-size                       ( fd [size.d] error? )
+   " Can't size file" ?nand-abort      ( fd size.d )
+   [ also nand-commands ] to file-bytes [ previous ]
 
    linefeed over force-line-delimiter  ( fd )