X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72d35070d8d725aa3a40002a14144b8e3eb65793..6627d4dfb7ee6b850e866f824b9bdd0d600b8c3e:/src/common/wxchar.cpp diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index db698b6e57..ea026cb10c 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -50,46 +50,62 @@ #if wxUSE_WCHAR_T size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) { + // assume that we have mbsrtowcs() too if we have wcsrtombs() +#if HAVE_WCSRTOMBS + mbstate_t mbstate; + memset(&mbstate, 0, sizeof(mbstate_t)); +#endif + if (buf) { if (!n || !*psz) { if (n) *buf = wxT('\0'); return 0; } +#ifdef HAVE_WCSRTOMBS + return mbsrtowcs(buf, &psz, n, &mbstate); +#else return mbstowcs(buf, psz, n); +#endif } - // assume that we have mbsrtowcs() too if we have wcsrtombs() #ifdef HAVE_WCSRTOMBS - mbstate_t mbstate; return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate); -#else // !GNU libc +#else return mbstowcs((wchar_t *) NULL, psz, 0); -#endif // GNU +#endif } size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n) { +#if HAVE_WCSRTOMBS + mbstate_t mbstate; + memset(&mbstate, 0, sizeof(mbstate_t)); +#endif + if (buf) { if (!n || !*pwz) { // glibc2.1 chokes on null input if (n) *buf = '\0'; return 0; } +#if HAVE_WCSRTOMBS + return wcsrtombs(buf, &pwz, n, &mbstate); +#else return wcstombs(buf, pwz, n); +#endif } #if HAVE_WCSRTOMBS - mbstate_t mbstate; return wcsrtombs((char *) NULL, &pwz, 0, &mbstate); -#else // !GNU libc +#else return wcstombs((char *) NULL, pwz, 0); -#endif // GNU +#endif } #endif // wxUSE_WCHAR_T bool WXDLLEXPORT wxOKlibc() { -#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) +#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) && !defined(__WINE__) // glibc 2.0 uses UTF-8 even when it shouldn't wchar_t res = 0; if ((MB_CUR_MAX == 2) && @@ -108,19 +124,27 @@ bool WXDLLEXPORT wxOKlibc() return TRUE; } -#ifndef HAVE_WCSLEN -size_t WXDLLEXPORT wcslen(const wchar_t *s) -{ - size_t len = 0; - while (s[len]) len++; - return len; -} -#endif - // ============================================================================ // printf() functions business // ============================================================================ +// special test mode: define all functions below even if we don't really need +// them to be able to test them +#ifdef wxTEST_PRINTF + #undef wxFprintf + #undef wxPrintf + #undef wxSprintf + #undef wxVfprintf + #undef wxVsprintf + #undef wxVprintf + #undef wxVsnprintf_ + #undef wxSnprintf_ + + #define wxNEED_WPRINTF + + int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr ); +#endif + // ---------------------------------------------------------------------------- // implement [v]snprintf() if the system doesn't provide a safe one // ---------------------------------------------------------------------------- @@ -135,9 +159,12 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, // number of characters in the buffer so far, must be less than lenMax size_t lenCur = 0; - for (size_t n = 0; format[n]; n++) + for ( size_t n = 0; ; n++ ) { - if (format[n] == wxT('%')) { + const wxChar chCur = format[n]; + + if ( chCur == wxT('%') ) + { static char s_szFlags[256] = "%"; size_t flagofs = 1; bool adj_left = FALSE, @@ -147,7 +174,8 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, int ilen = 0; size_t min_width = 0, max_width = wxSTRING_MAXLEN; - do { + do + { #define CHECK_PREC \ if (in_prec && !prec_dot) \ @@ -170,7 +198,10 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, } \ } - switch (format[++n]) { + // what follows '%'? + const wxChar ch = format[++n]; + switch ( ch ) + { case wxT('\0'): APPEND_CH(_T('\0')); @@ -188,57 +219,62 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, case wxT('+'): case wxT('\''): CHECK_PREC - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; break; case wxT('-'): CHECK_PREC adj_left = TRUE; - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; break; case wxT('.'): CHECK_PREC - in_prec = TRUE; + in_prec = TRUE; prec_dot = FALSE; max_width = 0; - // dot will be auto-added to s_szFlags if non-negative number follows + // dot will be auto-added to s_szFlags if non-negative + // number follows break; case wxT('h'): ilen = -1; CHECK_PREC - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; break; case wxT('l'): ilen = 1; CHECK_PREC - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; break; case wxT('q'): case wxT('L'): ilen = 2; CHECK_PREC - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; break; case wxT('Z'): ilen = 3; CHECK_PREC - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; break; case wxT('*'): { int len = va_arg(argptr, int); - if (in_prec) { + if (in_prec) + { if (len<0) break; CHECK_PREC max_width = len; - } else { - if (len<0) { + } + else + { + if (len<0) + { adj_left = !adj_left; s_szFlags[flagofs++] = '-'; len = -len; @@ -255,13 +291,19 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, { int len = 0; CHECK_PREC - while ((format[n]>=wxT('0')) && (format[n]<=wxT('9'))) { - s_szFlags[flagofs++] = format[n]; - len = len*10 + (format[n] - wxT('0')); - n++; - } - if (in_prec) max_width = len; - else min_width = len; + while ( (format[n] >= wxT('0')) && + (format[n] <= wxT('9')) ) + { + s_szFlags[flagofs++] = format[n]; + len = len*10 + (format[n] - wxT('0')); + n++; + } + + if (in_prec) + max_width = len; + else + min_width = len; + n--; // the main loop pre-increments n again } break; @@ -273,37 +315,47 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, case wxT('x'): case wxT('X'): CHECK_PREC - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; s_szFlags[flagofs] = '\0'; - if (ilen == 0 ) { + if (ilen == 0 ) + { int val = va_arg(argptr, int); ::sprintf(szScratch, s_szFlags, val); } - else if (ilen == -1) { + else if (ilen == -1) + { // NB: 'short int' value passed through '...' - // is promoted to 'int' + // is promoted to 'int', so we have to get + // an int from stack even if we need a short short int val = (short int) va_arg(argptr, int); ::sprintf(szScratch, s_szFlags, val); } - else if (ilen == 1) { + else if (ilen == 1) + { long int val = va_arg(argptr, long int); ::sprintf(szScratch, s_szFlags, val); } - else if (ilen == 2) { + else if (ilen == 2) + { #if SIZEOF_LONG_LONG long long int val = va_arg(argptr, long long int); ::sprintf(szScratch, s_szFlags, val); -#else +#else // !long long long int val = va_arg(argptr, long int); ::sprintf(szScratch, s_szFlags, val); -#endif +#endif // long long/!long long } - else if (ilen == 3) { + else if (ilen == 3) + { size_t val = va_arg(argptr, size_t); ::sprintf(szScratch, s_szFlags, val); } - APPEND_STR(wxConvLibc.cMB2WX(szScratch)); + { + const wxMB2WXbuf tmp = + wxConvLibc.cMB2WX(szScratch); + APPEND_STR(tmp); + } done = TRUE; break; @@ -314,17 +366,24 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, case wxT('g'): case wxT('G'): CHECK_PREC - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; s_szFlags[flagofs] = '\0'; - if (ilen == 2) { + if (ilen == 2) + { long double val = va_arg(argptr, long double); ::sprintf(szScratch, s_szFlags, val); - } else { + } + else + { double val = va_arg(argptr, double); ::sprintf(szScratch, s_szFlags, val); } - APPEND_STR(wxConvLibc.cMB2WX(szScratch)); + { + const wxMB2WXbuf tmp = + wxConvLibc.cMB2WX(szScratch); + APPEND_STR(tmp); + } done = TRUE; break; @@ -333,11 +392,13 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, { void *val = va_arg(argptr, void *); CHECK_PREC - s_szFlags[flagofs++] = format[n]; + s_szFlags[flagofs++] = ch; s_szFlags[flagofs] = '\0'; ::sprintf(szScratch, s_szFlags, val); - APPEND_STR(wxConvLibc.cMB2WX(szScratch)); + const wxMB2WXbuf tmp = + wxConvLibc.cMB2WX(szScratch); + APPEND_STR(tmp); done = TRUE; } @@ -354,29 +415,47 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, break; case wxT('s'): - if (ilen == -1) { - // wx extension: we'll let %hs mean non-Unicode strings + if (ilen == -1) + { + // wx extension: we'll let %hs mean non-Unicode + // strings char *val = va_arg(argptr, char *); #if wxUSE_UNICODE - // ASCII->Unicode constructor handles max_width right + // ASCII->Unicode constructor handles max_width + // right wxString s(val, wxConvLibc, max_width); #else size_t len = wxSTRING_MAXLEN; - if (val) { - for (len = 0; val[len] && (len= 1) { + else if (ilen >= 1) + { long int *val = va_arg(argptr, long int *); *val = lenCur; } @@ -403,23 +485,23 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, break; default: - if (wxIsalpha(format[n])) - // probably some flag not taken care of here yet - s_szFlags[flagofs++] = format[n]; - else { - // bad format - APPEND_CH(_T('%')); // just to pass the glibc tst-printf.c - n--; - done = TRUE; - } + // bad format, leave unchanged + APPEND_CH(_T('%')); + APPEND_CH(ch); + done = TRUE; break; } - } while (!done); + } + while (!done); } else { - APPEND_CH(format[n]); + APPEND_CH(chCur); } + + // terminating NUL? + if ( !chCur ) + break; } return lenCur; @@ -473,21 +555,21 @@ int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream) #ifdef wxNEED_WPRINTF // TODO: implement the scanf() functions -int vwscanf(const wchar_t *format, va_list argptr) +int vwscanf(const wxChar *format, va_list argptr) { wxFAIL_MSG( _T("TODO") ); return -1; } -int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr) +int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr) { wxFAIL_MSG( _T("TODO") ); return -1; } -int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr) +int vfwscanf(FILE *stream, const wxChar *format, va_list argptr) { wxFAIL_MSG( _T("TODO") ); @@ -496,7 +578,7 @@ int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr) #define vswprintf wxVsnprintf_ -int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr) +int vfwprintf(FILE *stream, const wxChar *format, va_list argptr) { wxString s; int rc = s.PrintfV(format, argptr); @@ -504,14 +586,14 @@ int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr) if ( rc != -1 ) { // we can't do much better without Unicode support in libc... - if ( fprintf(stream, s.mb_str()) == -1 ) + if ( fprintf(stream, "%s", s.mb_str()) == -1 ) return -1; } return rc; } -int vwprintf(const wchar_t *format, va_list argptr) +int vwprintf(const wxChar *format, va_list argptr) { return wxVfprintf(stdout, format, argptr); } @@ -738,7 +820,7 @@ wxFormatConverter::wxFormatConverter(const wxChar *format) #if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF) -int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2 +int wxScanf( const wxChar *format, ... ) { va_list argptr; va_start(argptr, format); @@ -750,7 +832,7 @@ int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2 return ret; } -int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3 +int wxSscanf( const wxChar *str, const wxChar *format, ... ) { va_list argptr; va_start(argptr, format); @@ -762,7 +844,7 @@ int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3 return ret; } -int wxFscanf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3 +int wxFscanf( FILE *stream, const wxChar *format, ... ) { va_list argptr; va_start(argptr, format); @@ -774,11 +856,11 @@ int wxFscanf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3 return ret; } -int wxPrintf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2 +int wxPrintf( const wxChar *format, ... ) { va_list argptr; va_start(argptr, format); - + int ret = vwprintf( wxFormatConverter(format), argptr ); va_end(argptr); @@ -787,7 +869,7 @@ int wxPrintf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2 } #ifndef wxSnprintf -int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_4 +int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) { va_list argptr; va_start(argptr, format); @@ -800,7 +882,7 @@ int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_ } #endif // wxSnprintf -int wxSprintf( wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3 +int wxSprintf( wxChar *str, const wxChar *format, ... ) { va_list argptr; va_start(argptr, format); @@ -813,7 +895,7 @@ int wxSprintf( wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3 return ret; } -int wxFprintf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3 +int wxFprintf( FILE *stream, const wxChar *format, ... ) { va_list argptr; va_start( argptr, format ); @@ -855,6 +937,8 @@ int wxVsprintf( wxChar *str, const wxChar *format, va_list argptr ) #endif // wxNEED_PRINTF_CONVERSION +#if wxUSE_WCHAR_T + // ---------------------------------------------------------------------------- // ctype.h stuff (currently unused) // ---------------------------------------------------------------------------- @@ -882,15 +966,26 @@ WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); } WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); } #endif -#ifndef wxStrdup -WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz) +#ifndef wxStrdupA + +WXDLLEXPORT char *wxStrdupA(const char *s) +{ + return strcpy((char *)malloc(strlen(s) + 1), s); +} + +#endif // wxStrdupA + +#ifndef wxStrdupW + +WXDLLEXPORT wchar_t * wxStrdupW(const wchar_t *pwz) { - size_t size = (wxStrlen(psz) + 1) * sizeof(wxChar); - wxChar *ret = (wxChar *) malloc(size); - memcpy(ret, psz, size); + size_t size = (wxWcslen(pwz) + 1) * sizeof(wchar_t); + wchar_t *ret = (wchar_t *) malloc(size); + memcpy(ret, pwz, size); return ret; } -#endif + +#endif // wxStrdupW #ifndef wxStricmp int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2) @@ -917,39 +1012,6 @@ int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n) } #endif -#ifndef wxStrtok -WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr) -{ - if (!psz) - { - psz = *save_ptr; - if ( !psz ) - return NULL; - } - - psz += wxStrspn(psz, delim); - if (!*psz) - { - *save_ptr = (wxChar *)NULL; - return (wxChar *)NULL; - } - - wxChar *ret = psz; - psz = wxStrpbrk(psz, delim); - if (!psz) - { - *save_ptr = (wxChar*)NULL; - } - else - { - *psz = wxT('\0'); - *save_ptr = psz + 1; - } - - return ret; -} -#endif // wxStrtok - #ifndef wxSetlocale WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale) { @@ -1217,7 +1279,7 @@ int WXDLLEXPORT wxSystem(const wxChar *psz) return system(wxConvLocal.cWX2MB(psz)); } -#endif +#endif // wxNEED_WX_STDLIB_H #ifdef wxNEED_WX_TIME_H WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm) @@ -1239,4 +1301,46 @@ WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const return 0; } } -#endif +#endif // wxNEED_WX_TIME_H + +#endif // wxUSE_WCHAR_T + +// ---------------------------------------------------------------------------- +// functions which we may need even if !wxUSE_WCHAR_T +// ---------------------------------------------------------------------------- + +#ifndef wxStrtok + +WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr) +{ + if (!psz) + { + psz = *save_ptr; + if ( !psz ) + return NULL; + } + + psz += wxStrspn(psz, delim); + if (!*psz) + { + *save_ptr = (wxChar *)NULL; + return (wxChar *)NULL; + } + + wxChar *ret = psz; + psz = wxStrpbrk(psz, delim); + if (!psz) + { + *save_ptr = (wxChar*)NULL; + } + else + { + *psz = wxT('\0'); + *save_ptr = psz + 1; + } + + return ret; +} + +#endif // wxStrtok +