Changeset 9c4cf0d in mainline for uspace/app/bdsh/cmds

Timestamp:

2017-04-02T11:24:06Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

151f1cc

Parents:

b19e892

Message:

Rename close() to vfs_put()

This is motivated mainly by the fact that a file handle does not
necessarily correspond to an open file and close() was no longer the
the opposite operation to open().

Location:

uspace/app/bdsh/cmds/modules

Files:

• cat/cat.c (modified) (3 diffs)
• cmp/cmp.c (modified) (1 diff)
• cp/cp.c (modified) (3 diffs)
• mkfile/mkfile.c (modified) (3 diffs)
• rm/rm.c (modified) (1 diff)
• touch/touch.c (modified) (1 diff)

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

@@ -203 +203 @@
 
         if (NULL == (buff = (char *) malloc(blen + 1))) {
-                close(fd);
+                vfs_put(fd);
                 printf("Unable to allocate enough memory to read %s\n",
                     fname);
@@ -213 +213 @@
 
                 if (vfs_stat(fd, &st) != EOK) {
-                        close(fd);
+                        vfs_put(fd);
                         free(buff);
                         printf("Unable to vfs_stat %d\n", fd);
@@ -287 +287 @@
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
-        close(fd);
+        vfs_put(fd);
         if (bytes == -1) {
                 printf("Error reading %s\n", fname);

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

@@ -116 +116 @@
 end:
         if (fd[0] >= 0)
-                close(fd[0]);
+                vfs_put(fd[0]);
         if (fd[1] >= 0)
-                close(fd[1]);
+                vfs_put(fd[1]);
         return rc;
 }

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

@@ -391 +391 @@
         if (fd2 < 0) {
                 printf("Unable to open destination file %s\n", dest);
-                close(fd1);
+                vfs_put(fd1);
                 return -1;
         }
@@ -397 +397 @@
         if (vfs_stat(fd1, &st) != EOK) {
                 printf("Unable to fstat %d\n", fd1);
-                close(fd1);
-                close(fd2);
+                vfs_put(fd1);
+                vfs_put(fd2);
                 return -1;      
         }
@@ -425 +425 @@
 
 out:
-        close(fd1);
-        close(fd2);
+        vfs_put(fd1);
+        vfs_put(fd2);
         if (buff)
                 free(buff);

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

@@ -168 +168 @@
                 rc2 = write(fd, &pos, &byte, sizeof(char));
                 if (rc2 < 0) {
-                        close(fd);
+                        vfs_put(fd);
                         goto error;
                 }
@@ -186 +186 @@
                 if (rc <= 0) {
                         printf("%s: Error writing file (%d).\n", cmdname, errno);
-                        close(fd);
+                        vfs_put(fd);
                         free(buffer);
                         return CMD_FAILURE;
@@ -195 +195 @@
         free(buffer);
 
-        if (close(fd) < 0)
+        if (vfs_put(fd) < 0)
                 goto error;
 

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

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

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

@@ -133 +133 @@
                         continue;
                 } else {
-                        close(fd);
+                        vfs_put(fd);
                         fd = -1;
                 }