Changeset 647cc79956895cfa8c8baf95d58e0f000a3e1a5b

Timestamp:

03/21/06 17:42:34 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1142959354 +0000

git-parent:

[e65878a6ef6e405098b77db28e02eebfae65b650]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1142959354 +0000

Message:

- FromWide?(): converts a wchar_t * to UTF-8 char *

(if local charset is UTF-8, this is similar to wcstombs())

- FromUTF16(): converts a host-order UTF-16 byte sequence to UTF-8

Files:

• include/charset.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (3 diffs)
• src/misc/unicode.c (modified) (6 diffs)

include/charset.h

@@ -48 +48 @@
-VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
-VLC_EXPORT( char *, FromUTF32, ( const uint32_t * ) );
+VLC_EXPORT( char *, FromUTF16, ( const uint16_t * ) );
+
+static inline char *FromWide( const wchar_t *in )
+{
+    return (sizeof( wchar_t ) == 2)
+        ? FromUTF16( (const uint16_t *)in )
+        : FromUTF32( (const uint32_t *)in );
+}
+
+
-VLC_EXPORT( char *, __vlc_fix_readdir_charset, ( vlc_object_t *, const char * ) );
-#define vlc_fix_readdir_charset(a,b) __vlc_fix_readdir_charset(VLC_OBJECT(a),b)

include/vlc_symbols.h

@@ -485 +485 @@
-    char * (*decode_encoded_URI_duplicate_inner) (const char *psz);
-    void (*resolve_xml_special_chars_inner) (char *psz_value);
+    char * (*FromUTF16_inner) (const uint16_t *);
-};
-# if defined (__PLUGIN__)
@@ -949 +950 @@
-#  define decode_encoded_URI_duplicate (p_symbols)->decode_encoded_URI_duplicate_inner
-#  define resolve_xml_special_chars (p_symbols)->resolve_xml_special_chars_inner
+#  define FromUTF16 (p_symbols)->FromUTF16_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1416 +1418 @@
-    ((p_symbols)->decode_encoded_URI_duplicate_inner) = decode_encoded_URI_duplicate; \
-    ((p_symbols)->resolve_xml_special_chars_inner) = resolve_xml_special_chars; \
+    ((p_symbols)->FromUTF16_inner) = FromUTF16; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__stats_CounterGet_deprecated = NULL; \

src/misc/unicode.c

@@ -1 +1 @@
-/*****************************************************************************
-TF8
+nicode
- *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
@@ -6 +6 @@
- *
- * Authors: Rémi Denis-Courmont <rem # videolan.org>
+ *
+ * UTF16toUTF8() adapted from Perl 5 (also GPL'd)
+ * Copyright (C) 1998-2002, Larry Wall
- *
- * This program is free software; you can redistribute it and/or modify
@@ -656 +659 @@
-
-/**
-
-
-
+
+
+
+
- * @param len the number of code points to be converted from src
- * (ie. the number of uint32_t in the table pointed to by src)
@@ -667 +671 @@
- * or NULL on error (in that case, *newlen is undefined).
- */
-
+
+
-{
-    char *res, *out;
@@ -726 +731 @@
- * FromUTF32(): converts an UTF-32 string to UTF-8.
- *
+ * @param src UTF-32 bytes sequence, aligned on a 32-bits boundary.
+ *
- * @return the result of the conversion (must be free()'d),
- * or NULL in case of error.
@@ -731 +738 @@
-char *FromUTF32( const uint32_t *src )
-{
+    const uint32_t *in;
-    size_t len;
-    const uint32_t *in;
-
-    /* determine the size of the string */
-GetWBE( in )
+*in
-        in++;
-
-    return UTF32toUTF8( src, len, NULL );
-}
+
+/**
+ * UTF16toUTF8: converts UTF-16 (host byte order) to UTF-8
+ *
+ * @param src UTF-16 bytes sequence, aligned on a 16-bits boundary
+ * @param len number of uint16_t to convert
+ */
+static char *
+UTF16toUTF8( const uint16_t *in, size_t len, size_t *newlen )
+{
+    char *res, *out;
+
+    /* allocate memory */
+    out = res = (char *)malloc( 3 * len );
+    if( res == NULL )
+        return NULL;
+
+    while( len > 0 )
+    {
+        uint32_t uv = *in;
+
+        in++;
+        len--;
+
+        if( uv < 0x80 )
+        {
+            *out++ = uv;
+            continue;
+        }
+        if( uv < 0x800 )
+        {
+            *out++ = (( uv >>  6)         | 0xc0);
+            *out++ = (( uv        & 0x3f) | 0x80);
+            continue;
+        }
+        if( (uv >= 0xd800) && (uv < 0xdbff) )
+        {   /* surrogates */
+            uint16_t low = GetWBE( in );
+            in++;
+            len--;
+
+            if( (low < 0xdc00) || (low >= 0xdfff) )
+            {
+                *out++ = '?'; /* Malformed surrogate */
+                continue;
+            }
+            else
+                uv = ((uv - 0xd800) << 10) + (low - 0xdc00) + 0x10000;
+        }
+        if( uv < 0x10000 )
+        {
+            *out++ = (( uv >> 12)         | 0xe0);
+            *out++ = (((uv >>  6) & 0x3f) | 0x80);
+            *out++ = (( uv        & 0x3f) | 0x80);
+            continue;
+        }
+        else
+        {
+            *out++ = (( uv >> 18)         | 0xf0);
+            *out++ = (((uv >> 12) & 0x3f) | 0x80);
+            *out++ = (((uv >>  6) & 0x3f) | 0x80);
+            *out++ = (( uv        & 0x3f) | 0x80);
+            continue;
+        }
+    }
+    len = out - res;
+    res = realloc( res, len );
+    if( newlen != NULL )
+        *newlen = len;
+    return res;
+}
+
+
+/**
+ * FromUTF16(): converts an UTF-16 string to UTF-8.
+ *
+ * @param src UTF-16 bytes sequence, aligned on a 16-bits boundary.
+ *
+ * @return the result of the conversion (must be free()'d),
+ * or NULL in case of error.
+ */
+char *FromUTF16( const uint16_t *src )
+{
+    const uint16_t *in;
+    size_t len;
+
+    /* determine the size of the string */
+    for( len = 1, in = src; *in; len++ )
+        in += 2;
+
+    return UTF16toUTF8( src, len, NULL );
+}