Changeset 77a194c in mainline for uspace/lib/clui/tinput.c

Timestamp:

2015-11-04T18:55:46Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44183b98

Parents:

5265eea4 (diff), bfcde8d (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 new disk partitioning architecture.

File:

• uspace/lib/clui/tinput.c (modified) (5 diffs)

uspace/lib/clui/tinput.c

@@ -457 +457 @@
 }
 
-static void tinput_set_str(tinput_t *ti, char *str)
+static void tinput_set_str(tinput_t *ti, const char *str)
 {
         str_to_wstr(ti->buffer, INPUT_MAX_SIZE, str);
@@ -853 +853 @@
 }
 
-/** Read in one line of input.
- *
- * @param ti   Text input.
- * @param dstr Place to save pointer to new string.
+/** Read in one line of input with initial text provided.
+ *
+ * @param ti   Text input
+ * @param istr Initial string
+ * @param dstr Place to save pointer to new string
  *
  * @return EOK on success
@@ -863 +864 @@
  *
  */
-int tinput_read(tinput_t *ti, char **dstr)
+int tinput_read_i(tinput_t *ti, const char *istr, char **dstr)
 {
         console_flush(ti->console);
@@ -869 +870 @@
                 return EIO;
         
-        ti->pos = 0;
+        tinput_set_str(ti, istr);
+
         ti->sel_start = 0;
-        ti->nc = 0;
-        ti->buffer[0] = '\0';
         ti->done = false;
         ti->exit_clui = false;
@@ -916 +916 @@
 }
 
+/** Read in one line of input.
+ *
+ * @param ti   Text input
+ * @param dstr Place to save pointer to new string.
+ *
+ * @return EOK on success
+ * @return ENOENT if user requested abort
+ * @return EIO if communication with console failed
+ *
+ */
+int tinput_read(tinput_t *ti, char **dstr)
+{
+        return tinput_read_i(ti, "", dstr);
+}
+
 static void tinput_key_ctrl(tinput_t *ti, kbd_event_t *ev)
 {