r426 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-05-30 08:10:31 +0200 (Wed, 30 May 2007)
New Revision: 426

Modified:
   cpu/x86/pc/olpc/copynand.fth
Log:
OLPC copynand.fth - Close files when aborting via the keyboard.

Modified: cpu/x86/pc/olpc/copynand.fth
===================================================================
--- cpu/x86/pc/olpc/copynand.fth	2007-05-30 06:09:43 UTC (rev 425)
+++ cpu/x86/pc/olpc/copynand.fth	2007-05-30 06:10:31 UTC (rev 426)
@@ -65,7 +65,10 @@
       load-base  load-base /nand-block +  /nand-block  comp  if        ( block# )
          cr  ." Miscompare in block starting at page# "                ( block# )
          " scan-page#" nandih $call-method  .x cr                      ( block# )
-         key? abort" Aborted by keystroke"                             ( block# )
+         key? if
+            nandih close-dev  fileih close-dev                         ( block# )
+            key drop  true abort" Aborted by keystroke"
+         then
       then                                                 ( block# )
    repeat                                                  ( block# )
    drop                                                    ( )
@@ -108,7 +111,10 @@
       load-base /nand-block  $crc                          ( block# crc actual-crc )
       2dup <>  if
          cr ." CRC miscompare - expected " swap . ." got " . cr
-         key? abort" Aborted by keystroke"
+         key?  if
+            crc-ih close-dev  fileih close-dev
+            key drop  true abort" Aborted by keystroke"
+         then
       else
          2drop
       then                                                 ( block# )
@@ -137,7 +143,10 @@
          cr ." CRC miscompare - expected " swap . ." got " .
          ." in NAND block starting at page "
          " scan-page#" nandih $call-method . cr
-         key? abort" Aborted by keystroke"
+         key?  if
+            nandih close-dev  crc-ih close-dev
+            key drop  true abort" Aborted by keystroke"
+         then
       else
          2drop
       then                                                 ( block# )