X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftext%2Funicode.c;h=77b7684d4a6f58ae793a9cea1b4822fc331df172;hb=1644d683e9df1620685ed666865b4752bfcca3a0;hp=499b0e7906393545911bf3d246928fede056ec15;hpb=5158c3af473f61e501440e1fb499271d69b6fe55;p=vlc diff --git a/src/text/unicode.c b/src/text/unicode.c index 499b0e7906..77b7684d4a 100644 --- a/src/text/unicode.c +++ b/src/text/unicode.c @@ -2,8 +2,7 @@ * unicode.c: Unicode <-> locale functions ***************************************************************************** * Copyright (C) 2005-2006 the VideoLAN team - * Copyright © 2005-2006 Rémi Denis-Courmont - * $Id$ + * Copyright © 2005-2008 Rémi Denis-Courmont * * Authors: Rémi Denis-Courmont * @@ -25,40 +24,25 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include -#include "libvlc.h" /* utf8_mkdir */ #include #include #include #include -#include #include -#ifdef HAVE_DIRENT_H -# include -#endif #ifdef UNDER_CE # include #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef HAVE_FCNTL_H -# include -#endif -#ifdef WIN32 -# include -#else -# include -#endif - -#ifndef HAVE_LSTAT -# define lstat( a, b ) stat(a, b) -#endif +#include -#ifdef __APPLE__ +#if defined (__APPLE__) || defined (HAVE_MAEMO) /* Define this if the OS always use UTF-8 internally */ # define ASSUME_UTF8 1 #endif @@ -74,32 +58,31 @@ #endif #if defined (USE_ICONV) -static char charset[sizeof ("CSISO11SWEDISHFORNAMES//translit")] = ""; +# include +static char charset[sizeof ("CSISO11SWEDISHFORNAMES")] = ""; static void find_charset_once (void) { - char *psz_charset; - if (vlc_current_charset (&psz_charset) - || (psz_charset == NULL) - || (strcmp (psz_charset, "ASCII") == 0) - || ((size_t)snprintf (charset, sizeof (charset), "%s//translit", - psz_charset) >= sizeof (charset))) - strcpy (charset, "UTF-8"); - - free (psz_charset); + strlcpy (charset, nl_langinfo (CODESET), sizeof (charset)); + if (!strcasecmp (charset, "ASCII") + || !strcasecmp (charset, "ANSI_X3.4-1968")) + strcpy (charset, "UTF-8"); /* superset... */ } static int find_charset (void) { static pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once (&once, find_charset_once); - return !strcmp (charset, "UTF-8"); + return !strcasecmp (charset, "UTF-8"); } #endif -static char *locale_fast (const char *string, vlc_bool_t from) +static char *locale_fast (const char *string, bool from) { + if( string == NULL ) + return NULL; + #if defined (USE_ICONV) if (find_charset ()) return (char *)string; @@ -107,23 +90,20 @@ static char *locale_fast (const char *string, vlc_bool_t from) vlc_iconv_t hd = vlc_iconv_open (from ? "UTF-8" : charset, from ? charset : "UTF-8"); if (hd == (vlc_iconv_t)(-1)) - return strdup (string); /* Uho! */ + return NULL; /* Uho! */ const char *iptr = string; size_t inb = strlen (string); size_t outb = inb * 6 + 1; char output[outb], *optr = output; - if (string == NULL) - return NULL; - while (vlc_iconv (hd, &iptr, &inb, &optr, &outb) == (size_t)(-1)) { *optr++ = '?'; outb--; iptr++; inb--; - vlc_iconv (hd, NULL, NULL, NULL, NULL); + vlc_iconv (hd, NULL, NULL, NULL, NULL); /* reset */ } *optr = '\0'; vlc_iconv_close (hd); @@ -137,29 +117,32 @@ static char *locale_fast (const char *string, vlc_bool_t from) char *out; int len; - if (string == NULL) - return NULL; - len = 1 + MultiByteToWideChar (from ? CP_ACP : CP_UTF8, 0, string, -1, NULL, 0); - wchar_t wide[len]; + wchar_t *wide = malloc (len * sizeof (wchar_t)); + if (wide == NULL) + return NULL; MultiByteToWideChar (from ? CP_ACP : CP_UTF8, 0, string, -1, wide, len); - len = 1 + WideCharToMultiByte (from ? CP_UTF8 : CP_ACP, 0, wide, -1, NULL, 0, NULL, NULL); + len = 1 + WideCharToMultiByte (from ? CP_UTF8 : CP_ACP, 0, wide, -1, + NULL, 0, NULL, NULL); out = malloc (len); - if (out == NULL) - return NULL; - - WideCharToMultiByte (from ? CP_UTF8 : CP_ACP, 0, wide, -1, out, len, NULL, NULL); + if (out != NULL) + WideCharToMultiByte (from ? CP_UTF8 : CP_ACP, 0, wide, -1, out, len, + NULL, NULL); + free (wide); return out; #else + (void)from; return (char *)string; #endif } -static inline char *locale_dup (const char *string, vlc_bool_t from) +static inline char *locale_dup (const char *string, bool from) { + assert( string ); + #if defined (USE_ICONV) if (find_charset ()) return strdup (string); @@ -167,11 +150,15 @@ static inline char *locale_dup (const char *string, vlc_bool_t from) #elif defined (USE_MB2MB) return locale_fast (string, from); #else + (void)from; return strdup (string); #endif } - +/** + * Releases (if needed) a localized or uniformized string. + * @param str non-NULL return value from FromLocale() or ToLocale(). + */ void LocaleFree (const char *str) { #if defined (USE_ICONV) @@ -179,14 +166,16 @@ void LocaleFree (const char *str) free ((char *)str); #elif defined (USE_MB2MB) free ((char *)str); +#else + (void)str; #endif } /** - * FromLocale: converts a locale string to UTF-8 + * Converts a string from the system locale character encoding to UTF-8. * - * @param locale nul-terminated string to be converted + * @param locale nul-terminated string to convert * * @return a nul-terminated UTF-8 string, or NULL in case of error. * To avoid memory leak, you have to pass the result to LocaleFree() @@ -194,17 +183,26 @@ void LocaleFree (const char *str) */ char *FromLocale (const char *locale) { - return locale_fast (locale, VLC_TRUE); + return locale_fast (locale, true); } +/** + * converts a string from the system locale character encoding to utf-8, + * the result is always allocated on the heap. + * + * @param locale nul-terminated string to convert + * + * @return a nul-terminated utf-8 string, or null in case of error. + * The result must be freed using free() - as with the strdup() function. + */ char *FromLocaleDup (const char *locale) { - return locale_dup (locale, VLC_TRUE); + return locale_dup (locale, true); } /** - * ToLocale: converts a UTF-8 string to local system encoding. + * ToLocale: converts an UTF-8 string to local system encoding. * * @param utf8 nul-terminated string to be converted * @@ -214,400 +212,27 @@ char *FromLocaleDup (const char *locale) */ char *ToLocale (const char *utf8) { - return locale_fast (utf8, VLC_FALSE); + return locale_fast (utf8, false); } -static char *ToLocaleDup (const char *utf8) -{ - return locale_dup (utf8, VLC_FALSE); -} - - -/** - * utf8_open: open() wrapper for UTF-8 filenames - */ -int utf8_open (const char *filename, int flags, mode_t mode) -{ -#if defined (WIN32) || defined (UNDER_CE) - if (GetVersion() < 0x80000000) - { - /* for Windows NT and above */ - wchar_t wpath[MAX_PATH + 1]; - - if (!MultiByteToWideChar (CP_UTF8, 0, filename, -1, wpath, MAX_PATH)) - { - errno = ENOENT; - return -1; - } - wpath[MAX_PATH] = L'\0'; - - /* - * open() cannot open files with non-“ANSI” characters on Windows. - * We use _wopen() instead. Same thing for mkdir() and stat(). - */ - return _wopen (wpath, flags, mode); - } -#endif - const char *local_name = ToLocale (filename); - - if (local_name == NULL) - { - errno = ENOENT; - return -1; - } - - int fd = open (local_name, flags, mode); - LocaleFree (local_name); - return fd; -} - /** - * utf8_fopen: fopen() wrapper for UTF-8 filenames - */ -FILE *utf8_fopen (const char *filename, const char *mode) -{ - int rwflags = 0, oflags = 0; - vlc_bool_t append = VLC_FALSE; - - for (const char *ptr = mode; *ptr; ptr++) - { - switch (*ptr) - { - case 'r': - rwflags = O_RDONLY; - break; - - case 'a': - rwflags = O_WRONLY; - oflags |= O_CREAT; - append = VLC_TRUE; - break; - - case 'w': - rwflags = O_WRONLY; - oflags |= O_CREAT | O_TRUNC; - break; - - case '+': - rwflags = O_RDWR; - break; - -#ifdef O_TEXT - case 't': - oflags |= O_TEXT; - break; -#endif - } - } - - int fd = utf8_open (filename, rwflags | oflags, 0666); - if (fd == -1) - return NULL; - - if (append && (lseek (fd, 0, SEEK_END) == -1)) - { - close (fd); - return NULL; - } - - FILE *stream = fdopen (fd, mode); - if (stream == NULL) - close (fd); - - return stream; -} - -/** - * utf8_mkdir: Calls mkdir() after conversion of file name to OS locale + * converts a string from UTF-8 to the system locale character encoding, + * the result is always allocated on the heap. * - * @param dirname a UTF-8 string with the name of the directory that you - * want to create. - * @return A 0 return value indicates success. A -1 return value indicates an - * error, and an error code is stored in errno - */ -int utf8_mkdir( const char *dirname, mode_t mode ) -{ -#if defined (UNDER_CE) || defined (WIN32) - wchar_t wname[MAX_PATH + 1]; - char mod[MAX_PATH + 1]; - int i; - - /* Convert '/' into '\' */ - for( i = 0; *dirname; i++ ) - { - if( i == MAX_PATH ) - return -1; /* overflow */ - - if( *dirname == '/' ) - mod[i] = '\\'; - else - mod[i] = *dirname; - dirname++; - - } - mod[i] = 0; - - if( MultiByteToWideChar( CP_UTF8, 0, mod, -1, wname, MAX_PATH ) == 0 ) - { - errno = ENOENT; - return -1; - } - wname[MAX_PATH] = L'\0'; - - if( CreateDirectoryW( wname, NULL ) == 0 ) - { - if( GetLastError( ) == ERROR_ALREADY_EXISTS ) - errno = EEXIST; - else - errno = ENOENT; - return -1; - } - return 0; -#else - char *locname = ToLocale( dirname ); - int res; - - if( locname == NULL ) - { - errno = ENOENT; - return -1; - } - res = mkdir( locname, mode ); - - LocaleFree( locname ); - return res; -#endif -} - -/** - * utf8_opendir: wrapper that converts dirname to the locale in use by the OS - * - * @param dirname UTF-8 representation of the directory name + * @param utf8 nul-terminated string to convert * - * @return a pointer to the DIR struct. Release with closedir(). + * @return a nul-terminated string, or null in case of error. + * The result must be freed using free() - as with the strdup() function. */ -DIR *utf8_opendir( const char *dirname ) +char *ToLocaleDup (const char *utf8) { -#ifdef WIN32 - wchar_t wname[MAX_PATH + 1]; - - if (MultiByteToWideChar (CP_UTF8, 0, dirname, -1, wname, MAX_PATH)) - { - wname[MAX_PATH] = L'\0'; - return (DIR *)vlc_wopendir (wname); - } -#else - const char *local_name = ToLocale( dirname ); - - if( local_name != NULL ) - { - DIR *dir = opendir( local_name ); - LocaleFree( local_name ); - return dir; - } -#endif - - errno = ENOENT; - return NULL; + return locale_dup (utf8, false); } /** - * utf8_readdir: a readdir wrapper that returns the name of the next entry - * in the directory as a UTF-8 string. - * - * @param dir The directory that is being read - * - * @return a UTF-8 string of the directory entry. Use free() to free this memory. - */ -char *utf8_readdir( DIR *dir ) -{ -#ifdef WIN32 - struct _wdirent *ent = vlc_wreaddir (dir); - if (ent == NULL) - return NULL; - - return FromWide (ent->d_name); -#else - struct dirent *ent; - - ent = readdir( (DIR *)dir ); - if( ent == NULL ) - return NULL; - - return vlc_fix_readdir( ent->d_name ); -#endif -} - -static int dummy_select( const char *str ) -{ - (void)str; - return 1; -} - -int utf8_loaddir( DIR *dir, char ***namelist, - int (*select)( const char * ), - int (*compar)( const char **, const char ** ) ) -{ - if( select == NULL ) - select = dummy_select; - - if( dir == NULL ) - return -1; - else - { - char **tab = NULL; - char *entry; - unsigned num = 0; - - rewinddir( dir ); - - while( ( entry = utf8_readdir( dir ) ) != NULL ) - { - char **newtab; - - if( !select( entry ) ) - { - free( entry ); - continue; - } - - newtab = realloc( tab, sizeof( char * ) * (num + 1) ); - if( newtab == NULL ) - { - free( entry ); - goto error; - } - tab = newtab; - tab[num++] = entry; - } - - if( compar != NULL ) - qsort( tab, num, sizeof( tab[0] ), - (int (*)( const void *, const void *))compar ); - - *namelist = tab; - return num; - - error:{ - unsigned i; - - for( i = 0; i < num; i++ ) - free( tab[i] ); - if( tab != NULL ) - free( tab ); - } - } - return -1; -} - -int utf8_scandir( const char *dirname, char ***namelist, - int (*select)( const char * ), - int (*compar)( const char **, const char ** ) ) -{ - DIR *dir = utf8_opendir (dirname); - int val = -1; - - if (dir != NULL) - { - val = utf8_loaddir (dir, namelist, select, compar); - closedir (dir); - } - return val; -} - -static int utf8_statEx( const char *filename, struct stat *buf, - vlc_bool_t deref ) -{ -#if defined (WIN32) || defined (UNDER_CE) - /* retrieve Windows OS version */ - if( GetVersion() < 0x80000000 ) - { - /* for Windows NT and above */ - wchar_t wpath[MAX_PATH + 1]; - - if( !MultiByteToWideChar( CP_UTF8, 0, filename, -1, wpath, MAX_PATH ) ) - { - errno = ENOENT; - return -1; - } - wpath[MAX_PATH] = L'\0'; - - return _wstati64( wpath, buf ); - } -#endif -#ifdef HAVE_SYS_STAT_H - const char *local_name = ToLocale( filename ); - - if( local_name != NULL ) - { - int res = deref ? stat( local_name, buf ) - : lstat( local_name, buf ); - LocaleFree( local_name ); - return res; - } - errno = ENOENT; -#endif - return -1; -} - - -int utf8_stat( const char *filename, struct stat *buf) -{ - return utf8_statEx( filename, buf, VLC_TRUE ); -} - -int utf8_lstat( const char *filename, struct stat *buf) -{ - return utf8_statEx( filename, buf, VLC_FALSE ); -} - -/** - * utf8_unlink: Calls unlink() after conversion of file name to OS locale - * - * @param filename a UTF-8 string with the name of the file you want to delete. - * @return A 0 return value indicates success. A -1 return value indicates an - * error, and an error code is stored in errno - */ -int utf8_unlink( const char *filename ) -{ -#if defined (WIN32) || defined (UNDER_CE) - if( GetVersion() < 0x80000000 ) - { - /* for Windows NT and above */ - wchar_t wpath[MAX_PATH + 1]; - - if( !MultiByteToWideChar( CP_UTF8, 0, filename, -1, wpath, MAX_PATH ) ) - { - errno = ENOENT; - return -1; - } - wpath[MAX_PATH] = L'\0'; - - /* - * unlink() cannot open files with non-“ANSI” characters on Windows. - * We use _wunlink() instead. - */ - return _wunlink( wpath ); - } -#endif - const char *local_name = ToLocale( filename ); - - if( local_name == NULL ) - { - errno = ENOENT; - return -1; - } - - int ret = unlink( local_name ); - LocaleFree( local_name ); - return ret; -} - - - -/** - * utf8_*printf: *printf with conversion from UTF-8 to local encoding + * Formats an UTF-8 string as vasprintf(), then print it to stdout, with + * appropriate conversion to local encoding. */ static int utf8_vasprintf( char **str, const char *fmt, va_list ap ) { @@ -621,6 +246,10 @@ static int utf8_vasprintf( char **str, const char *fmt, va_list ap ) return res; } +/** + * Formats an UTF-8 string as vfprintf(), then print it, with + * appropriate conversion to local encoding. + */ int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap ) { char *str; @@ -633,6 +262,10 @@ int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap ) return res; } +/** + * Formats an UTF-8 string as fprintf(), then print it, with + * appropriate conversion to local encoding. + */ int utf8_fprintf( FILE *stream, const char *fmt, ... ) { va_list ap; @@ -653,30 +286,25 @@ static char *CheckUTF8( char *str, char rep ) for (;;) { uint8_t c = ptr[0]; - int charlen = -1; if (c == '\0') break; - for (int i = 0; i < 7; i++) - if ((c >> (7 - i)) == ((0xff >> (7 - i)) ^ 1)) - { - charlen = i; - break; - } + if (c > 0xF4) + goto error; + int charlen = clz8 (c ^ 0xFF); switch (charlen) { case 0: // 7-bit ASCII character -> OK ptr++; continue; - case -1: // 1111111x -> error case 1: // continuation byte -> error goto error; } - assert (charlen >= 2); + assert (charlen >= 2 && charlen <= 4); uint32_t cp = c & ~((0xff >> (7 - charlen)) << (7 - charlen)); for (int i = 1; i < charlen; i++) @@ -684,18 +312,26 @@ static char *CheckUTF8( char *str, char rep ) assert (cp < (1 << 26)); c = ptr[i]; - if ((c == '\0') // unexpected end of string - || ((c >> 6) != 2)) // not a continuation byte + if ((c >> 6) != 2) // not a continuation byte goto error; cp = (cp << 6) | (ptr[i] & 0x3f); } - if (cp < 128) // overlong (special case for ASCII) - goto error; - if (cp < (1u << (5 * charlen - 3))) // overlong - goto error; - + switch (charlen) + { + case 4: + if (cp > 0x10FFFF) // beyond Unicode + goto error; + case 3: + if (cp >= 0xD800 && cp < 0xC000) // UTF-16 surrogate + goto error; + case 2: + if (cp < 128) // ASCII overlong + goto error; + if (cp < (1u << (5 * charlen - 3))) // overlong + goto error; + } ptr += charlen; continue; @@ -710,7 +346,7 @@ static char *CheckUTF8( char *str, char rep ) } /** - * EnsureUTF8: replaces invalid/overlong UTF-8 sequences with question marks + * Replaces invalid/overlong UTF-8 sequences with question marks. * Note that it is not possible to convert from Latin-1 to UTF-8 on the fly, * so we don't try that, even though it would be less disruptive. * @@ -723,7 +359,7 @@ char *EnsureUTF8( char *str ) /** - * IsUTF8: checks whether a string is a valid UTF-8 byte sequence. + * Checks whether a string is a valid UTF-8 byte sequence. * * @param str nul-terminated string to be checked * @@ -733,3 +369,40 @@ const char *IsUTF8( const char *str ) { return CheckUTF8( (char *)str, 0 ); } + +/** + * Converts a string from the given character encoding to utf-8. + * + * @return a nul-terminated utf-8 string, or null in case of error. + * The result must be freed using free(). + */ +char *FromCharset(const char *charset, const void *data, size_t data_size) +{ + vlc_iconv_t handle = vlc_iconv_open ("UTF-8", charset); + if (handle == (vlc_iconv_t)(-1)) + return NULL; + + char *out = NULL; + for(unsigned mul = 4; mul < 8; mul++ ) + { + size_t in_size = data_size; + const char *in = data; + size_t out_max = mul * data_size; + char *tmp = out = malloc (1 + out_max); + if (!out) + break; + + if (vlc_iconv (handle, &in, &in_size, &tmp, &out_max) != (size_t)(-1)) { + *tmp = '\0'; + break; + } + free(out); + out = NULL; + + if (errno != E2BIG) + break; + } + vlc_iconv_close(handle); + return out; +} +