* nis/nis_defaults.c (searchXYX): New functions. Used by both

[platform/upstream/glibc.git] / iconv / gconv_open.c

diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index dfcd7b7..bbf27b3 100644 (file)
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -1,5 +1,6 @@
 /* Find matching transformation algorithms and initialize steps.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997,1998,1999,2000,2001,2004,2005
+       Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -20,6 +21,7 @@
 
 #include <errno.h>
 #include <locale.h>
+#include "../locale/localeinfo.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -65,11 +67,12 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
          tok = __strtok_r (tok, ",", &ptr);
          while (tok != NULL)
            {
-             if (__strcasecmp_l (tok, "TRANSLIT", &_nl_C_locobj) == 0)
+             if (__strcasecmp_l (tok, "TRANSLIT", _nl_C_locobj_ptr) == 0)
                {
                  /* It's the builtin transliteration handling.  We only
                     support it for working on the internal encoding.  */
-                 static const char *internal_trans_names[1] = { "INTERNAL" };
+                 static const char *const internal_trans_names[1]
+                   = { "INTERNAL" };
                  struct trans_struct *lastp = NULL;
                  struct trans_struct *runp;
 
@@ -88,7 +91,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 
                      /* We leave the `name' field zero to signal that
                         this is an internal transliteration step.  */
-                     newp->csnames = internal_trans_names;
+                     newp->csnames = (const char **) internal_trans_names;
                      newp->ncsnames = 1;
                      newp->trans_fct = __gconv_transliterate;
 
@@ -98,7 +101,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
                        lastp->next = newp;
                    }
                }
-             else if (__strcasecmp_l (tok, "IGNORE", &_nl_C_locobj) == 0)
+             else if (__strcasecmp_l (tok, "IGNORE", _nl_C_locobj_ptr) == 0)
                /* Set the flag to ignore all errors.  */
                conv_flags |= __GCONV_IGNORE_ERRORS;
              else
@@ -112,7 +115,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
                  for (runp = trans; runp != NULL; runp = runp->next)
                    if (runp->name != NULL
                        && __strcasecmp_l (tok, runp->name,
-                                          &_nl_C_locobj) == 0)
+                                          _nl_C_locobj_ptr) == 0)
                      break;
                    else
                      lastp = runp;
@@ -149,6 +152,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)
     {
@@ -162,8 +184,13 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
              || __builtin_expect (__gconv_translit_find (runp), 0) == 0)
            lastp = runp;
          else
-           /* This means we haven't found the module.  Remove it.  */
-           (lastp == NULL ? trans : lastp->next) = runp->next;
+           {
+             /* This means we haven't found the module.  Remove it.  */
+             if (lastp == NULL)
+               trans  = runp->next;
+             else
+               lastp->next  = runp->next;
+           }
        }
 
       /* Allocate room for handle.  */
@@ -208,7 +235,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
              for (runp = trans; runp != NULL; runp = runp->next)
                for (n = 0; n < runp->ncsnames; ++n)
                  if (__strcasecmp_l (steps[cnt].__from_name,
-                                     runp->csnames[n], &_nl_C_locobj) == 0)
+                                     runp->csnames[n], _nl_C_locobj_ptr) == 0)
                    {
                      void *data = NULL;
 
@@ -254,7 +281,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
                  /* Allocate the buffer.  */
                  size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to);
 
-                 result->__data[cnt].__outbuf = (char *) malloc (size);
+                 result->__data[cnt].__outbuf = malloc (size);
                  if (result->__data[cnt].__outbuf == NULL)
                    {
                      res = __GCONV_NOMEM;