* Copyright (C) 2001-2003 The Mape Project
* Written by Karel Zak <zakkr@zf.jcu.cz>.
*
+ * which itself is an adaptation of locale_charset():
+ *
+ * Copyright (C) 2000-2002 Free Software Foundation, Inc.
+ * Written by Bruno Haible <bruno@clisp.org>.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#if !defined WIN32
# ifdef HAVE_LANGINFO_CODESET
#ifdef __APPLE__
# include <errno.h>
# include <string.h>
+# include <xlocale.h>
#endif
+#include "libvlc.h"
#include <vlc_charset.h>
typedef struct VLCCharsetAlias
}
#endif
-vlc_bool_t vlc_current_charset( char **psz_charset )
+bool vlc_current_charset( char **psz_charset )
{
const char *psz_codeset;
#if !(defined WIN32 || defined OS2 || defined __APPLE__)
-# if HAVE_LANGINFO_CODESET
+# ifdef HAVE_LANGINFO_CODESET
/* Most systems support nl_langinfo( CODESET ) nowadays. */
psz_codeset = nl_langinfo( CODESET );
if( !strcmp( psz_codeset, "ANSI_X3.4-1968" ) )
* (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
* use setlocale here; it would return "C" when it doesn't support the
* locale name the user has set. Darwin's setlocale is broken. */
-# if HAVE_SETLOCALE && !__APPLE__
+# if defined (HAVE_SETLOCALE) && !defined (__APPLE__)
psz_locale = setlocale( LC_ALL, NULL );
# endif
if( psz_locale == NULL || psz_locale[0] == '\0' )
*psz_charset = strdup(psz_codeset);
if( !strcasecmp(psz_codeset, "UTF8") || !strcasecmp(psz_codeset, "UTF-8") )
- return VLC_TRUE;
+ return true;
- return VLC_FALSE;
+ return false;
}
/**
- * There are two decimal separators in the computer world-wide locales:
- * dot (which is the american default), and comma (which is used in France,
- * the country with the most VLC developers, among others).
- *
- * i18n_strtod() has the same prototype as ANSI C strtod() but it accepts
- * either decimal separator when deserializing the string to a float number,
- * independant of the local computer setting.
+ * us_strtod() has the same prototype as ANSI C strtod() but it uses the
+ * POSIX/C decimal format, regardless of the current numeric locale.
*/
-double i18n_strtod( const char *str, char **end )
+double us_strtod( const char *str, char **end )
{
- char *end_buf, e;
- double d;
-
- if( end == NULL )
- end = &end_buf;
- d = strtod( str, end );
+ locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
+ locale_t oldloc = uselocale (loc);
+ double res = strtod (str, end);
- e = **end;
- if(( e == ',' ) || ( e == '.' ))
+ if (loc != (locale_t)0)
{
- char dup[strlen( str ) + 1];
- strcpy( dup, str );
-
- if( dup == NULL )
- return d;
-
- dup[*end - str] = ( e == ',' ) ? '.' : ',';
- d = strtod( dup, end );
+ uselocale (oldloc);
+ freelocale (loc);
}
- return d;
-}
-
-/**
- * i18n_atof() has the same prototype as ANSI C atof() but it accepts
- * either decimal separator when deserializing the string to a float number,
- * independant of the local computer setting.
- */
-double i18n_atof( const char *str )
-{
- return i18n_strtod( str, NULL );
-}
-
-
-/**
- * us_strtod() has the same prototype as ANSI C strtod() but it expects
- * a dot as decimal separator regardless of the system locale.
- */
-double us_strtod( const char *str, char **end )
-{
- char dup[strlen( str ) + 1], *ptr;
- double d;
- strcpy( dup, str );
-
- ptr = strchr( dup, ',' );
- if( ptr != NULL )
- *ptr = '\0';
-
- d = strtod( dup, &ptr );
- if( end != NULL )
- *end = (char *)&str[ptr - dup];
-
- return d;
+ return res;
}
/**