Update.

2002-08-24  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/charmap.c (charmap_new_char): Don't use
	ULONG_MAX as maximum UCS4 value.

	* sysdeps/unix/sysv/linux/ia64/sys/user.h: New file.

	* sysdeps/generic/strtol.c: We don't need the isascii test in glibc.

	* malloc/hooks.c (public_sET_STATe): use size_t as type for i.
	* malloc/malloc.c (mALLINFo): Likewise.

	* libio/wstrops.c (_IO_wstr_pbackfail): Use WEOF in comparison.

	* libio/wfileops.c (_IO_wfile_overflow): Use EOF not WEOF when
	examining result of _IO_do_flush call.

	* stdio-common/vfprintf.c (vfprintf): Use correct type in va_arg.
	Use prec not spec when sizing buffers.

	* catgets/open_catalog.c (__open_catalog): Add casts to avoid warnings.
	* locale/loadarchive.c (_nl_load_locale_from_archive): Likewise.
	* locale/loadlocale.c (_nl_intern_locale_data): Likewise.
	* stdio-common/vfscanf.c (inchar): Likewise.
	* misc/efgcvt_r.c (fcvt_r): Likewise.
	* elf/dl-misc.c (_dl_debug_vdprintf): Likewise.
	* elf/readlib.c (process_file): Likewise.
	* elf/sprof.c (load_profdata): Likewise.
	* sysdeps/ia64/hp-timing.h (HP_TIMING_PRINT): Likewise.
	* locale/programs/linereader.c (get_toplvl_escape): Likewise.
	* locale/programs/charmap.c (charmap_read): Likewise.
	* libio/fileops.c: Likewise.
	* libio/fmemopen.c: Likewise.
	* stdlib/strtod.c: Likewise.
	* elf/dl-load.c: Likewise.
	* iconv/iconvconfig.c: Likewise.
	* iconv/iconv_prog.c (process_block): Likewise.

	* sysdeps/unix/sysv/linux/ia64/Makefile: Define _ASM_IA64_CURRENT_H
	macro to calm down the compiler.

	* iconv/gconv_cache.c (__gconv_load_cache): Add cast to avoid warning.

	* sysdeps/ia64/elf/initfini.c: Don't use newlines embedded in string.

	* sysdeps/unix/sysv/linux/i386/sysdep.S: Update comment regarding
	placement of errno definition.
	* sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise.
	* sysdeps/unix/sysv/linux/mips/sysdep.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/sysdep.S: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise.

	* resolv/nss_dns/dns-host.c (MAXPACKET): Increase minimum value
	from 1024 to 65536, to avoid buffer overrun.

2002-08-16  Paul Eggert  <eggert@twinsun.com>

	* resolv/gethnamaddr.c (MAXPACKET): Increase minimum value
	from 1024 to 65536, to avoid buffer overrun.
	* resolv/res_query.c (MAXPACKET): Likewise.

	architectures.

4 files changed, 12 insertions, 10 deletions

diff --git a/libio/fileops.c b/libio/fileops.c
index b6655be..720796a 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -477,7 +477,8 @@ _IO_new_do_write (fp, data, to_do)
      const char *data;
      _IO_size_t to_do;
 {
-  return (to_do == 0 || new_do_write (fp, data, to_do) == to_do) ? 0 : EOF;
+  return (to_do == 0
+	  || (_IO_size_t) new_do_write (fp, data, to_do) == to_do) ? 0 : EOF;
 }
 INTDEF2(_IO_new_do_write, _IO_do_write)
 
@@ -1423,7 +1424,8 @@ _IO_file_xsgetn (fp, data, n)
 	  /* If we now want less than a buffer, underflow and repeat
 	     the copy.  Otherwise, _IO_SYSREAD directly to
 	     the user buffer. */
-	  if (fp->_IO_buf_base && want < fp->_IO_buf_end - fp->_IO_buf_base)
+	  if (fp->_IO_buf_base
+	      && want < (size_t) (fp->_IO_buf_end - fp->_IO_buf_base))
 	    {
 	      if (__underflow (fp) == EOF)
 		break;
diff --git a/libio/fmemopen.c b/libio/fmemopen.c
index a1c75f2..ab6ffdd 100644
--- a/libio/fmemopen.c
+++ b/libio/fmemopen.c
@@ -98,7 +98,7 @@ fmemopen_read (void *cookie, char *b, size_t s)
 
   if (c->pos + s > c->size)
     {
-      if (c->pos == c->size)
+      if ((size_t) c->pos == c->size)
 	return 0;
       s = c->size - c->pos;
     }
@@ -106,7 +106,7 @@ fmemopen_read (void *cookie, char *b, size_t s)
   memcpy (b, &(c->buffer[c->pos]), s);
 
   c->pos += s;
-  if (c->pos > c->maxpos)
+  if ((size_t) c->pos > c->maxpos)
     c->maxpos = c->pos;
 
   return s;
@@ -125,7 +125,7 @@ fmemopen_write (void *cookie, const char *b, size_t s)
 
   if (c->pos + s + addnullc > c->size)
     {
-      if (c->pos + addnullc == c->size)
+      if ((size_t) (c->pos + addnullc) == c->size)
 	{
 	  __set_errno (ENOSPC);
 	  return -1;
@@ -136,7 +136,7 @@ fmemopen_write (void *cookie, const char *b, size_t s)
   memcpy (&(c->buffer[c->pos]), b, s);
 
   c->pos += s;
-  if (c->pos > c->maxpos)
+  if ((size_t) c->pos > c->maxpos)
     {
       c->maxpos = c->pos;
       if (addnullc)
@@ -173,7 +173,7 @@ fmemopen_seek (void *cookie, _IO_off64_t *p, int w)
       return -1;
     }
 
-  if (np < 0 || np > c->size)
+  if (np < 0 || (size_t) np > c->size)
     return -1;
 
   c->pos = np;
diff --git a/libio/wfileops.c b/libio/wfileops.c
index 770c9b2..e9fe55b 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -430,12 +430,12 @@ _IO_wfile_overflow (f, wch)
     return _IO_do_flush (f);
   if (f->_wide_data->_IO_write_ptr == f->_wide_data->_IO_buf_end)
     /* Buffer is really full */
-    if (_IO_do_flush (f) == WEOF)
+    if (_IO_do_flush (f) == EOF)
       return WEOF;
   *f->_wide_data->_IO_write_ptr++ = wch;
   if ((f->_flags & _IO_UNBUFFERED)
       || ((f->_flags & _IO_LINE_BUF) && wch == L'\n'))
-    if (_IO_do_flush (f) == WEOF)
+    if (_IO_do_flush (f) == EOF)
       return WEOF;
   return wch;
 }
diff --git a/libio/wstrops.c b/libio/wstrops.c
index 64cdf52..3c9c497 100644
--- a/libio/wstrops.c
+++ b/libio/wstrops.c
@@ -291,7 +291,7 @@ _IO_wstr_pbackfail (fp, c)
      _IO_FILE *fp;
      _IO_wint_t c;
 {
-  if ((fp->_flags & _IO_NO_WRITES) && c != EOF)
+  if ((fp->_flags & _IO_NO_WRITES) && c != WEOF)
     return WEOF;
   return INTUSE(_IO_wdefault_pbackfail) (fp, c);
 }