Changeset 04803bf in mainline for uspace/app/bdsh/scli.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/app/bdsh/scli.c (modified) (4 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"
@@ -61 +61 @@
         usr->line = (char *) NULL;
         usr->name = "root";
-        usr->home = "/";
         usr->cwd = (char *) NULL;
         usr->prompt = (char *) NULL;
-        chdir(usr->home);
         usr->lasterr = 0;
+
+        if (input_init() != 0)
+                return 1;
+
         return (int) cli_set_prompt(usr);
 }
@@ -87 +89 @@
                 exit(EXIT_FAILURE);
 
-        printf("Welcome to %s - %s\nType `help' at any time for usage information.\n",
-                progname, PACKAGE_STRING);
-
         while (!cli_quit) {
                 get_input(&usr);
@@ -98 +97 @@
                 }
         }
-        goto finit;
 
-finit:
+        printf("Leaving %s.\n", progname);
+
         cli_finit(&usr);
         return ret;