X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57f6da0dec3bae2f9e635085561779d18df752b8..270a909e20a2c652fd816ad14407113ad0319c9d:/src/common/wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index d1a9ecb760..baa67e326d 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
+#include <time.h>
 
 #ifndef WX_PRECOMP
   #include "wx/defs.h"
@@ -51,7 +52,7 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   if (buf) {
     if (!n || !*psz) {
-      if (n) *buf = _T('\0');
+      if (n) *buf = wxT('\0');
       return 0;
     }
     return mbstowcs(buf, psz, n);
@@ -62,7 +63,7 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 #if wxUSE_WCSRTOMBS
   // don't know if it's really needed (or if we can pass NULL), but better safe
   // than quick
-  mbstate_t mbstate;  
+  mbstate_t mbstate;
   return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
 #else  // !GNU libc
   return mbstowcs((wchar_t *) NULL, psz, 0);
@@ -85,7 +86,7 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 #if wxUSE_WCSRTOMBS
   // don't know if it's really needed (or if we can pass NULL), but better safe
   // than quick
-  mbstate_t mbstate;  
+  mbstate_t mbstate;
   return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
 #else  // !GNU libc
   return wcstombs((char *) NULL, pwz, 0);
@@ -113,10 +114,10 @@ bool WXDLLEXPORT wxOKlibc()
   return TRUE;
 }
 
-#ifdef wxNEED_WCSLEN
+#ifndef HAVE_WCSLEN
 size_t   WXDLLEXPORT wcslen(const wchar_t *s)
 {
-  size_t len;
+  size_t len = 0;
   while (s[len]) len++;
   return len;
 }
@@ -130,23 +131,23 @@ inline WORD wxMSW_ctype(wxChar ch)
   return ret;
 }
 
-int WXDLLEXPORT wxIsalnum(wxChar ch) { return IsCharAlphaNumeric(ch); }
-int WXDLLEXPORT wxIsalpha(wxChar ch) { return IsCharAlpha(ch); }
-int WXDLLEXPORT wxIsctrl(wxChar ch) { return wxMSW_ctype(ch) & C1_CNTRL; }
-int WXDLLEXPORT wxIsdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_DIGIT; }
-int WXDLLEXPORT wxIsgraph(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_PUNCT|C1_ALPHA); }
-int WXDLLEXPORT wxIslower(wxChar ch) { return IsCharLower(ch); }
-int WXDLLEXPORT wxIsprint(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_SPACE|C1_PUNCT|C1_ALPHA); }
-int WXDLLEXPORT wxIspunct(wxChar ch) { return wxMSW_ctype(ch) & C1_PUNCT; }
-int WXDLLEXPORT wxIsspace(wxChar ch) { return wxMSW_ctype(ch) & C1_SPACE; }
-int WXDLLEXPORT wxIsupper(wxChar ch) { return IsCharUpper(ch); }
-int WXDLLEXPORT wxIsxdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_XDIGIT; }
-int WXDLLEXPORT wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch); }
-int WXDLLEXPORT wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch); }
+WXDLLEXPORT int wxIsalnum(wxChar ch) { return IsCharAlphaNumeric(ch); }
+WXDLLEXPORT int wxIsalpha(wxChar ch) { return IsCharAlpha(ch); }
+WXDLLEXPORT int wxIsctrl(wxChar ch) { return wxMSW_ctype(ch) & C1_CNTRL; }
+WXDLLEXPORT int wxIsdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_DIGIT; }
+WXDLLEXPORT int wxIsgraph(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_PUNCT|C1_ALPHA); }
+WXDLLEXPORT int wxIslower(wxChar ch) { return IsCharLower(ch); }
+WXDLLEXPORT int wxIsprint(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_SPACE|C1_PUNCT|C1_ALPHA); }
+WXDLLEXPORT int wxIspunct(wxChar ch) { return wxMSW_ctype(ch) & C1_PUNCT; }
+WXDLLEXPORT int wxIsspace(wxChar ch) { return wxMSW_ctype(ch) & C1_SPACE; }
+WXDLLEXPORT int wxIsupper(wxChar ch) { return IsCharUpper(ch); }
+WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_XDIGIT; }
+WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); }
+WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
 #endif
 
 #ifndef wxStrdup
-wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)
+WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz)
 {
   size_t size = (wxStrlen(psz) + 1) * sizeof(wxChar);
   wxChar *ret = (wxChar *) malloc(size);
@@ -168,7 +169,7 @@ int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
 #endif
 
 #ifndef wxStrtok
-wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
+WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {
   if (!psz) psz = *save_ptr;
   psz += wxStrspn(psz, delim);
@@ -180,7 +181,7 @@ wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
   psz = wxStrpbrk(psz, delim);
   if (!psz) *save_ptr = (wxChar*)NULL;
   else {
-    *psz = _T('\0');
+    *psz = wxT('\0');
     *save_ptr = psz + 1;
   }
   return ret;
@@ -188,15 +189,171 @@ wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 #endif
 
 #ifndef wxSetlocale
-wxChar * WXDLLEXPORT wxSetlocale(int category, const wxChar *locale)
+WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale)
 {
-  setlocale(category, wxConv_libc.cWX2MB(locale));
+  setlocale(category, wxConvLibc.cWX2MB(locale));
   // FIXME
   return (wxChar *)NULL;
 }
 #endif
 
+#ifdef wxNEED_WX_STRING_H
+WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src)
+{
+  wxChar *ret = dest;
+  while (*dest) dest++;
+  while ((*dest++ = *src++));
+  return ret;
+}
+
+WXDLLEXPORT wxChar * wxStrchr(const wxChar *s, wxChar c)
+{
+  while (*s && *s != c) s++;
+  return (*s) ? (wxChar *)s : (wxChar *)NULL;
+}
+
+WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2)
+{
+  while ((*s1 == *s2) && *s1) s1++, s2++;
+  if ((wxUChar)*s1 < (wxUChar)*s2) return -1;
+  if ((wxUChar)*s1 > (wxUChar)*s2) return 1;
+  return 0;
+}
+
+WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src)
+{
+  wxChar *ret = dest;
+  while ((*dest++ = *src++));
+  return ret;
+}
+
+WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n)
+{
+  wxChar *ret = dest;
+  while (*dest) dest++;
+  while (n && (*dest++ = *src++)) n--;
+  return ret;
+}
+
+WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n)
+{
+  while (n && (*s1 == *s2) && *s1) n--, s1++, s2++;
+  if (n) {
+    if ((wxUChar)*s1 < (wxUChar)*s2) return -1;
+    if ((wxUChar)*s1 > (wxUChar)*s2) return 1;
+  }
+  return 0;
+}
+
+WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n)
+{
+  wxChar *ret = dest;
+  while (n && (*dest++ = *src++)) n--;
+  while (n) *dest++=0, n--; // the docs specify padding with zeroes
+  return ret;
+}
+
+WXDLLEXPORT wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept)
+{
+  while (*s && !wxStrchr(accept, *s)) s++;
+  return (*s) ? (wxChar *)s : (wxChar *)NULL;
+}
+
+WXDLLEXPORT wxChar * wxStrrchr(const wxChar *s, wxChar c)
+{
+  wxChar *ret = (wxChar *)NULL;
+  while (*s) {
+    if (*s == c) ret = (wxChar *)s;
+    s++;
+  }
+  return ret;
+}
+
+WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept)
+{
+  size_t len = 0;
+  while (wxStrchr(accept, *s++)) len++;
+  return len;
+}
+
+WXDLLEXPORT 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;
+}
+
+WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
+{
+  const wxChar *start = nptr;
+
+  // FIXME: only correct for C locale
+  while (wxIsspace(*nptr)) nptr++;
+  if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;
+  while (wxIsdigit(*nptr)) nptr++;
+  if (*nptr == wxT('.')) {
+    nptr++;
+    while (wxIsdigit(*nptr)) nptr++;
+  }
+  if (*nptr == wxT('E') || *nptr == wxT('e')) {
+    nptr++;
+    if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;
+    while (wxIsdigit(*nptr)) nptr++;
+  }
+
+  wxString data(nptr, nptr-start);
+  wxWX2MBbuf dat = data.mb_str(wxConvLibc);
+  char *rdat = wxMBSTRINGCAST dat;
+  double ret = strtod(dat, &rdat);
+
+  if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat));
+
+  return ret;
+}
+
+WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
+{
+  const wxChar *start = nptr;
+
+  // FIXME: only correct for C locale
+  while (wxIsspace(*nptr)) nptr++;
+  if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;
+  if (((base == 0) || (base == 16)) &&
+      (nptr[0] == wxT('0') && nptr[1] == wxT('x'))) {
+    nptr += 2;
+    base = 16;
+  }
+  else if ((base == 0) && (nptr[0] == wxT('0'))) base = 8;
+  else if (base == 0) base = 10;
+
+  while ((wxIsdigit(*nptr) && (*nptr - wxT('0') < base)) ||
+         (wxIsalpha(*nptr) && (wxToupper(*nptr) - wxT('A') + 10 < base))) nptr++;
+
+  wxString data(nptr, nptr-start);
+  wxWX2MBbuf dat = data.mb_str(wxConvLibc);
+  char *rdat = wxMBSTRINGCAST dat;
+  long int ret = strtol(dat, &rdat, base);
+
+  if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat));
+
+  return ret;
+}
+#endif
+
 #ifdef wxNEED_WX_STDIO_H
+WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *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;
@@ -272,7 +429,7 @@ int WXDLLEXPORT wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr)
   int ret;
   // this will work only for numeric conversion! Strings will not be converted correctly
   // hopefully this is all we'll need
-  ret = vsscanf(wxConv_libc.cWX2MB(buf), wxConv_libc.cWX2MB(fmt), argptr);
+  ret = vsscanf(wxConvLibc.cWX2MB(buf), wxConvLibc.cWX2MB(fmt), argptr);
   return ret;
 }
 #endif
@@ -280,19 +437,19 @@ int WXDLLEXPORT wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr)
 #ifndef wxAtof
 double   WXDLLEXPORT wxAtof(const wxChar *psz)
 {
-  return atof(wxConv_libc.cWX2MB(psz));
+  return atof(wxConvLibc.cWX2MB(psz));
 }
 #endif
 
 #ifdef wxNEED_WX_STDLIB_H
 int      WXDLLEXPORT wxAtoi(const wxChar *psz)
 {
-  return atoi(wxConv_libc.cWX2MB(psz));
+  return atoi(wxConvLibc.cWX2MB(psz));
 }
 
 long     WXDLLEXPORT wxAtol(const wxChar *psz)
 {
-  return atol(wxConv_libc.cWX2MB(psz));
+  return atol(wxConvLibc.cWX2MB(psz));
 }
 
 wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
@@ -302,7 +459,7 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
   wxObject *data = env.Get(name);
   if (!data) {
     // nope, retrieve it,
-    const char *val = getenv(wxConv_libc.cWX2MB(name));
+    const char *val = getenv(wxConvLibc.cWX2MB(name));
     if (!val) return (wxChar *)NULL;
     // convert it,
     data = (wxObject *)new wxString(val);
@@ -315,7 +472,25 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
 
 int      WXDLLEXPORT wxSystem(const wxChar *psz)
 {
-  return system(wxConv_libc.cWX2MB(psz));
+  return system(wxConvLibc.cWX2MB(psz));
 }
 
 #endif
+
+#ifdef wxNEED_WX_TIME_H
+WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm)
+{
+  if (!max) return 0;
+  char *buf = (char *)malloc(max);
+  size_t ret = strftime(buf, max, wxConvLibc.cWX2MB(fmt), tm);
+  if (ret) {
+    wxStrcpy(s, wxConvLibc.cMB2WX(buf));
+    free(buf);
+    return wxStrlen(s);
+  } else {
+    free(buf);
+    *s = 0;
+    return 0;
+  }
+}
+#endif