From 98c66dd5a0a5430ac8882642c9a9448ee85bc53f Mon Sep 17 00:00:00 2001
From: rofl0r <rofl0r@users.noreply.github.com>
Date: Sat, 1 May 2021 13:56:50 +0100
Subject: [PATCH] fix compile on systems lacking memrchr()

like OSX.
---
 configure             | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/common/outbound.c |  9 +++++++
 2 files changed, 75 insertions(+)

diff --git a/configure b/configure
index e02115a..5d23b49 100755
--- a/configure
+++ b/configure
@@ -130,6 +130,70 @@ parsearg() {
 	esac
 }
 
+fail() { printf "%s\n" "$1" >&2 ; exit 1 ; }
+
+# Get a temporary filename
+i=0
+set -C
+while : ; do i=$(($i+1))
+tmpc="./conf$$-$PPID-$i.c"
+2>|/dev/null > "$tmpc" && break
+test "$i" -gt 50 && fail "$0: cannot create temporary file $tmpc"
+done
+set +C
+trap 'rm "$tmpc"' EXIT INT QUIT TERM HUP
+
+check_compile() {
+	printf "checking %s ... " "$1"
+	printf "$3" > "$tmpc"
+	local res=0
+	$CC $OUR_CPPFLAGS $CPPFLAGS $2 $CFLAGS "$tmpc" -o /dev/null >/dev/null 2>&1 \
+	|| res=1
+	test x$res = x0 && \
+	{ printf "yes\n" ; test x"$2" = x || OUR_CPPFLAGS="$OUR_CPPFLAGS $2" ; } \
+	|| printf "no\n"
+	return $res
+}
+
+check_define() {
+	printf "checking whether \$CC defines %s ... " "$1"
+	local res=1
+	$CC $OUR_CPPFLAGS $CPPFLAGS $CFLAGS -dM -E - </dev/null | grep "$1" >/dev/null && res=0
+	test x$res = x0 && printf "yes\n" || printf "no\n"
+	return $res
+}
+
+check_compile_run() {
+	printf "checking %s ... " "$1"
+	printf "$2" > "$tmpc"
+	local res=0
+	$CC $OUR_CPPFLAGS $CPPFLAGS $CFLAGS "$tmpc" -o "$tmpc".out >/dev/null 2>&1 \
+	|| res=1
+	test x$res = x0 && { "$tmpc".out || res=1 ; }
+	rm -f "$tmpc".out
+	test x$res = x0 && printf "yes\n" || printf "no\n"
+	return $res
+}
+
+check_link_silent() {
+	printf "$2" > "$tmpc"
+	$CC $OUR_CPPFLAGS $CPPFLAGS $1 $CFLAGS "$tmpc" -o /dev/null >/dev/null 2>&1
+}
+
+check_link() {
+	printf "checking %s ... " "$1"
+	local res=0
+	check_link_silent "$2" "$3" || res=1
+	test x$res = x0 && printf "yes\n" || printf "no\n"
+	return $res
+}
+
+test -z "$CC" && CC=cc
+
+check_compile 'whether C compiler works' '' 'int main() {return 0;}' || fail 'error: install a C compiler and library'
+check_compile 'whether we have memrchr()' "-DGNU_SOURCE -DHAVE_MEMRCHR" \
+'#define _GNU_SOURCE\n#include <string.h>\nint main() {\nvoid *p = memrchr("foo", 0, 3);\nreturn 0;}'
+
 for i in  python perl tcl libsexy gtkspell ; do eval feature_$i=auto ; done
 while true ; do
 	case $1 in
@@ -155,7 +219,9 @@ add_config "includedir = $includedir"
 add_config "sysconfdir = $sysconfdir"
 
 add_config "CC ?= $CC"
+
 [ -z "$CPPFLAGS" ] || add_config "USER_CPPFLAGS = $CPPFLAGS"
+[ -z "$OUR_CPPFLAGS" ] || add_config "USER_CPPFLAGS += $OUR_CPPFLAGS"
 [ -z "$CFLAGS" ] ||   add_config "USER_CFLAGS = $CFLAGS"
 [ -z "$LDFLAGS" ] ||   add_config "USER_LDFLAGS = $LDFLAGS"
 
diff --git a/src/common/outbound.c b/src/common/outbound.c
index ddcc6b9..da208d8 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -54,6 +54,15 @@
 #include "outbound.h"
 #include "chanopt.h"
 
+#ifndef HAVE_MEMRCHR
+static void *memrchr(const void *m, int c, size_t n) {
+	const unsigned char *s = m;
+	c = (unsigned char)c;
+	while (n--) if (s[n]==c) return (void *)(s+n);
+	return 0;
+}
+#endif
+
 
 #ifdef USE_DEBUG
 extern int current_mem_usage;
-- 
2.11.4.GIT