Changeset c47e1a8 in mainline for uspace/app/bdsh/scli.c

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

uspace/app/bdsh/scli.c

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include "config.h"
@@ -65 +65 @@
         usr->lasterr = 0;
 
-        input_init();
+        if (input_init() != 0)
+                return 1;
 
         return (int) cli_set_prompt(usr);
@@ -99 +100 @@
                 }
         }
-        goto finit;
 
-finit:
+        printf("Leaving %s.\n", progname);
+
         cli_finit(&usr);
         return ret;