Changeset f77c1c9 in mainline for uspace/app

Timestamp:

2017-12-08T21:03:35Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

c19a5a59

Parents:

c1694b6b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 19:44:55)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Return VFS handles separately from error codes.

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• bdsh/cmds/modules/cmp/cmp.c (modified) (1 diff)
• bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• bdsh/cmds/modules/mkfile/mkfile.c (modified) (1 diff)
• bdsh/cmds/modules/rm/rm.c (modified) (1 diff)
• bdsh/cmds/modules/touch/touch.c (modified) (1 diff)
• bdsh/exec.c (modified) (1 diff)
• getterm/getterm.c (modified) (1 diff)
• redir/redir.c (modified) (1 diff)
• sysinst/futil.c (modified) (3 diffs)
• taskdump/elf_core.c (modified) (1 diff)
• taskdump/symtab.c (modified) (1 diff)
• tester/mm/pager1.c (modified) (1 diff)
• tester/vfs/vfs1.c (modified) (1 diff)
• viewer/viewer.c (modified) (1 diff)
• websrv/websrv.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -195 +195 @@
                 /* Allow storing the whole UTF-8 character. */
                 blen = STR_BOUNDS(1);
-        } else
-                fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
+        } else {
+                int rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+                if (rc != EOK) {
+                        fd = -1;
+                }
+        }
         
         if (fd < 0) {

uspace/app/bdsh/cmds/modules/cmp/cmp.c

@@ -80 +80 @@
 
         for (int i = 0; i < 2; i++) {
-                fd[i] = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ);
-                if (fd[i] < 0) {
-                        rc = fd[i];
+                rc = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ, &(fd[i]));
+                if (rc != EOK) {
                         printf("Unable to open %s\n", fn[i]);
                         goto end;

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -394 +394 @@
                 printf("Copying %s to %s\n", src, dest);
 
-        fd1 = vfs_lookup_open(src, WALK_REGULAR, MODE_READ);
-        if (fd1 < 0) {
+        rc = vfs_lookup_open(src, WALK_REGULAR, MODE_READ, &fd1);
+        if (rc != EOK) {
                 printf("Unable to open source file %s\n", src);
                 return -1;
         }
 
-        fd2 = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
-        if (fd2 < 0) {
+        rc = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &fd2);
+        if (rc != EOK) {
                 printf("Unable to open destination file %s\n", dest);
                 vfs_put(fd1);

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -163 +163 @@
         file_name = argv[optind];
 
-        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE);
-        if (fd < 0) {
+        rc = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE, &fd);
+        if (rc != EOK) {
                 printf("%s: failed to create file %s.\n", cmdname, file_name);
                 return CMD_FAILURE;

uspace/app/bdsh/cmds/modules/rm/rm.c

@@ -149 +149 @@
         }
 
-        fd = vfs_lookup(path, WALK_REGULAR);
-        if (fd >= 0) {
+        if (vfs_lookup(path, WALK_REGULAR, &fd) == EOK) {
                 vfs_put(fd);
                 return RM_FILE;

uspace/app/bdsh/cmds/modules/touch/touch.c

@@ -123 +123 @@
                 if ((!no_create) ||
                     ((no_create) && (vfs_stat_path(buff, &file_stat) == EOK))) {
-                        fd = vfs_lookup(buff, WALK_REGULAR | WALK_MAY_CREATE);
+                        int rc = vfs_lookup(buff, WALK_REGULAR | WALK_MAY_CREATE, &fd);
+                        if (rc != EOK) {
+                                fd = -1;
+                        }
                 }
                 

uspace/app/bdsh/exec.c

@@ -58 +58 @@
         int fd;
 
-        fd = vfs_lookup_open(f, WALK_REGULAR, MODE_READ);
-        if (fd >= 0) {
+        int rc = vfs_lookup_open(f, WALK_REGULAR, MODE_READ, &fd);
+        if (rc == EOK) {
                 vfs_put(fd);
                 return 0;

uspace/app/getterm/getterm.c

@@ -65 +65 @@
         *stream = NULL;
         
-        int oldfd = vfs_lookup_open(path, WALK_REGULAR, mode);
-        if (oldfd < 0)
+        int oldfd;
+        int rc = vfs_lookup_open(path, WALK_REGULAR, mode, &oldfd);
+        if (rc != EOK)
                 return;
         
         if (oldfd != fd) {
-                if (vfs_clone(oldfd, fd, false) != fd)
+                int newfd;
+                if (vfs_clone(oldfd, fd, false, &newfd) != EOK)
                         return;
                 
+                assert(newfd == fd);
+
                 if (vfs_put(oldfd))
                         return;

uspace/app/redir/redir.c

@@ -59 +59 @@
         *stream = NULL;
         
-        int oldfd = vfs_lookup_open(path, WALK_REGULAR | flags, mode);
-        if (oldfd < 0)
+        int oldfd;
+        int rc = vfs_lookup_open(path, WALK_REGULAR | flags, mode, &oldfd);
+        if (rc != EOK)
                 return;
         
         if (oldfd != fd) {
-                if (vfs_clone(oldfd, fd, false) != fd)
+                int newfd;
+                if (vfs_clone(oldfd, fd, false, &newfd) != EOK)
                         return;
                 
+                assert(newfd == fd);
+
                 if (vfs_put(oldfd))
                         return;

uspace/app/sysinst/futil.c

@@ -63 +63 @@
         printf("Copy '%s' to '%s'.\n", srcp, destp);
 
-        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
-        if (sf < 0)
-                return EIO;
-
-        df = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
-        if (df < 0)
+        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
+        if (rc != EOK)
+                return EIO;
+
+        rc = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &df);
+        if (rc != EOK)
                 return EIO;
 
@@ -87 +87 @@
 
         rc = vfs_put(df);
-        if (rc < 0)
+        if (rc != EOK)
                 return EIO;
 
@@ -167 +167 @@
         struct stat st;
 
-        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
-        if (sf < 0)
+        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
+        if (rc != EOK)
                 return ENOENT;
 

uspace/app/taskdump/elf_core.c

@@ -123 +123 @@
         }
 
-        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_WRITE);
-        if (fd < 0) {
-                printf("Failed opening file.\n");
+        rc = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_WRITE, &fd);
+        if (rc != EOK) {
+                printf("Failed opening file '%s': %s.\n", file_name, str_error(rc));
                 free(p_hdr);
                 return ENOENT;

uspace/app/taskdump/symtab.c

@@ -82 +82 @@
                 return ENOMEM;
 
-        fd = vfs_lookup_open(file_name, WALK_REGULAR, MODE_READ);
-        if (fd < 0) {
-                printf("failed opening file\n");
+        rc = vfs_lookup_open(file_name, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK) {
+                printf("failed opening file '%s': %s\n", file_name, str_error(rc));
                 free(stab);
                 return ENOENT;

uspace/app/tester/mm/pager1.c

@@ -49 +49 @@
         TPRINTF("Creating temporary file...\n");
 
-        fd = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_READ | MODE_WRITE);
-        if (fd < 0)
+        rc = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE, &fd);
+        if (rc != EOK)
                 return NULL;
         (void) vfs_unlink_path(TEST_FILE);

uspace/app/tester/vfs/vfs1.c

@@ -73 +73 @@
         rc = vfs_link_path(TEST_DIRECTORY, KIND_DIRECTORY, NULL);
         if (rc != EOK) {
-                TPRINTF("rc=%d\n", rc);
+                TPRINTF("rc=%s\n", str_error_name(rc));
                 return "vfs_link_path() failed";
         }
         TPRINTF("Created directory %s\n", TEST_DIRECTORY);
         
-        int fd0 = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_READ | MODE_WRITE);
-        if (fd0 < 0)
+        int fd0;
+        rc = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE, &fd0);
+        if (rc != EOK)
                 return "vfs_lookup_open() failed";
         TPRINTF("Created file %s (fd=%d)\n", TEST_FILE, fd0);

uspace/app/viewer/viewer.c

@@ -109 +109 @@
 static bool img_load(const char *fname, surface_t **p_local_surface)
 {
-        int fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
-        if (fd < 0)
+        int fd;
+        int rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK)
                 return false;
         
         struct stat stat;
-        int rc = vfs_stat(fd, &stat);
+        rc = vfs_stat(fd, &stat);
         if (rc != EOK) {
                 vfs_put(fd);

uspace/app/websrv/websrv.c

@@ -265 +265 @@
         }
         
-        fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
-        if (fd < 0) {
+        rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK) {
                 rc = send_response(conn, msg_not_found);
                 goto out;