X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftext%2Funicode.c;h=77b7684d4a6f58ae793a9cea1b4822fc331df172;hb=3683cc99da0a39bca72d14a17682ffeacee7652b;hp=df0df105a31b8ef0caff60e3fca969fd19caaa5e;hpb=78277aedce99a6ca8f69844b5a93b70aa95a7ede;p=vlc diff --git a/src/text/unicode.c b/src/text/unicode.c index df0df105a3..77b7684d4a 100644 --- a/src/text/unicode.c +++ b/src/text/unicode.c @@ -30,38 +30,19 @@ #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 @@ -138,17 +119,18 @@ static char *locale_fast (const char *string, bool from) 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); 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; @@ -248,427 +230,6 @@ char *ToLocaleDup (const char *utf8) return locale_dup (utf8, false); } - -/** - * Opens a system file handle using UTF-8 paths. - * - * @param filename file path to open (with UTF-8 encoding) - * @param flags open() flags, see the C library open() documentation - * @param mode file permissions if creating a new file - * @return a file handle on success, -1 on error (see errno). - */ -int utf8_open (const char *filename, int flags, mode_t mode) -{ -#ifdef UNDER_CE - /*_open translates to wchar internally on WinCE*/ - return _open (filename, flags, mode); -#elif defined (WIN32) - /* 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; -} - -/** - * Opens a FILE pointer using UTF-8 filenames. - * @param filename file path, using UTF-8 encoding - * @param mode fopen file open mode - * @return NULL on error, an open FILE pointer on success. - */ -FILE *utf8_fopen (const char *filename, const char *mode) -{ - int rwflags = 0, oflags = 0; - bool append = 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 = 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; -} - -/** - * Creates a directory using UTF-8 paths. - * - * @param dirname a UTF-8 string with the name of the directory that you - * want to create. - * @param mode directory permissions - * @return 0 on success, -1 on error (see errno). - */ -int utf8_mkdir( const char *dirname, mode_t mode ) -{ -#if defined (UNDER_CE) || defined (WIN32) - VLC_UNUSED( mode ); - - 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 -} - -/** - * Opens a DIR pointer using UTF-8 paths - * - * @param dirname UTF-8 representation of the directory name - * @return a pointer to the DIR struct, or NULL in case of error. - * Release with standard closedir(). - */ -DIR *utf8_opendir( const char *dirname ) -{ -#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; -} - -/** - * Reads the next file name from an open directory. - * - * @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; -} - -/** - * Does the same as utf8_scandir(), but takes an open directory pointer - * instead of a directory path. - */ -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; -} - -/** - * Selects file entries from a directory, as GNU C scandir(), yet using - * UTF-8 file names. - * - * @param dirname UTF-8 diretory path - * @param pointer [OUT] pointer set, on succesful completion, to the address - * of a table of UTF-8 filenames. All filenames must be freed with free(). - * The table itself must be freed with free() as well. - * - * @return How many file names were selected (possibly 0), - * or -1 in case of error. - */ -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, - bool deref ) -{ -#ifdef UNDER_CE - /*_stat translates to wchar internally on WinCE*/ - return _stat( filename, buf ); -#elif defined (WIN32) - /* 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; -} - -/** - * Finds file/inode informations, as stat(). - * Consider usign fstat() instead, if possible. - * - * @param filename UTF-8 file path - */ -int utf8_stat( const char *filename, struct stat *buf) -{ - return utf8_statEx( filename, buf, true ); -} - -/** - * Finds file/inode informations, as lstat(). - * Consider usign fstat() instead, if possible. - * - * @param filename UTF-8 file path - */ -int utf8_lstat( const char *filename, struct stat *buf) -{ - return utf8_statEx( filename, buf, false ); -} - -/** - * Removes a file. - * - * @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 ) -{ -#ifdef UNDER_CE - /*_open translates to wchar internally on WinCE*/ - return _unlink( filename ); -#elif defined (WIN32) - /* 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; -} - - - /** * Formats an UTF-8 string as vasprintf(), then print it to stdout, with * appropriate conversion to local encoding. @@ -725,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++) @@ -756,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; @@ -805,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; +} +