Changeset b67c7d64 in mainline

Timestamp:

2009-11-30T19:51:29Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e866806

Parents:

0f06dbc

Message:

Add wstr_to_astr() for easy conversion from wide string to string.

Location:

uspace

Files:

• app/bdsh/input.c (modified) (1 diff)
• app/edit/edit.c (modified) (1 diff)
• lib/libc/generic/string.c (modified) (1 diff)
• lib/libc/include/string.h (modified) (1 diff)

uspace/app/bdsh/input.c

@@ -134 +134 @@
 static char *tinput_get_str(tinput_t *ti)
 {
-        char *str;
-
-        str = malloc(STR_BOUNDS(ti->nc) + 1);
-        if (str == NULL)
-                return NULL;
-
-        wstr_to_str(str, STR_BOUNDS(ti->nc) + 1, ti->buffer);
-
-        return str;
+        return wstr_to_astr(ti->buffer);
 }
 

uspace/app/edit/edit.c

@@ -391 +391 @@
 
         buffer[nc] = '\0';
-
-        str = malloc(STR_BOUNDS(wstr_length(buffer)) + 1);
-        if (str == NULL)
-                return NULL;
-
-        wstr_to_str(str, STR_BOUNDS(wstr_length(buffer)) + 1, buffer);
+        str = wstr_to_astr(buffer);
 
         console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);

uspace/lib/libc/generic/string.c

@@ -579 +579 @@
 }
 
+/** Convert wide string to new string.
+ *
+ * Convert wide string @a src to string. Space for the new string is allocated
+ * on the heap.
+ *
+ * @param src   Source wide string.
+ * @return      New string.
+ */
+char *wstr_to_astr(const wchar_t *src)
+{
+        char dbuf[STR_BOUNDS(1)];
+        char *str;
+        wchar_t ch;
+
+        size_t src_idx;
+        size_t dest_off;
+        size_t dest_size;
+
+        /* Compute size of encoded string. */
+
+        src_idx = 0;
+        dest_size = 0;
+
+        while ((ch = src[src_idx++]) != 0) {
+                dest_off = 0;
+                if (chr_encode(ch, dbuf, &dest_off, STR_BOUNDS(1)) != EOK)
+                        break;
+                dest_size += dest_off;
+        }
+
+        str = malloc(dest_size + 1);
+        if (str == NULL)
+                return NULL;
+
+        /* Encode string. */
+
+        src_idx = 0;
+        dest_off = 0;
+
+        while ((ch = src[src_idx++]) != 0) {
+                if (chr_encode(ch, str, &dest_off, dest_size) != EOK)
+                        break;
+        }
+
+        str[dest_size] = '\0';
+        return str;
+}
+
+
 /** Convert string to wide string.
  *

uspace/lib/libc/include/string.h

@@ -74 +74 @@
 
 extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
+extern char *wstr_to_astr(const wchar_t *src);
 extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);