Changeset 368ee04 in mainline for uspace/app/bdsh/cmds/modules/rm/rm.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (6 diffs)

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

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <dirent.h>
 #include <getopt.h>
 #include <mem.h>
 #include <str.h>
+#include <vfs/vfs.h>
 
 #include "config.h"
@@ -110 +109 @@
         memset(rm->cwd, 0, PATH_MAX);
 
-        chdir(".");
-
-        if (NULL == (getcwd(rm->owd, PATH_MAX)))
+        vfs_cwd_set(".");
+
+        if (EOK != vfs_cwd_get(rm->owd, PATH_MAX))
                 return 0;
 
@@ -132 +131 @@
 static unsigned int rm_single(const char *path)
 {
-        if (unlink(path) != 0) {
+        if (vfs_unlink_path(path) != EOK) {
                 cli_error(CL_EFAIL, "rm: could not remove file %s", path);
                 return 1;
@@ -150 +149 @@
         }
 
-        fd = open(path, O_RDONLY);
+        fd = vfs_lookup(path, WALK_REGULAR);
         if (fd >= 0) {
-                close(fd);
+                vfs_put(fd);
                 return RM_FILE;
         }
@@ -201 +200 @@
 
         /* First see if it will just go away */
-        rc = rmdir(path);
-        if (rc == 0)
+        rc = vfs_unlink_path(path);
+        if (rc == EOK)
                 return 0;
 
@@ -209 +208 @@
 
         /* Delete directory */
-        rc = rmdir(path);
-        if (rc == 0)
-                return errno;
+        rc = vfs_unlink_path(path);
+        if (rc == EOK)
+                return EOK;
 
         cli_error(CL_ENOTSUP, "Can not remove %s", path);