From 0484299ee4924e9bfa2870024fd519202797f177 Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Thu, 11 Apr 2024 10:51:15 +0200
Subject: [PATCH] Align with Berry PR #412 (#21143)

---
 lib/libesp32/berry/src/be_strlib.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/libesp32/berry/src/be_strlib.c b/lib/libesp32/berry/src/be_strlib.c
index 308906125..2da719da9 100644
--- a/lib/libesp32/berry/src/be_strlib.c
+++ b/lib/libesp32/berry/src/be_strlib.c
@@ -21,6 +21,21 @@
 #define is_digit(c)     ((c) >= '0' && (c) <= '9')
 #define skip_space(s)   while (is_space(*(s))) { ++(s); }
 
+static int str_strncasecmp(const char *s1, const char *s2, size_t n)
+{
+	if (n == 0) return 0;
+
+	while (n-- != 0 && tolower(*s1) == tolower(*s2)) {
+		if (n == 0 || *s1 == '\0' || *s2 == '\0')
+			break;
+		s1++;
+		s2++;
+	}
+
+	return tolower(*(const unsigned char *)s1)
+		- tolower(*(const unsigned char *)s2);
+}
+
 typedef bint (*str_opfunc)(const char*, const char*, bint, bint);
 
 bstring* be_strcat(bvm *vm, bstring *s1, bstring *s2)
@@ -964,7 +979,7 @@ static int str_startswith(bvm *vm)
         const char *p = be_tostring(vm, 2);
         size_t len = (size_t)be_strlen(vm, 2);
         if (case_insensitive) {
-            if (strncasecmp(s, p, len) == 0) {
+            if (str_strncasecmp(s, p, len) == 0) {
                 result = btrue;
             }
         } else {
@@ -991,7 +1006,7 @@ static int str_endswith(bvm *vm)
         const char *p = be_tostring(vm, 2);
         size_t len = (size_t)be_strlen(vm, 2);
         if (case_insensitive) {
-            if (strncasecmp(s + (int)strlen(s) - (int)len, p, len) == 0) {
+            if (str_strncasecmp(s + (int)strlen(s) - (int)len, p, len) == 0) {
                 result = btrue;
             }
         } else {