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

Timestamp:

2017-04-02T10:39:13Z (8 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/redir/redir.c (modified) (7 diffs)

uspace/app/redir/redir.c

@@ -37 +37 @@
 #include <sys/types.h>
 #include <stdlib.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <str.h>
@@ -54 +53 @@
 }
 
-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 flags, int mode,
+    const char *fmode)
 {
         if (fclose(*stream))
@@ -61 +61 @@
         *stream = NULL;
         
-        int oldfd = open(path, flags);
+        int oldfd = vfs_lookup_open(path, WALK_REGULAR | flags, mode);
         if (oldfd < 0)
                 return;
@@ -73 +73 @@
         }
         
-        *stream = fdopen(fd, mode);
+        *stream = fdopen(fd, fmode);
 }
 
@@ -122 +122 @@
                                 return -2;
                         }
-                        reopen(&stdin, 0, argv[i], O_RDONLY, "r");
+                        reopen(&stdin, 0, argv[i], 0, MODE_READ, "r");
                 } else if (str_cmp(argv[i], "-o") == 0) {
                         i++;
@@ -129 +129 @@
                                 return -3;
                         }
-                        reopen(&stdout, 1, argv[i], O_WRONLY | O_CREAT, "w");
+                        reopen(&stdout, 1, argv[i], WALK_MAY_CREATE, MODE_WRITE,
+                            "w");
                 } else if (str_cmp(argv[i], "-e") == 0) {
                         i++;
@@ -136 +137 @@
                                 return -4;
                         }
-                        reopen(&stderr, 2, argv[i], O_WRONLY | O_CREAT, "w");
+                        reopen(&stderr, 2, argv[i], WALK_MAY_CREATE, MODE_WRITE,
+                            "w");
                 } else if (str_cmp(argv[i], "--") == 0) {
                         i++;