diff options
| author | Roland McGrath <roland@gnu.org> | 1995-12-05 03:35:55 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-12-05 03:35:55 +0000 |
| commit | 77a58cad3fa0a286bd2581187a2463a762d711ba (patch) | |
| tree | 50756d67e82e3edbe49f722662b0bed8c0cd19cc /libio/iogetdelim.c | |
| parent | b5a08c5aca57835de5f69b8b017f09cd75f5cf7d (diff) | |
| download | glibc-77a58cad3fa0a286bd2581187a2463a762d711ba.tar glibc-77a58cad3fa0a286bd2581187a2463a762d711ba.tar.gz glibc-77a58cad3fa0a286bd2581187a2463a762d711ba.tar.bz2 glibc-77a58cad3fa0a286bd2581187a2463a762d711ba.zip | |
Tue Dec 5 02:27:32 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile [routines]: Remove iofscanf, add iopopen, pclose.
* libio/iofscanf.c: Remove file.
* libio/iogetdelim.c (_IO_getdelim): Correct stupid bug at string
termination.
* libio/iopopen.c: New file from GNU libio.
* libio/memstream.c: Fixed bug in fclose handling. Instead of
providing a close callback we need a finish callback.
* libio/pclose.c: New file. Derived from popen.c in GNU libio.
* posix/gnu/types.h: Fixed typo.
* stdio-common/errnobug.c: fputs returns EOF in error case. Do
not test for != 0.
* stdio-common/printf-parse.h (parse_one_spec): Do not force
padding with ' ' if precision is given. Fix by HJ Lu.
* stdio-common/printf_fp.c: Fix comment.
* stdio-common/tfformat.c, stdio-common/tiformat.c,
stdio-common/tstdiomisc.c: New files from GNU libio test suite.
* stdio-common/tstgetln.c: Provide ssize_t type when testing
libio.
* stdio-common/vfprintf.c (outchar): Use PUTC instead of putc.
(vfprintf): Cleasr args_type array before using it.
When printing 0 as an integer with precision 0 nothing must be
written for the number.
Based on patch by HJ Lu.
* stdio-common/vfscanf.c: Remove fixed input buffer. Now we
have a dynamically extended buffer.
* stdlib/strtod.c: Merge with version in Linux libc. This fixes
some bugs with handling of very small numbers and has different
solution for formaer patches.
* sysdeps/i386/i586/add_n.S, sysdeps/i386/i586/sub_n.S: Rename
macros r1 and r2 to t1, and t2 resp. This is necessary because
glibc headers also define r1.
Tue Dec 5 02:27:32 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile [routines]: Remove iofscanf, add iopopen, pclose.
* libio/iofscanf.c: Remove file.
* libio/iogetdelim.c (_IO_getdelim): Correct stupid bug at string
termination.
* libio/iopopen.c: New file from GNU libio.
* libio/memstream.c: Fixed bug in fclose handling. Instead of
providing a close callback we need a finish callback.
* libio/pclose.c: New file. Derived from popen.c in GNU libio.
* posix/gnu/types.h: Fixed typo.
* stdio-common/errnobug.c: fputs returns EOF in error case. Do
not test for != 0.
* stdio-common/printf-parse.h (parse_one_spec): Do not force
padding with ' ' if precision is given. Fix by HJ Lu.
* stdio-common/printf_fp.c: Fix comment.
* stdio-common/tfformat.c, stdio-common/tiformat.c,
stdio-common/tstdiomisc.c: New files from GNU libio test suite.
* stdio-common/tstgetln.c: Provide ssize_t type when testing
libio.
* stdio-common/vfprintf.c (outchar): Use PUTC instead of putc.
(vfprintf): Cleasr args_type array before using it.
When printing 0 as an integer with precision 0 nothing must be
written for the number.
Based on patch by HJ Lu.
* stdio-common/vfscanf.c: Remove fixed input buffer. Now we
have a dynamically extended buffer.
* stdlib/strtod.c: Merge with version in Linux libc. This fixes
some bugs with handling of very small numbers and has different
solution for formaer patches.
* sysdeps/i386/i586/add_n.S, sysdeps/i386/i586/sub_n.S: Rename
macros r1 and r2 to t1, and t2 resp. This is necessary because
glibc headers also define r1.
Diffstat (limited to 'libio/iogetdelim.c')
| -rw-r--r-- | libio/iogetdelim.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c index a6894a5ae6..ecb360b1f5 100644 --- a/libio/iogetdelim.c +++ b/libio/iogetdelim.c @@ -79,11 +79,11 @@ _IO_getdelim (lineptr, n, delimiter, fp) t = (char *) memchr ((void *) fp->_IO_read_ptr, delimiter, len); if (t != NULL) len = (t - fp->_IO_read_ptr) + 1; - /* make enough space for len+1 (for final NUL) bytes. */ + /* Make enough space for len+1 (for final NUL) bytes. */ needed = cur_len + len + 1; if (needed > *n) { - if (t == NULL && needed < 2 * *n) + if (needed < 2 * *n) needed = 2 * *n; /* Be generous. */ *n = needed; *lineptr = (char *) realloc (*lineptr, needed); @@ -97,7 +97,7 @@ _IO_getdelim (lineptr, n, delimiter, fp) break; len = fp->_IO_read_end - fp->_IO_read_ptr; } - lineptr[cur_len] = '\0'; + (*lineptr)[cur_len] = '\0'; return cur_len; } |