2011-12-02 21:18:42 +00:00
|
|
|
/* taken from wine string.c */
|
2007-03-14 20:24:57 +00:00
|
|
|
|
2011-12-02 21:18:42 +00:00
|
|
|
#include <precomp.h>
|
|
|
|
#include <internal/wine/msvcrt.h>
|
2007-03-14 20:24:57 +00:00
|
|
|
|
2011-12-02 21:18:42 +00:00
|
|
|
/*********************************************************************
|
|
|
|
* strtok (MSVCRT.@)
|
2007-03-14 20:24:57 +00:00
|
|
|
*/
|
2011-12-02 21:18:42 +00:00
|
|
|
char * CDECL strtok( char *str, const char *delim )
|
2007-03-14 20:24:57 +00:00
|
|
|
{
|
2011-12-02 21:18:42 +00:00
|
|
|
thread_data_t *data = msvcrt_get_thread_data();
|
|
|
|
char *ret;
|
2007-03-14 20:24:57 +00:00
|
|
|
|
2011-12-02 21:18:42 +00:00
|
|
|
if (!str)
|
|
|
|
if (!(str = data->strtok_next)) return NULL;
|
2007-03-14 20:24:57 +00:00
|
|
|
|
2011-12-02 21:18:42 +00:00
|
|
|
while (*str && strchr( delim, *str )) str++;
|
|
|
|
if (!*str) return NULL;
|
|
|
|
ret = str++;
|
|
|
|
while (*str && !strchr( delim, *str )) str++;
|
|
|
|
if (*str) *str++ = 0;
|
|
|
|
data->strtok_next = str;
|
|
|
|
return ret;
|
2007-03-14 20:24:57 +00:00
|
|
|
}
|
[CRT]
- Update file.c to recent wine. (now with locking!)
- implement/enable __wcserror, __wcserror_s, _access_s, _ctime32_s, _ctime64_s,
_cwprintf, _fseeki64, _ftelli64, _get_osplatform, _get_output_format,
_get_pgmptr, _get_wpgmptr, _get_terminate, _get_tzname, _get_unexpected,
_gmtime64_s, _i64toa_s, _i64tow_s, _initterm_e, _itoa_s, _itow_s,
_localtime32_s, _localtime64_s, _ltoa_s, _ltow_s, _putwch, _searchenv_s,
_sopen_s, _ui64toa_s, _ui64tow_s, _vcwprintf, _vsprintf_p, _waccess_s,
_wcserror, _wcserror_s, _wfopen_s, _wsopen_s, fopen_s, fprintf_s, fwprintf_s,
printf_s, strerror_s, strncpy_s, strtok_s, vfprintf_s, vfwprintf_s, vprintf_s,
vwprintf_s, wcscat_s, wcsncat_s, wcstok_s, wprintf_s. Most code comes from
wine.
- Fix __set_errno -> _set_errno and export it.
- Remove unneeded files.
[CRT_HEADERS]
- add threadmbcinfo struct.
- update some sec_api headers from mingw64 due to missing or incorrect
functions.
Patch by Samuel Serapion.
Changes to msvcrt spec by me due to winebuild.
CRLF/LF fixes.
svn path=/trunk/; revision=54651
2011-12-14 22:09:24 +00:00
|
|
|
|
|
|
|
/*********************************************************************
|
|
|
|
* strtok_s (MSVCRT.@)
|
|
|
|
*/
|
|
|
|
char * CDECL strtok_s(char *str, const char *delim, char **ctx)
|
|
|
|
{
|
|
|
|
if (!MSVCRT_CHECK_PMT(delim != NULL) || !MSVCRT_CHECK_PMT(ctx != NULL) ||
|
|
|
|
!MSVCRT_CHECK_PMT(str != NULL || *ctx != NULL)) {
|
|
|
|
*_errno() = EINVAL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!str)
|
|
|
|
str = *ctx;
|
|
|
|
|
|
|
|
while(*str && strchr(delim, *str))
|
|
|
|
str++;
|
|
|
|
if(!*str)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
*ctx = str+1;
|
|
|
|
while(**ctx && !strchr(delim, **ctx))
|
|
|
|
(*ctx)++;
|
|
|
|
if(**ctx)
|
|
|
|
*(*ctx)++ = 0;
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|