Commit 1604c0fe authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Add the compatibility definition for getdelim.c from netbsd. 

We shouldn't actually need this code nearly anywhere we build:
getdelim is POSIX, and mingw provides it.
parent 3145e469

LICENSE

+30 −0
Original line number Diff line number Diff line
@@ -155,6 +155,36 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



===============================================================================

getdelim.c is distributed under this license:



 Copyright (c) 2011 The NetBSD Foundation, Inc.

 All rights reserved.



 This code is derived from software contributed to The NetBSD Foundation

 by Christos Zoulas.



 Redistribution and use in source and binary forms, with or without

 modification, are permitted provided that the following conditions

 are met:

 1. Redistributions of source code must retain the above copyright

    notice, this list of conditions and the following disclaimer.

 2. Redistributions in binary form must reproduce the above copyright

    notice, this list of conditions and the following disclaimer in the

    documentation and/or other materials provided with the distribution.



 THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS

 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS

 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 POSSIBILITY OF SUCH DAMAGE.



===============================================================================

src/config/geoip is licensed under the following license:

src/ext/getdelim.c

0 → 100644
+82 −0
Original line number Diff line number Diff line 
/*	$NetBSD: getdelim.c,v 1.2 2015/12/25 20:12:46 joerg Exp $	*/

/*	NetBSD-src: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp 	*/



/*-

 * Copyright (c) 2011 The NetBSD Foundation, Inc.

 * All rights reserved.

 *

 * This code is derived from software contributed to The NetBSD Foundation

 * by Christos Zoulas.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS

 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS

 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 */



#include <nbcompat.h>

#include <nbcompat/stdio.h>

#include <nbcompat/stdlib.h>



#if !HAVE_GETDELIM



ssize_t

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)

			return -1;

	}



	for (ptr = *buf, eptr = *buf + *bufsiz;;) {

		int c = fgetc(fp);

		if (c == -1) {

			if (feof(fp)) {

				ssize_t diff = (ssize_t)(ptr - *buf);

				if (diff != 0) {

					*ptr = '\0';

					return diff;

				}

			}

			return -1;

		}

		*ptr++ = c;

		if (c == delimiter) {

			*ptr = '\0';

			return ptr - *buf;

		}

		if (ptr + 2 >= eptr) {

			char *nbuf;

			size_t nbufsiz = *bufsiz * 2;

			ssize_t d = ptr - *buf;

			if ((nbuf = realloc(*buf, nbufsiz)) == NULL)

				return -1;

			*buf = nbuf;

			*bufsiz = nbufsiz;

			eptr = nbuf + nbufsiz;

			ptr = nbuf + d;

		}

	}

}



#endif

src/ext/include.am

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ EXTHEADERS = \ 
  src/ext/tor_readpassphrase.h \

  src/ext/strlcat.c	\

  src/ext/strlcpy.c	\

  src/ext/getdelim.c    \

  src/ext/tinytest_macros.h \

  src/ext/tor_queue.h	\

  src/ext/siphash.h \
@@ -173,4 +174,3 @@ EXTRA_DIST += \ 
	src/ext/timeouts/Makefile			\

	src/ext/timeouts/Rules.shrc			\

	src/ext/timeouts/test-timeout.c