Changeset d5c1051 in mainline for uspace/app/bdsh

Timestamp:

2017-12-20T22:25:34Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

Location:

uspace/app/bdsh

Files:

• cmds/builtins/batch/batch.c (modified) (2 diffs)
• cmds/builtins/cd/cd.c (modified) (1 diff)
• cmds/modules/mkdir/mkdir.c (modified) (3 diffs)
• cmds/modules/mkfile/mkfile.c (modified) (1 diff)
• cmds/modules/mount/mount.c (modified) (1 diff)
• cmds/modules/rm/rm.c (modified) (1 diff)
• exec.c (modified) (1 diff)
• test/toktest.c (modified) (1 diff)

uspace/app/bdsh/cmds/builtins/batch/batch.c

@@ -85 +85 @@
         }
 
-        int rc = 0;
+        int rc = EOK;
         FILE *batch = fopen(argv[1], "r");
         if (batch == NULL) {
@@ -104 +104 @@
                                 if (cur == fusr.line) {
                                         /* skip empty line */
-                                        rc = 0;
+                                        rc = EOK;
                                         free(cur);
                                 } else {

uspace/app/bdsh/cmds/builtins/cd/cd.c

@@ -85 +85 @@
 int cmd_cd(char **argv, cliuser_t *usr)
 {
-        int argc, rc = 0;
+        int argc;
+        int rc = EOK;
 
         argc = cli_count_args(argv);

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

@@ -94 +94 @@
 
         int ret = 0;
+        int rc;
 
         if (!create_parents) {
-                ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                if (ret != EOK) {
+                rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                if (rc != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(ret));
+                            cmdname, path, str_error(rc));
                         ret = 1;
                 }
@@ -135 +136 @@
                         path[prev_off] = 0;
 
-                        ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                        if (ret != EOK && ret != EEXIST) {
+                        rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                        if (rc != EOK && rc != EEXIST) {
                                 cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                                    cmdname, path, str_error(ret));
+                                    cmdname, path, str_error(rc));
                                 ret = 1;
                                 goto leave;
@@ -146 +147 @@
                 }
                 /* Create the final directory. */
-                ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                if (ret != EOK) {
+                rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                if (rc != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(ret));
+                            cmdname, path, str_error(rc));
                         ret = 1;
                 }

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

@@ -202 +202 @@
         free(buffer);
 
-        if (vfs_put(fd) < 0)
+        if (vfs_put(fd) != EOK)
                 goto error;
 

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

@@ -132 +132 @@
         const char *mopts = "";
         const char *dev = "";
-        int rc, c, opt_ind;
+        int rc;
+        int c, opt_ind;
         unsigned int instance = 0;
         bool instance_set = false;

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

@@ -209 +209 @@
         rc = vfs_unlink_path(path);
         if (rc == EOK)
-                return EOK;
+                return 0;
 
         cli_error(CL_ENOTSUP, "Can not remove %s", path);

uspace/app/bdsh/exec.c

@@ -98 +98 @@
         task_exit_t texit;
         char *tmp;
-        int rc, retval, i;
+        int rc;
+        int retval, i;
         int file_handles[3] = { -1, -1, -1 };
         FILE *files[3];

uspace/app/bdsh/test/toktest.c

@@ -47 +47 @@
 
         int rc = tok_init(&tokenizer, input_buffer, tokens, MAX_TOKENS);
-        PCUT_ASSERT_INT_EQUALS(EOK, rc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
         size_t token_count;
         rc = tok_tokenize(&tokenizer, &token_count);
-        PCUT_ASSERT_INT_EQUALS(EOK, rc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);