From b04d719c1067dd1cf9b48295f1d0e7ed5adb7255 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 10 Jul 2018 10:23:29 -0400 Subject: Integrate getdelim() and getline() support into Tor. --- src/ext/getdelim.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/ext') diff --git a/src/ext/getdelim.c b/src/ext/getdelim.c index 60df7e1b64..8254103ff9 100644 --- a/src/ext/getdelim.c +++ b/src/ext/getdelim.c @@ -30,21 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include - -#if !HAVE_GETDELIM +#ifndef BUFSIZ +#define BUFSIZ 512 +#endif ssize_t -getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) +compat_getdelim_(char **buf, size_t *bufsiz, int delimiter, FILE *fp) { char *ptr, *eptr; if (*buf == NULL || *bufsiz == 0) { *bufsiz = BUFSIZ; - if ((*buf = malloc(*bufsiz)) == NULL) + if ((*buf = raw_malloc(*bufsiz)) == NULL) return -1; } @@ -69,7 +67,7 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) char *nbuf; size_t nbufsiz = *bufsiz * 2; ssize_t d = ptr - *buf; - if ((nbuf = realloc(*buf, nbufsiz)) == NULL) + if ((nbuf = raw_realloc(*buf, nbufsiz)) == NULL) return -1; *buf = nbuf; *bufsiz = nbufsiz; @@ -78,5 +76,3 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) } } } - -#endif -- cgit v1.2.3-54-g00ecf