Changeset 6a44ee4 in mainline for uspace/app/sbi/src/input.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/input.c (modified) (2 diffs)

uspace/app/sbi/src/input.c

@@ -176 +176 @@
 int input_get_line(input_t *input, char **line)
 {
+        const char *prompt;
         const char *sp;
         char *dp;
@@ -212 +213 @@
                 /* Interactive mode */
                 if (input->line_no == 0)
-                        printf("sbi> ");
+                        prompt = "sbi> ";
                 else
-                        printf("...  ");
+                        prompt = "...  ";
 
                 fflush(stdout);
-                if (os_input_line(&line_p) != EOK)
+                if (os_input_line(prompt, &line_p) != EOK)
                         return EIO;