From 90b3ed0d01880af45eb6eca582a825740c7fba02 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 21 Jun 2000 09:12:30 +0000 Subject: [PATCH] (getstr): Move into a separate file. --- lib/getline.c | 94 ++--------------------------------------------------------- 1 file changed, 3 insertions(+), 91 deletions(-) diff --git a/lib/getline.c b/lib/getline.c index 170a26e96..8213a2e96 100644 --- a/lib/getline.c +++ b/lib/getline.c @@ -1,6 +1,6 @@ /* getline.c -- Replacement for GNU C library function getline -Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc. +Copyright (C) 1993, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -39,105 +39,17 @@ getline (char **lineptr, size_t *n, FILE *stream) return getdelim (lineptr, n, '\n', stream); } - #else /* ! have getdelim */ -# define NDEBUG -# include - -# if STDC_HEADERS -# include -# else -char *malloc (), *realloc (); -# endif - -/* Always add at least this many bytes when extending the buffer. */ -# define MIN_CHUNK 64 - -/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR - + OFFSET (and null-terminate it). *LINEPTR is a pointer returned from - malloc (or NULL), pointing to *N characters of space. It is realloc'd - as necessary. Return the number of characters read (not including the - null terminator), or -1 on error or EOF. */ - -int -getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset) -{ - int nchars_avail; /* Allocated but unused chars in *LINEPTR. */ - char *read_pos; /* Where we're reading into *LINEPTR. */ - int ret; - - if (!lineptr || !n || !stream) - return -1; - - if (!*lineptr) - { - *n = MIN_CHUNK; - *lineptr = malloc (*n); - if (!*lineptr) - return -1; - } - - nchars_avail = *n - offset; - read_pos = *lineptr + offset; - - for (;;) - { - register int c = getc (stream); - - /* We always want at least one char left in the buffer, since we - always (unless we get an error while reading the first char) - NUL-terminate the line buffer. */ - - assert(*n - nchars_avail == read_pos - *lineptr); - if (nchars_avail < 2) - { - if (*n > MIN_CHUNK) - *n *= 2; - else - *n += MIN_CHUNK; - - nchars_avail = *n + *lineptr - read_pos; - *lineptr = realloc (*lineptr, *n); - if (!*lineptr) - return -1; - read_pos = *n - nchars_avail + *lineptr; - assert(*n - nchars_avail == read_pos - *lineptr); - } - - if (c == EOF || ferror (stream)) - { - /* Return partial line, if any. */ - if (read_pos == *lineptr) - return -1; - else - break; - } - - *read_pos++ = c; - nchars_avail--; - - if (c == terminator) - /* Return the line. */ - break; - } - - /* Done - NUL terminate and return the number of chars read. */ - *read_pos = '\0'; - - ret = read_pos - (*lineptr + offset); - return ret; -} - int getline (char **lineptr, size_t *n, FILE *stream) { - return getstr (lineptr, n, stream, '\n', 0); + return getstr (lineptr, n, stream, '\n', 0, 0); } int getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream) { - return getstr (lineptr, n, stream, delimiter, 0); + return getstr (lineptr, n, stream, delimiter, 0, 0); } #endif -- 2.11.0