luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-04 01:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add function to get the codeset name for the current locale.

Browse Source 
Mon May 29 14:10:35 2000  Owen Taylor  <otaylor@redhat.com>

	* gutils.c (g_locale_get_codeset): Add function to get the
	codeset name for the current locale.

	* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
This commit is contained in:
Owen Taylor
2000-05-29 18:48:29 +00:00
committed by Owen Taylor
parent 1fe02b28ad
commit 466305d0ca
14 changed files with 106 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the
codeset name for the current locale.
* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>

7
ChangeLog.pre-2-0
View File

@@ -1,3 +1,10 @@
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the
codeset name for the current locale.
* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>

7
ChangeLog.pre-2-10
View File

@@ -1,3 +1,10 @@
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the
codeset name for the current locale.
* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>

7
ChangeLog.pre-2-12
View File

@@ -1,3 +1,10 @@
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the
codeset name for the current locale.
* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>

7
ChangeLog.pre-2-2
View File

@@ -1,3 +1,10 @@
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the
codeset name for the current locale.
* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>

7
ChangeLog.pre-2-4
View File

@@ -1,3 +1,10 @@
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the
codeset name for the current locale.
* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>

7
ChangeLog.pre-2-6
View File

@@ -1,3 +1,10 @@
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the
codeset name for the current locale.
* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>

7
ChangeLog.pre-2-8
View File

@@ -1,3 +1,10 @@
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the
codeset name for the current locale.
* configure.in acconfig.h: Add check for nl_langinfo(CODESET);
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>

1
acconfig.h
View File

@@ -54,6 +54,7 @@
#undef GLIB_BYTE_CONTENTS_GRECMUTEX
#undef HAVE_BROKEN_WCTYPE
#undef HAVE_CODESET
#undef HAVE_DOPRNT
#undef HAVE_FLOAT_H
#undef HAVE_GETPWUID_R

11
configure.in
View File

@@ -449,6 +449,17 @@ AC_CACHE_VAL(glib_cv_sane_realloc,[
])
AC_MSG_RESULT($glib_cv_sane_realloc)
dnl Check for nl_langinfo and CODESET
AC_MSG_CHECKING([for nl_langinfo (CODESET)])
AC_TRY_COMPILE([#include <langinfo.h>],
[char *codeset = nl_langinfo (CODESET);],
AC_DEFINE(HAVE_CODESET)
have_codeset=yes,
have_codeset=no)
AC_MSG_RESULT($have_codeset)
dnl **********************
dnl *** va_copy checks ***

2
glib.h
View File

@@ -1712,6 +1712,8 @@ gchar* g_get_current_dir (void);
* must not be freed. */
gchar* g_getenv (const gchar *variable);
gchar * g_locale_get_codeset (void);
/* we use a GLib function as a replacement for ATEXIT, so
* the programmer is not required to check the return value
* (if there is any in the implementation) and doesn't encounter

2
glib/glib.h
View File

@@ -1712,6 +1712,8 @@ gchar* g_get_current_dir (void);
* must not be freed. */
gchar* g_getenv (const gchar *variable);
gchar * g_locale_get_codeset (void);
/* we use a GLib function as a replacement for ATEXIT, so
* the programmer is not required to check the return value
* (if there is any in the implementation) and doesn't encounter

17
glib/gutils.c
View File

@@ -72,6 +72,10 @@
# include <io.h>
#endif /* G_OS_WIN32 */
#ifdef HAVE_CODESET
#include <langinfo.h>
#endif
const guint glib_major_version = GLIB_MAJOR_VERSION;
const guint glib_minor_version = GLIB_MINOR_VERSION;
const guint glib_micro_version = GLIB_MICRO_VERSION;
@@ -756,3 +760,16 @@ g_int_hash (gconstpointer v)
{
return *(const gint*) v;
}
gchar *
g_locale_get_codeset (void)
{
#ifdef HAVE_CODESET
char *result = nl_langinfo (CODESET);
return g_strdup (result);
#else
/* FIXME: Do something more intelligent based on setlocale (LC_CTYPE, NULL)
*/
return g_strdup ("ISO-8859-1");
#endif
}

17
gutils.c
View File

@@ -72,6 +72,10 @@
# include <io.h>
#endif /* G_OS_WIN32 */
#ifdef HAVE_CODESET
#include <langinfo.h>
#endif
const guint glib_major_version = GLIB_MAJOR_VERSION;
const guint glib_minor_version = GLIB_MINOR_VERSION;
const guint glib_micro_version = GLIB_MICRO_VERSION;
@@ -756,3 +760,16 @@ g_int_hash (gconstpointer v)
{
return *(const gint*) v;
}
gchar *
g_locale_get_codeset (void)
{
#ifdef HAVE_CODESET
char *result = nl_langinfo (CODESET);
return g_strdup (result);
#else
/* FIXME: Do something more intelligent based on setlocale (LC_CTYPE, NULL)
*/
return g_strdup ("ISO-8859-1");
#endif
}