Changeset 23a0368 in mainline for uspace/lib/posix/source

Timestamp:

2017-03-30T19:52:23Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ae7bfbbd

Parents:

b5b5d84

Message:

Rename stat() to vfs_stat_path() and fstat() to vfs_stat()

Location:

uspace/lib/posix/source

Files:

• internal/common.h (modified) (1 diff)
• sys/stat.c (modified) (3 diffs)
• unistd.c (modified) (3 diffs)

uspace/lib/posix/source/internal/common.h

@@ -59 +59 @@
 })
 
+/* Convert error code to positive errno and -1 return value */
+#define rcerrno(func, ...) ({ \
+        int rc = func(__VA_ARGS__); \
+        if (rc < 0) \
+                errno = -rc; \
+        rc; \
+})
+
 extern aoff64_t posix_pos[MAX_OPEN_FILES];
 

uspace/lib/posix/source/sys/stat.c

@@ -39 +39 @@
 #include "../internal/common.h"
 #include "posix/sys/stat.h"
-#include "libc/sys/stat.h"
+#include "libc/vfs/vfs.h"
 
 #include "posix/errno.h"
@@ -80 +80 @@
 {
         struct stat hst;
-        int rc = negerrno(fstat, fd, &hst);
+        int rc = rcerrno(vfs_stat, fd, &hst);
         if (rc < 0)
-                return rc;
+                return -1;
         stat_to_posix(st, &hst);
         return 0;
@@ -110 +110 @@
 {
         struct stat hst;
-        int rc = negerrno(stat, path, &hst);
+        int rc = rcerrno(vfs_stat_path, path, &hst);
         if (rc < 0)
-                return rc;
+                return -1;
         stat_to_posix(st, &hst);
         return 0;

uspace/lib/posix/source/unistd.c

@@ -48 +48 @@
 #include "libc/malloc.h"
 #include "libc/vfs/vfs.h"
-#include "libc/sys/stat.h"
 
 aoff64_t posix_pos[MAX_OPEN_FILES];
@@ -221 +220 @@
 {
         struct stat st;
+        int rc;
 
         switch (whence) {
@@ -230 +230 @@
                 break;
         case SEEK_END:
-                if (fstat(fildes, &st) != EOK) {
-                        errno = -errno;
+                rc = rcerrno(vfs_stat, fildes, &st);
+                if (rc != EOK)
                         return -1;
-                }
                 posix_pos[fildes] = st.size + offset;
                 break;