aboutsummaryrefslogtreecommitdiff
path: root/iconv/gconv_open.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-19 21:12:06 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-19 21:12:06 +0000
commitd620426811688301eb1cbe6e63773d6430b2706e (patch)
tree555eb9182298ec1e56db8a5de4f62daa2e654321 /iconv/gconv_open.c
parent01da56ba764e6abc52bfe9a1feeb79d3d67346d1 (diff)
downloadglibc-d620426811688301eb1cbe6e63773d6430b2706e.zip
glibc-d620426811688301eb1cbe6e63773d6430b2706e.tar.gz
glibc-d620426811688301eb1cbe6e63773d6430b2706e.tar.bz2
Update.
2000-06-19 Ulrich Drepper <drepper@redhat.com> * iconv/gconv.h (__gconv_trans_fct): Add new parameter. General namespace cleanup. (struct __gconv_trans_data): Add next field. (struct __gconv_step_data): Make __trans a pointer. * iconv/gconv_conf.c: Split out code to find gconv directories from __gconv_read_conf in new functions. * iconv/gconv_int.h: Define new data structure and declare new functions for handling of gconv directory list. * iconv/gconv_open.c: Allow more than one error handling step being used. Call function to load error handling module if it is none of the builtin transformations. * iconv/gconv_close.c: Add code to free transliteration data. * iconv/gconv_trans.c: Add functions to load and unload modules implementing transliteration etc. * iconv/skeleton.c: Call all context functions now that more than one module is allowed. * iconv/loop.c (STANDARD_ERR_HANDLING): New macro. * iconv/gconv_simple.c: Use STANDARD_ERR_HANDLING macro for places where the full error handling using transliteration is needed. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/big5hkscs.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/iso-2022-cn.c: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/unicode.c: Likewise. * iconvdata/utf-16.c: Likewise. * libio/iofwide.c: Reset __trans member of __gconv_trans_data structure correctly after last change. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * localedata/Makefile: Set -Wno-format for some files since gcc does not know all the format specifiers. 2000-06-18 Ulrich Drepper <drepper@redhat.com> * locale/loadlocale.c (_nl_unload_locale): Remove a bit of unneeded code. * locale/lc-time.c (_nl_init_era_entries): Likewise.
Diffstat (limited to 'iconv/gconv_open.c')
-rw-r--r--iconv/gconv_open.c255
1 files changed, 184 insertions, 71 deletions
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index d2963fa..2374703 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -38,6 +38,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
int conv_flags = 0;
const char *errhand;
const char *ignore;
+ struct trans_struct *trans = NULL;
/* Find out whether any error handling method is specified. */
errhand = strchr (toset, '/');
@@ -51,17 +52,85 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
{
/* Make copy without the error handling description. */
char *newtoset = (char *) alloca (errhand - toset + 1);
+ char *tok;
+ char *ptr;
newtoset[errhand - toset] = '\0';
toset = memcpy (newtoset, toset, errhand - toset);
- flags = __GCONV_IGNORE_ERRORS;
+ /* Find the appropriate transliteration handlers. */
+ tok = strdupa (errhand);
- if (__strcasecmp (errhand, "IGNORE") == 0)
+ tok = __strtok_r (tok, ",", &ptr);
+ while (tok != NULL)
{
- /* Found it. This means we should ignore conversion errors. */
- flags = __GCONV_IGNORE_ERRORS;
- errhand = NULL;
+ if (__strcasecmp (tok, "TRANSLIT") == 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" };
+ struct trans_struct *lastp = NULL;
+ struct trans_struct *runp;
+
+ for (runp = trans; runp != NULL; runp = runp->next)
+ if (runp->trans_fct == __gconv_transliterate)
+ break;
+ else
+ lastp = runp;
+
+ if (runp == NULL)
+ {
+ struct trans_struct *newp;
+
+ newp = (struct trans_struct *) alloca (sizeof (*newp));
+ memset (newp, '\0', sizeof (*newp));
+
+ /* We leave the `name' field zero to signal that
+ this is an internal transliteration step. */
+ newp->csnames = internal_trans_names;
+ newp->ncsnames = 1;
+ newp->trans_fct = __gconv_transliterate;
+
+ if (lastp == NULL)
+ trans = newp;
+ else
+ lastp->next = newp;
+ }
+ }
+ else if (__strcasecmp (tok, "IGNORE") == 0)
+ /* Set the flag to ignore all errors. */
+ flags = __GCONV_IGNORE_ERRORS;
+ else
+ {
+ /* `tok' is possibly a module name. We'll see later
+ whether we can find it. But first see that we do
+ not already a module of this name. */
+ struct trans_struct *lastp = NULL;
+ struct trans_struct *runp;
+
+ for (runp = trans; runp != NULL; runp = runp->next)
+ if (runp->name != NULL
+ && __strcasecmp (tok, runp->name) == 0)
+ break;
+ else
+ lastp = runp;
+
+ if (runp == NULL)
+ {
+ struct trans_struct *newp;
+
+ newp = (struct trans_struct *) alloca (sizeof (*newp));
+ memset (newp, '\0', sizeof (*newp));
+ newp->name = tok;
+
+ if (lastp == NULL)
+ trans = newp;
+ else
+ lastp->next = newp;
+ }
+ }
+
+ tok = __strtok_r (NULL, ",", &ptr);
}
}
}
@@ -81,31 +150,18 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
res = __gconv_find_transform (toset, fromset, &steps, &nsteps, flags);
if (res == __GCONV_OK)
{
- const char **csnames = NULL;
- size_t ncsnames = 0;
- __gconv_trans_fct trans_fct = NULL;
- __gconv_trans_context_fct trans_context_fct = NULL;
- __gconv_trans_init_fct trans_init_fct = NULL;
- __gconv_trans_end_fct trans_end_fct = NULL;
-
- if (errhand != NULL)
+ /* Find the modules. */
+ struct trans_struct *lastp = NULL;
+ struct trans_struct *runp;
+
+ for (runp = trans; runp != NULL; runp = runp->next)
{
- /* Find the appropriate transliteration handling. */
- if (__strcasecmp (errhand, "TRANSLIT") == 0)
- {
- /* It's the builtin transliteration handling. We only
- suport for it working on the internal encoding. */
- static const char *internal_trans_names[1] = { "INTERNAL" };
-
- csnames = internal_trans_names;
- ncsnames = 1;
- trans_fct = __gconv_transliterate;
- /* No context, init, or end function. */
- }
- else if (__strcasecmp (errhand, "WORK AROUND A GCC BUG") == 0)
- {
- trans_init_fct = (__gconv_trans_init_fct) 1;
- }
+ if (runp->name == NULL
+ || __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;
}
/* Allocate room for handle. */
@@ -154,32 +210,51 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
result->__data[cnt].__outbuf = (char *) malloc (size);
if (result->__data[cnt].__outbuf == NULL)
- {
- res = __GCONV_NOMEM;
- break;
- }
+ goto bail;
+
result->__data[cnt].__outbufend =
result->__data[cnt].__outbuf + size;
- /* Now see whether we can use the transliteration module
- for this step. */
- for (n = 0; n < ncsnames; ++n)
- if (__strcasecmp (steps[cnt].__from_name, csnames[n]) == 0)
- {
- /* Match! Now try the initializer. */
- if (trans_init_fct == NULL
- || (trans_init_fct (&result->__data[cnt].__trans.__data,
- steps[cnt].__to_name)
- == __GCONV_OK))
- {
- result->__data[cnt].__trans.__trans_fct = trans_fct;
- result->__data[cnt].__trans.__trans_context_fct =
- trans_context_fct;
- result->__data[cnt].__trans.__trans_end_fct =
- trans_end_fct;
- }
- break;
- }
+ /* 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)
+ {
+ void *data = NULL;
+
+ /* 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;
+
+ 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;
+
+ lastp = NULL;
+ for (endp = result->__data[cnt].__trans;
+ endp != NULL; endp = endp->__next)
+ lastp = endp;
+
+ if (lastp == NULL)
+ result->__data[cnt].__trans = newp;
+ else
+ lastp->__next = newp;
+ }
+ break;
+ }
}
/* Now handle the last entry. */
@@ -194,34 +269,72 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
/* Now see whether we can use the transliteration module
for this step. */
- for (n = 0; n < ncsnames; ++n)
- if (__strcasecmp (steps[cnt].__from_name, csnames[n]) == 0)
- {
- /* Match! Now try the initializer. */
- if (trans_init_fct == NULL
- || trans_init_fct (&result->__data[cnt].__trans.__data,
- steps[cnt].__to_name)
- == __GCONV_OK)
- {
- result->__data[cnt].__trans.__trans_fct = trans_fct;
- result->__data[cnt].__trans.__trans_context_fct =
- trans_context_fct;
- result->__data[cnt].__trans.__trans_end_fct =
- trans_end_fct;
- }
- break;
- }
+ 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)
+ {
+ void *data = NULL;
+
+ /* 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;
+
+ 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;
+
+ lastp = NULL;
+ for (endp = result->__data[cnt].__trans;
+ endp != NULL; endp = endp->__next)
+ lastp = endp;
+
+ if (lastp == NULL)
+ result->__data[cnt].__trans = newp;
+ else
+ lastp->__next = newp;
+ }
+ break;
+ }
}
if (res != __GCONV_OK)
{
/* Something went wrong. Free all the resources. */
- int serrno = errno;
+ int serrno;
+ bail:
+ serrno = errno;
if (result != NULL)
{
while (cnt-- > 0)
- free (result->__data[cnt].__outbuf);
+ {
+ struct __gconv_trans_data *transp;
+
+ transp = result->__data[cnt].__trans;
+ while (transp != NULL)
+ {
+ struct __gconv_trans_data *curp = transp;
+ transp = transp->__next;
+
+ if (__builtin_expect (curp->__trans_end_fct != NULL, 0))
+ curp->__trans_end_fct (curp->__data);
+
+ free (curp);
+ }
+
+ free (result->__data[cnt].__outbuf);
+ }
free (result);
result = NULL;