about summary refs log tree commit diff
path: root/libio/iogetline.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-08-26 00:07:26 +0000
committerUlrich Drepper <drepper@redhat.com>1998-08-26 00:07:26 +0000
commit08cac4ac19abd40887afbd9d841cd96a8efbbe98 (patch)
tree4bf358e1cb79b646a43b0fc527436e240ee4edaa /libio/iogetline.c
parent6dbb7062ff2af970c6b8befecf71d7284d5813fb (diff)
downloadglibc-08cac4ac19abd40887afbd9d841cd96a8efbbe98.tar.gz
glibc-08cac4ac19abd40887afbd9d841cd96a8efbbe98.tar.xz
glibc-08cac4ac19abd40887afbd9d841cd96a8efbbe98.zip
Update.
1998-08-25  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/dl-cache.c: Move static variable cache and cachesize
	to toplevel.
	(_dl_unload_cache): New function.
	* elf/Versions [libc GLIBC_2.1]: Add _dl_unload_cache.
	* elf/dl-open.c (_dl_open): Unload map file before freeing the lock.
	* elf/rtld (dl_main): Unload map file before jumping to user code.

	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Define O_DIRECT.
	Correct comment for O_LARGEFILE.
	* sysdeps/unix/sysv/linux/bits/fcntl.h: Define O_DIRECT.
	Change O_LARGEFILE to correct value.

1998-08-25 14:34  Ulrich Drepper  <drepper@cygnus.com>

	* libio/iogetline.c (_IO_getline_info): Don't read anything for
	N == 0.  Patch by HJ Lu.
Diffstat (limited to 'libio/iogetline.c')
-rw-r--r--libio/iogetline.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libio/iogetline.c b/libio/iogetline.c
index 328e20e6ea..9b49039f58 100644
--- a/libio/iogetline.c
+++ b/libio/iogetline.c
@@ -59,7 +59,7 @@ _IO_getline_info (fp, buf, n, delim, extract_delim, eof)
   char *ptr = buf;
   if (eof != NULL)
     *eof = 0;
-  do
+  while (n != 0);
     {
       _IO_ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr;
       if (len <= 0)
@@ -108,7 +108,7 @@ _IO_getline_info (fp, buf, n, delim, extract_delim, eof)
 	    ptr += len;
 	    n -= len;
 	  }
-    } while (n != 0);
+    }
   return ptr - buf;
 }