Changeset 132ab5d1 in mainline for uspace/app/bdsh/input.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/app/bdsh/input.c (modified) (3 diffs)

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: