Implement strstr, strcasestr.

noarch/string.go

@@ -3,6 +3,7 @@ package noarch
 import (
 	"bytes"
 	"reflect"
+	"strings"
 	"unsafe"
 )
 
@@ -66,6 +67,18 @@ func Strncpy(dest, src []byte, len int32) []byte {
 	return dest
 }
 
+// Strcasestr - function is similar to Strstr(),
+// but ignores the case of both strings.
+func Strcasestr(str1, str2 []byte) []byte {
+	a := strings.ToLower(CStringToString(str1))
+	b := strings.ToLower(CStringToString(str2))
+	index := strings.Index(a, b)
+	if index == -1 {
+		return []byte{0}
+	}
+	return str1[index : index+len(b)]
+}
+
 // Strcat - concatenate strings
 // Appends a copy of the source string to the destination string.
 // The terminating null character in destination is overwritten by the first
@@ -93,6 +106,19 @@ func Strncmp(str1, str2 []byte, n int32) int32 {
 	return int32(bytes.Compare(a, b))
 }
 
+// Strstr - locate a substring in a string
+// function locates the first occurrence of the null-terminated string needle
+// in the null-terminated string haystack.
+func Strstr(str1, str2 []byte) []byte {
+	a := CStringToString(str1)
+	b := CStringToString(str2)
+	index := strings.Index(a, b)
+	if index == -1 {
+		return []byte{0}
+	}
+	return str1[index : index+len(b)]
+}
+
 func min(a, b int) int {
 	if a < b {
 		return a

program/function_definition.go

@@ -180,6 +180,7 @@ var builtInFunctionDefinitions = map[string][]string{
 	},
 	"string.h": []string{
 		// string.h
+		"char* strcasestr(const char*, const char*) -> noarch.Strcasestr",
 		"char* strcat(char *, const char *) -> noarch.Strcat",
 		"int strcmp(const char *, const char *) -> noarch.Strcmp",
 
@@ -195,6 +196,8 @@ var builtInFunctionDefinitions = map[string][]string{
 		// in according to noarch.Strlen
 		"int strlen(const char*) -> noarch.Strlen",
 
+		"char* strstr(const char*, const char*) -> noarch.Strstr",
+
 		// should be: "void* memset(void *, int, size_t) -> noarch.Memset"
 		"void* memset(void *, int, int) -> noarch.Memset",
 

tests/string.c

@@ -8,7 +8,7 @@ typedef struct mem {
 
 int main()
 {
-    plan(70);
+    plan(72);
 
     diag("TODO: __builtin_object_size")
     // https://github.com/elliotchance/c2go/issues/359
@@ -268,6 +268,24 @@ int main()
             is_true(memcmp(a,b,3) == 0);
         }
     }
+    {
+        diag("strstr");
+        {
+            char* a = "needle in a haystack";
+            char* b = "haystack";
+            char* res = strstr(a,b);
+            is_streq(res, "haystack");
+        }
+    }
+    {
+        diag("strcasestr");
+        {
+            char* a = "needle in a haystack";
+            char* b = "HayStack";
+            char* res = strcasestr(a,b);
+            is_streq(res, "haystack");
+        }
+    }
 
     done_testing();
 }