Changeset 1051

Timestamp:

Jan 25, 2004, 3:17:04 AM (22 years ago)

Author:

bird

Message:

We must return EBADF if the handle is is not suitable for read or write accordingly. We used to return EACCES which is wrong.

Location:

trunk/src/emx/src/lib/sys

Files:

• __read.c (modified) (2 diffs, 1 prop)
• __write.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/sys/__read.c

@@ -10 +10 @@
 #include <stdlib.h>
 #include <memory.h>
+#include <sys/fcntl.h>
 #include <emx/umalloc.h>
 #include <emx/io.h>
@@ -78 +79 @@
     {
         _sys_set_errno(rc);
+        /* If we don't have read access, EBADF should be returned, not EACCES. */
+        if (    errno == EACCES
+            &&  (pFH->fFlags & O_ACCMODE) != O_RDONLY
+            &&  (pFH->fFlags & O_ACCMODE) != O_RDWR)
+            errno = EBADF;
         return -1;
     }

trunk/src/emx/src/lib/sys/__write.c

@@ -10 +10 @@
 #include <stdlib.h>
 #include <errno.h>
+#include <sys/fcntl.h>
 #include <emx/io.h>
 #include <emx/umalloc.h>
@@ -87 +88 @@
     {
         _sys_set_errno(rc);
+        /* If we don't have write access, EBADF should be returned, not EACCES. */
+        if (    errno == EACCES
+            &&  (pFH->fFlags & O_ACCMODE) != O_WRONLY
+            &&  (pFH->fFlags & O_ACCMODE) != O_RDWR)
+            errno = EBADF;
         return -1;
     }