Changeset 1954

Timestamp:

May 2, 2005, 5:57:51 AM (20 years ago)

Author:

bird

Message:

Quick rewrite.

File:

• trunk/src/emx/src/lib/io/access.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/io/access.c

@@ -5 +5 @@
 #include <io.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <emx/io.h>
 #include <emx/syscalls.h>
 
+
+/** @todo Reimplement access and eaccess using the actual UID/GID stuff from the file and SPM. */
 int _STD(access) (const char *name, int mode)
 {
-  int a, slash;
-  size_t len;
-  char *tmp;
+    struct stat s;
+    if (stat(name, &s))
+        return -1;
 
-  /* If there is a trailing slash or backslash, remove it and set
-     `slash' to true.  Make a local copy of the string to remove the
-     slash or backslash. */
-
-  len = strlen (name);
-  slash = _trslash (name, len, 1);
-  if (slash)
+    /* Check if directory spec, don't trust stat to do that right yet. */
+    char *psz = strchr(name, 0);
+    if (    (psz[-1] == '/' || psz[-1] == '\\')
+        &&  !(s.st_attr & _A_SUBDIR))
     {
-      tmp = alloca (len);
-      memcpy (tmp, name, len - 1);
-      tmp[len-1] = 0;
-      name = tmp;
+        errno = ENOTDIR;
+        return -1;
     }
 
-  /* Query the attributes of the file or directory. */
-
-  a = __chmod (name, 0, 0);
-  if (a < 0)
-    return -1;
-
-  /* Fail if the name ends with a slash or backslash and is not a
-     directory. */
-
-  if (slash && !(a & _A_SUBDIR))
+    /* Volume IDs are not accessible. */
+    if (s.st_attr & _A_VOLID)
     {
-      errno = ENOTDIR;
-      return -1;
+        errno = ENOENT;
+        return -1;
     }
 
-  /* Volume IDs are not accessible. */
-
-  if (a & _A_VOLID)
+    /* When testing for write permission, check the read-only bit. */
+    if ((mode & 2) && (s.st_attr & _A_RDONLY))
     {
-      errno = ENOENT;
-      return -1;
+        errno = EACCES;
+        return -1;
     }
-
-  /* When testing for write permission, check the read-only bit. */
-
-  if ((mode & 2) && (a & _A_RDONLY))
-    {
-      errno = EACCES;
-      return -1;
-    }
-  return 0;
+    return 0;
 }