Changeset 3aae4e8 in mainline for uspace/app/bdsh

Timestamp:

2010-04-04T22:07:05Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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.

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (1 diff)
• input.c (modified) (3 diffs)
• scli.c (modified) (1 diff)

uspace/app/bdsh/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIB_PREFIX)/block/libblock.a $(LIB_PREFIX)/clui/libclui.a
-EXTRA_CFLAGS = -I$(LIB_PREFIX)/block -I$(LIB_PREFIX)/clui -I. -Icmds/ \
-    -Icmds/builtins -Icmds/modules
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCLUI_PREFIX)/libclui.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCLUI_PREFIX) -I. -Icmds/ \
+        -Icmds/builtins -Icmds/modules
 BINARY = bdsh
 

uspace/app/bdsh/input.c

@@ -50 +50 @@
 #include "errors.h"
 #include "exec.h"
+
+extern volatile unsigned int cli_quit;
 
 /** Text input field. */
@@ -107 +109 @@
 {
         char *str;
+        int rc;
 
         fflush(stdout);
@@ -114 +117 @@
         console_set_style(fphone(stdout), STYLE_NORMAL);
 
-        str = tinput_read(tinput);
+        rc = tinput_read(tinput, &str);
+        if (rc == ENOENT) {
+                /* User requested exit */
+                cli_quit = 1;
+                putchar('\n');
+                return;
+        }
+
+        if (rc != EOK) {
+                /* Error in communication with console */
+                return;
+        }
 
         /* Check for empty input. */

uspace/app/bdsh/scli.c

@@ -100 +100 @@
                 }
         }
-        goto finit;
 
-finit:
+        printf("Leaving %s.\n", progname);
+
         cli_finit(&usr);
         return ret;