Skip to content

Add bh_strtok_r function #4790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linear0211 wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −7
Open

Add bh_strtok_r function #4790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions core/iwasm/common/wasm_runtime_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3909,13 +3909,8 @@ wasm_runtime_init_wasi(WASMModuleInstanceCommon *module_inst,
goto fail;
}

#ifdef BH_PLATFORM_WINDOWS
address = strtok_s(cp, "/", &nextptr);
mask = strtok_s(NULL, "/", &nextptr);
#else
address = strtok_r(cp, "/", &nextptr);
mask = strtok_r(NULL, "/", &nextptr);
#endif
address = bh_strtok_r(cp, "/", &nextptr);
mask = bh_strtok_r(NULL, "/", &nextptr);

if (!mask) {
snprintf(error_buf, error_buf_size,
Expand Down
10 changes: 10 additions & 0 deletions core/shared/utils/bh_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ wa_strdup(const char *s)
return s1;
}

char *
bh_strtok_r(char *str, const char *delim, char **saveptr)
{
#if !(defined(_WIN32) || defined(_WIN32_))
return strtok_r(str, delim, saveptr);
#else
return strtok_s(str, delim, saveptr);
#endif
}

#if WASM_ENABLE_WAMR_COMPILER != 0 || WASM_ENABLE_JIT != 0
int
bh_system(const char *cmd)
Expand Down
3 changes: 3 additions & 0 deletions core/shared/utils/bh_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ bh_strdup(const char *s);
char *
wa_strdup(const char *s);

char *
bh_strtok_r(char *str, const char *delim, char **saveptr);

#if WASM_ENABLE_WAMR_COMPILER != 0 || WASM_ENABLE_JIT != 0
/* Executes a system command in bash/cmd.exe */
int
Expand Down
Loading