Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / intl / bindtextdom.c

diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 54ce061e24ec59f02212865b76fd85c6981d9363..dcdc40085da9e9f6b189d512425bafc114219b1c 100644 (file)
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,6 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -14,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
@@ -25,21 +24,29 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
 # include "libgnuintl.h"
 #endif
+#include "gettextP.h"
 
-/* Handle multi-threaded applications.  */
 #ifdef _LIBC
+/* We have to handle multi-threaded applications.  */
 # include <bits/libc-lock.h>
-# define gl_rwlock_define __libc_rwlock_define
-# define gl_rwlock_wrlock __libc_rwlock_wrlock
-# define gl_rwlock_unlock __libc_rwlock_unlock
 #else
-# include "lock.h"
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+   names than the internal variables in GNU libc, otherwise programs
+   using libintl.a cannot be linked statically.  */
+#if !defined _LIBC
+# define _nl_default_dirname libintl_nl_default_dirname
+# define _nl_domain_bindings libintl_nl_domain_bindings
 #endif
 
 /* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
@@ -49,8 +56,19 @@
 
 /* @@ end of prolog @@ */
 
+/* Contains the default location of the message catalogs.  */
+extern const char _nl_default_dirname[];
+#ifdef _LIBC
+extern const char _nl_default_dirname_internal[] attribute_hidden;
+#else
+# define INTUSE(name) name
+#endif
+
+/* List with bindings of specific domains.  */
+extern struct binding *_nl_domain_bindings;
+
 /* Lock variable to protect the global data in the gettext implementation.  */
-gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -91,7 +109,7 @@ set_binding_values (const char *domainname,
       return;
     }
 
-  gl_rwlock_wrlock (_nl_state_lock);
+  __libc_rwlock_wrlock (_nl_state_lock);
 
   modified = 0;
 
@@ -126,8 +144,8 @@ set_binding_values (const char *domainname,
              char *result = binding->dirname;
              if (strcmp (dirname, result) != 0)
                {
-                 if (strcmp (dirname, _nl_default_dirname) == 0)
-                   result = (char *) _nl_default_dirname;
+                 if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+                   result = (char *) INTUSE(_nl_default_dirname);
                  else
                    {
 #if defined _LIBC || defined HAVE_STRDUP
@@ -142,7 +160,7 @@ set_binding_values (const char *domainname,
 
                  if (__builtin_expect (result != NULL, 1))
                    {
-                     if (binding->dirname != _nl_default_dirname)
+                     if (binding->dirname != INTUSE(_nl_default_dirname))
                        free (binding->dirname);
 
                      binding->dirname = result;
@@ -179,9 +197,11 @@ set_binding_values (const char *domainname,
 
                  if (__builtin_expect (result != NULL, 1))
                    {
-                     free (binding->codeset);
+                     if (binding->codeset != NULL)
+                       free (binding->codeset);
 
                      binding->codeset = result;
+                     binding->codeset_cntr++;
                      modified = 1;
                    }
                }
@@ -194,7 +214,7 @@ set_binding_values (const char *domainname,
     {
       /* Simply return the default values.  */
       if (dirnamep)
-       *dirnamep = _nl_default_dirname;
+       *dirnamep = INTUSE(_nl_default_dirname);
       if (codesetp)
        *codesetp = NULL;
     }
@@ -216,11 +236,11 @@ set_binding_values (const char *domainname,
 
          if (dirname == NULL)
            /* The default value.  */
-           dirname = _nl_default_dirname;
+           dirname = INTUSE(_nl_default_dirname);
          else
            {
-             if (strcmp (dirname, _nl_default_dirname) == 0)
-               dirname = _nl_default_dirname;
+             if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+               dirname = INTUSE(_nl_default_dirname);
              else
                {
                  char *result;
@@ -243,7 +263,9 @@ set_binding_values (const char *domainname,
        }
       else
        /* The default value.  */
-       new_binding->dirname = (char *) _nl_default_dirname;
+       new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
+
+      new_binding->codeset_cntr = 0;
 
       if (codesetp)
        {
@@ -265,6 +287,7 @@ set_binding_values (const char *domainname,
              memcpy (result, codeset, len);
 #endif
              codeset = result;
+             new_binding->codeset_cntr++;
            }
          *codesetp = codeset;
          new_binding->codeset = (char *) codeset;
@@ -296,7 +319,7 @@ set_binding_values (const char *domainname,
       if (0)
        {
        failed_codeset:
-         if (new_binding->dirname != _nl_default_dirname)
+         if (new_binding->dirname != INTUSE(_nl_default_dirname))
            free (new_binding->dirname);
        failed_dirname:
          free (new_binding);
@@ -312,7 +335,7 @@ set_binding_values (const char *domainname,
   if (modified)
     ++_nl_msg_cat_cntr;
 
-  gl_rwlock_unlock (_nl_state_lock);
+  __libc_rwlock_unlock (_nl_state_lock);
 }
 
 /* Specify that the DOMAINNAME message catalog will be found