Changeset 4069f5c in mainline for uspace/app/sbi/src/os/posix.c

Timestamp:

2011-07-17T09:52:42Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

64639256, ca1f1ec

Parents:

27eddb52 (diff), 4118f5f (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/posix.c (modified) (1 diff)

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

@@ -193 +193 @@
  * @param ptr   Place to store pointer to new string.
  */
-int os_input_line(char **ptr)
-{
+int os_input_line(const char *prompt, char **ptr)
+{
+        printf("%s", prompt);
+
         if (fgets(os_input_buffer, OS_INPUT_BUFFER_SIZE, stdin) == NULL)
                 os_input_buffer[0] = '\0';