Changeset 368ee04 in mainline for uspace/lib/posix/source/stdio.c

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/lib/posix/source/stdio.c (modified) (5 diffs)

uspace/lib/posix/source/stdio.c

@@ -53 +53 @@
 #include "libc/malloc.h"
 #include "libc/adt/list.h"
-#include "libc/sys/stat.h"
 
 /** Clears the stream's error and end-of-file indicators.
@@ -344 +343 @@
 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 = vfs_write(fildes, &posix_pos[fildes], str, size);
         if (wr < 0)
-                return errno;
+                return wr;
         return str_nlength(str, wr);
 }
@@ -371 +371 @@
                 }
                 
-                if (write(*(int *) fd, buf, sz) != (ssize_t) sz) {
+                const int fildes = *(int *) fd;
+                if (vfs_write(fildes, &posix_pos[fildes], buf, sz) < 0)
                         break;
-                }
                 
                 chars++;
@@ -575 +575 @@
 int posix_remove(const char *path)
 {
-        return negerrno(remove, path);
+        if (rcerrno(vfs_unlink_path, path) != EOK)
+                return -1;
+        else
+                return 0;
 }
 
@@ -587 +590 @@
 int posix_rename(const char *old, const char *new)
 {
-        return negerrno(rename, old, new);
+        int rc = rcerrno(vfs_rename_path, old, new);
+        if (rc != EOK)
+                return -1;
+        else
+                return 0;
 }