Changes in / [73060801:ee7e82a9] 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. */
@@ -109 +107 @@
 {
         char *str;
-        int rc;
 
         fflush(stdout);
@@ -117 +114 @@
         console_set_style(fphone(stdout), STYLE_NORMAL);
 
-        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;
-        }
+        str = tinput_read(tinput);
 
         /* Check for empty input. */

uspace/app/bdsh/scli.c

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

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

@@ -105 +105 @@
 {
         char *line;
-        int rc;
 
         if (tinput == NULL) {
@@ -113 +112 @@
         }
 
-        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 */
+        line = tinput_read(tinput);
+        if (line == NULL)
                 return EIO;
-        }
 
         /* XXX Input module needs trailing newline to keep going. */

uspace/lib/clui/tinput.c

@@ -513 +513 @@
 }
 
-/** 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)
+/** Read in one line of input. */
+char *tinput_read(tinput_t *ti)
 {
         console_event_t ev;
@@ -528 +522 @@
 
         if (console_get_size(fphone(stdin), &ti->con_cols, &ti->con_rows) != EOK)
-                return EIO;
+                return NULL;
         if (console_get_pos(fphone(stdin), &ti->col0, &ti->row0) != EOK)
-                return EIO;
+                return NULL;
 
         ti->pos = ti->sel_start = 0;
@@ -536 +530 @@
         ti->buffer[0] = '\0';
         ti->done = false;
-        ti->exit_clui = false;
 
         while (!ti->done) {
                 fflush(stdout);
                 if (!console_get_event(fphone(stdin), &ev))
-                        return EIO;
+                        return NULL;
 
                 if (ev.type != KEY_PRESS)
@@ -572 +565 @@
         }
 
-        if (ti->exit_clui)
-                return ENOENT;
-
         ti->pos = ti->nc;
         tinput_position_caret(ti);
@@ -585 +575 @@
         ti->hpos = 0;
 
-        *dstr = str;
-        return EOK;
+        return str;
 }
 
@@ -617 +606 @@
         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;
-        /** @c true if finished with this line (return to caller) */
+        /** Exit flag */
         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 int tinput_read(tinput_t *ti, char **str);
+extern char *tinput_read(tinput_t *ti);
 
 #endif