Changeset 5db9084 in mainline for uspace/app

Timestamp:

2010-04-04T22:01:32Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

73060801

Parents:

59ecd4a3

Message:

Ctrl-Q to quit CLUI application.

Location:

uspace/app

Files:

• bdsh/input.c (modified) (3 diffs)
• bdsh/scli.c (modified) (1 diff)
• sbi/src/os/helenos.c (modified) (2 diffs)

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;

uspace/app/sbi/src/os/helenos.c

@@ -105 +105 @@
 {
         char *line;
+        int rc;
 
         if (tinput == NULL) {
@@ -112 +113 @@
         }
 
-        line = tinput_read(tinput);
-        if (line == NULL)
+        rc = tinput_read(tinput, &line);
+        if (rc == ENOENT) {
+                /* User-requested abort */
+                *ptr = os_str_dup("");
+                return EOK;
+        }
+
+        if (rc != EOK) {
+                /* Error in communication with console */
                 return EIO;
+        }
 
         /* XXX Input module needs trailing newline to keep going. */