AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge PR #1175: Remove all references to strtok() and wcstok(), implement and use alternatives

Browse Source
This commit is contained in:
Davide Beatrici 2020-07-20 18:17:35 +02:00 committed by GitHub
commit 7b042e53d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 169 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
src/Mayaqua/Internat.c
View File

@ -2086,82 +2086,171 @@ UNI_TOKEN_LIST *UnixUniParseToken(wchar_t *src, wchar_t *separator)
return ret;
}
// Get a standard token delimiter
wchar_t *UniDefaultTokenSplitChars()
{
return L" ,\t\r\n";
}
// Check whether the specified character is in the string
bool UniIsCharInStr(wchar_t *str, wchar_t c)
{
UINT i, len;
// Validate arguments
if (str == NULL)
{
return false;
}
len = UniStrLen(str);
for (i = 0;i < len;i++)
{
if (str[i] == c)
{
return true;
}
}
return false;
}
// Cut out the token from the string (not ignore the blanks between delimiters)
UNI_TOKEN_LIST *UniParseTokenWithNullStr(wchar_t *str, wchar_t *split_chars)
{
LIST *o;
UINT i, len;
BUF *b;
wchar_t zero = 0;
UNI_TOKEN_LIST *t;
// Validate arguments
if (str == NULL)
{
return UniNullToken();
}
if (split_chars == NULL)
{
split_chars = UniDefaultTokenSplitChars();
}
b = NewBuf();
o = NewListFast(NULL);
len = UniStrLen(str);
for (i = 0;i < (len + 1);i++)
{
wchar_t c = str[i];
bool flag = UniIsCharInStr(split_chars, c);
if (c == L'\0')
{
flag = true;
}
if (flag == false)
{
WriteBuf(b, &c, sizeof(wchar_t));
}
else
{
WriteBuf(b, &zero, sizeof(wchar_t));
Insert(o, UniCopyStr((wchar_t *)b->Buf));
ClearBuf(b);
}
}
t = ZeroMalloc(sizeof(UNI_TOKEN_LIST));
t->NumTokens = LIST_NUM(o);
t->Token = ZeroMalloc(sizeof(wchar_t *) * t->NumTokens);
for (i = 0;i < t->NumTokens;i++)
{
t->Token[i] = LIST_DATA(o, i);
}
ReleaseList(o);
FreeBuf(b);
return t;
}
// Cut out the token from string (Ignore blanks between delimiters)
UNI_TOKEN_LIST *UniParseTokenWithoutNullStr(wchar_t *str, wchar_t *split_chars)
{
LIST *o;
UINT i, len;
bool last_flag;
BUF *b;
wchar_t zero = 0;
UNI_TOKEN_LIST *t;
// Validate arguments
if (str == NULL)
{
return UniNullToken();
}
if (split_chars == NULL)
{
split_chars = UniDefaultTokenSplitChars();
}
b = NewBuf();
o = NewListFast(NULL);
len = UniStrLen(str);
last_flag = false;
for (i = 0;i < (len + 1);i++)
{
wchar_t c = str[i];
bool flag = UniIsCharInStr(split_chars, c);
if (c == L'\0')
{
flag = true;
}
if (flag == false)
{
WriteBuf(b, &c, sizeof(wchar_t));
}
else
{
if (last_flag == false)
{
WriteBuf(b, &zero, sizeof(wchar_t));
if ((UniStrLen((wchar_t *)b->Buf)) != 0)
{
Insert(o, UniCopyStr((wchar_t *)b->Buf));
}
ClearBuf(b);
}
}
last_flag = flag;
}
t = ZeroMalloc(sizeof(UNI_TOKEN_LIST));
t->NumTokens = LIST_NUM(o);
t->Token = ZeroMalloc(sizeof(wchar_t *) * t->NumTokens);
for (i = 0;i < t->NumTokens;i++)
{
t->Token[i] = LIST_DATA(o, i);
}
ReleaseList(o);
FreeBuf(b);
return t;
}
// Parse the token
UNI_TOKEN_LIST *UniParseToken(wchar_t *src, wchar_t *separator)
{
#ifdef OS_WIN32
UNI_TOKEN_LIST *ret;
wchar_t *tmp;
wchar_t *str1, *str2;
UINT len, num;
#if (!defined _MSC_VER) || (_MSC_VER >= 1900)
wchar_t *state = NULL;
#endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
// Validate arguments
if (src == NULL)
{
ret = ZeroMalloc(sizeof(UNI_TOKEN_LIST));
ret->Token = ZeroMalloc(0);
return ret;
}
if (separator == NULL)
{
separator = L" .\t\r\n";
}
len = UniStrLen(src);
str1 = Malloc((len + 1) * sizeof(wchar_t));
str2 = Malloc((len + 1) * sizeof(wchar_t));
UniStrCpy(str1, 0, src);
UniStrCpy(str2, 0, src);
Lock(token_lock);
{
tmp = wcstok(str1, separator
#if (!defined _MSC_VER) || (_MSC_VER >= 1900)
, &state
#endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
);
num = 0;
while (tmp != NULL)
{
num++;
tmp = wcstok(NULL, separator
#if (!defined _MSC_VER) || (_MSC_VER >= 1900)
, &state
#endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
);
}
ret = Malloc(sizeof(UNI_TOKEN_LIST));
ret->NumTokens = num;
ret->Token = (wchar_t **)Malloc(sizeof(wchar_t *) * num);
num = 0;
tmp = wcstok(str2, separator
#if (!defined _MSC_VER) || (_MSC_VER >= 1900)
, &state
#endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
);
while (tmp != NULL)
{
ret->Token[num] = (wchar_t *)Malloc((UniStrLen(tmp) + 1) * sizeof(wchar_t));
UniStrCpy(ret->Token[num], 0, tmp);
num++;
tmp = wcstok(NULL, separator
#if (!defined _MSC_VER) || (_MSC_VER >= 1900)
, &state
#endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
);
}
}
Unlock(token_lock);
Free(str1);
Free(str2);
return ret;
#else // OS_WIN32
return UnixUniParseToken(src, separator);
#endif // OS_WIN32
// 2020/7/20 remove strtok by dnobori
return UniParseTokenWithoutNullStr(src, separator);
}
// Get a line from standard input

