Changeset b19e892 in mainline for uspace/app/getterm/getterm.c

Timestamp:

2017-04-02T10:39:13Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9c4cf0d

Parents:

80743a1

Message:

Merge open() with posix_open() and provide vfs_lookup_open() instead

vfs_lookup_open() is really just a convenience wrapper around
vfs_lookup() and vfs_open().

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>
@@ -59 +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))
@@ -67 +66 @@
         *stream = NULL;
         
-        int oldfd = open(path, flags);
+        int oldfd = vfs_lookup_open(path, WALK_REGULAR, mode);
         if (oldfd < 0)
                 return;
@@ -79 +78 @@
         }
         
-        *stream = fdopen(fd, mode);
+        *stream = fdopen(fd, fmode);
 }
 
@@ -142 +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)