bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

new module 'nl_langinfo'


From: Bruno Haible
Subject: new module 'nl_langinfo'
Date: Fri, 11 Dec 2009 20:12:09 +0100
User-agent: KMail/1.9.9

Here comes a substitute for the nl_langinfo() function. At the moment, it
returns non-localized (English) strings. Proper localization can be added
at a later time, together with cross-platform support for locale_t. For now,
the purpose is only to be able to use this function in the 'localename' module.


2009-12-11  Bruno Haible  <address@hidden>

        New module 'nl_langinfo'.
        * lib/nl_langinfo.c: New file.
        * m4/nl_langinfo.m4: New file.
        * modules/nl_langinfo: New file.
        * doc/posix-functions/nl_langinfo.texi: Mention the new module.

============================== lib/nl_langinfo.c ==============================
/* nl_langinfo() replacement: query locale dependent information.

   Copyright (C) 2007-2009 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 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
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   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, see <http://www.gnu.org/licenses/>.  */

#include <config.h>

/* Specification.  */
#include <langinfo.h>

#if REPLACE_NL_LANGINFO

/* Override nl_langinfo with support for added nl_item values.  */

# include <locale.h>
# include <string.h>

# undef nl_langinfo

char *
rpl_nl_langinfo (nl_item item)
{
  switch (item)
    {
# if GNULIB_defined_CODESET
    case CODESET:
      {
        const char *locale;
        static char buf[2 + 10 + 1];

        locale = setlocale (LC_CTYPE, NULL);
        if (locale != NULL && locale[0] != '\0')
          {
            /* If the locale name contains an encoding after the dot, return
               it.  */
            const char *dot = strchr (locale, '.');

            if (dot != NULL)
              {
                const char *modifier;

                dot++;
                /* Look for the possible @... trailer and remove it, if any.  */
                modifier = strchr (dot, '@');
                if (modifier == NULL)
                  return dot;
                if (modifier - dot < sizeof (buf))
                  {
                    memcpy (buf, dot, modifier - dot);
                    buf [modifier - dot] = '\0';
                    return buf;
                  }
              }
          }
        return "";
      }
# endif
# if GNULIB_defined_ERA
    case ERA:
      /* The format is not standardized.  In glibc it is a sequence of strings
         of the form "direction:offset:start_date:end_date:era_name:era_format"
         with an empty string at the end.  */
      return "";
    case ERA_D_FMT:
      /* The %Ex conversion in strftime behaves like %x if the locale does not
         have an alternative time format.  */
      item = D_FMT;
      break;
    case ERA_D_T_FMT:
      /* The %Ec conversion in strftime behaves like %c if the locale does not
         have an alternative time format.  */
      item = D_T_FMT;
      break;
    case ERA_T_FMT:
      /* The %EX conversion in strftime behaves like %X if the locale does not
         have an alternative time format.  */
      item = T_FMT;
      break;
    case ALT_DIGITS:
      /* The format is not standardized.  In glibc it is a sequence of 10
         strings, appended in memory.  */
      return "\0\0\0\0\0\0\0\0\0\0";
# endif
    default:
      break;
    }
  return nl_langinfo (item);
}

#else

/* Provide nl_langinfo from scratch.  */

# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__

/* Native Windows platforms.  */

#  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
#  include <windows.h>

#  include <stdio.h>

# else

/* An old Unix platform without locales, such as Linux libc5 or BeOS.  */

# endif

# include <locale.h>

