X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fhard-locale.c;h=25e66bce3a27a4a23ca82a497302a9eee8a9ad56;hb=bd606be378ddd8404641cad023dd43f1f676b26e;hp=1c75b390a68472bc7ccfd94d150dc393aeb2f7c0;hpb=89f2b4892655a929a506eff123c9126a88e2c8eb;p=gnulib.git
diff --git a/lib/hard-locale.c b/lib/hard-locale.c
index 1c75b390a..25e66bce3 100644
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -1,10 +1,12 @@
/* hard-locale.c -- Determine whether a locale is hard.
- Copyright 1997, 1998, 1999 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, 2006, 2007 Free
+ Software Foundation, Inc.
+
+ 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, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,74 +14,57 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-# include
-# else
-# ifdef _AIX
- # pragma alloca
-# else
-# ifdef _WIN32
-# include
-# include
-# else
-# ifndef alloca
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
+#include "hard-locale.h"
-#if HAVE_LOCALE_H
-# include
-#endif
+#include
+#include
+#include
-#if HAVE_STRING_H
-# include
+#ifdef __GLIBC__
+# define GLIBC_VERSION __GLIBC__
+#else
+# define GLIBC_VERSION 0
#endif
-/* Return nonzero if the current CATEGORY locale is hard, i.e. if you
+/* Return true if the current CATEGORY locale is hard, i.e. if you
can't get away with assuming traditional C or POSIX behavior. */
-int
+bool
hard_locale (int category)
{
-#if ! (defined ENABLE_NLS && HAVE_SETLOCALE)
- return 0;
-#else
-
- int hard = 1;
- char const *p = setlocale (category, 0);
+ bool hard = true;
+ char const *p = setlocale (category, NULL);
if (p)
{
-# if defined __GLIBC__ && __GLIBC__ >= 2
- if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
- hard = 0;
-# else
- char *locale = alloca (strlen (p) + 1);
- strcpy (locale, p);
-
- /* Temporarily set the locale to the "C" and "POSIX" locales to
- find their names, so that we can determine whether one or the
- other is the caller's locale. */
- if (((p = setlocale (category, "C")) && strcmp (p, locale) == 0)
- || ((p = setlocale (category, "POSIX")) && strcmp (p, locale) == 0))
- hard = 0;
+ if (2 <= GLIBC_VERSION)
+ {
+ if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+ hard = false;
+ }
+ else
+ {
+ char *locale = strdup (p);
+ if (locale)
+ {
+ /* Temporarily set the locale to the "C" and "POSIX" locales
+ to find their names, so that we can determine whether one
+ or the other is the caller's locale. */
+ if (((p = setlocale (category, "C"))
+ && strcmp (p, locale) == 0)
+ || ((p = setlocale (category, "POSIX"))
+ && strcmp (p, locale) == 0))
+ hard = false;
- /* Restore the caller's locale. */
- setlocale (category, locale);
-# endif
+ /* Restore the caller's locale. */
+ setlocale (category, locale);
+ free (locale);
+ }
+ }
}
return hard;
-
-#endif
}