X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fextras%2Flibc.c;h=e55f51a775b2a03b08c8aae9a67cf59fa8865a77;hb=48e4674acd7f2ad37adef14340269f255f56c3a1;hp=5b8e9b20b3bee947db8319586440be261e6f4e49;hpb=22fe2438b98e2d041b4481c0c8706096a8f160ce;p=vlc diff --git a/src/extras/libc.c b/src/extras/libc.c index 5b8e9b20b3..e55f51a775 100644 --- a/src/extras/libc.c +++ b/src/extras/libc.c @@ -29,7 +29,7 @@ # include "config.h" #endif -#include +#include #include @@ -47,11 +47,8 @@ # include #endif -#ifdef HAVE_SIGNAL_H -# include -#endif - #ifdef HAVE_FORK +# include # include # include # include @@ -59,6 +56,9 @@ # include # include # include +# ifndef PF_LOCAL +# define PF_LOCAL PF_UNIX +# endif #endif #if defined(WIN32) || defined(UNDER_CE) @@ -70,210 +70,11 @@ # include #endif -#ifdef UNDER_CE -# define strcoll strcmp -#endif - -/****************************************************************************** - * strcasestr: find a substring (little) in another substring (big) - * Case sensitive. Return NULL if not found, return big if little == null - *****************************************************************************/ -#if !defined( HAVE_STRCASESTR ) && !defined( HAVE_STRISTR ) -char * vlc_strcasestr( const char *psz_big, const char *psz_little ) -{ - char *p_pos = (char *)psz_big; - - if( !psz_big || !psz_little || !*psz_little ) return p_pos; - - while( *p_pos ) - { - if( toupper( *p_pos ) == toupper( *psz_little ) ) - { - char * psz_cur1 = p_pos + 1; - char * psz_cur2 = (char *)psz_little + 1; - while( *psz_cur1 && *psz_cur2 && - toupper( *psz_cur1 ) == toupper( *psz_cur2 ) ) - { - psz_cur1++; - psz_cur2++; - } - if( !*psz_cur2 ) return p_pos; - } - p_pos++; - } - return NULL; -} -#endif - -/***************************************************************************** - * vasprintf: - *****************************************************************************/ -#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) -int vlc_vasprintf(char **strp, const char *fmt, va_list ap) -{ - /* Guess we need no more than 100 bytes. */ - int i_size = 100; - char *p = malloc( i_size ); - int n; - - if( p == NULL ) - { - *strp = NULL; - return -1; - } - - for( ;; ) - { - /* Try to print in the allocated space. */ - n = vsnprintf( p, i_size, fmt, ap ); - - /* If that worked, return the string. */ - if (n > -1 && n < i_size) - { - *strp = p; - return strlen( p ); - } - /* Else try again with more space. */ - if (n > -1) /* glibc 2.1 */ - { - i_size = n+1; /* precisely what is needed */ - } - else /* glibc 2.0 */ - { - i_size *= 2; /* twice the old size */ - } - if( (p = realloc( p, i_size ) ) == NULL) - { - *strp = NULL; - return -1; - } - } -} -#endif - -/***************************************************************************** - * asprintf: - *****************************************************************************/ -#if !defined(HAVE_ASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) -int vlc_asprintf( char **strp, const char *fmt, ... ) -{ - va_list args; - int i_ret; - - va_start( args, fmt ); - i_ret = vasprintf( strp, fmt, args ); - va_end( args ); - - return i_ret; -} -#endif - -/***************************************************************************** - * strtoll: convert a string to a 64 bits int. - *****************************************************************************/ -#if !defined( HAVE_STRTOLL ) -int64_t vlc_strtoll( const char *nptr, char **endptr, int base ) -{ - int64_t i_value = 0; - int sign = 1, newbase = base ? base : 10; - - while( isspace(*nptr) ) nptr++; - - if( *nptr == '-' ) - { - sign = -1; - nptr++; - } - - /* Try to detect base */ - if( *nptr == '0' ) - { - newbase = 8; - nptr++; - - if( *nptr == 'x' ) - { - newbase = 16; - nptr++; - } - } - - if( base && newbase != base ) - { - if( endptr ) *endptr = (char *)nptr; - return i_value; - } - - switch( newbase ) - { - case 10: - while( *nptr >= '0' && *nptr <= '9' ) - { - i_value *= 10; - i_value += ( *nptr++ - '0' ); - } - if( endptr ) *endptr = (char *)nptr; - break; - - case 16: - while( (*nptr >= '0' && *nptr <= '9') || - (*nptr >= 'a' && *nptr <= 'f') || - (*nptr >= 'A' && *nptr <= 'F') ) - { - int i_valc = 0; - if(*nptr >= '0' && *nptr <= '9') i_valc = *nptr - '0'; - else if(*nptr >= 'a' && *nptr <= 'f') i_valc = *nptr - 'a' +10; - else if(*nptr >= 'A' && *nptr <= 'F') i_valc = *nptr - 'A' +10; - i_value *= 16; - i_value += i_valc; - nptr++; - } - if( endptr ) *endptr = (char *)nptr; - break; - - default: - i_value = strtol( nptr, endptr, newbase ); - break; - } - - return i_value * sign; -} -#endif - -/** - * Copy a string to a sized buffer. The result is always nul-terminated - * (contrary to strncpy()). - * - * @param dest destination buffer - * @param src string to be copied - * @param len maximum number of characters to be copied plus one for the - * terminating nul. - * - * @return strlen(src) - */ -#ifndef HAVE_STRLCPY -extern size_t vlc_strlcpy (char *tgt, const char *src, size_t bufsize) -{ - size_t length; - - for (length = 1; (length < bufsize) && *src; length++) - *tgt++ = *src++; - - if (bufsize) - *tgt = '\0'; - - while (*src++) - length++; - - return length - 1; -} -#endif - /***************************************************************************** * vlc_*dir_wrapper: wrapper under Windows to return the list of drive letters * when called with an empty argument or just '\' *****************************************************************************/ -#if defined(WIN32) && !defined(UNDER_CE) +#if defined(WIN32) # include typedef struct vlc_DIR @@ -297,7 +98,11 @@ void *vlc_wopendir( const wchar_t *wpath ) if( !p_dir ) return NULL; p_dir->p_real_dir = NULL; +#if defined(UNDER_CE) + p_dir->i_drives = NULL; +#else p_dir->i_drives = GetLogicalDrives(); +#endif return (void *)p_dir; } @@ -321,7 +126,6 @@ void *vlc_wopendir( const wchar_t *wpath ) struct _wdirent *vlc_wreaddir( void *_p_dir ) { vlc_DIR *p_dir = (vlc_DIR *)_p_dir; - unsigned int i; DWORD i_drives; if ( p_dir->p_real_dir != NULL ) @@ -342,6 +146,11 @@ struct _wdirent *vlc_wreaddir( void *_p_dir ) /* Drive letters mode */ i_drives = p_dir->i_drives; +#ifdef UNDER_CE + swprintf( p_dir->dd_dir.d_name, L"\\"); + p_dir->dd_dir.d_namlen = wcslen(p_dir->dd_dir.d_name); +#else + unsigned int i; if ( !i_drives ) return NULL; /* end */ @@ -354,21 +163,10 @@ struct _wdirent *vlc_wreaddir( void *_p_dir ) swprintf( p_dir->dd_dir.d_name, L"%c:\\", 'A' + i ); p_dir->dd_dir.d_namlen = wcslen(p_dir->dd_dir.d_name); p_dir->i_drives &= ~(1UL << i); +#endif return &p_dir->dd_dir; } -int vlc_wclosedir( void *_p_dir ) -{ - vlc_DIR *p_dir = (vlc_DIR *)_p_dir; - int i_ret = 0; - - if ( p_dir->p_real_dir != NULL ) - i_ret = _wclosedir( p_dir->p_real_dir ); - - free( p_dir ); - return i_ret; -} - void vlc_rewinddir( void *_p_dir ) { vlc_DIR *p_dir = (vlc_DIR *)_p_dir; @@ -378,81 +176,25 @@ void vlc_rewinddir( void *_p_dir ) } #endif -/***************************************************************************** - * scandir: scan a directory alpha-sorted - *****************************************************************************/ -#if !defined( HAVE_SCANDIR ) -/* FIXME: I suspect this is dead code -> utf8_scandir */ -#ifdef WIN32 -# undef opendir -# undef readdir -# undef closedir -#endif -int vlc_alphasort( const struct dirent **a, const struct dirent **b ) -{ - return strcoll( (*a)->d_name, (*b)->d_name ); -} - -int vlc_scandir( const char *name, struct dirent ***namelist, - int (*filter) ( const struct dirent * ), - int (*compar) ( const struct dirent **, - const struct dirent ** ) ) +/* This one is in the libvlccore exported symbol list */ +int vlc_wclosedir( void *_p_dir ) { - DIR * p_dir; - struct dirent * p_content; - struct dirent ** pp_list; - int ret, size; - - if( !namelist || !( p_dir = opendir( name ) ) ) return -1; - - ret = 0; - pp_list = NULL; - while( ( p_content = readdir( p_dir ) ) ) - { - if( filter && !filter( p_content ) ) - { - continue; - } - pp_list = realloc( pp_list, ( ret + 1 ) * sizeof( struct dirent * ) ); - size = sizeof( struct dirent ) + strlen( p_content->d_name ) + 1; - pp_list[ret] = malloc( size ); - if( pp_list[ret] ) - { - memcpy( pp_list[ret], p_content, size ); - ret++; - } - else - { - /* Continuing is useless when no more memory can be allocted, - * so better return what we have found. - */ - ret = -1; - break; - } - } - - closedir( p_dir ); +#if defined(WIN32) + vlc_DIR *p_dir = (vlc_DIR *)_p_dir; + int i_ret = 0; - if( compar ) - { - qsort( pp_list, ret, sizeof( struct dirent * ), - (int (*)(const void *, const void *)) compar ); - } + if ( p_dir->p_real_dir != NULL ) + i_ret = _wclosedir( p_dir->p_real_dir ); - *namelist = pp_list; - return ret; -} + free( p_dir ); + return i_ret; +#else + return closedir( _p_dir ); #endif - -#if defined (WIN32) -/** - * gettext callbacks for plugins. - * LibVLC links libintl statically on Windows. - */ -char *vlc_dgettext( const char *package, const char *msgid ) -{ - return dgettext( package, msgid ); } + +#ifdef ENABLE_NLS +# include #endif /** @@ -460,127 +202,334 @@ char *vlc_dgettext( const char *package, const char *msgid ) */ char *vlc_gettext( const char *msgid ) { +#ifdef ENABLE_NLS return dgettext( PACKAGE_NAME, msgid ); +#else + return (char *)msgid; +#endif } /***************************************************************************** - * count_utf8_string: returns the number of characters in the string. + * Local conversion routine from ISO_6937 to UTF-8 charset. Support for this + * is still missing in libiconv, hence multiple operating systems lack it. + * The conversion table adds Euro sign (0xA4) as per ETSI EN 300 468 Annex A *****************************************************************************/ -static int count_utf8_string( const char *psz_string ) +#ifndef __linux__ +static const uint16_t to_ucs4[128] = { - int i = 0, i_count = 0; - while( psz_string[ i ] != 0 ) - { - if( ((unsigned char *)psz_string)[ i ] < 0x80UL ) i_count++; - i++; - } - return i_count; -} - -/***************************************************************************** - * wraptext: inserts \n at convenient places to wrap the text. - * Returns the modified string in a new buffer. - *****************************************************************************/ -char *vlc_wraptext( const char *psz_text, int i_line ) + /* 0x80 */ 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + /* 0x88 */ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, + /* 0x90 */ 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + /* 0x98 */ 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, + /* 0xa0 */ 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x0000, 0x00a7, + /* 0xa8 */ 0x00a4, 0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, + /* 0xb0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, + /* 0xb8 */ 0x00f7, 0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, + /* 0xc0 */ 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, + /* 0xc8 */ 0xffff, 0x0000, 0xffff, 0xffff, 0x0000, 0xffff, 0xffff, 0xffff, + /* 0xd0 */ 0x2014, 0x00b9, 0x00ae, 0x00a9, 0x2122, 0x266a, 0x00ac, 0x00a6, + /* 0xd8 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, + /* 0xe0 */ 0x2126, 0x00c6, 0x00d0, 0x00aa, 0x0126, 0x0000, 0x0132, 0x013f, + /* 0xe8 */ 0x0141, 0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0x0149, + /* 0xf0 */ 0x0138, 0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0140, + /* 0xf8 */ 0x0142, 0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0x00ad +}; + +/* The outer array range runs from 0xc1 to 0xcf, the inner range from 0x40 + to 0x7f. */ +static const uint16_t to_ucs4_comb[15][64] = { - int i_len; - char *psz_line, *psz_new_text; + /* 0xc1 */ + { + /* 0x40 */ 0x0000, 0x00c0, 0x0000, 0x0000, 0x0000, 0x00c8, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x00cc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d2, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d9, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x00e0, 0x0000, 0x0000, 0x0000, 0x00e8, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x00ec, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f2, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f9, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xc2 */ + { + /* 0x40 */ 0x0000, 0x00c1, 0x0000, 0x0106, 0x0000, 0x00c9, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x00cd, 0x0000, 0x0000, 0x0139, 0x0000, 0x0143, 0x00d3, + /* 0x50 */ 0x0000, 0x0000, 0x0154, 0x015a, 0x0000, 0x00da, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x00dd, 0x0179, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x00e1, 0x0000, 0x0107, 0x0000, 0x00e9, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x00ed, 0x0000, 0x0000, 0x013a, 0x0000, 0x0144, 0x00f3, + /* 0x70 */ 0x0000, 0x0000, 0x0155, 0x015b, 0x0000, 0x00fa, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x00fd, 0x017a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xc3 */ + { + /* 0x40 */ 0x0000, 0x00c2, 0x0000, 0x0108, 0x0000, 0x00ca, 0x0000, 0x011c, + /* 0x48 */ 0x0124, 0x00ce, 0x0134, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d4, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x015c, 0x0000, 0x00db, 0x0000, 0x0174, + /* 0x58 */ 0x0000, 0x0176, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x00e2, 0x0000, 0x0109, 0x0000, 0x00ea, 0x0000, 0x011d, + /* 0x68 */ 0x0125, 0x00ee, 0x0135, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f4, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x015d, 0x0000, 0x00fb, 0x0000, 0x0175, + /* 0x78 */ 0x0000, 0x0177, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xc4 */ + { + /* 0x40 */ 0x0000, 0x00c3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x0128, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d1, 0x00d5, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0168, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x00e3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x0129, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f1, 0x00f5, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0169, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xc5 */ + { + /* 0x40 */ 0x0000, 0x0100, 0x0000, 0x0000, 0x0000, 0x0112, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x012a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x014c, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016a, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x0101, 0x0000, 0x0000, 0x0000, 0x0113, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x012b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x014d, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016b, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xc6 */ + { + /* 0x40 */ 0x0000, 0x0102, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x011e, + /* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x0103, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x011f, + /* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xc7 */ + { + /* 0x40 */ 0x0000, 0x0000, 0x0000, 0x010a, 0x0000, 0x0116, 0x0000, 0x0120, + /* 0x48 */ 0x0000, 0x0130, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x017b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x0000, 0x0000, 0x010b, 0x0000, 0x0117, 0x0000, 0x0121, + /* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x017c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xc8 */ + { + /* 0x40 */ 0x0000, 0x00c4, 0x0000, 0x0000, 0x0000, 0x00cb, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x00cf, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d6, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00dc, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0178, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x00e4, 0x0000, 0x0000, 0x0000, 0x00eb, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x00ef, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f6, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00fc, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x00ff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xc9 */ + { + 0x0000, + }, + /* 0xca */ + { + /* 0x40 */ 0x0000, 0x00c5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016e, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x00e5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016f, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xcb */ + { + /* 0x40 */ 0x0000, 0x0000, 0x0000, 0x00c7, 0x0000, 0x0000, 0x0000, 0x0122, + /* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0136, 0x013b, 0x0000, 0x0145, 0x0000, + /* 0x50 */ 0x0000, 0x0000, 0x0156, 0x015e, 0x0162, 0x0000, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x0000, 0x0000, 0x00e7, 0x0000, 0x0000, 0x0000, 0x0123, + /* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0137, 0x013c, 0x0000, 0x0146, 0x0000, + /* 0x70 */ 0x0000, 0x0000, 0x0157, 0x015f, 0x0163, 0x0000, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xcc */ + { + 0x0000, + }, + /* 0xcd */ + { + /* 0x40 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0170, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0151, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0171, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xce */ + { + /* 0x40 */ 0x0000, 0x0104, 0x0000, 0x0000, 0x0000, 0x0118, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x012e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0172, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x0105, 0x0000, 0x0000, 0x0000, 0x0119, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x012f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0173, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }, + /* 0xcf */ + { + /* 0x40 */ 0x0000, 0x0000, 0x0000, 0x010c, 0x010e, 0x011a, 0x0000, 0x0000, + /* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x013d, 0x0000, 0x0147, 0x0000, + /* 0x50 */ 0x0000, 0x0000, 0x0158, 0x0160, 0x0164, 0x0000, 0x0000, 0x0000, + /* 0x58 */ 0x0000, 0x0000, 0x017d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x60 */ 0x0000, 0x0000, 0x0000, 0x010d, 0x010f, 0x011b, 0x0000, 0x0000, + /* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x013e, 0x0000, 0x0148, 0x0000, + /* 0x70 */ 0x0000, 0x0000, 0x0159, 0x0161, 0x0165, 0x0000, 0x0000, 0x0000, + /* 0x78 */ 0x0000, 0x0000, 0x017e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + } +}; + +static size_t ISO6937toUTF8( const unsigned char **inbuf, size_t *inbytesleft, + unsigned char **outbuf, size_t *outbytesleft ) - psz_line = psz_new_text = strdup( psz_text ); - i_len = count_utf8_string( psz_text ); +{ + if( !inbuf || !(*inbuf) ) + return (size_t)(0); /* Reset state requested */ - while( i_len > i_line ) + const unsigned char *iptr = *inbuf; + const unsigned char *iend = iptr + *inbytesleft; + unsigned char *optr = *outbuf; + unsigned char *oend = optr + *outbytesleft; + uint16_t ch; + int err = 0; + + while ( iptr < iend ) { - /* Look if there is a newline somewhere. */ - char *psz_parser = psz_line; - int i_count = 0; - while( i_count <= i_line && *psz_parser != '\n' ) + if( *iptr < 0x80 ) { - while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser++; - psz_parser++; - i_count++; + if( optr >= oend ) + { + err = E2BIG; + break; /* No space in outbuf */ + } + *optr++ = *iptr++; + continue; } - if( *psz_parser == '\n' ) + + + if ( optr + 2 >= oend ) { - i_len -= (i_count + 1); - psz_line = psz_parser + 1; - continue; + err = E2BIG; + break; /* No space in outbuf for multibyte char */ } - /* Find the furthest space. */ - while( psz_parser > psz_line && *psz_parser != ' ' ) + ch = to_ucs4[*iptr - 0x80]; + + if( ch == 0xffff ) { - while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser--; - psz_parser--; - i_count--; + /* Composed character */ + if ( iptr + 1 >= iend ) + { + err = EINVAL; + break; /* No next character */ + } + if ( iptr[1] < 0x40 || iptr[1] >= 0x80 || + !(ch = to_ucs4_comb[iptr[0] - 0xc1][iptr[1] - 0x40]) ) + { + err = EILSEQ; + break; /* Illegal combination */ + } + iptr += 2; + } - if( *psz_parser == ' ' ) + else { - *psz_parser = '\n'; - i_len -= (i_count + 1); - psz_line = psz_parser + 1; - continue; + if ( !ch ) + { + err = EILSEQ; + break; + } + iptr++; } - /* Wrapping has failed. Find the first space or newline */ - while( i_count < i_len && *psz_parser != ' ' && *psz_parser != '\n' ) + if ( ch < 0x800 ) + { + optr[1] = 0x80 | (ch & 0x3f); + optr[0] = 0xc0 | (ch >> 6); + optr +=2; + } + else { - while( *((unsigned char *)psz_parser) >= 0x80UL ) psz_parser++; - psz_parser++; - i_count++; + optr[2] = 0x80 | (ch & 0x3f); + ch >>= 6; + optr[1] = 0x80 | (ch & 0x3f); + optr[0] = 0xe0 | (ch >> 6); + optr += 3; } - if( i_count < i_len ) *psz_parser = '\n'; - i_len -= (i_count + 1); - psz_line = psz_parser + 1; + + } + *inbuf = iptr; + *outbuf = optr; + *inbytesleft = iend - iptr; + *outbytesleft = oend - optr; + + if( err ) + { + errno = err; + return (size_t)(-1); } - return psz_new_text; + return (size_t)(0); + } +#endif /***************************************************************************** * iconv wrapper *****************************************************************************/ vlc_iconv_t vlc_iconv_open( const char *tocode, const char *fromcode ) { +#ifndef __linux__ + if( !strcasecmp(tocode, "UTF-8") && !strcasecmp(fromcode, "ISO_6937") ) + return (vlc_iconv_t)(-2); +#endif #if defined(HAVE_ICONV) return iconv_open( tocode, fromcode ); #else - return NULL; + return (vlc_iconv_t)(-1); #endif } size_t vlc_iconv( vlc_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft ) { +#ifndef __linux__ + if ( cd == (vlc_iconv_t)(-2) ) + return ISO6937toUTF8( (const unsigned char **)inbuf, inbytesleft, + (unsigned char **)outbuf, outbytesleft ); +#endif #if defined(HAVE_ICONV) return iconv( cd, (ICONV_CONST char **)inbuf, inbytesleft, outbuf, outbytesleft ); #else - int i_bytes; - - if (inbytesleft == NULL || outbytesleft == NULL) - { - return 0; - } - - i_bytes = __MIN(*inbytesleft, *outbytesleft); - if( !inbuf || !outbuf || !i_bytes ) return (size_t)(-1); - memcpy( *outbuf, *inbuf, i_bytes ); - inbuf += i_bytes; - outbuf += i_bytes; - inbytesleft -= i_bytes; - outbytesleft -= i_bytes; - return i_bytes; + abort (); #endif } int vlc_iconv_close( vlc_iconv_t cd ) { +#ifndef __linux__ + if ( cd == (vlc_iconv_t)(-2) ) + return 0; +#endif #if defined(HAVE_ICONV) return iconv_close( cd ); #else - return 0; + abort (); #endif } @@ -651,7 +600,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv, # define BUFSIZE 1024 int fds[2], i_status; - if (socketpair (AF_LOCAL, SOCK_STREAM, 0, fds)) + if (socketpair (PF_LOCAL, SOCK_STREAM, 0, fds)) return -1; pid_t pid = -1; @@ -916,7 +865,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv, || i_read == 0 ) break; *pi_data += i_read; - *pp_data = realloc( *pp_data, *pi_data + 1025 ); + *pp_data = xrealloc( *pp_data, *pi_data + 1025 ); } while ( !p_object->b_die