Changeset 368ee04 in mainline for uspace/app/getterm/getterm.c

Timestamp:

2017-04-05T18:10:39Z (8 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/app/getterm/getterm.c (modified) (5 diffs)

uspace/app/getterm/getterm.c

@@ -36 +36 @@
 
 #include <sys/types.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -43 +42 @@
 #include <errno.h>
 #include <loc.h>
+#include <vfs/vfs.h>
 #include "version.h"
 #include "welcome.h"
@@ -58 +58 @@
 }
 
-static void reopen(FILE **stream, int fd, const char *path, int flags,
-    const char *mode)
+static void reopen(FILE **stream, int fd, const char *path, int mode,
+    const char *fmode)
 {
         if (fclose(*stream))
@@ -66 +66 @@
         *stream = NULL;
         
-        int oldfd = open(path, flags);
+        int oldfd = vfs_lookup_open(path, WALK_REGULAR, mode);
         if (oldfd < 0)
                 return;
         
         if (oldfd != fd) {
-                if (dup2(oldfd, fd) != fd)
+                if (vfs_clone(oldfd, fd, false) != fd)
                         return;
                 
-                if (close(oldfd))
+                if (vfs_put(oldfd))
                         return;
         }
         
-        *stream = fdopen(fd, mode);
+        *stream = fdopen(fd, fmode);
 }
 
@@ -141 +141 @@
         snprintf(term_node, LOC_NAME_MAXLEN, "%s/%s", locfs, term);
         
-        reopen(&stdin, 0, term_node, O_RDONLY, "r");
-        reopen(&stdout, 1, term_node, O_WRONLY, "w");
-        reopen(&stderr, 2, term_node, O_WRONLY, "w");
+        reopen(&stdin, 0, term_node, MODE_READ, "r");
+        reopen(&stdout, 1, term_node, MODE_WRITE, "w");
+        reopen(&stderr, 2, term_node, MODE_WRITE, "w");
         
         if (stdin == NULL)