summary refs log tree commit diff
path: root/libio/iogetline.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-29 22:41:42 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-29 22:41:42 +0000
commit076bfcf612a1f774b214e335184d010b60bfad40 (patch)
tree1b165613e8f1bae3cc7ccd96407a88378283fbec /libio/iogetline.c
parentc7c3b0e907efac218b329ebbe3fc7432ec4415c5 (diff)
downloadglibc-076bfcf612a1f774b214e335184d010b60bfad40.tar.gz
glibc-076bfcf612a1f774b214e335184d010b60bfad40.tar.xz
glibc-076bfcf612a1f774b214e335184d010b60bfad40.zip
Update.
2000-08-29  Ulrich Drepper  <drepper@redhat.com>

	* libio/iogetline.c: Set mode before the loop in case n==0.
	* libio/iogetwline.c: Likewise.

2000-08-29  H.J. Lu  <hjl@gnu.org>

	* libio/fileops.c (new_do_write): Check fp->_mode <= 0 instead
	of fp->_mode < 0.
	(_IO_new_file_overflow): Likewise.
	* libio/genops.c (_IO_flush_all): Likewise.
	* libio/ioftell.c (_IO_ftell): Likewise.
Diffstat (limited to 'libio/iogetline.c')
-rw-r--r--libio/iogetline.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libio/iogetline.c b/libio/iogetline.c
index 9a5f691031..dbea76ffcb 100644
--- a/libio/iogetline.c
+++ b/libio/iogetline.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU IO Library.
 
    This library is free software; you can redistribute it and/or
@@ -59,6 +59,8 @@ _IO_getline_info (fp, buf, n, delim, extract_delim, eof)
   char *ptr = buf;
   if (eof != NULL)
     *eof = 0;
+  if (__builtin_expect (fp->_mode, -1) == 0)
+    _IO_fwide (fp, -1);
   while (n != 0)
     {
       _IO_ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr;