diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | iconv/gconv_open.c | 9 | ||||
| -rw-r--r-- | nis/nis_findserv.c | 3 |
4 files changed, 25 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 387020074c..37a51d50b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +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>. + 2001-01-30 Yong Li <yong.li@asu.edu> - * iconv/gconv_open.c (__gconv_open): Fix the variable used to - set result->__data[cnt].__flags. * iconv/iconv_prog.c (main): Correct error handling method name. 2001-01-29 Ben Collins <bcollins@debian.org> diff --git a/NEWS b/NEWS index ddae546102..773922a282 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -GNU C Library NEWS -- history of user-visible changes. 2001-1-12 +GNU C Library NEWS -- history of user-visible changes. 2001-1-30 Copyright (C) 1992-1999, 2000, 2001 Free Software Foundation, Inc. See the end for copying conditions. @@ -7,6 +7,16 @@ Please send GNU C library bug reports using the `glibcbug' script to <bugs@gnu.org>. Questions and suggestions should be send to <bug-glibc@gnu.org>. +Version 2.2.2 + +* lots of headers were cleaned up. Using the tool in the conform/ subdir + we can now check for namespace violations and missing declarations. The + result is that almost all headers are now Unix-compliant (as defined in + the upcoming XPG6). The negative side is that some programs might need + corrections, too, if they depend on the incorrect form of the headers in + previous versions which defined too many symbols and included too many + other headers. + Version 2.2.1 * The gencat program now parses the input file according to the charset 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; } diff --git a/nis/nis_findserv.c b/nis/nis_findserv.c index 2659878e20..1a331d28b6 100644 --- a/nis/nis_findserv.c +++ b/nis/nis_findserv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. @@ -18,6 +18,7 @@ Boston, MA 02111-1307, USA. */ #include <string.h> +#include <time.h> #include <unistd.h> #include <sys/ioctl.h> #include <sys/socket.h> |