Currently the wcstok function for these import libraries is defined as
alias to wcstok_s. But these two functions differs in special cases for
argument validation.
So define wcstok() function for msvcr80+ import libraries which does its
own argument validation without setting errno and without calling exception
handler and then calls the wcstok_s().
---
mingw-w64-crt/Makefile.am | 23 ++++++++++++++-----
mingw-w64-crt/def-include/crt-aliases.def.in | 3 ---
mingw-w64-crt/lib-common/msvcr120_app.def.in | 1 -
mingw-w64-crt/lib-common/msvcrt.def.in | 1 -
mingw-w64-crt/lib32/msvcr100.def.in | 1 -
mingw-w64-crt/lib32/msvcr100d.def.in | 1 -
mingw-w64-crt/lib32/msvcr110.def.in | 1 -
mingw-w64-crt/lib32/msvcr110d.def.in | 1 -
mingw-w64-crt/lib32/msvcr120.def.in | 1 -
mingw-w64-crt/lib32/msvcr120d.def.in | 1 -
mingw-w64-crt/lib32/msvcr80.def.in | 1 -
mingw-w64-crt/lib32/msvcr80d.def.in | 1 -
mingw-w64-crt/lib32/msvcr90.def.in | 1 -
mingw-w64-crt/lib32/msvcr90d.def.in | 1 -
mingw-w64-crt/lib64/msvcr100.def.in | 1 -
mingw-w64-crt/lib64/msvcr100d.def.in | 1 -
mingw-w64-crt/lib64/msvcr110.def.in | 1 -
mingw-w64-crt/lib64/msvcr110d.def.in | 1 -
mingw-w64-crt/lib64/msvcr120.def.in | 1 -
mingw-w64-crt/lib64/msvcr120d.def.in | 1 -
mingw-w64-crt/lib64/msvcr80.def.in | 1 -
mingw-w64-crt/lib64/msvcr80d.def.in | 1 -
mingw-w64-crt/lib64/msvcr90.def.in | 1 -
mingw-w64-crt/lib64/msvcr90d.def.in | 1 -
mingw-w64-crt/libarm32/msvcr110.def.in | 1 -
mingw-w64-crt/libarm32/msvcr110d.def.in | 1 -
mingw-w64-crt/libarm32/msvcr120.def.in | 1 -
mingw-w64-crt/libarm32/msvcr120d.def.in | 1 -
mingw-w64-crt/string/msvcr80plus_wcstok.c | 20 ++++++++++++++++
.../string/{wcstok.c => msvcr80pre_wcstok.c} | 0
30 files changed, 37 insertions(+), 35 deletions(-)
create mode 100644 mingw-w64-crt/string/msvcr80plus_wcstok.c
rename mingw-w64-crt/string/{wcstok.c => msvcr80pre_wcstok.c} (100%)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index c800fe70b67f..8e4300c16cb2 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -600,7 +600,7 @@ src_msvcrt32=\
stdio/_vscwprintf.c \
stdio/_wstat64.c \
stdio/_wstat64i32.c \
- string/wcstok.c
+ string/msvcr80pre_wcstok.c
# Files included in libmsvcrt-os.a (for msvcrt.dll) on x86_64
src_msvcrt64=\
@@ -655,7 +655,7 @@ src_msvcrt64=\
stdio/_stat32i64.c \
stdio/_wstat32.c \
stdio/_wstat32i64.c \
- string/wcstok.c
+ string/msvcr80pre_wcstok.c
# Files included in libmsvcrt-os.a (for msvcrt.dll) on arm32
src_msvcrtarm32=\
@@ -691,7 +691,8 @@ src_msvcrtarm32=\
stdio/_stat64i32.c \
stdio/_wstat64i32.c \
stdio/gets.c \
- stdio/scanf.S
+ stdio/scanf.S \
+ string/msvcr80plus_wcstok.c
if !ENABLE_SOFTMATH
src_msvcrtarm32+=\
@@ -815,7 +816,8 @@ src_msvcrtarm64=\
stdio/_stat32i64.c \
stdio/_wstat32.c \
stdio/_wstat32i64.c \
- stdio/gets.c
+ stdio/gets.c \
+ string/msvcr80plus_wcstok.c
if ARM64EC
src_msvcrtarm64+=math/fabsf.c
@@ -933,7 +935,7 @@ src_pre_msvcr80=\
stdio/_stat64i32.c \
stdio/_wstat64i32.c \
stdio/mingw_lock.c \
- string/wcstok.c
+ string/msvcr80pre_wcstok.c
src_pre_msvcr100=\
misc/_invalid_parameter_noinfo_noreturn.c \
@@ -958,6 +960,9 @@ src_pre_msvcr120_post_msvcr71=\
misc/_isblank_l.c \
misc/_iswblank_l.c
+src_post_msvcr71=\
+ string/msvcr80plus_wcstok.c
+
src_post_msvcr80=\
misc/__p__osplatform_emul.c \
misc/__p__osver_emul.c
@@ -1051,32 +1056,38 @@ src_msvcr80=\
$(src_pre_msvcr100) \
$(src_pre_msvcr110) \
$(src_pre_msvcr120) \
- $(src_pre_msvcr120_post_msvcr71)
+ $(src_pre_msvcr120_post_msvcr71) \
+ $(src_post_msvcr71)
src_msvcr90=\
$(src_pre_msvcr100) \
$(src_pre_msvcr110) \
$(src_pre_msvcr120) \
$(src_pre_msvcr120_post_msvcr71) \
+ $(src_post_msvcr71) \
$(src_post_msvcr80)
src_msvcr100=\
$(src_pre_msvcr110) \
$(src_pre_msvcr120) \
$(src_pre_msvcr120_post_msvcr71) \
+ $(src_post_msvcr71) \
$(src_post_msvcr80)
src_msvcr110=\
$(src_pre_msvcr120) \
$(src_pre_msvcr120_post_msvcr71) \
+ $(src_post_msvcr71) \
$(src_post_msvcr80) \
$(src_post_msvcr100)
src_msvcr120=\
+ $(src_post_msvcr71) \
$(src_post_msvcr80) \
$(src_post_msvcr100)
src_msvcr120_app=\
+ $(src_post_msvcr71) \
$(src_post_msvcr80) \
$(src_post_msvcr100) \
misc/__p___initenv.c \
diff --git a/mingw-w64-crt/def-include/crt-aliases.def.in
b/mingw-w64-crt/def-include/crt-aliases.def.in
index 65675ecbc1c9..472828e377ef 100644
--- a/mingw-w64-crt/def-include/crt-aliases.def.in
+++ b/mingw-w64-crt/def-include/crt-aliases.def.in
@@ -248,9 +248,6 @@ getwchar == _fgetwchar
putwc == fputwc
putwchar == _fputwchar
#endif
-#ifdef USE_WCSTOK_S_FOR_WCSTOK
-wcstok == wcstok_s
-#endif
; This is list of symbol aliases for C99 functions
; ADD_UNDERSCORE(logb)
diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in
b/mingw-w64-crt/lib-common/msvcr120_app.def.in
index 32a85cde7913..a1fc7dc6e4cd 100644
--- a/mingw-w64-crt/lib-common/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in
@@ -2334,5 +2334,4 @@ wscanf
wscanf_s
#define CRTAPP
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in
b/mingw-w64-crt/lib-common/msvcrt.def.in
index fefddc5b7229..2ba671354e38 100644
--- a/mingw-w64-crt/lib-common/msvcrt.def.in
+++ b/mingw-w64-crt/lib-common/msvcrt.def.in
@@ -1929,7 +1929,6 @@ F_I386(_libm_sse2_tan_precise)
#define WITH_STRTO64_ALIAS
#endif
#if defined(__arm__) || defined(__aarch64__)
-#define USE_WCSTOK_S_FOR_WCSTOK
#define WITH_FSEEKO64_ALIAS
#endif
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr100.def.in
b/mingw-w64-crt/lib32/msvcr100.def.in
index 2d00f87f0d07..b8f183bf0e11 100644
--- a/mingw-w64-crt/lib32/msvcr100.def.in
+++ b/mingw-w64-crt/lib32/msvcr100.def.in
@@ -1909,5 +1909,4 @@ wscanf_s
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr100d.def.in
b/mingw-w64-crt/lib32/msvcr100d.def.in
index e1f6b4770127..7dad2cc0f0be 100644
--- a/mingw-w64-crt/lib32/msvcr100d.def.in
+++ b/mingw-w64-crt/lib32/msvcr100d.def.in
@@ -1972,5 +1972,4 @@ wscanf_s
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr110.def.in
b/mingw-w64-crt/lib32/msvcr110.def.in
index be2491f6fd85..aa94393e4c01 100644
--- a/mingw-w64-crt/lib32/msvcr110.def.in
+++ b/mingw-w64-crt/lib32/msvcr110.def.in
@@ -2057,5 +2057,4 @@ __crtSetThreadStackGuarantee
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr110d.def.in
b/mingw-w64-crt/lib32/msvcr110d.def.in
index 16d06696c574..8c82e6ac08bf 100644
--- a/mingw-w64-crt/lib32/msvcr110d.def.in
+++ b/mingw-w64-crt/lib32/msvcr110d.def.in
@@ -2124,5 +2124,4 @@ __crtSetThreadStackGuarantee
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr120.def.in
b/mingw-w64-crt/lib32/msvcr120.def.in
index aaa965780e67..692846a5c328 100644
--- a/mingw-w64-crt/lib32/msvcr120.def.in
+++ b/mingw-w64-crt/lib32/msvcr120.def.in
@@ -2296,5 +2296,4 @@ wprintf_s
wscanf
wscanf_s
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr120d.def.in
b/mingw-w64-crt/lib32/msvcr120d.def.in
index f670d0bbffa8..9d6d6cb2495f 100644
--- a/mingw-w64-crt/lib32/msvcr120d.def.in
+++ b/mingw-w64-crt/lib32/msvcr120d.def.in
@@ -2363,5 +2363,4 @@ wprintf_s
wscanf
wscanf_s
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr80.def.in
b/mingw-w64-crt/lib32/msvcr80.def.in
index 981870755ae8..96116ac33248 100644
--- a/mingw-w64-crt/lib32/msvcr80.def.in
+++ b/mingw-w64-crt/lib32/msvcr80.def.in
@@ -1553,5 +1553,4 @@ fread_s
#define WITH_LLABS_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr80d.def.in
b/mingw-w64-crt/lib32/msvcr80d.def.in
index a98c5dd36dc1..c34f7a55152d 100644
--- a/mingw-w64-crt/lib32/msvcr80d.def.in
+++ b/mingw-w64-crt/lib32/msvcr80d.def.in
@@ -1631,5 +1631,4 @@ fread_s
#define WITH_LLABS_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr90.def.in
b/mingw-w64-crt/lib32/msvcr90.def.in
index 6f626415f7fc..aba9b9726b6b 100644
--- a/mingw-w64-crt/lib32/msvcr90.def.in
+++ b/mingw-w64-crt/lib32/msvcr90.def.in
@@ -1538,5 +1538,4 @@ wscanf_s
#define WITH_LLABS_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in
b/mingw-w64-crt/lib32/msvcr90d.def.in
index 8bca8f485a4a..2c04ccd82d1e 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def.in
+++ b/mingw-w64-crt/lib32/msvcr90d.def.in
@@ -1610,5 +1610,4 @@ wscanf_s
#define WITH_LLABS_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr100.def.in
b/mingw-w64-crt/lib64/msvcr100.def.in
index df860c09d27c..0b378d9f1ac2 100644
--- a/mingw-w64-crt/lib64/msvcr100.def.in
+++ b/mingw-w64-crt/lib64/msvcr100.def.in
@@ -1871,5 +1871,4 @@ wscanf_s
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr100d.def.in
b/mingw-w64-crt/lib64/msvcr100d.def.in
index 6fd09a5886e4..138a161d8c23 100644
--- a/mingw-w64-crt/lib64/msvcr100d.def.in
+++ b/mingw-w64-crt/lib64/msvcr100d.def.in
@@ -1936,5 +1936,4 @@ wscanf_s
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr110.def.in
b/mingw-w64-crt/lib64/msvcr110.def.in
index 80f9fa554c71..f4abb6f79b81 100644
--- a/mingw-w64-crt/lib64/msvcr110.def.in
+++ b/mingw-w64-crt/lib64/msvcr110.def.in
@@ -2014,5 +2014,4 @@ __crtSetThreadStackGuarantee
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr110d.def.in
b/mingw-w64-crt/lib64/msvcr110d.def.in
index 3bb047b4cd3c..16b66b597965 100644
--- a/mingw-w64-crt/lib64/msvcr110d.def.in
+++ b/mingw-w64-crt/lib64/msvcr110d.def.in
@@ -2079,5 +2079,4 @@ __crtSetThreadStackGuarantee
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr120.def.in
b/mingw-w64-crt/lib64/msvcr120.def.in
index 4f19699b1771..ce006671e818 100644
--- a/mingw-w64-crt/lib64/msvcr120.def.in
+++ b/mingw-w64-crt/lib64/msvcr120.def.in
@@ -2252,5 +2252,4 @@ wprintf_s
wscanf
wscanf_s
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr120d.def.in
b/mingw-w64-crt/lib64/msvcr120d.def.in
index f4a1d6b24a68..ed72d726098b 100644
--- a/mingw-w64-crt/lib64/msvcr120d.def.in
+++ b/mingw-w64-crt/lib64/msvcr120d.def.in
@@ -2317,5 +2317,4 @@ wprintf_s
wscanf
wscanf_s
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr80.def.in
b/mingw-w64-crt/lib64/msvcr80.def.in
index 362ca3efe409..b3787ba7d9af 100644
--- a/mingw-w64-crt/lib64/msvcr80.def.in
+++ b/mingw-w64-crt/lib64/msvcr80.def.in
@@ -1501,5 +1501,4 @@ fread_s
#define WITH_LLABS_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr80d.def.in
b/mingw-w64-crt/lib64/msvcr80d.def.in
index 66ff58201d8f..e30a100d5cab 100644
--- a/mingw-w64-crt/lib64/msvcr80d.def.in
+++ b/mingw-w64-crt/lib64/msvcr80d.def.in
@@ -1573,5 +1573,4 @@ fread_s
#define WITH_LLABS_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr90.def.in
b/mingw-w64-crt/lib64/msvcr90.def.in
index d04136ed004a..ea71960598b1 100644
--- a/mingw-w64-crt/lib64/msvcr90.def.in
+++ b/mingw-w64-crt/lib64/msvcr90.def.in
@@ -1486,5 +1486,4 @@ wscanf_s
#define WITH_LLABS_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in
b/mingw-w64-crt/lib64/msvcr90d.def.in
index 1a25264437f1..01d12ceaaa41 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def.in
+++ b/mingw-w64-crt/lib64/msvcr90d.def.in
@@ -1552,5 +1552,4 @@ wscanf_s
#define WITH_LLABS_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/libarm32/msvcr110.def.in
b/mingw-w64-crt/libarm32/msvcr110.def.in
index d863b64340a5..095dcaf69834 100644
--- a/mingw-w64-crt/libarm32/msvcr110.def.in
+++ b/mingw-w64-crt/libarm32/msvcr110.def.in
@@ -2001,5 +2001,4 @@ __crtSetThreadStackGuarantee
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/libarm32/msvcr110d.def.in
b/mingw-w64-crt/libarm32/msvcr110d.def.in
index 699f0e8de058..d14b0e8c6ba5 100644
--- a/mingw-w64-crt/libarm32/msvcr110d.def.in
+++ b/mingw-w64-crt/libarm32/msvcr110d.def.in
@@ -2066,5 +2066,4 @@ __crtSetThreadStackGuarantee
#define WITH_IMAXDIV_ALIAS
#define WITH_STRTO64_ALIAS
#define WITH_STRTO64_L_ALIAS
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/libarm32/msvcr120.def.in
b/mingw-w64-crt/libarm32/msvcr120.def.in
index 3218c4897b44..74e9f0e8993d 100644
--- a/mingw-w64-crt/libarm32/msvcr120.def.in
+++ b/mingw-w64-crt/libarm32/msvcr120.def.in
@@ -2220,5 +2220,4 @@ wprintf_s
wscanf
wscanf_s
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/libarm32/msvcr120d.def.in
b/mingw-w64-crt/libarm32/msvcr120d.def.in
index 096f4d17d9ca..6ccc5bb90a2d 100644
--- a/mingw-w64-crt/libarm32/msvcr120d.def.in
+++ b/mingw-w64-crt/libarm32/msvcr120d.def.in
@@ -2285,5 +2285,4 @@ wprintf_s
wscanf
wscanf_s
-#define USE_WCSTOK_S_FOR_WCSTOK
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/string/msvcr80plus_wcstok.c
b/mingw-w64-crt/string/msvcr80plus_wcstok.c
new file mode 100644
index 000000000000..caf13b1e11b7
--- /dev/null
+++ b/mingw-w64-crt/string/msvcr80plus_wcstok.c
@@ -0,0 +1,20 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the mingw-w64 runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
+
+#include <wchar.h>
+
+wchar_t *__cdecl wcstok(wchar_t *restrict _Str, const wchar_t *restrict
_Delim, wchar_t **restrict _Context)
+{
+ /* wcstok_s() differs from wcstok() just in:
+ * - validation of _Context and _Delim arguments
+ * - setting errno for invalid arguments
+ * - calling exception handler for invalid arguments
+ */
+ if (!_Str && !*_Context)
+ return NULL; /* do not set errno and do not call exception handler for
invalid _Str / _Context */
+ return wcstok_s(_Str, _Delim, _Context);
+}
+wchar_t *(__cdecl *__MINGW_IMP_SYMBOL(wcstok))(wchar_t *restrict, const
wchar_t *restrict, wchar_t **restrict) = wcstok;
diff --git a/mingw-w64-crt/string/wcstok.c
b/mingw-w64-crt/string/msvcr80pre_wcstok.c
similarity index 100%
rename from mingw-w64-crt/string/wcstok.c
rename to mingw-w64-crt/string/msvcr80pre_wcstok.c
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
