[PATCH 01/15] tools/nolibc: add strstr()

[Thomas Weißschuh]

This is used in various selftests and will be handy when integrating
those with nolibc.

Signed-off-by: Thomas Weißschuh <thomas.weisssc...@linutronix.de>
---
 tools/include/nolibc/string.h                | 20 ++++++++++++++++++++
 tools/testing/selftests/nolibc/nolibc-test.c |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/tools/include/nolibc/string.h b/tools/include/nolibc/string.h
index 
f0d335f0e467ec870066811289dfd11e46e60a92..b7b2b93bc90c9330dec7186d45c18fd3f24373d0
 100644
--- a/tools/include/nolibc/string.h
+++ b/tools/include/nolibc/string.h
@@ -289,6 +289,26 @@ char *strrchr(const char *s, int c)
        return (char *)ret;
 }
 
+static __attribute__((unused))
+char *strstr(const char *haystack, const char *needle)
+{
+       size_t len_haystack, len_needle;
+
+       len_needle = strlen(needle);
+       if (!len_needle)
+               return NULL;
+
+       len_haystack = strlen(haystack);
+       while (len_haystack >= len_needle) {
+               if (!memcmp(haystack, needle, len_needle))
+                       return (char *)haystack;
+               haystack++;
+               len_haystack--;
+       }
+
+       return NULL;
+}
+
 static __attribute__((unused))
 int tolower(int c)
 {
diff --git a/tools/testing/selftests/nolibc/nolibc-test.c 
b/tools/testing/selftests/nolibc/nolibc-test.c
index 
1ad0db92f0ed47f708363b2e558717fa0e686b8f..3e15a25ccddf5135db1f59bce1eefdff2ffe57f6
 100644
--- a/tools/testing/selftests/nolibc/nolibc-test.c
+++ b/tools/testing/selftests/nolibc/nolibc-test.c
@@ -1211,6 +1211,9 @@ int run_stdlib(int min, int max)
                CASE_TEST(strlcpy_2);          EXPECT_STRBUFEQ(is_nolibc, 
strlcpy(buf, "bar", 2), buf, 3, "b"); break;
                CASE_TEST(strlcpy_3);          EXPECT_STRBUFEQ(is_nolibc, 
strlcpy(buf, "bar", 3), buf, 3, "ba"); break;
                CASE_TEST(strlcpy_4);          EXPECT_STRBUFEQ(is_nolibc, 
strlcpy(buf, "bar", 4), buf, 3, "bar"); break;
+               CASE_TEST(strstr_foobar_foo);  EXPECT_STREQ(1, strstr("foobar", 
"foo"), "foobar"); break;
+               CASE_TEST(strstr_foobar_bar);  EXPECT_STREQ(1, strstr("foobar", 
"bar"), "bar"); break;
+               CASE_TEST(strstr_foobar_baz);  EXPECT_PTREQ(1, strstr("foobar", 
"baz"), NULL); break;
                CASE_TEST(memcmp_20_20);       EXPECT_EQ(1, memcmp("aaa\x20", 
"aaa\x20", 4), 0); break;
                CASE_TEST(memcmp_20_60);       EXPECT_LT(1, memcmp("aaa\x20", 
"aaa\x60", 4), 0); break;
                CASE_TEST(memcmp_60_20);       EXPECT_GT(1, memcmp("aaa\x60", 
"aaa\x20", 4), 0); break;

-- 
2.49.0