Changeset 6a44ee4 in mainline for uspace/app/sbi/src/os/helenos.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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.

File:

• uspace/app/sbi/src/os/helenos.c (modified) (2 diffs)

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

@@ -210 +210 @@
  * @param ptr   Place to store pointer to new string.
  */
-int os_input_line(char **ptr)
+int os_input_line(const char *prompt, char **ptr)
 {
         char *line;
@@ -219 +219 @@
                 if (tinput == NULL)
                         return EIO;
+
+                tinput_set_prompt(tinput, prompt);
         }