diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-01-31 07:42:03 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-01-31 07:42:03 +0000 |
| commit | 306eeae553820c7ac30a94ac890a3fe70fc68909 (patch) | |
| tree | 20d783759bf3f767fe4ee90baca1f79b6aa20b0d /iconv/gconv_open.c | |
| parent | c7fb46a94e67b79fcd2f07b656c7fb6a4559195f (diff) | |
| download | glibc-306eeae553820c7ac30a94ac890a3fe70fc68909.tar.gz glibc-306eeae553820c7ac30a94ac890a3fe70fc68909.tar.xz glibc-306eeae553820c7ac30a94ac890a3fe70fc68909.zip | |
Update.
2001-01-30 Ulrich Drepper <drepper@redhat.com> * iconv/gconv_open.c (__gconv_open): Set conv_flags if IGNORE is seen, not flags. * nis/nis_findserv.c: Include <time.h>.
Diffstat (limited to 'iconv/gconv_open.c')
| -rw-r--r-- | iconv/gconv_open.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c index 9deeb5363c..058bcd9e5d 100644 --- a/iconv/gconv_open.c +++ b/iconv/gconv_open.c @@ -1,5 +1,5 @@ /* 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. @@ -35,6 +35,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, __gconv_t result = NULL; size_t cnt = 0; int res; + int conv_flags = 0; const char *errhand; const char *ignore; struct trans_struct *trans = NULL; @@ -98,7 +99,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, } else if (__strcasecmp (tok, "IGNORE") == 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 @@ -246,7 +247,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, output buffer. */ if (cnt < nsteps - 1) { - result->__data[cnt].__flags = flags; + result->__data[cnt].__flags = conv_flags; /* Allocate the buffer. */ size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to); @@ -264,7 +265,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, else { /* Handle the last entry. */ - result->__data[cnt].__flags = flags | __GCONV_IS_LAST; + result->__data[cnt].__flags = conv_flags | __GCONV_IS_LAST; break; } |