diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/iogetline.c | 81 | ||||
| -rw-r--r-- | libio/libioP.h | 4 |
2 files changed, 62 insertions, 23 deletions
diff --git a/libio/iogetline.c b/libio/iogetline.c index bd1a7431f3..328e20e6ea 100644 --- a/libio/iogetline.c +++ b/libio/iogetline.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or @@ -26,6 +26,19 @@ #include "libioP.h" #include <string.h> +#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO + +_IO_size_t +_IO_getline (fp, buf, n, delim, extract_delim) + _IO_FILE *fp; + char *buf; + _IO_size_t n; + int delim; + int extract_delim; +{ + return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0); +} + /* Algorithm based on that used by Berkeley pre-4.4 fgets implementation. Read chars into buf (of size n), until delim is seen. @@ -35,44 +48,68 @@ If extract_delim > 0, insert delim in output. */ _IO_size_t -_IO_getline (fp, buf, n, delim, extract_delim) +_IO_getline_info (fp, buf, n, delim, extract_delim, eof) _IO_FILE *fp; char *buf; _IO_size_t n; int delim; int extract_delim; + int *eof; { char *ptr = buf; + if (eof != NULL) + *eof = 0; do { _IO_ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr; - char *t; if (len <= 0) - if (__underflow (fp) == EOF) - break; - else - len = fp->_IO_read_end - fp->_IO_read_ptr; - if ((_IO_size_t) len >= n) - len = n; - t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len); - if (t != NULL) { - _IO_size_t old_len = ptr-buf; - len = t - fp->_IO_read_ptr; - if (extract_delim >= 0) + int c = __uflow (fp); + if (c == EOF) { - ++t; + if (eof) *eof = c; + break; + } + if (c == delim) + { + if (extract_delim > 0) + *ptr++ = c; + else if (extract_delim < 0) + _IO_sputbackc (fp, c); + return ptr - buf; if (extract_delim > 0) ++len; } - memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); - fp->_IO_read_ptr = t; - return old_len + len; + *ptr++ = c; + n--; } - memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); - fp->_IO_read_ptr += len; - ptr += len; - n -= len; + else + { + char *t; + if ((_IO_size_t) len >= n) + len = n; + t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len); + if (t != NULL) + { + _IO_size_t old_len = ptr-buf; + len = t - fp->_IO_read_ptr; + if (extract_delim >= 0) + { + ++t; + if (extract_delim > 0) + ++len; + } + memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); + fp->_IO_read_ptr = t; + return old_len + len; + } + memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); + fp->_IO_read_ptr += len; + ptr += len; + n -= len; + } } while (n != 0); return ptr - buf; } + +#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */ diff --git a/libio/libioP.h b/libio/libioP.h index 568bbe8812..785bfee08a 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or @@ -428,6 +428,8 @@ extern int _IO_vsnprintf __P ((char *string, _IO_size_t maxlen, extern _IO_size_t _IO_getline __P ((_IO_FILE *,char *, _IO_size_t, int, int)); +extern _IO_size_t _IO_getline_info __P ((_IO_FILE *,char *, _IO_size_t, + int, int, int *)); extern _IO_ssize_t _IO_getdelim __P ((char **, _IO_size_t *, int, _IO_FILE *)); extern double _IO_strtod __P ((const char *, char **)); extern char *_IO_dtoa __P ((double __d, int __mode, int __ndigits, |