X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_charset.h;h=8674aeed8e2b446657f5f7345f43b13f7990e9b9;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=e9791719a25e69ba21ebddbf9d430820db50014a;hpb=f556b69004ce0978944d0f1ce024f04b9130b53a;p=vlc

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index e9791719a2..8674aeed8e 100644
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -2,7 +2,7 @@
  * charset.h: Unicode UTF-8 wrappers function
  *****************************************************************************
  * Copyright (C) 2003-2005 the VideoLAN team
- * Copyright © 2005-2006 Rémi Denis-Courmont
+ * Copyright © 2005-2010 Rémi Denis-Courmont
  * $Id$
  *
  * Author: Rémi Denis-Courmont <rem # videolan,org>
@@ -22,45 +22,30 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
+#ifndef VLC_CHARSET_H
+#define VLC_CHARSET_H 1
 
-#ifndef __VLC_CHARSET_H
-#define __VLC_CHARSET_H 1
+/**
+ * \file
+ * This files handles locale conversions in vlc
+ */
 
 #include <stdarg.h>
-#include <sys/types.h>
-#include <dirent.h>
 
 VLC_EXPORT( void, LocaleFree, ( const char * ) );
-VLC_EXPORT( char *, FromLocale, ( const char * ) );
-VLC_EXPORT( char *, FromLocaleDup, ( const char * ) );
-VLC_EXPORT( char *, ToLocale, ( const char * ) );
-
-/* TODO: move all of this to "vlc_fs.h" or something like that */
-VLC_EXPORT( int, utf8_open, ( const char *filename, int flags, mode_t mode ) );
-VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) );
-VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) );
-VLC_EXPORT( char *, utf8_readdir, ( DIR *dir ) );
-VLC_EXPORT( int, utf8_loaddir, ( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
-VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
-
-#ifdef WIN32
-# define stat _stati64
-#endif
-
-VLC_EXPORT( int, utf8_stat, ( const char *filename, struct stat *buf ) );
-VLC_EXPORT( int, utf8_lstat, ( const char *filename, struct stat *buf ) );
-VLC_EXPORT( int, utf8_mkdir, ( const char *filename ) );
+VLC_EXPORT( char *, FromLocale, ( const char * ) LIBVLC_USED );
+VLC_EXPORT( char *, FromLocaleDup, ( const char * ) LIBVLC_USED );
+VLC_EXPORT( char *, ToLocale, ( const char * ) LIBVLC_USED );
+VLC_EXPORT( char *, ToLocaleDup, ( const char * ) LIBVLC_USED );
 
 VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
-VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) );
+VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) );
 
 VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
-VLC_EXPORT( const char *, IsUTF8, ( const char * ) );
+VLC_EXPORT( const char *, IsUTF8, ( const char * ) LIBVLC_USED );
 
 #ifdef WIN32
+LIBVLC_USED
 static inline char *FromWide (const wchar_t *wide)
 {
     size_t len = WideCharToMultiByte (CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL);
@@ -69,19 +54,58 @@ static inline char *FromWide (const wchar_t *wide)
 
     char *out = (char *)malloc (len);
 
-    WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
+    if (likely(out))
+        WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
+    return out;
+}
+
+LIBVLC_USED
+static inline wchar_t *ToWide (const char *utf8)
+{
+    int len = MultiByteToWideChar (CP_UTF8, 0, utf8, -1, NULL, 0);
+    if (len == 0)
+        return NULL;
+
+    wchar_t *out = (wchar_t *)malloc (len * sizeof (wchar_t));
+
+    if (likely(out))
+        MultiByteToWideChar (CP_UTF8, 0, utf8, -1, out, len);
     return out;
 }
 #endif
 
-VLC_INTERNAL( char *, vlc_fix_readdir, ( const char * ) );
-VLC_INTERNAL( vlc_bool_t, vlc_current_charset, ( char ** ) );
+/**
+ * Converts a nul-terminated string from ISO-8859-1 to UTF-8.
+ */
+static inline char *FromLatin1 (const char *latin)
+{
+    char *str = (char *)malloc (2 * strlen (latin) + 1), *utf8 = str;
+    unsigned char c;
+
+    if (str == NULL)
+        return NULL;
+
+    while ((c = *(latin++)) != '\0')
+    {
+         if (c >= 0x80)
+         {
+             *(utf8++) = 0xC0 | (c >> 6);
+             *(utf8++) = 0x80 | (c & 0x3F);
+         }
+         else
+             *(utf8++) = c;
+    }
+    *(utf8++) = '\0';
+
+    utf8 = (char *)realloc (str, utf8 - str);
+    return utf8 ? utf8 : str;
+}
 
-VLC_EXPORT( const char *, GetFallbackEncoding, ( void ) );
+VLC_EXPORT( char *, FromCharset, ( const char *charset, const void *data, size_t data_size ) LIBVLC_USED );
 
-VLC_INTERNAL( double, i18n_strtod, ( const char *, char ** ) );
-VLC_INTERNAL( double, i18n_atof, ( const char * ) );
-VLC_EXPORT( double, us_strtod, ( const char *, char ** ) );
-VLC_EXPORT( double, us_atof, ( const char * ) );
+VLC_EXPORT( double, us_strtod, ( const char *, char ** ) LIBVLC_USED );
+VLC_EXPORT( float, us_strtof, ( const char *, char ** ) LIBVLC_USED );
+VLC_EXPORT( double, us_atof, ( const char * ) LIBVLC_USED );
+VLC_EXPORT( int, us_asprintf, ( char **, const char *, ... ) LIBVLC_USED );
 
 #endif