Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibC: Fix some string functions 

I was not casting some required values to char or handling length of
zero
This commit is contained in:
Bananymous 2024-10-13 22:04:08 +03:00
parent fdddb556ae
commit 88b8ca5b29
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
userspace/libraries/LibC/string.cpp
View File

@ -87,6 +87,8 @@ int strcmp(const char* s1, const char* s2)
int strncmp(const char* s1, const char* s2, size_t n) int strncmp(const char* s1, const char* s2, size_t n)
{ {
if (n == 0)
return 0;
const unsigned char* u1 = (unsigned char*)s1; const unsigned char* u1 = (unsigned char*)s1;
const unsigned char* u2 = (unsigned char*)s2; const unsigned char* u2 = (unsigned char*)s2;
for (; --n && *u1 && *u2; u1++, u2++) for (; --n && *u1 && *u2; u1++, u2++)
@ -220,11 +222,11 @@ char* strchr(const char* str, int c)
{ {
while (*str) while (*str)
{ {
if (*str == c) if (*str == (char)c)
return (char*)str; return (char*)str;
str++; str++;
} }
return (*str == c) ? (char*)str : nullptr; return (*str == (char)c) ? (char*)str : nullptr;
} }
char* strchrnul(const char* str, int c) char* strchrnul(const char* str, int c)
@ -252,7 +254,9 @@ char* strrchr(const char* str, int c)
char* strstr(const char* haystack, const char* needle) char* strstr(const char* haystack, const char* needle)
{ {
size_t needle_len = strlen(needle); const size_t needle_len = strlen(needle);
if (needle_len == 0)
return const_cast<char*>(haystack);
for (size_t i = 0; haystack[i]; i++) for (size_t i = 0; haystack[i]; i++)
if (strncmp(haystack + i, needle, needle_len) == 0) if (strncmp(haystack + i, needle, needle_len) == 0)
return const_cast<char*>(haystack + i); return const_cast<char*>(haystack + i);