diff options
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv.c | 17 | ||||
| -rw-r--r-- | iconv/gconv_conf.c | 4 | ||||
| -rw-r--r-- | iconv/gconv_dl.c | 12 | ||||
| -rw-r--r-- | iconv/gconv_int.h | 6 | ||||
| -rw-r--r-- | iconv/gconv_simple.c | 228 |
5 files changed, 256 insertions, 11 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c index 71d87ae1f6..f8b7c8050d 100644 --- a/iconv/gconv.c +++ b/iconv/gconv.c @@ -1,6 +1,6 @@ /* Convert characters in input buffer using conversion descriptor to output buffer. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -34,19 +34,24 @@ __gconv (gconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, if (cd == (gconv_t) -1L) return GCONV_ILLEGAL_DESCRIPTOR; - cd->data[last_step].outbuf = *outbuf; + cd->data[last_step].outbuf = outbuf ? *outbuf : NULL; cd->data[last_step].outbufavail = 0; cd->data[last_step].outbufsize = *outbytesleft; if (converted != NULL) *converted = 0; - result = (*cd->steps->fct) (cd->steps, cd->data, *inbuf, inbytesleft, + result = (*cd->steps->fct) (cd->steps, cd->data, + inbuf ? *inbuf : NULL, inbytesleft, converted, inbuf == NULL || *inbuf == NULL); - *inbuf += oldinbytes - *inbytesleft; - *outbuf += cd->data[last_step].outbufavail; - *outbytesleft -= cd->data[last_step].outbufavail; + if (inbuf != NULL && *inbuf != NULL) + *inbuf += oldinbytes - *inbytesleft; + if (outbuf != NULL && *outbuf != NULL) + { + *outbuf += cd->data[last_step].outbufavail; + *outbytesleft -= cd->data[last_step].outbufavail; + } return result; } diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index c448a160d2..7765efb6d5 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -398,6 +398,10 @@ __gconv_read_conf (void) elem = strtok_r (gconv_path, ":", &gconv_path); while (elem != NULL) { +#ifndef MAXPATHLEN + /* We define a reasonable limit. */ +# define 4096 +#endif char real_elem[MAXPATHLEN]; if (realpath (elem, real_elem) != NULL) diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c index b11e156a03..9e80158f43 100644 --- a/iconv/gconv_dl.c +++ b/iconv/gconv_dl.c @@ -108,9 +108,9 @@ get_sym (void *a) } -static void * +void * internal_function -find_func (void *handle, const char *name) +__gconv_find_func (void *handle, const char *name) { struct get_sym_args args; @@ -170,7 +170,7 @@ __gconv_find_shlib (const char *name) { if (dlerror_run (do_open, found) == 0) { - found->fct = find_func (found->handle, "gconv"); + found->fct = __gconv_find_func (found->handle, "gconv"); if (found->fct == NULL) { /* Argh, no conversion function. There is something @@ -180,8 +180,10 @@ __gconv_find_shlib (const char *name) } else { - found->init_fct = find_func (found->handle, "gconv_init"); - found->end_fct = find_func (found->handle, "gconv_end"); + found->init_fct = __gconv_find_func (found->handle, + "gconv_init"); + found->end_fct = __gconv_find_func (found->handle, + "gconv_end"); /* We have succeeded in loading the shared object. */ found->counter = 1; diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 5e0723ed34..35ec31a7b8 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -129,6 +129,10 @@ extern int __gconv_close_transform (struct gconv_step *__steps, extern struct gconv_loaded_object *__gconv_find_shlib (const char *__name) internal_function; +/* Find function named NAME in shared object referenced by HANDLE. */ +void *__gconv_find_func (void *handle, const char *name) + internal_function; + /* Release shared object. If no further reference is available unload the object. */ extern int __gconv_release_shlib (struct gconv_loaded_object *__handle) @@ -149,6 +153,8 @@ extern void __gconv_get_builtin_trans (const char *__name, int __do_flush) __BUILTIN_TRANS (__gconv_transform_dummy); +__BUILTIN_TRANS (__gconv_transform_ascii_ucs4); +__BUILTIN_TRANS (__gconv_transform_ucs4_ascii); __BUILTIN_TRANS (__gconv_transform_ucs4_utf8); __BUILTIN_TRANS (__gconv_transform_utf8_ucs4); __BUILTIN_TRANS (__gconv_transform_ucs2_ucs4); diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index 197a3d1e9c..478c0dc8fe 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -76,6 +76,234 @@ __gconv_transform_dummy (struct gconv_step *step, struct gconv_step_data *data, } +/* Convert from ISO 646-IRV to ISO 10646/UCS4. */ +int +__gconv_transform_ascii_ucs4 (struct gconv_step *step, + struct gconv_step_data *data, const char *inbuf, + size_t *inlen, size_t *written, int do_flush) +{ + struct gconv_step *next_step = step + 1; + struct gconv_step_data *next_data = data + 1; + gconv_fct fct = next_step->fct; + size_t do_write; + int result; + + /* If the function is called with no input this means we have to reset + to the initial state. The possibly partly converted input is + dropped. */ + if (do_flush) + { + /* Clear the state. */ + memset (data->statep, '\0', sizeof (mbstate_t)); + do_write = 0; + + /* Call the steps down the chain if there are any. */ + if (data->is_last) + result = GCONV_OK; + else + { + struct gconv_step *next_step = step + 1; + struct gconv_step_data *next_data = data + 1; + + result = (*fct) (next_step, next_data, NULL, 0, written, 1); + + /* Clear output buffer. */ + data->outbufavail = 0; + } + } + else + { + int save_errno = errno; + do_write = 0; + + result = GCONV_OK; + do + { + const unsigned char *newinbuf = inbuf; + size_t actually = 0; + size_t cnt = 0; + + while (data->outbufavail + sizeof (wchar_t) <= data->outbufsize + && cnt < *inlen) + { + if (*newinbuf > '\x7f') + { + /* This is no correct ANSI_X3.4-1968 character. */ + result = GCONV_ILLEGAL_INPUT; + break; + } + + /* It's an one byte sequence. */ + *(wchar_t *) &data->outbuf[data->outbufavail++] + = (wchar_t) *newinbuf; + ++actually; + + ++newinbuf; + ++cnt; + } + + /* Remember how much we converted. */ + do_write += cnt * sizeof (wchar_t); + *inlen -= cnt; + + /* Check whether an illegal character appeared. */ + if (result != GCONV_OK) + break; + + if (data->is_last) + { + /* This is the last step. */ + result = (*inlen == 0 ? GCONV_EMPTY_INPUT : GCONV_FULL_OUTPUT); + break; + } + + /* Status so far. */ + result = GCONV_EMPTY_INPUT; + + if (data->outbufavail > 0) + { + /* Call the functions below in the chain. */ + size_t newavail = data->outbufavail; + + result = (*fct) (next_step, next_data, data->outbuf, &newavail, + written, 0); + + /* Correct the output buffer. */ + if (newavail != data->outbufavail && newavail > 0) + { + memmove (data->outbuf, + &data->outbuf[data->outbufavail - newavail], + newavail); + data->outbufavail = newavail; + } + } + } + while (*inlen > 0 && result == GCONV_EMPTY_INPUT); + + __set_errno (save_errno); + } + + if (written != NULL && data->is_last) + *written = do_write / sizeof (wchar_t); + + return result; +} + + +/* Convert from ISO 10646/UCS to ISO 646-IRV. */ +int +__gconv_transform_ucs4_ascii (struct gconv_step *step, + struct gconv_step_data *data, const char *inbuf, + size_t *inlen, size_t *written, int do_flush) +{ + struct gconv_step *next_step = step + 1; + struct gconv_step_data *next_data = data + 1; + gconv_fct fct = next_step->fct; + size_t do_write; + int result; + + /* If the function is called with no input this means we have to reset + to the initial state. The possibly partly converted input is + dropped. */ + if (do_flush) + { + /* Clear the state. */ + memset (data->statep, '\0', sizeof (mbstate_t)); + do_write = 0; + + /* Call the steps down the chain if there are any. */ + if (data->is_last) + result = GCONV_OK; + else + { + struct gconv_step *next_step = step + 1; + struct gconv_step_data *next_data = data + 1; + + result = (*fct) (next_step, next_data, NULL, 0, written, 1); + + /* Clear output buffer. */ + data->outbufavail = 0; + } + } + else + { + int save_errno = errno; + do_write = 0; + + result = GCONV_OK; + do + { + const wchar_t *newinbuf = (const wchar_t *) inbuf; + size_t actually = 0; + size_t cnt = 0; + + while (data->outbufavail < data->outbufsize + && cnt + sizeof (wchar_t) <= *inlen) + { + if (*newinbuf < L'\0' || *newinbuf > L'\x7f') + { + /* This is no correct ANSI_X3.4-1968 character. */ + result = GCONV_ILLEGAL_INPUT; + break; + } + + /* It's an one byte sequence. */ + data->outbuf[data->outbufavail++] = (char) *newinbuf; + ++actually; + + ++newinbuf; + ++cnt; + } + + /* Remember how much we converted. */ + do_write += cnt; + *inlen -= cnt * sizeof (wchar_t); + + /* Check whether an illegal character appeared. */ + if (result != GCONV_OK) + break; + + if (data->is_last) + { + /* This is the last step. */ + result = (*inlen < sizeof (wchar_t) + ? GCONV_EMPTY_INPUT : GCONV_FULL_OUTPUT); + break; + } + + /* Status so far. */ + result = GCONV_EMPTY_INPUT; + + if (data->outbufavail > 0) + { + /* Call the functions below in the chain. */ + size_t newavail = data->outbufavail; + + result = (*fct) (next_step, next_data, data->outbuf, &newavail, + written, 0); + + /* Correct the output buffer. */ + if (newavail != data->outbufavail && newavail > 0) + { + memmove (data->outbuf, + &data->outbuf[data->outbufavail - newavail], + newavail); + data->outbufavail = newavail; + } + } + } + while (*inlen > 0 && result == GCONV_EMPTY_INPUT); + + __set_errno (save_errno); + } + + if (written != NULL && data->is_last) + *written = do_write; + + return result; +} + + int __gconv_transform_ucs4_utf8 (struct gconv_step *step, struct gconv_step_data *data, const char *inbuf, |