Changeset 9be9c4d in mainline for uspace/app/sbi/src

Timestamp:

2011-07-13T19:54:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3e5c48c9

Parents:

026793d

Message:

Shell command and file-name completion.

Location:

uspace/app/sbi/src

Files:

• input.c (modified) (2 diffs)
• os/helenos.c (modified) (2 diffs)
• os/os.h (modified) (1 diff)
• os/posix.c (modified) (1 diff)

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;
 

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);
         }
 

uspace/app/sbi/src/os/os.h

@@ -38 +38 @@
 char *os_chr_to_astr(wchar_t chr);
 void os_input_disp_help(void);
-int os_input_line(char **ptr);
+int os_input_line(const char *prompt, char **ptr);
 int os_exec(char * const cmd[]);
 

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';