|
 |
dacebc |
From e482b394efc371412ce659b731a9b1e1d73bdf0e Mon Sep 17 00:00:00 2001
|
|
|
dacebc |
From: akallabeth <akallabeth@posteo.net>
|
|
|
dacebc |
Date: Mon, 24 Oct 2022 10:42:56 +0200
|
|
|
dacebc |
Subject: [PATCH] Added function _wcsncmp
|
|
|
dacebc |
|
|
|
dacebc |
* Compare WCHAR strings up to n characters
|
|
|
dacebc |
|
|
|
dacebc |
(cherry picked from commit 8178ed26a459356ece17414c6e871a7e0735a4ec)
|
|
|
dacebc |
---
|
|
|
dacebc |
winpr/include/winpr/string.h | 2 ++
|
|
|
dacebc |
winpr/libwinpr/crt/string.c | 15 ++++++++++++++-
|
|
|
dacebc |
2 files changed, 16 insertions(+), 1 deletion(-)
|
|
|
dacebc |
|
|
|
dacebc |
diff --git a/winpr/include/winpr/string.h b/winpr/include/winpr/string.h
|
|
|
dacebc |
index 8ce83bc1d..3b907c444 100644
|
|
|
dacebc |
--- a/winpr/include/winpr/string.h
|
|
|
dacebc |
+++ b/winpr/include/winpr/string.h
|
|
|
dacebc |
@@ -57,6 +57,7 @@ extern "C"
|
|
|
dacebc |
WINPR_API int _strnicmp(const char* string1, const char* string2, size_t count);
|
|
|
dacebc |
|
|
|
dacebc |
WINPR_API int _wcscmp(const WCHAR* string1, const WCHAR* string2);
|
|
|
dacebc |
+ WINPR_API int _wcsncmp(const WCHAR* string1, const WCHAR* string2, size_t count);
|
|
|
dacebc |
|
|
|
dacebc |
WINPR_API size_t _wcslen(const WCHAR* str);
|
|
|
dacebc |
WINPR_API size_t _wcsnlen(const WCHAR* str, size_t maxNumberOfElements);
|
|
|
dacebc |
@@ -70,6 +71,7 @@ extern "C"
|
|
|
dacebc |
#else
|
|
|
dacebc |
|
|
|
dacebc |
#define _wcscmp wcscmp
|
|
|
dacebc |
+#define _wcsncmp wcsncmp
|
|
|
dacebc |
#define _wcslen wcslen
|
|
|
dacebc |
#define _wcsnlen wcsnlen
|
|
|
dacebc |
#define _wcschr wcschr
|
|
|
dacebc |
diff --git a/winpr/libwinpr/crt/string.c b/winpr/libwinpr/crt/string.c
|
|
|
dacebc |
index 37fcb4b25..c25ffa279 100644
|
|
|
dacebc |
--- a/winpr/libwinpr/crt/string.c
|
|
|
dacebc |
+++ b/winpr/libwinpr/crt/string.c
|
|
|
dacebc |
@@ -90,7 +90,20 @@ int _wcscmp(const WCHAR* string1, const WCHAR* string2)
|
|
|
dacebc |
|
|
|
dacebc |
Data_Read_UINT16(string1, value1);
|
|
|
dacebc |
Data_Read_UINT16(string2, value2);
|
|
|
dacebc |
- return value1 - value2;
|
|
|
dacebc |
+ return (int)value1 - value2;
|
|
|
dacebc |
+}
|
|
|
dacebc |
+
|
|
|
dacebc |
+int _wcsncmp(const WCHAR* string1, const WCHAR* string2, size_t count)
|
|
|
dacebc |
+{
|
|
|
dacebc |
+ for (size_t x = 0; x < count; x++)
|
|
|
dacebc |
+ {
|
|
|
dacebc |
+ const WCHAR a = string1[x];
|
|
|
dacebc |
+ const WCHAR b = string2[x];
|
|
|
dacebc |
+
|
|
|
dacebc |
+ if (a != b)
|
|
|
dacebc |
+ return (int)a - b;
|
|
|
dacebc |
+ }
|
|
|
dacebc |
+ return 0;
|
|
|
dacebc |
}
|
|
|
dacebc |
|
|
|
dacebc |
/* _wcslen -> wcslen */
|
|
|
dacebc |
--
|
|
|
dacebc |
2.37.1
|
|
|
dacebc |
|