Changeset 1569a9b in mainline for uspace/app/bdsh

Timestamp:

2017-12-24T16:40:33Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

48fd597

Parents:

a1026da

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-24 16:40:33)

git-committer:

GitHub <noreply@…> (2017-12-24 16:40:33)

Message:

The "not-so-obvious" error handling tweaks. (#9)

Some more changes to enable type-checking with errno_t. Some of the "fixes" here don't quite feel right, but a proper solution would be a more elaborate refactoring of the surrounding code.

Location:

uspace/app/bdsh

Files:

• cmds/modules/cmp/cmp.c (modified) (1 diff)
• cmds/modules/cp/cp.c (modified) (4 diffs)
• input.c (modified) (3 diffs)

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

@@ -101 +101 @@
                     memcmp(buffer[0], buffer[1], offset[0]) != 0) {
                         printf("Return 1\n");
-                        rc = 1;
+                        rc = EBUSY;
                         goto end;
                 }

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

@@ -266 +266 @@
 
                 /* call copy_file and exit */
-                rc = (copy_file(src, dest_path, blen, vb) < 0);
+                if (copy_file(src, dest_path, blen, vb) < 0) {
+                        rc = EIO;
+                }
 
         } else if (src_type == TYPE_DIR) {
@@ -434 +436 @@
         if (rc != EOK) {
                 printf("\nError copying %s: %s\n", src, str_error(rc));
-                return rc;
+                return -1;
         }
 
@@ -442 +444 @@
         if (buff)
                 free(buff);
-        return rc;
+        if (rc != EOK) {
+                return -1;
+        } else {
+                return 0;
+        }
 }
 
@@ -473 +479 @@
         int force = 0, interactive = 0;
         int c, opt_ind;
-        int64_t ret;
+        int ret;
 
         con = console_init(stdin, stdout);

uspace/app/bdsh/input.c

@@ -73 +73 @@
         
         char *cmd[WORD_MAX];
-        int rc = 0;
+        int rc = EOK;
         tokenizer_t tok;
         unsigned int i, pipe_count, processed_pipes;
@@ -82 +82 @@
         if (usr->line == NULL) {
                 free(tokens_buf);
-                return CL_EFAIL;
+                return EINVAL;
         }
 
@@ -198 +198 @@
         }
 
-        rc = run_command(cmd, usr, &new_iostate);
+        if (run_command(cmd, usr, &new_iostate) == 0) {
+                rc = EOK;
+        } else {
+                rc = EINVAL;
+        }
         
 finit_with_files: