Changeset f77c1c9 in mainline for uspace/app/bdsh/cmds

Timestamp:

2017-12-08T21:03:35Z (6 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/bdsh/cmds/modules

Files:

• cat/cat.c (modified) (1 diff)
• cmp/cmp.c (modified) (1 diff)
• cp/cp.c (modified) (1 diff)
• mkfile/mkfile.c (modified) (1 diff)
• rm/rm.c (modified) (1 diff)
• touch/touch.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;
+                        }
                 }