* Added an strnstr() function and the requirement in some functions to

  use null terminated PEM structures is no more.

1 files changed, 47 insertions, 0 deletions

diff --git a/lib/strnstr.c b/lib/strnstr.c
new file mode 100644
index 0000000000..57aed55fb0
--- /dev/null
+++ b/lib/strnstr.c
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (C) 2003 Nikos Mavroyanopoulos
+ *
+ *  This file is part of GNUTLS.
+ *
+ *  The GNUTLS library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public   
+ *  License as published by the Free Software Foundation; either 
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ */
+
+#include <defines.h>
+#ifndef HAVE_STRNSTR
+# include <string.h>
+
+char *strnstr(const char *haystack, const char *needle, size_t haystacklen)
+{
+	char *p;
+	ssize_t plen;
+	ssize_t len = strlen(needle);
+
+	if (*needle == '\0')	/* everything matches empty string */
+		return (char*) haystack;
+
+	plen = haystacklen;
+	for (p = (char*) haystack; p != NULL; p = memchr(p + 1, *needle, plen-1)) {
+		plen = haystacklen - (p - haystack);
+
+		if (plen < len) return NULL;
+
+		if (strncmp(p, needle, len) == 0)
+			return (p);
+	}
+	return NULL;
+}
+
+#endif