Changeset 1ebc1a62 in mainline for uspace/app/sbi/src/os

Timestamp:

2010-03-29T20:30:29Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a95310e

Parents:

5da468e

Message:

Update SBI to rev. 157.

Location:

uspace/app/sbi/src/os

Files:

• helenos.c (modified) (3 diffs)
• os.h (modified) (1 diff)
• posix.c (modified) (1 diff)

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

@@ -34 +34 @@
 #include <str.h>
 #include <task.h>
+#include <tinput.h>
 
 #include "os.h"
@@ -40 +41 @@
  * Using HelenOS-specific string API.
  */
+
+static tinput_t *tinput = NULL;
 
 /** Concatenate two strings. */
@@ -98 +101 @@
 }
 
+/** Read one line of input from the user. */
+int os_input_line(char **ptr)
+{
+        char *line;
+
+        if (tinput == NULL) {
+                tinput = tinput_new();
+                if (tinput == NULL)
+                        return EIO;
+        }
+
+        line = tinput_read(tinput);
+        if (line == NULL)
+                return EIO;
+
+        /* XXX Input module needs trailing newline to keep going. */
+        *ptr = os_str_acat(line, "\n");
+        free(line);
+
+        return EOK;
+}
+
 /** Simple command execution. */
 int os_exec(char *const cmd[])

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

@@ -34 +34 @@
 char *os_str_dup(const char *str);
 int os_str_get_char(const char *str, int index, int *out_char);
+int os_input_line(char **ptr);
 int os_exec(char *const cmd[]);
 

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

@@ -92 +92 @@
 }
 
+#define OS_INPUT_BUFFER_SIZE 256
+static char os_input_buffer[OS_INPUT_BUFFER_SIZE];
+
+/** Read one line of input from the user. */
+int os_input_line(char **ptr)
+{
+        if (fgets(os_input_buffer, OS_INPUT_BUFFER_SIZE, stdin) == NULL)
+                os_input_buffer[0] = '\0';
+
+        if (ferror(stdin)) {
+                *ptr = NULL;
+                return EIO;
+        }
+
+        *ptr = strdup(os_input_buffer);
+        return EOK;
+}
+
 /** Simple command execution. */
 int os_exec(char *const cmd[])