X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fhard-locale.c;h=25e66bce3a27a4a23ca82a497302a9eee8a9ad56;hb=ade4fb6ef4588f370c1bdbdb90665501140a608d;hp=0070542e09fac2893b0ed5f2f9ac26f3e5b67861;hpb=9e38fe502809e8eb64141d9e9f1b2542ba681600;p=gnulib.git

diff --git a/lib/hard-locale.c b/lib/hard-locale.c
index 0070542e0..25e66bce3 100644
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -1,11 +1,12 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
-   Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+   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
+   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
@@ -13,67 +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 <http://www.gnu.org/licenses/>.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include "hard-locale.h"
 
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
 
-#if HAVE_STRING_H
-# include <string.h>
+#ifdef __GLIBC__
+# define GLIBC_VERSION __GLIBC__
+#else
+# define GLIBC_VERSION 0
 #endif
 
-#include "hard-locale.h"
-
-/* 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 ! 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__ && 2 <= __GLIBC__
-      if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
-	hard = 0;
-# else
-      char *locale = malloc (strlen (p) + 1);
-      if (locale)
+      if (2 <= GLIBC_VERSION)
 	{
-	  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;
-
-	  /* Restore the caller's locale.  */
-	  setlocale (category, locale);
-	  free (locale);
+	  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);
+	      free (locale);
+	    }
 	}
-# endif
     }
 
   return hard;
-
-#endif
 }