Skip to content

bpo-20596: define a platform dependent Py_WCSTOK in Include/pyport.h,… #10286

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

Closed
erikjanss wants to merge 4 commits into from
Closed

bpo-20596: define a platform dependent Py_WCSTOK in Include/pyport.h,… #10286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b90e8b
bpo-20596: define a platform dependent Py_WCSTOK in Include/pyport.h,…
erikjanss Nov 1, 2018
f0e9779
bpo-20596: define _Py_WCSTOK instead of Py_WCSTOK
erikjanss Nov 4, 2018
9a42bad
bpo-20596: add Misc/NEWS
erikjanss Nov 4, 2018
9041c01
bpo-20596: fix comments of _Py_WCSTOK
erikjanss Nov 4, 2018
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
15 changes: 15 additions & 0 deletions Include/pyport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,4 +809,19 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
#define WITH_THREAD
#endif

/* The _Py_WCSTOK macro provides a uniform interface to the wide
* character tokenizer function. Based on the environment,
* an appropriate implementation will be chosen.
*
* Microsoft does not have a three-argument wcstok, but instead provides
* an equivalent via the wcstok_s(). Borland/Embarcadero and MinGW provide this
* same wcstok_s() function. If MS_WINDOWS is not defined,
* we'll assume that a POSIX-like three-argument version is available.
*/
#if defined(MS_WINDOWS)
# define _Py_WCSTOK(str, tok, state) wcstok_s(str, tok, state)
#else
# define _Py_WCSTOK(str, tok, state) wcstok(str, tok, state)
#endif

#endif /* Py_PYPORT_H */
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2018-11-04-11-47-53.bpo-20596.N6nB_g.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
define a platform dependent _Py_WCSTOK in Include/pyport.h
11 changes: 2 additions & 9 deletions Modules/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@ extern "C" {
? _Py_INIT_USER_ERR("cannot decode " NAME) \
: _Py_INIT_NO_MEMORY())


#ifdef MS_WINDOWS
#define WCSTOK wcstok_s
#else
#define WCSTOK wcstok
#endif

/* For Py_GetArgcArgv(); set by main() */
static wchar_t **orig_argv = NULL;
static int orig_argc = 0;
Expand Down Expand Up @@ -893,9 +886,9 @@ cmdline_init_env_warnoptions(_PyMain *pymain, const _PyCoreConfig *config,


wchar_t *warning, *context = NULL;
for (warning = WCSTOK(env, L",", &context);
for (warning = _Py_WCSTOK(env, L",", &context);
warning != NULL;
warning = WCSTOK(NULL, L",", &context))
warning = _Py_WCSTOK(NULL, L",", &context))
{
_PyInitError err = _Py_wstrlist_append(&cmdline->nenv_warnoption,
&cmdline->env_warnoptions,
Expand Down
6 changes: 3 additions & 3 deletions Python/pathconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,11 +693,11 @@ _Py_FindEnvConfigValue(FILE *env_file, const wchar_t *key,
wchar_t *tmpbuffer = _Py_DecodeUTF8_surrogateescape(buffer, n);
if (tmpbuffer) {
wchar_t * state;
wchar_t * tok = wcstok(tmpbuffer, L" \t\r\n", &state);
wchar_t * tok = _Py_WCSTOK(tmpbuffer, L" \t\r\n", &state);
if ((tok != NULL) && !wcscmp(tok, key)) {
tok = wcstok(NULL, L" \t", &state);
tok = _Py_WCSTOK(NULL, L" \t", &state);
if ((tok != NULL) && !wcscmp(tok, L"=")) {
tok = wcstok(NULL, L"\r\n", &state);
tok = _Py_WCSTOK(NULL, L"\r\n", &state);
if (tok != NULL) {
wcsncpy(value, tok, MAXPATHLEN);
result = 1;
Expand Down