From d175970f402a07706f7cf82b032be5037b2cebb5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 16 May 2004 19:03:42 +0000 Subject: getline cleanup. This changes the getndelim2 API: both order of arguments, and meaning of delim2 (now uses EOF, not 0, to indicate no delimiter). --- lib/getndelim2.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'lib/getndelim2.h') diff --git a/lib/getndelim2.h b/lib/getndelim2.h index d9bafe3b42..39f80cb557 100644 --- a/lib/getndelim2.h +++ b/lib/getndelim2.h @@ -1,7 +1,7 @@ /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters, with bounded memory allocation. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 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 published by @@ -20,23 +20,24 @@ #ifndef GETNDELIM2_H #define GETNDELIM2_H 1 -#include #include - -/* Get ssize_t. */ #include -/* Read up to (and including) a delimiter DELIM1 from STREAM into *LINEPTR - + OFFSET (and NUL-terminate it). If DELIM2 is non-zero, then read up - and including the first occurrence of DELIM1 or DELIM2. *LINEPTR is - a pointer returned from malloc (or NULL), pointing to *LINESIZE bytes of - space. It is realloc'd as necessary. Reallocation is limited to - NMAX bytes; if the line is longer than that, the extra bytes are read but - thrown away. +#define GETNLINE_NO_LIMIT ((size_t) -1) + +/* Read into a buffer *LINEPTR returned from malloc (or NULL), + pointing to *LINESIZE bytes of space. Store the input bytes + starting at *LINEPTR + OFFSET, and null-terminate them. Reallocate + the buffer as necessary, but if NMAX is not GETNLINE_NO_LIMIT + then do not allocate more than NMAX bytes; if the line is longer + than that, read and discard the extra bytes. Stop reading after + after the first occurrence of DELIM1 or DELIM2, whichever comes + first; a delimiter equal to EOF stands for no delimiter. Read the + input bytes from STREAM. Return the number of bytes read and stored at *LINEPTR + OFFSET (not including the NUL terminator), or -1 on error or EOF. */ -extern ssize_t getndelim2 (char **lineptr, size_t *linesize, size_t nmax, - FILE *stream, int delim1, int delim2, - size_t offset); +extern ssize_t getndelim2 (char **lineptr, size_t *linesize, size_t offset, + size_t nmax, int delim1, int delim2, + FILE *stream); #endif /* GETNDELIM2_H */ -- cgit v1.2.1