From d07e580eda3032ef8477ce7614d858228877cf06 Mon Sep 17 00:00:00 2001
From: Brad Nelson <flagxor@gmail.com>
Date: Fri, 29 Jan 2021 09:13:34 -0800
Subject: [PATCH] Fixing file bugs

---
 ueforth/posix/posix.fs     | 12 ++++++------
 ueforth/windows/windows.fs | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ueforth/posix/posix.fs b/ueforth/posix/posix.fs
index 9d3dd4d..04dd9d0 100644
--- a/ueforth/posix/posix.fs
+++ b/ueforth/posix/posix.fs
@@ -77,29 +77,29 @@ decimal
 ' posix-bye is bye
 
 ( I/O Error Helpers )
-: 0<ior ( n -- n ior ) dup 0< if errno else 0 then ;
+: d0<ior ( n -- n ior ) dup 0< if errno else 0 then ;
 
 ( Generic Files )
 O_RDONLY constant r/o
 O_WRONLY constant w/o
 O_RDWR constant r/w
 octal 777 constant 0777 decimal
-: open-file ( a n fam -- fh ior ) >r s>z r> 0777 open sign-extend 0<ior ;
+: open-file ( a n fam -- fh ior ) >r s>z r> 0777 open sign-extend d0<ior ;
 : create-file ( a n fam -- fh ior )
-   >r s>z r> O_CREAT or 0777 open sign-extend 0<ior ;
+   >r s>z r> O_CREAT or 0777 open sign-extend d0<ior ;
 : close-file ( fh -- ior ) close sign-extend ;
 : flush-file ( fh -- ior ) fsync sign-extend ;
 : delete-file ( a n -- ior ) s>z unlink sign-extend ;
 : rename-file ( a n a n -- ior ) s>z -rot s>z swap rename sign-extend ;
-: read-file ( a n fh -- n ior ) -rot read 0<ior ;
+: read-file ( a n fh -- n ior ) -rot read d0<ior ;
 : write-file ( a n fh -- ior ) -rot dup >r write r> = 0= ;
-: file-position ( fh -- n ior ) 0 SEEK_CUR lseek 0<ior ;
+: file-position ( fh -- n ior ) 0 SEEK_CUR lseek d0<ior ;
 : reposition-file ( n fh -- ior ) swap SEEK_SET lseek 0< ;
 : resize-file ( n fh -- ior ) swap ftruncate 0< ;
 : file-size ( fh -- n ior )
    dup 0 SEEK_CUR lseek >r
    dup 0 SEEK_END lseek r> swap >r
-         SEEK_SET lseek drop r> 0<ior ;
+         SEEK_SET lseek drop r> d0<ior ;
 
 ( Other Utils )
 : ms ( n -- ) 1000 * usleep drop ;
diff --git a/ueforth/windows/windows.fs b/ueforth/windows/windows.fs
index b18c56b..dd7e92c 100644
--- a/ueforth/windows/windows.fs
+++ b/ueforth/windows/windows.fs
@@ -91,8 +91,8 @@ $80 constant FILE_ATTRIBUTE_NORMAL
 
 ( I/O Error Helpers )
 : ior ( f -- ior ) if GetLastError else 0 then ;
-: 0=ior ( n -- n ior ) dup 0= ior ;
-: 0<ior ( n -- n ior ) dup 0< ior ;
+: 0=ior ( n -- n ior ) 0= ior ;
+: d0<ior ( n -- n ior ) dup 0< ior ;
 : invalid?ior ( n -- ior ) $ffffffff = ior ;
 
 ( Generic Files )
@@ -101,15 +101,15 @@ $40000000 constant w/o  ( GENERIC_WRITE )
 r/o w/o or constant r/w
 : open-file ( a n fam -- fh ior )
    >r s>z r> FILE_SHARE_READ FILE_SHARE_WRITE or NULL
-   OPEN_EXISTING FILE_ATTRIBUTE_NORMAL NULL CreateFileA 0<ior ;
+   OPEN_EXISTING FILE_ATTRIBUTE_NORMAL NULL CreateFileA d0<ior ;
 : create-file ( a n fam -- fh ior )
    >r s>z r> FILE_SHARE_READ FILE_SHARE_WRITE or NULL
-   CREATE_ALWAYS FILE_ATTRIBUTE_NORMAL NULL CreateFileA 0<ior ;
+   CREATE_ALWAYS FILE_ATTRIBUTE_NORMAL NULL CreateFileA d0<ior ;
 : close-file ( fh -- ior ) CloseHandle 0=ior ;
 : flush-file ( fh -- ior ) FlushFileBuffers 0=ior ;
 : delete-file ( a n -- ior ) s>z DeleteFileA 0=ior ;
 : rename-file ( a n a n -- ior ) s>z -rot s>z swap MoveFileA 0=ior ;
-: read-file ( a n fh -- n ior ) -rot 0 >r rp@ NULL ReadFile r> swap 0= ior ;
+: read-file ( a n fh -- n ior ) -rot 0 >r rp@ NULL ReadFile r> swap 0=ior ;
 : write-file ( a n fh -- ior )
    -rot dup >r 0 >r rp@ NULL WriteFile
    if r> r> <> else rdrop rdrop GetLastError then ;