From: Victor Julien <victor@mini.local>
Date: Fri, 20 Sep 2013 15:12:58 +0000 (+0200)
Subject: Add a fallback memrchr implementation for those platforms that dont support it. Bug... 
X-Git-Tag: suricata-2.0beta2~347
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8b71938ff64b58fb64bb30a7c7df452609bc2b2;p=thirdparty%2Fsuricata.git

Add a fallback memrchr implementation for those platforms that dont support it. Bug #963.
---

diff --git a/configure.ac b/configure.ac
index 1a327bc223..6f8a3b6bdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,7 @@
     # Checks for library functions.
     AC_FUNC_MALLOC
     AC_FUNC_REALLOC
-    AC_CHECK_FUNCS([gettimeofday memset strcasecmp strchr strdup strerror strncasecmp strtol strtoul memchr])
+    AC_CHECK_FUNCS([gettimeofday memset strcasecmp strchr strdup strerror strncasecmp strtol strtoul memchr memrchr])
 
     # Add large file support
     AC_SYS_LARGEFILE
diff --git a/src/Makefile.am b/src/Makefile.am
index 2084a1efce..498fa41e3a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -294,6 +294,7 @@ util-logopenfile.h util-logopenfile.c \
 util-magic.c util-magic.h \
 util-memcmp.c util-memcmp.h \
 util-mem.h \
+util-memrchr.c util-memrchr.h \
 util-misc.c util-misc.h \
 util-mpm-ac-bs.c util-mpm-ac-bs.h \
 util-mpm-ac.c util-mpm-ac.h \
diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index dd399f5753..daa12ccb04 100644
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -64,6 +64,8 @@
 
 #include "util-optimize.h"
 
+#include "util-memrchr.h"
+
 #ifndef IPPROTO_SCTP
 #define IPPROTO_SCTP 132
 #endif
diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index 5e8fc87e15..a3190306e6 100644
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -99,6 +99,7 @@
 #include "util-pool.h"
 #include "util-byte.h"
 #include "util-proto-name.h"
+#include "util-memrchr.h"
 
 #include "util-mpm-ac.h"
 #include "detect-engine-mpm.h"
@@ -253,6 +254,7 @@ int RunUnittests(int list_unittests, char *regex_arg)
     DetectProtoTests();
     DetectPortTests();
     SCAtomicRegisterTests();
+    MemrchrRegisterTests();
 #ifdef __SC_CUDA_SUPPORT__
     CudaBufferRegisterUnittests();
 #endif
diff --git a/src/util-memrchr.c b/src/util-memrchr.c
new file mode 100644
index 0000000000..eac5474753
--- /dev/null
+++ b/src/util-memrchr.c
@@ -0,0 +1,65 @@
+/* Copyright (C) 2007-2013 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Victor Julien <victor@inliniac.net>
+ *
+ */
+
+#include "suricata-common.h"
+#include "util-unittest.h"
+
+#ifndef HAVE_MEMRCHR
+void *memrchr (const void *s, int c, size_t n)
+{
+    const char *end = s + n;
+
+    while (end > (const char *)s) {
+        if (*end == (char)c)
+            return (void *)end;
+        end--;
+    }
+    return NULL;
+}
+#endif  /* HAVE_MEMRCHR */
+
+#ifdef UNITTESTS
+static int MemrchrTest01 (void) {
+    char haystack[] = "abcabc";
+    char needle = 'b';
+
+    char *ptr = memrchr(haystack, needle, strlen(haystack));
+    if (ptr == NULL)
+        return 0;
+
+    if (strlen(ptr) != 2)
+        return 0;
+
+    if (strcmp(ptr, "bc") != 0)
+        return 0;
+
+    return 1;
+}
+#endif
+
+void MemrchrRegisterTests(void) {
+#ifdef UNITTESTS
+    UtRegisterTest("MemrchrTest01", MemrchrTest01, 1);
+#endif
+}
diff --git a/src/util-memrchr.h b/src/util-memrchr.h
new file mode 100644
index 0000000000..c3b5c8d893
--- /dev/null
+++ b/src/util-memrchr.h
@@ -0,0 +1,30 @@
+/* Copyright (C) 2007-2010 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ */
+
+#ifndef __UTIL_MEMRCHR_H__
+#define __UTIL_MEMRCHR_H__
+
+void *memrchr(const void *s, int c, size_t n);
+
+void MemrchrRegisterTests(void);
+
+#endif /* __UTIL_MEMRCHR_H__ */