[vlc-devel] [PATCH 1/9] Workaround for OS/2 iconv(), which 1. supports UCS-2 only not UTF-16 2. does not treat a string as a pathname by default

[KO Myung-Hun]

Rémi Denis-Courmont wrote:
> Le samedi 26 novembre 2011 08:05:21 KO Myung-Hun, vous avez écrit :
>> ---
>>  src/extras/libc.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
>>  1 files changed, 44 insertions(+), 0 deletions(-)
>>
>> diff --git a/src/extras/libc.c b/src/extras/libc.c
>> index 5b028a6..ff40aa0 100644
>> --- a/src/extras/libc.c
>> +++ b/src/extras/libc.c
>> @@ -37,6 +37,15 @@
>>  #   include <iconv.h>
>>  #endif
>>
>> +#if defined(__OS2__) && defined(__INNOTEK_LIBC__)
>> +#   include <uconv.h>
>> +
>> +typedef struct os2_iconv_t
>> +{
>> +    UconvObject from;
>> +} os2_iconv_t;
>> +#endif
>> +
>>  /*************************************************************************
>> **** * Local conversion routine from ISO_6937 to UTF-8 charset. Support for
>> this * is still missing in libiconv, hence multiple operating systems lack
>> it. @@ -326,7 +335,42 @@ vlc_iconv_t vlc_iconv_open( const char *tocode,
>> const char *fromcode ) return (vlc_iconv_t)(-2);
>>  #endif
>>  #if defined(HAVE_ICONV)
>> +# if defined(__OS2__) && defined(__INNOTEK_LIBC__)
>> +    char tocode_ucs2[] = "UCS-2LE";
>> +    char fromcode_ucs2[] = "UCS-2LE";
> 
> This should be const char *. There is no point in copying the strings on the 
> stack every time.
> 

Ok.

>> +    os2_iconv_t *p_os2_iconv;
>> +
>> +    /* Workaround for UTF-16 because OS/2 supports UCS-2 only not UTF-16
>> */ +    if( !strncmp( tocode, "UTF-16", 6 ))
>> +    {
>> +        strncpy( tocode_ucs2 + 5, tocode + 6, 2 );
>> +        tocode = tocode_ucs2;
>> +    }
>> +
>> +    if( !strncmp( fromcode, "UTF-16", 6 ))
>> +    {
>> +        strncpy( fromcode_ucs2 + 5, fromcode + 6, 2 );
>> +        fromcode = fromcode_ucs2;
>> +    }
>> +
>> +    p_os2_iconv = ( os2_iconv_t * )iconv_open( tocode, fromcode );
>> +
>> +    if( p_os2_iconv != ( iconv_t )(-1))
>> +    {
>> +        /* Assume strings contain pathnames */
>> +        uconv_attribute_t attr;
> 
> The string is not necessarily a path here. If you need special decoding for 
> path names, it belongs in the OS-specific filesystem functions.
> 

But, I know, GNU iconv does like this.


-- 
KO Myung-Hun

Using Mozilla SeaMonkey 2.0.14
Under OS/2 Warp 4 for Korean with FixPak #15
On AMD ThunderBird 1GHz with 512 MB RAM

Korean OS/2 User Community : http://www.ecomstation.co.kr