5
src/Mayaqua/Internat.h
View File

@ -101,6 +101,11 @@ bool UniInStrEx(wchar_t *str, wchar_t *keyword, bool case_sensitive);
void ClearUniStr(wchar_t *str, UINT str_size);
bool UniInChar(wchar_t *string, wchar_t c);
UNI_TOKEN_LIST *UniGetLines(wchar_t *str);
wchar_t *UniDefaultTokenSplitChars();
bool UniIsCharInStr(wchar_t *str, wchar_t c);
UNI_TOKEN_LIST *UniParseTokenWithNullStr(wchar_t *str, wchar_t *split_chars);
UNI_TOKEN_LIST *UniParseTokenWithoutNullStr(wchar_t *str, wchar_t *split_chars);
#ifdef OS_UNIX
void GetCurrentCharSet(char *name, UINT size);

51
src/Mayaqua/Str.c
View File

@ -2379,54 +2379,8 @@ void FreeToken(TOKEN_LIST *tokens)
// Parse the token
TOKEN_LIST *ParseToken(char *src, char *separator)
{
TOKEN_LIST *ret;
char *tmp;
char *str1, *str2;
UINT len;
UINT num;
if (src == NULL)
{
ret = ZeroMalloc(sizeof(TOKEN_LIST));
ret->Token = ZeroMalloc(0);
return ret;
}
if (separator == NULL)
{
separator = " ,\t\r\n";
}
len = StrLen(src);
str1 = Malloc(len + 1);
str2 = Malloc(len + 1);
StrCpy(str1, 0, src);
StrCpy(str2, 0, src);
Lock(token_lock);
{
tmp = strtok(str1, separator);
num = 0;
while (tmp != NULL)
{
num++;
tmp = strtok(NULL, separator);
}
ret = Malloc(sizeof(TOKEN_LIST));
ret->NumTokens = num;
ret->Token = (char **)Malloc(sizeof(char *) * num);
num = 0;
tmp = strtok(str2, separator);
while (tmp != NULL)
{
ret->Token[num] = (char *)Malloc(StrLen(tmp) + 1);
StrCpy(ret->Token[num], 0, tmp);
num++;
tmp = strtok(NULL, separator);
}
}
Unlock(token_lock);
Free(str1);
Free(str2);
return ret;
// 2020/7/20 remove strtok by dnobori
return ParseTokenWithoutNullStr(src, separator);
}
// Get a line from standard input
@ -5136,4 +5090,3 @@ void SystemTime64ToJsonStr(char *dst, UINT size, UINT64 t)