X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libsrc%2Fapple2%2Fopendir.c;h=04059311864b8b25c609669ba183ccc13cd1d097;hb=7ebaec18024dc2a94de538637c20c5b4c65e530c;hp=ad415705aa783cbad9ca55b3661ec639f01a4808;hpb=feae688346d03cbd571fb945b43e5671ad3cda8a;p=cc65

diff --git a/libsrc/apple2/opendir.c b/libsrc/apple2/opendir.c
index ad415705a..040593118 100644
--- a/libsrc/apple2/opendir.c
+++ b/libsrc/apple2/opendir.c
@@ -37,7 +37,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <dirent.h>
-#include <dir.h>
+#include "dir.h"
 
 
 
@@ -52,7 +52,7 @@ extern char _cwd[FILENAME_MAX];
 
 
 /*****************************************************************************/
-/*		   		     Code	   			     */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -64,44 +64,44 @@ DIR* __fastcall__ opendir (register const char* name)
     /* Alloc DIR */
     if ((dir = malloc (sizeof (*dir))) == NULL) {
 
-	/* May not have been done by malloc() */
-	errno = ENOMEM;
+        /* May not have been done by malloc() */
+        _directerrno (ENOMEM);
 
-	/* Return failure */
-	return NULL;
+        /* Return failure */
+        return NULL;
     }
 
     /* Interpret dot as current working directory */
     if (*name == '.') {
-	name = _cwd;
+        name = _cwd;
     }
 
     /* Open directory file */
     if ((dir->fd = open (name, O_RDONLY)) != -1) {
 
-	/* Read directory key block */
-	if (read (dir->fd,
-		  dir->block.bytes,
-		  sizeof (dir->block)) == sizeof (dir->block)) {
+        /* Read directory key block */
+        if (read (dir->fd,
+                  dir->block.bytes,
+                  sizeof (dir->block)) == sizeof (dir->block)) {
 
-	    /* Get directory entry infos from directory header */
-	    dir->entry_length      = dir->block.bytes[0x23];
-	    dir->entries_per_block = dir->block.bytes[0x24];
+            /* Get directory entry infos from directory header */
+            dir->entry_length      = dir->block.bytes[0x23];
+            dir->entries_per_block = dir->block.bytes[0x24];
 
-	    /* Skip directory header entry */
-	    dir->current_entry = 1;
+            /* Skip directory header entry */
+            dir->current_entry = 1;
 
-	    /* Return success */
-	    return dir;
-	}
+            /* Return success */
+            return dir;
+        }
 
-	/* EOF: Most probably no directory file at all */
-	if (errno == 0) {
-	    errno = EINVAL;
-	}
+        /* EOF: Most probably no directory file at all */
+        if (_oserror == 0) {
+            _directerrno (EINVAL);
+        }
 
-	/* Cleanup directory file */
-	close (dir->fd);
+        /* Cleanup directory file */
+        close (dir->fd);
     }
 
     /* Cleanup DIR */