Changes in uspace/app/bdsh/cmds/modules/rm/rm.c [6afc9d7:d96d9bc] in mainline

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);