char *
nl_langinfo (nl_item item)
{
  switch (item)
    {
    /* nl_langinfo items of the LC_CTYPE category */
    case CODESET:
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
      {
        static char buf[2 + 10 + 1];

        /* Woe32 has a function returning the locale's codepage as a number.  */
        sprintf (buf, "CP%u", GetACP ());
        return buf;
      }
# elif defined __BEOS__
      return "UTF-8";
# else
      return "ISO-8859-1";
# endif
    /* nl_langinfo items of the LC_NUMERIC category */
    case RADIXCHAR:
      return localeconv () ->decimal_point;
    case THOUSEP:
      return localeconv () ->thousands_sep;
    /* nl_langinfo items of the LC_TIME category.
       TODO: Really use the locale.  */
    case D_T_FMT:
    case ERA_D_T_FMT:
      return "%a %b %e %H:%M:%S %Y";
    case D_FMT:
    case ERA_D_FMT:
      return "%m/%d/%y";
    case T_FMT:
    case ERA_T_FMT:
      return "%H:%M:%S";
    case T_FMT_AMPM:
      return "%I:%M:%S %p";
    case AM_STR:
      return "AM";
    case PM_STR:
      return "PM";
    case DAY_1:
      return "Sunday";
    case DAY_2:
      return "Monday";
    case DAY_3:
      return "Tuesday";
    case DAY_4:
      return "Wednesday";
    case DAY_5:
      return "Thursday";
    case DAY_6:
      return "Friday";
    case DAY_7:
      return "Saturday";
    case ABDAY_1:
      return "Sun";
    case ABDAY_2:
      return "Mon";
    case ABDAY_3:
      return "Tue";
    case ABDAY_4:
      return "Wed";
    case ABDAY_5:
      return "Thu";
    case ABDAY_6:
      return "Fri";
    case ABDAY_7:
      return "Sat";
    case MON_1:
      return "January";
    case MON_2:
      return "February";
    case MON_3:
      return "March";
    case MON_4:
      return "April";
    case MON_5:
      return "May";
    case MON_6:
      return "June";
    case MON_7:
      return "July";
    case MON_8:
      return "August";
    case MON_9:
      return "September";
    case MON_10:
      return "October";
    case MON_11:
      return "November";
    case MON_12:
      return "December";
    case ABMON_1:
      return "Jan";
    case ABMON_2:
      return "Feb";
    case ABMON_3:
      return "Mar";
    case ABMON_4:
      return "Apr";
    case ABMON_5:
      return "May";
    case ABMON_6:
      return "Jun";
    case ABMON_7:
      return "Jul";
    case ABMON_8:
      return "Aug";
    case ABMON_9:
      return "Sep";
    case ABMON_10:
      return "Oct";
    case ABMON_11:
      return "Nov";
    case ABMON_12:
      return "Dec";
    case ERA:
      return "";
    case ALT_DIGITS:
      return "\0\0\0\0\0\0\0\0\0\0";
    /* nl_langinfo items of the LC_MONETARY category
       TODO: Really use the locale. */
    case CRNCYSTR:
      return "-";
    /* nl_langinfo items of the LC_MESSAGES category
       TODO: Really use the locale. */
    case YESEXPR:
      return "^[yY]";
    case NOEXPR:
      return "^[nN]";
    default:
      return "";
    }
}

#endif
============================== m4/nl_langinfo.m4 ==============================
# nl_langinfo.m4 serial 1
dnl Copyright (C) 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

AC_DEFUN([gl_FUNC_NL_LANGINFO],
[
  AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
  AC_REQUIRE([gl_LANGINFO_H])
  if test $HAVE_LANGINFO_H = 1; then
    AC_CHECK_FUNCS_ONCE([nl_langinfo])
  else
    ac_cv_func_nl_langinfo=no
  fi
  if test $ac_cv_func_nl_langinfo = yes; then
    if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1; then
      :
    else
      REPLACE_NL_LANGINFO=1
      AC_DEFINE([REPLACE_NL_LANGINFO], [1],
        [Define if nl_langinfo exists but is overridden by gnulib.])
      AC_LIBOBJ([nl_langinfo])
    fi
  else
    HAVE_NL_LANGINFO=0
    AC_LIBOBJ([nl_langinfo])
  fi
])
============================= modules/nl_langinfo =============================
Description:
nl_langinfo() function: query locale dependent information.

Files:
lib/nl_langinfo.c
m4/nl_langinfo.m4

Depends-on:
langinfo

configure.ac:
gl_FUNC_NL_LANGINFO
gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])

Makefile.am:

Include:
<langinfo.h>

License:
LGPL

Maintainer:
Bruno Haible
===============================================================================
--- doc/posix-functions/nl_langinfo.texi.orig   2009-12-11 20:02:36.000000000 
+0100
+++ doc/posix-functions/nl_langinfo.texi        2009-12-11 18:00:36.000000000 
+0100
@@ -4,20 +4,24 @@
 
 POSIX specification: 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/nl_langinfo.html}
 
-Gnulib module: ---
+Gnulib module: nl_langinfo
 
 Portability problems fixed by Gnulib:
 @itemize
address@hidden itemize
-
-Portability problems not fixed by Gnulib:
address@hidden
 @item
 This function is missing on some platforms:
 mingw, BeOS.
 @item
-Some older versions of glibc had @code{nl_langinfo} but not the @code{CODESET}
-macro.
+The constant @code{CODESET} is not supported on some platforms:
+glibc 2.0.6, OpenBSD 3.8.
address@hidden
+The constants @code{ERA}, @code{ERA_D_FMT}, @code{ERA_D_T_FMT},
address@hidden, @code{ALT_DIGITS} are not supported on some platforms:
+OpenBSD 3.8.
address@hidden itemize
+
+Portability problems not fixed by Gnulib:
address@hidden
 @item
 On Cygwin 1.5.x, which doesn't have locales, @code{nl_langinfo(CODESET)} always
 returns @code{"US-ASCII"}.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]