Changeset 79ea5af in mainline for uspace/app/bdsh/cmds/modules/rm/rm.c

Timestamp:

2017-03-30T20:47:53Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

67e881c

Parents:

ae7bfbbd

Message:

Rename unlink() to vfs_unlink_path() and _vfs_unlink() to vfs_unlink()

• Also, remove rmdir()

File:

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

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

@@ -36 +36 @@
 #include <mem.h>
 #include <str.h>
+#include <vfs/vfs.h>
 
 #include "config.h"
@@ -132 +133 @@
 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;
@@ -201 +202 @@
 
         /* 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 +210 @@
 
         /* 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);