|
 |
1069f6 |
From ddc6dacd06b41ed5001b1c884b5d5c9e0a70e275 Mon Sep 17 00:00:00 2001
|
|
|
1069f6 |
From: akallabeth <akallabeth@posteo.net>
|
|
|
1069f6 |
Date: Thu, 10 Nov 2022 15:54:28 +0100
|
|
|
1069f6 |
Subject: [PATCH] [winpr, crt] Added wcsstr implementation
|
|
|
1069f6 |
|
|
|
1069f6 |
(cherry picked from commit 6c034ba6117a4efc9266e845fe9a9a92ed4ee61d)
|
|
|
1069f6 |
---
|
|
|
1069f6 |
winpr/include/winpr/string.h | 3 +++
|
|
|
1069f6 |
winpr/libwinpr/crt/string.c | 20 ++++++++++++++++++++
|
|
|
1069f6 |
2 files changed, 23 insertions(+)
|
|
|
1069f6 |
|
|
|
1069f6 |
diff --git a/winpr/include/winpr/string.h b/winpr/include/winpr/string.h
|
|
|
1069f6 |
index 3b907c444..2d7126210 100644
|
|
|
1069f6 |
--- a/winpr/include/winpr/string.h
|
|
|
1069f6 |
+++ b/winpr/include/winpr/string.h
|
|
|
1069f6 |
@@ -62,6 +62,8 @@ extern "C"
|
|
|
1069f6 |
WINPR_API size_t _wcslen(const WCHAR* str);
|
|
|
1069f6 |
WINPR_API size_t _wcsnlen(const WCHAR* str, size_t maxNumberOfElements);
|
|
|
1069f6 |
|
|
|
1069f6 |
+ WINPR_API WCHAR* _wcsstr(const WCHAR* str, const WCHAR* strSearch);
|
|
|
1069f6 |
+
|
|
|
1069f6 |
WINPR_API WCHAR* _wcschr(const WCHAR* str, WCHAR c);
|
|
|
1069f6 |
WINPR_API WCHAR* _wcsrchr(const WCHAR* str, WCHAR c);
|
|
|
1069f6 |
|
|
|
1069f6 |
@@ -74,6 +76,7 @@ extern "C"
|
|
|
1069f6 |
#define _wcsncmp wcsncmp
|
|
|
1069f6 |
#define _wcslen wcslen
|
|
|
1069f6 |
#define _wcsnlen wcsnlen
|
|
|
1069f6 |
+#define _wcsstr wcsstr
|
|
|
1069f6 |
#define _wcschr wcschr
|
|
|
1069f6 |
#define _wcsrchr wcsrchr
|
|
|
1069f6 |
|
|
|
1069f6 |
diff --git a/winpr/libwinpr/crt/string.c b/winpr/libwinpr/crt/string.c
|
|
|
1069f6 |
index 5dcf4b3f1..efd7d166c 100644
|
|
|
1069f6 |
--- a/winpr/libwinpr/crt/string.c
|
|
|
1069f6 |
+++ b/winpr/libwinpr/crt/string.c
|
|
|
1069f6 |
@@ -147,6 +147,26 @@ size_t _wcsnlen(const WCHAR* str, size_t max)
|
|
|
1069f6 |
return x;
|
|
|
1069f6 |
}
|
|
|
1069f6 |
|
|
|
1069f6 |
+/* _wcsstr -> wcsstr */
|
|
|
1069f6 |
+
|
|
|
1069f6 |
+WCHAR* _wcsstr(const WCHAR* str, const WCHAR* strSearch)
|
|
|
1069f6 |
+{
|
|
|
1069f6 |
+ assert(str);
|
|
|
1069f6 |
+ assert(strSearch);
|
|
|
1069f6 |
+
|
|
|
1069f6 |
+ if (strSearch[0] == '\0')
|
|
|
1069f6 |
+ return str;
|
|
|
1069f6 |
+
|
|
|
1069f6 |
+ const size_t searchLen = _wcslen(strSearch);
|
|
|
1069f6 |
+ while (*str)
|
|
|
1069f6 |
+ {
|
|
|
1069f6 |
+ if (_wcsncmp(str, strSearch, searchLen) == 0)
|
|
|
1069f6 |
+ return str;
|
|
|
1069f6 |
+ str++;
|
|
|
1069f6 |
+ }
|
|
|
1069f6 |
+ return NULL;
|
|
|
1069f6 |
+}
|
|
|
1069f6 |
+
|
|
|
1069f6 |
/* _wcschr -> wcschr */
|
|
|
1069f6 |
|
|
|
1069f6 |
WCHAR* _wcschr(const WCHAR* str, WCHAR c)
|
|
|
1069f6 |
--
|
|
|
1069f6 |
2.37.1
|
|
|
1069f6 |
|