Changeset 58898d1d in mainline for uspace/lib/posix/source

Timestamp:

2017-03-24T20:31:54Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8e9b2534

Parents:

c9e3692

Message:

Remove VFS_IN_SEEK from VFS

Location:

uspace/lib/posix/source

Files:

• internal/common.h (modified) (2 diffs)
• stdio.c (modified) (2 diffs)
• unistd.c (modified) (5 diffs)

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

@@ -38 +38 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <vfs/vfs.h>
 
 #define not_implemented() do { \
@@ -57 +59 @@
 })
 
+extern aoff64_t posix_pos[MAX_OPEN_FILES];
+
 #endif /* LIBPOSIX_COMMON_H_ */
 

uspace/lib/posix/source/stdio.c

@@ -344 +344 @@
 static int _dprintf_str_write(const char *str, size_t size, void *fd)
 {
-        ssize_t wr = write(*(int *) fd, str, size);
+        const int fildes = *(int *) fd;
+        ssize_t wr = write(fildes, &posix_pos[fildes], str, size);
         if (wr < 0)
                 return errno;
@@ -371 +372 @@
                 }
                 
-                if (write(*(int *) fd, buf, sz) != (ssize_t) sz) {
+                const int fildes = *(int *) fd;
+                if (write(fildes, &posix_pos[fildes], buf, sz) != (ssize_t) sz)
                         break;
-                }
                 
                 chars++;

uspace/lib/posix/source/unistd.c

@@ -47 +47 @@
 #include "libc/stats.h"
 #include "libc/malloc.h"
+#include "libc/vfs/vfs.h"
+#include "libc/sys/stat.h"
+
+aoff64_t posix_pos[MAX_OPEN_FILES];
 
 /* Array of environment variable strings (NAME=VALUE). */
@@ -175 +179 @@
 int posix_close(int fildes)
 {
+        posix_pos[fildes] = 0;
         return negerrno(close, fildes);
 }
@@ -188 +193 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        return negerrno(read, fildes, buf, nbyte);
+        return negerrno(read, fildes, &posix_pos[fildes], buf, nbyte);
 }
 
@@ -201 +206 @@
 ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
 {
-        return negerrno(write, fildes, buf, nbyte);
+        return negerrno(write, fildes, &posix_pos[fildes], buf, nbyte);
 }
 
@@ -215 +220 @@
 posix_off_t posix_lseek(int fildes, posix_off_t offset, int whence)
 {
-        return negerrno(lseek, fildes, offset, whence);
+        struct stat st;
+
+        switch (whence) {
+        case SEEK_SET:
+                posix_pos[fildes] = offset;
+                break;
+        case SEEK_CUR:
+                posix_pos[fildes] += offset;
+                break;
+        case SEEK_END:
+                if (fstat(fildes, &st) != EOK) {
+                        errno = -errno;
+                        return -1;
+                }
+                posix_pos[fildes] = st.size + offset;
+                break;
+        }
+        return posix_pos[fildes];
 }