Merge pull request #36 from ellerh/resize-file-limit

[pforth] / fth / file.fth

diff --git a/fth/file.fth b/fth/file.fth
index 0017942..59303f0 100644 (file)
--- a/fth/file.fth
+++ b/fth/file.fth
@@ -117,6 +117,22 @@ create (LINE-TERMINATOR) \n c,
     THEN
 ;
 
     THEN
 ;
 

+\ A limit used to perform a sanity check on the size argument for
+\ RESIZE-FILE.
+2variable RESIZE-FILE-LIMIT
+10000000 0 resize-file-limit 2!  \ 10MB is somewhat arbitrarily chosen
+
+: RESIZE-FILE ( ud fileid -- ior )
+    -rot 2dup resize-file-limit 2@ d>             ( fileid ud big? )
+    IF
+        ." Argument (" 0 d.r ." ) is larger then RESIZE-FILE-LIMIT." cr
+        ." (You can increase RESIZE-FILE-LIMIT with 2!)" cr
+        abort
+    ELSE
+        rot (resize-file)
+    THEN
+;
+

 : (  ( "comment<rparen>"  -- )
     source-id
     CASE
 : (  ( "comment<rparen>"  -- )
     source-id
     CASE


@@ -133,10 +149,10 @@ create (LINE-TERMINATOR) \n c,
 \ a proper primitive.  (OTOH, portable programs can't assume much
 \ about FILE-STATUS and non-portable programs could create a custom
 \ function for access(2).)
 \ a proper primitive.  (OTOH, portable programs can't assume much
 \ about FILE-STATUS and non-portable programs could create a custom
 \ function for access(2).)

-: FILE-STATUS ( c-addr u -- x ior )
+: FILE-STATUS ( c-addr u -- 0 ior )

     r/o bin open-file           ( fileid ior1 )
     ?dup
     r/o bin open-file           ( fileid ior1 )
     ?dup

-    IF                          ( fileid ior1 )
+    IF   nip 0 swap             ( 0 ior1 )

     ELSE close-file 0 swap      ( 0 ior2 )
     THEN
 ;
     ELSE close-file 0 swap      ( 0 ior2 )
     THEN
 ;