Replace __gconv_alias_db, __gconv_modules_db, and __gconv_cache with
[kopensolaris-gnu/glibc.git] / iconv / gconv_open.c
index 2374703..94a54f8 100644 (file)
@@ -1,24 +1,26 @@
 /* Find matching transformation algorithms and initialize steps.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library 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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <errno.h>
+#include <locale.h>
+#include "../locale/localeinfo.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -64,7 +66,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
          tok = __strtok_r (tok, ",", &ptr);
          while (tok != NULL)
            {
-             if (__strcasecmp (tok, "TRANSLIT") == 0)
+             if (__strcasecmp_l (tok, "TRANSLIT", &_nl_C_locobj) == 0)
                {
                  /* It's the builtin transliteration handling.  We only
                     support it for working on the internal encoding.  */
@@ -97,9 +99,9 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
                        lastp->next = newp;
                    }
                }
-             else if (__strcasecmp (tok, "IGNORE") == 0)
+             else if (__strcasecmp_l (tok, "IGNORE", &_nl_C_locobj) == 0)
                /* Set the flag to ignore all errors.  */
-               flags = __GCONV_IGNORE_ERRORS;
+               conv_flags |= __GCONV_IGNORE_ERRORS;
              else
                {
                  /* `tok' is possibly a module name.  We'll see later
@@ -110,7 +112,8 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 
                  for (runp = trans; runp != NULL; runp = runp->next)
                    if (runp->name != NULL
-                       && __strcasecmp (tok, runp->name) == 0)
+                       && __strcasecmp_l (tok, runp->name,
+                                          &_nl_C_locobj) == 0)
                      break;
                    else
                      lastp = runp;
@@ -147,6 +150,25 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
       fromset = memcpy (newfromset, fromset, ignore - fromset);
     }
 
+  /* If the string is empty define this to mean the charset of the
+     currently selected locale.  */
+  if (strcmp (toset, "//") == 0)
+    {
+      const char *codeset = _NL_CURRENT (LC_CTYPE, CODESET);
+      size_t len = strlen (codeset);
+      char *dest;
+      toset = dest = (char *) alloca (len + 3);
+      memcpy (__mempcpy (dest, codeset, len), "//", 3);
+    }
+  if (strcmp (fromset, "//") == 0)
+    {
+      const char *codeset = _NL_CURRENT (LC_CTYPE, CODESET);
+      size_t len = strlen (codeset);
+      char *dest;
+      fromset = dest = (char *) alloca (len + 3);
+      memcpy (__mempcpy (dest, codeset, len), "//", 3);
+    }
+
   res = __gconv_find_transform (toset, fromset, &steps, &nsteps, flags);
   if (res == __GCONV_OK)
     {
@@ -184,16 +206,12 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 
          /* Call all initialization functions for the transformation
             step implementations.  */
-         for (cnt = 0; cnt < nsteps - 1; ++cnt)
+         for (cnt = 0; cnt < nsteps; ++cnt)
            {
              size_t size;
 
              /* Would have to be done if we would not clear the whole
                  array above.  */
-             /* If this is the last step we must not allocate an
-                output buffer.  */
-             result->__data[cnt].__flags = conv_flags;
-
 #if 0
              /* Reset the counter.  */
              result->__data[cnt].__invocation_counter = 0;
@@ -205,107 +223,75 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
              /* We use the `mbstate_t' member in DATA.  */
              result->__data[cnt].__statep = &result->__data[cnt].__state;
 
-             /* Allocate the buffer.  */
-             size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to);
-
-             result->__data[cnt].__outbuf = (char *) malloc (size);
-             if (result->__data[cnt].__outbuf == NULL)
-               goto bail;
-
-             result->__data[cnt].__outbufend =
-               result->__data[cnt].__outbuf + size;
-
              /* Now see whether we can use any of the transliteration
                 modules for this step.  */
              for (runp = trans; runp != NULL; runp = runp->next)
                for (n = 0; n < runp->ncsnames; ++n)
-                 if (__strcasecmp (steps[cnt].__from_name,
-                                   runp->csnames[n]) == 0)
+                 if (__strcasecmp_l (steps[cnt].__from_name,
+                                     runp->csnames[n], &_nl_C_locobj) == 0)
                    {
                      void *data = NULL;
 
                      /* Match!  Now try the initializer.  */
                      if (runp->trans_init_fct == NULL
-                         || (runp->trans_init_fct (data, steps[cnt].__to_name)
+                         || (runp->trans_init_fct (&data,
+                                                   steps[cnt].__to_name)
                              == __GCONV_OK))
                        {
                          /* Append at the end of the list.  */
                          struct __gconv_trans_data *newp;
-                         struct __gconv_trans_data *endp;
-                         struct __gconv_trans_data *lastp;
+                         struct __gconv_trans_data **lastp;
 
                          newp = (struct __gconv_trans_data *)
                            malloc (sizeof (struct __gconv_trans_data));
                          if (newp == NULL)
-                           goto bail;
+                           {
+                             res = __GCONV_NOMEM;
+                             goto bail;
+                           }
 
                          newp->__trans_fct = runp->trans_fct;
                          newp->__trans_context_fct = runp->trans_context_fct;
                          newp->__trans_end_fct = runp->trans_end_fct;
+                         newp->__data = data;
+                         newp->__next = NULL;
 
-                         lastp = NULL;
-                         for (endp = result->__data[cnt].__trans;
-                              endp != NULL; endp = endp->__next)
-                           lastp = endp;
+                         lastp = &result->__data[cnt].__trans;
+                         while (*lastp != NULL)
+                           lastp = &(*lastp)->__next;
 
-                         if (lastp == NULL)
-                           result->__data[cnt].__trans = newp;
-                         else
-                           lastp->__next = newp;
+                         *lastp = newp;
                        }
                      break;
                    }
-           }
-
-         /* Now handle the last entry.  */
-         result->__data[cnt].__flags = conv_flags | __GCONV_IS_LAST;
-         /* Would have to be done if we would not clear the whole
-            array above.  */
-#if 0
-         result->__data[cnt].__invocation_counter = 0;
-         result->__data[cnt].__internal_use = 0;
-#endif
-         result->__data[cnt].__statep = &result->__data[cnt].__state;
 
-         /* Now see whether we can use the transliteration module
-            for this step.  */
-         for (runp = trans; runp != NULL; runp = runp->next)
-           for (n = 0; n < runp->ncsnames; ++n)
-             if (__strcasecmp (steps[cnt].__from_name, runp->csnames[n]) == 0)
+             /* If this is the last step we must not allocate an
+                output buffer.  */
+             if (cnt < nsteps - 1)
                {
-                 void *data = NULL;
+                 result->__data[cnt].__flags = conv_flags;
 
-                 /* Match!  Now try the initializer.  */
-                 if (runp->trans_init_fct == NULL
-                     || (runp->trans_init_fct (data, steps[cnt].__to_name)
-                         == __GCONV_OK))
-                   {
-                     /* Append at the end of the list.  */
-                     struct __gconv_trans_data *newp;
-                     struct __gconv_trans_data *endp;
-                     struct __gconv_trans_data *lastp;
+                 /* Allocate the buffer.  */
+                 size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to);
 
-                     newp = (struct __gconv_trans_data *)
-                       malloc (sizeof (struct __gconv_trans_data));
-                     if (newp == NULL)
-                       goto bail;
-
-                     newp->__trans_fct = runp->trans_fct;
-                     newp->__trans_context_fct = runp->trans_context_fct;
-                     newp->__trans_end_fct = runp->trans_end_fct;
+                 result->__data[cnt].__outbuf = (char *) malloc (size);
+                 if (result->__data[cnt].__outbuf == NULL)
+                   {
+                     res = __GCONV_NOMEM;
+                     goto bail;
+                   }
 
-                     lastp = NULL;
-                     for (endp = result->__data[cnt].__trans;
-                          endp != NULL; endp = endp->__next)
-                       lastp = endp;
+                 result->__data[cnt].__outbufend =
+                   result->__data[cnt].__outbuf + size;
+               }
+             else
+               {
+                 /* Handle the last entry.  */
+                 result->__data[cnt].__flags = conv_flags | __GCONV_IS_LAST;
 
-                     if (lastp == NULL)
-                       result->__data[cnt].__trans = newp;
-                     else
-                       lastp->__next = newp;
-                   }
                  break;
                }
+           }
        }
 
       if (res != __GCONV_OK)