From 1f42523014758b9ef1f68ecf2555c0581763b90f Mon Sep 17 00:00:00 2001
From: Dave Schmenk <dschmenk@gmail.com>
Date: Fri, 10 Jan 2020 13:55:05 -0800
Subject: [PATCH] Fix some Apple /// differences

---
 src/inc/fileio.plh          | 2 +-
 src/libsrc/apple/fileio.pla | 2 +-
 src/utilsrc/apple/cat.pla   | 4 ++--
 src/utilsrc/apple/copy.pla  | 2 +-
 src/utilsrc/apple/del.pla   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/inc/fileio.plh b/src/inc/fileio.plh
index 04c8cc6..4226cf1 100644
--- a/src/inc/fileio.plh
+++ b/src/inc/fileio.plh
@@ -33,7 +33,7 @@ import fileio
         byte entry_minver
         byte entry_access
         word entry_aux
-        word entry_mod
+        word entry_mod[2]
         word entry_headptr
     end
     //
diff --git a/src/libsrc/apple/fileio.pla b/src/libsrc/apple/fileio.pla
index 9851bd9..0020808 100644
--- a/src/libsrc/apple/fileio.pla
+++ b/src/libsrc/apple/fileio.pla
@@ -298,7 +298,7 @@ def a3write(refnum, buff, len)
     params:2 = buff
     params:4 = len
     perr     = syscall($CB, @params)
-    return perr
+    return perr ?? 0 :: len
 end
 def a1create(path, type, aux)
     return perr
diff --git a/src/utilsrc/apple/cat.pla b/src/utilsrc/apple/cat.pla
index 68f3860..e7f131e 100644
--- a/src/utilsrc/apple/cat.pla
+++ b/src/utilsrc/apple/cat.pla
@@ -162,9 +162,9 @@ if not except(exit)
     if ^arg
         struprcpy(@path, arg)
         //
-        // Check if cataloging a directory
+        // Check if cataloging a directory or volume
         //
-        if fileio:getfileinfo(@path, @fileinfo) <> FILE_ERR_OK or fileinfo.file_type <> $0F
+        if fileio:getfileinfo(@path, @fileinfo) <> FILE_ERR_OK or (fileinfo.storage_type & $0D <> $0D)
             filefrompath(@wildname, @path)
         fin
         path = path - wildname
diff --git a/src/utilsrc/apple/copy.pla b/src/utilsrc/apple/copy.pla
index 1985a32..8bab308 100644
--- a/src/utilsrc/apple/copy.pla
+++ b/src/utilsrc/apple/copy.pla
@@ -252,7 +252,7 @@ if not except(exit)
             srcfileptr = srcfilelist
             while srccnt
                 dstlen = dstpath
-                if fileio:getfileinfo(srcfileptr, @srcfileinfo) == FILE_ERR_OK and srcfileinfo.file_type == $0F
+                if fileio:getfileinfo(srcfileptr, @srcfileinfo) == FILE_ERR_OK and (srcfileinfo.storage_type & $0D == $0D)
                     if recurse
                         //
                         // Copy directory
diff --git a/src/utilsrc/apple/del.pla b/src/utilsrc/apple/del.pla
index 5501609..3129ed4 100644
--- a/src/utilsrc/apple/del.pla
+++ b/src/utilsrc/apple/del.pla
@@ -152,7 +152,7 @@ if not except(exit)
             //
             // Delete files in list
             //
-            if recurse and fileio:getfileinfo(fileptr, @fileinfo) == FILE_ERR_OK and fileinfo.file_type == $0F
+            if recurse and fileio:getfileinfo(fileptr, @fileinfo) == FILE_ERR_OK and (fileinfo.storage_type & $0D == $0D)
                 strcpy(@path,fileptr)
                 strcat(@path, "/")
                 delfiles(@path)