Changes in / [ee7e82a9:73060801] in mainline

Location:

uspace

Files:

• app/bdsh/input.c (modified) (3 diffs)
• app/bdsh/scli.c (modified) (1 diff)
• app/sbi/src/os/helenos.c (modified) (2 diffs)
• lib/clui/tinput.c (modified) (6 diffs)
• lib/clui/tinput.h (modified) (1 diff)

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. */

uspace/lib/clui/tinput.c

@@ -513 +513 @@
 }
 
-/** Read in one line of input. */
-char *tinput_read(tinput_t *ti)
+/** Read in one line of input.
+ *
+ * @param ti    Text input.
+ * @param dstr  Place to save pointer to new string.
+ * @return      EOK on success, ENOENT if user requested abort, EIO
+ *              if communication with console failed.
+ */
+int tinput_read(tinput_t *ti, char **dstr)
 {
         console_event_t ev;
@@ -522 +528 @@
 
         if (console_get_size(fphone(stdin), &ti->con_cols, &ti->con_rows) != EOK)
-                return NULL;
+                return EIO;
         if (console_get_pos(fphone(stdin), &ti->col0, &ti->row0) != EOK)
-                return NULL;
+                return EIO;
 
         ti->pos = ti->sel_start = 0;
@@ -530 +536 @@
         ti->buffer[0] = '\0';
         ti->done = false;
+        ti->exit_clui = false;
 
         while (!ti->done) {
                 fflush(stdout);
                 if (!console_get_event(fphone(stdin), &ev))
-                        return NULL;
+                        return EIO;
 
                 if (ev.type != KEY_PRESS)
@@ -565 +572 @@
         }
 
+        if (ti->exit_clui)
+                return ENOENT;
+
         ti->pos = ti->nc;
         tinput_position_caret(ti);
@@ -575 +585 @@
         ti->hpos = 0;
 
-        return str;
+        *dstr = str;
+        return EOK;
 }
 
@@ -606 +617 @@
         case KC_A:
                 tinput_sel_all(ti);
+                break;
+        case KC_Q:
+                /* Signal libary client to quit interactive loop. */
+                ti->done = true;
+                ti->exit_clui = true;
                 break;
         default:

uspace/lib/clui/tinput.h

@@ -64 +64 @@
         /** Current position in history */
         int hpos;
-        /** Exit flag */
+        /** @c true if finished with this line (return to caller) */
         bool done;
+        /** @c true if user requested to abort interactive loop */
+        bool exit_clui;
 } tinput_t;
 
 extern tinput_t *tinput_new(void);
 extern void tinput_destroy(tinput_t *ti);
-extern char *tinput_read(tinput_t *ti);
+extern int tinput_read(tinput_t *ti, char **str);
 
 #endif