Changeset b19e892 in mainline for uspace/app/tester

Timestamp:

2017-04-02T10:39:13Z (9 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().

Location:

uspace/app/tester

Files:

• hw/misc/virtchar1.c (modified) (2 diffs)
• mm/pager1.c (modified) (2 diffs)
• vfs/vfs1.c (modified) (2 diffs)

uspace/app/tester/hw/misc/virtchar1.c

@@ -45 +45 @@
 #include <vfs/vfs.h>
 #include <vfs/vfs_sess.h>
-#include <fcntl.h>
 #include "../../tester.h"
 
@@ -55 +54 @@
 {
         TPRINTF("Opening `%s'...\n", path);
-        int fd = open(path, O_RDONLY);
+        int fd = vfs_lookup(path, WALK_REGULAR);
         if (fd < 0) {
                 TPRINTF("   ...error: %s\n", str_error(errno));

uspace/app/tester/mm/pager1.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <vfs/vfs.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <malloc.h>
@@ -48 +47 @@
         TPRINTF("Creating temporary file...\n");
 
-        fd = open(TEST_FILE, O_RDWR | O_CREAT);
+        fd = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE);
         if (fd < 0)
                 return NULL;

uspace/app/tester/vfs/vfs1.c

@@ -33 +33 @@
 #include <vfs/vfs.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <dirent.h>
 #include <loc.h>
@@ -79 +78 @@
         TPRINTF("Created directory %s\n", TEST_DIRECTORY);
         
-        int fd0 = open(TEST_FILE, O_RDWR | O_CREAT);
+        int fd0 = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE);
         if (fd0 < 0)
-                return "open() failed";
+                return "vfs_lookup_open() failed";
         TPRINTF("Created file %s (fd=%d)\n", TEST_FILE, fd0);