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

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

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

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

@@ -27 +27 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -131 +132 @@
 static unsigned int rm_single(const char *path)
 {
-        if (unlink(path)) {
+        if (unlink(path) != 0) {
                 cli_error(CL_EFAIL, "rm: could not remove file %s", path);
                 return 1;
@@ -150 +151 @@
 
         fd = open(path, O_RDONLY);
-        if (fd > 0) {
+        if (fd >= 0) {
                 close(fd);
                 return RM_FILE;
@@ -210 +211 @@
         rc = rmdir(path);
         if (rc == 0)
-                return ret;
+                return errno;
 
         cli_error(CL_ENOTSUP, "Can not remove %s", path);