Changeset 1113c9e in mainline for uspace/app/sbi/src/os

Timestamp:

2010-06-09T19:03:24Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8eec3c8

Parents:

8f80c77 (diff), c5cb943d (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 from lp:~jsvoboda/helenos/sysel.

Location:

uspace/app/sbi/src/os

Files:

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

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

@@ -173 +173 @@
 }
 
+/** Convert character to new string.
+ *
+ * @param chr           Character
+ * @return              Newly allocated string.
+ */
+char *os_chr_to_astr(wchar_t chr)
+{
+        char *str;
+        size_t offset;
+
+        str = malloc(STR_BOUNDS(1) + 1);
+        if (str == NULL) {
+                printf("Memory allocation error.\n");
+                exit(1);
+        }
+
+        offset = 0;
+        if (chr_encode(chr, str, &offset, STR_BOUNDS(1)) != EOK) {
+                /* XXX Should handle gracefully */
+                printf("String conversion error.\n");
+                exit(1);
+        }
+
+        str[offset] = '\0';
+        return str;
+}
+
 /** Display survival help message. */
 void os_input_disp_help(void)

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

@@ -36 +36 @@
 size_t os_str_length(const char *str);
 int os_str_get_char(const char *str, int index, int *out_char);
+char *os_chr_to_astr(wchar_t chr);
 void os_input_disp_help(void);
 int os_input_line(char **ptr);

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

@@ -159 +159 @@
 }
 
+/** Convert character to new string.
+ *
+ * @param chr           Character
+ * @return              Newly allocated string.
+ */
+char *os_chr_to_astr(wchar_t chr)
+{
+        char *str;
+
+        str = malloc(2);
+        if (str == NULL) {
+                printf("Memory allocation error.\n");
+                exit(1);
+        }
+
+        str[0] = (char) chr;
+        str[1] = '\0';
+
+        return str;
+}
+
 #define OS_INPUT_BUFFER_SIZE 256
 static char os_input_buffer[OS_INPUT_BUFFER_SIZE];