#include "wx/hash.h"
#endif
+#include "wx/msgdlg.h"
+
#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H)
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <winnt.h>
+ #include <windef.h>
+ #include <winbase.h>
+ #include <winnls.h>
+ #include <winnt.h>
#endif
#if wxUSE_WCHAR_T
return mbstowcs(buf, psz, n);
}
- // NB: GNU libc5 wcstombs() is completely broken, don't use it (it doesn't
- // honor the 3rd parameter, thus it will happily crash here).
-#if wxUSE_WCSRTOMBS
- // don't know if it's really needed (or if we can pass NULL), but better safe
- // than quick
+ // 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
return wcstombs(buf, pwz, n);
}
- // NB: GNU libc5 wcstombs() is completely broken, don't use it (it doesn't
- // honor the 3rd parameter, thus it will happily crash here).
-#if wxUSE_WCSRTOMBS
- // don't know if it's really needed (or if we can pass NULL), but better safe
- // than quick
+#if HAVE_WCSRTOMBS
mbstate_t mbstate;
return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
#else // !GNU libc
return wcstombs((char *) NULL, pwz, 0);
#endif // GNU
}
-#endif
+#endif // wxUSE_WCHAR_T
bool WXDLLEXPORT wxOKlibc()
{
#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__)
- // GNU libc uses UTF-8 even when it shouldn't
- wchar_t res;
+ // glibc 2.0 uses UTF-8 even when it shouldn't
+ wchar_t res = 0;
if ((MB_CUR_MAX == 2) &&
- (wxMB2WC(&res, "\xdd\xa5", 1)>0) &&
+ (wxMB2WC(&res, "\xdd\xa5", 1) == 1) &&
(res==0x765)) {
// this is UTF-8 allright, check whether that's what we want
- char *cur_locale = setlocale(LC_ALL, NULL);
+ char *cur_locale = setlocale(LC_CTYPE, NULL);
if ((strlen(cur_locale) < 4) ||
- (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) {
+ (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
+ (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
// nope, don't use libc conversion
return FALSE;
}
}
#endif
+#ifndef wxStricmp
+int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n)
+{
+ register wxChar c1, c2;
+ while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++;
+ if (n) {
+ if (c1 < c2) return -1;
+ if (c1 > c2) return 1;
+ }
+ return 0;
+}
+#endif
+
#ifndef wxStrtok
WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
{
return ret;
}
-WXDLLEXPORT wxChar * wxStrchr(const wxChar *s, wxChar c)
+WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c)
{
- while (*s && *s != c) s++;
- return (*s) ? (wxChar *)s : (wxChar *)NULL;
+ // be careful here as the terminating NUL makes part of the string
+ while ( *s != c )
+ {
+ if ( !*s++ )
+ return NULL;
+ }
+
+ return s;
}
WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2)
return ret;
}
-WXDLLEXPORT wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept)
+WXDLLEXPORT const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept)
{
- while (*s && !wxStrchr(accept, *s)) s++;
- return (*s) ? (wxChar *)s : (wxChar *)NULL;
+ while (*s && !wxStrchr(accept, *s))
+ s++;
+
+ return *s ? s : NULL;
}
-WXDLLEXPORT wxChar * wxStrrchr(const wxChar *s, wxChar c)
+WXDLLEXPORT const wxChar * wxStrrchr(const wxChar *s, wxChar c)
{
- wxChar *ret = (wxChar *)NULL;
- while (*s) {
- if (*s == c) ret = (wxChar *)s;
- s++;
- }
- return ret;
+ const wxChar *ret = NULL;
+ do
+ {
+ if ( *s == c )
+ ret = s;
+ s++;
+ }
+ while ( *s );
+
+ return ret;
}
WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept)
return len;
}
-WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle)
+WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle)
{
- wxChar *fnd;
- while ((fnd = wxStrchr(haystack, *needle))) {
- if (!wxStrcmp(fnd, needle)) return fnd;
- haystack = fnd + 1;
- }
- return (wxChar *)NULL;
+ wxCHECK_RET( needle, NULL, _T("NULL argument in wxStrstr") );
+
+ // VZ: this is not exactly the most efficient string search algorithm...
+
+ const size_t len = wxStrlen(needle);
+
+ while ( const wxChar *fnd = wxStrchr(haystack, *needle) )
+ {
+ if ( !wxStrncmp(fnd, needle, len) )
+ return fnd;
+
+ haystack = fnd + 1;
+ }
+
+ return NULL;
}
WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
#ifdef wxNEED_WX_STDIO_H
WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
{
- return fopen(wxConvFile.cWX2MB(path), wxConvLibc.cWX2MB(mode));
+ return fopen( wxConvFile.cWX2MB(path), wxConvLibc.cWX2MB(mode) );
}
WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream)
{
- return freopen(wxConvFile.cWX2MB(path), wxConvLibc.cWX2MB(mode), stream);
-}
-
-int WXDLLEXPORT wxPrintf(const wxChar *fmt, ...)
-{
- va_list argptr;
- int ret;
-
- va_start(argptr, fmt);
- ret = wxVprintf(fmt, argptr);
- va_end(argptr);
- return ret;
-}
-
-int WXDLLEXPORT wxVprintf(const wxChar *fmt, va_list argptr)
-{
- wxString str;
- str.PrintfV(fmt,argptr);
- printf("%s", (const char*)str.mb_str());
- return str.Len();
-}
-
-int WXDLLEXPORT wxFprintf(FILE *stream, const wxChar *fmt, ...)
-{
- va_list argptr;
- int ret;
-
- va_start(argptr, fmt);
- ret = wxVfprintf(stream, fmt, argptr);
- va_end(argptr);
- return ret;
-}
-
-int WXDLLEXPORT wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr)
-{
- wxString str;
- str.PrintfV(fmt,argptr);
- fprintf(stream, "%s", (const char*)str.mb_str());
- return str.Len();
-}
-
-int WXDLLEXPORT wxSprintf(wxChar *buf, const wxChar *fmt, ...)
-{
- va_list argptr;
- int ret;
-
- va_start(argptr, fmt);
- ret = wxVsprintf(buf, fmt, argptr);
- va_end(argptr);
- return ret;
-}
-
-int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr)
-{
- // this might be sort of inefficient, but it doesn't matter since
- // we'd prefer people to use wxString::Printf directly instead anyway
- wxString str;
- str.PrintfV(fmt,argptr);
- wxStrcpy(buf,str.c_str());
- return str.Len();
+ return freopen( wxConvFile.cWX2MB(path), wxConvLibc.cWX2MB(mode), stream );
}
-int WXDLLEXPORT wxSscanf(const wxChar *buf, const wxChar *fmt, ...)
+WXDLLEXPORT int wxRemove(const wxChar *path)
{
- va_list argptr;
- int ret;
-
- va_start(argptr, fmt);
- ret = wxVsscanf(buf, fmt, argptr);
- va_end(argptr);
- return ret;
+ return remove( wxConvFile.cWX2MB(path) );
}
-int WXDLLEXPORT wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr)
+WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath)
{
- int ret;
- // this will work only for numeric conversion! Strings will not be converted correctly
- // hopefully this is all we'll need
- ret = vsscanf(wxConvLibc.cWX2MB(buf), wxConvLibc.cWX2MB(fmt), argptr);
- return ret;
+ return rename( wxConvFile.cWX2MB(oldpath), wxConvFile.cWX2MB(newpath) );
}
#endif
wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
{
static wxHashTable env;
+
// check if we already have stored the converted env var
wxObject *data = env.Get(name);
- if (!data) {
+ if (!data)
+ {
// nope, retrieve it,
- const char *val = getenv(wxConvLibc.cWX2MB(name));
+#if wxUSE_UNICODE
+ wxCharBuffer buffer = wxConvLibc.cWX2MB(name);
+ // printf( "buffer %s\n", (const char*) buffer );
+ const char *val = getenv( (const char *)buffer );
+#else
+ const char *val = getenv( name );
+#endif
+
if (!val) return (wxChar *)NULL;
+ // printf( "home %s\n", val );
+
// convert it,
+#ifdef wxUSE_UNICODE
+ data = (wxObject *)new wxString(val, wxConvLibc);
+#else
data = (wxObject *)new wxString(val);
+#endif
+
// and store it
env.Put(name, data);
}
projects / wxWidgets.git / blobdiff