// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
#pragma implementation "filefn.h"
#endif
#include <dirent.h>
#endif
+#ifdef __OS2__
+ #include <direct.h>
+ #include <process.h>
+#endif
#ifdef __WINDOWS__
#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
#include <direct.h>
#include "windows.h"
#endif
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
#define _MAXPATHLEN 500
-extern char *wxBuffer;
#ifdef __WXMAC__
- extern char gwxMacFileName[] ;
- extern char gwxMacFileName2[] ;
- extern char gwxMacFileName3[] ;
+ extern wxChar gwxMacFileName[] ;
+ extern wxChar gwxMacFileName2[] ;
+ extern wxChar gwxMacFileName3[] ;
#endif
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
#endif
+// ----------------------------------------------------------------------------
+// private globals
+// ----------------------------------------------------------------------------
+
+static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
+
+// ============================================================================
+// implementation
+// ============================================================================
+
void wxPathList::Add (const wxString& path)
{
- wxStringList::Add ((char *)(const char *)path);
+ wxStringList::Add (WXSTRINGCAST path);
}
// Add paths e.g. from the PATH environment variable
void wxPathList::AddEnvList (const wxString& envVariable)
{
- static const char PATH_TOKS[] =
+ static const wxChar PATH_TOKS[] =
#ifdef __WINDOWS__
- " ;"; // Don't seperate with colon in DOS (used for drive)
+ wxT(" ;"); // Don't seperate with colon in DOS (used for drive)
#else
- " :;";
+ wxT(" :;");
#endif
- char *val = getenv (WXSTRINGCAST envVariable);
+ wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
if (val && *val)
{
- char *s = copystring (val);
- char *token = strtok (s, PATH_TOKS);
+ wxChar *s = copystring (val);
+ wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
if (token)
- {
+ {
Add (copystring (token));
while (token)
- {
- if ((token = strtok ((char *) NULL, PATH_TOKS)) != NULL)
- Add (wxString(token));
- }
- }
- delete[]s;
+ {
+ if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL)
+ Add (wxString(token));
+ }
+ }
+
+ // suppress warning about unused variable save_ptr when wxStrtok() is a
+ // macro which throws away its third argument
+ save_ptr = token;
+
+ delete [] s;
}
}
{
for (wxNode * node = First (); node != NULL; node = node->Next ())
{
- wxString path2((char *) node->Data ());
+ wxString path2((wxChar *) node->Data ());
if (
#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
// Case INDEPENDENT
wxString wxPathList::FindValidPath (const wxString& file)
{
- if (wxFileExists (wxExpandPath(wxBuffer, file)))
- return wxString(wxBuffer);
+ if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file)))
+ return wxString(wxFileFunctionsBuffer);
- char buf[_MAXPATHLEN];
- strcpy(buf, wxBuffer);
+ wxChar buf[_MAXPATHLEN];
+ wxStrcpy(buf, wxFileFunctionsBuffer);
- char *filename = (char*) NULL; /* shut up buggy egcs warning */
- filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (char *)buf;
+ wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
+ filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
for (wxNode * node = First (); node; node = node->Next ())
{
- char *path = (char *) node->Data ();
- strcpy (wxBuffer, path);
- char ch = wxBuffer[strlen(wxBuffer)-1];
- if (ch != '\\' && ch != '/')
- strcat (wxBuffer, "/");
- strcat (wxBuffer, filename);
+ wxChar *path = (wxChar *) node->Data ();
+ wxStrcpy (wxFileFunctionsBuffer, path);
+ wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
+ if (ch != wxT('\\') && ch != wxT('/'))
+ wxStrcat (wxFileFunctionsBuffer, wxT("/"));
+ wxStrcat (wxFileFunctionsBuffer, filename);
#ifdef __WINDOWS__
- Unix2DosFilename (wxBuffer);
+ Unix2DosFilename (wxFileFunctionsBuffer);
#endif
- if (wxFileExists (wxBuffer))
+ if (wxFileExists (wxFileFunctionsBuffer))
{
- return wxString(wxBuffer); // Found!
+ return wxString(wxFileFunctionsBuffer); // Found!
}
} // for()
- return wxString(""); // Not found
+ return wxString(wxT("")); // Not found
}
wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
{
- wxString f = FindValidPath(file);
- if (wxIsAbsolutePath(f))
- return f;
- else
- {
- char buf[500];
- wxGetWorkingDirectory(buf, 499);
- int len = (int)strlen(buf);
- char lastCh = 0;
- if (len > 0)
- lastCh = buf[len-1];
- if (lastCh != '/' && lastCh != '\\')
+ wxString f = FindValidPath(file);
+ if ( wxIsAbsolutePath(f) )
+ return f;
+
+ wxString buf;
+ wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1);
+ buf.UngetWriteBuf();
+ if ( !wxEndsWithPathSeparator(buf) )
{
-#ifdef __WINDOWS__
- strcat(buf, "\\");
-#else
- strcat(buf, "/");
-#endif
+ buf += wxFILE_SEP_PATH;
}
- strcat(buf, (const char *)f);
- strcpy(wxBuffer, buf);
- return wxString(wxBuffer);
- }
+ buf += f;
+
+ return buf;
}
bool
return TRUE;
#elif defined(__WXMAC__)
struct stat stbuf;
- strcpy( gwxMacFileName , filename ) ;
+ wxStrcpy( gwxMacFileName , filename ) ;
wxUnix2MacFilename( gwxMacFileName ) ;
- if (gwxMacFileName && stat ((char *)(const char *)gwxMacFileName, &stbuf) == 0)
+ if (gwxMacFileName && stat (WXSTRINGCAST gwxMacFileName, &stbuf) == 0)
return TRUE;
return FALSE ;
#else
struct stat stbuf;
#endif
- if ((filename != "") && stat ((char *)(const char *)filename, &stbuf) == 0)
+ if ((filename != wxT("")) && stat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0)
return TRUE;
return FALSE;
#endif
bool
wxIsAbsolutePath (const wxString& filename)
{
- if (filename != "")
+ if (filename != wxT(""))
{
- if (filename[0] == '/'
+ if (filename[0] == wxT('/')
#ifdef __VMS__
- || (filename[0] == '[' && filename[1] != '.')
+ || (filename[0] == wxT('[') && filename[1] != wxT('.'))
#endif
#ifdef __WINDOWS__
/* MSDOS */
- || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
+ || filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))
#endif
)
return TRUE;
*
*/
-void wxStripExtension(char *buffer)
+void wxStripExtension(wxChar *buffer)
{
- int len = strlen(buffer);
+ int len = wxStrlen(buffer);
int i = len-1;
while (i > 0)
{
- if (buffer[i] == '.')
+ if (buffer[i] == wxT('.'))
{
buffer[i] = 0;
break;
size_t i = len-1;
while (i > 0)
{
- if (buffer.GetChar(i) == '.')
+ if (buffer.GetChar(i) == wxT('.'))
{
buffer = buffer.Left(i);
break;
}
// Destructive removal of /./ and /../ stuff
-char *wxRealPath (char *path)
+wxChar *wxRealPath (wxChar *path)
{
#ifdef __WXMSW__
- static const char SEP = '\\';
+ static const wxChar SEP = wxT('\\');
Unix2DosFilename(path);
#else
- static const char SEP = '/';
+ static const wxChar SEP = wxT('/');
#endif
if (path[0] && path[1]) {
/* MATTHEW: special case "/./x" */
- char *p;
- if (path[2] == SEP && path[1] == '.')
+ wxChar *p;
+ if (path[2] == SEP && path[1] == wxT('.'))
p = &path[0];
else
p = &path[2];
{
if (*p == SEP)
{
- if (p[1] == '.' && p[2] == '.' && (p[3] == SEP || p[3] == '\0'))
+ if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
{
- char *q;
+ wxChar *q;
for (q = p - 1; q >= path && *q != SEP; q--);
- if (q[0] == SEP && (q[1] != '.' || q[2] != '.' || q[3] != SEP)
+ if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
&& (q - 1 <= path || q[-1] != SEP))
{
- strcpy (q, p + 3);
- if (path[0] == '\0')
+ wxStrcpy (q, p + 3);
+ if (path[0] == wxT('\0'))
{
path[0] = SEP;
- path[1] = '\0';
+ path[1] = wxT('\0');
}
#ifdef __WXMSW__
/* Check that path[2] is NULL! */
- else if (path[1] == ':' && !path[2])
+ else if (path[1] == wxT(':') && !path[2])
{
path[2] = SEP;
- path[3] = '\0';
+ path[3] = wxT('\0');
}
#endif
p = q - 1;
}
}
- else if (p[1] == '.' && (p[2] == SEP || p[2] == '\0'))
- strcpy (p, p + 2);
+ else if (p[1] == wxT('.') && (p[2] == SEP || p[2] == wxT('\0')))
+ wxStrcpy (p, p + 2);
}
}
}
}
// Must be destroyed
-char *wxCopyAbsolutePath(const wxString& filename)
+wxChar *wxCopyAbsolutePath(const wxString& filename)
{
- if (filename == "")
- return (char *) NULL;
+ if (filename == wxT(""))
+ return (wxChar *) NULL;
- if (! IsAbsolutePath(wxExpandPath(wxBuffer, filename))) {
- char buf[_MAXPATHLEN];
- buf[0] = '\0';
+ if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
+ wxChar buf[_MAXPATHLEN];
+ buf[0] = wxT('\0');
wxGetWorkingDirectory(buf, WXSIZEOF(buf));
- char ch = buf[strlen(buf) - 1];
+ wxChar ch = buf[wxStrlen(buf) - 1];
#ifdef __WXMSW__
- if (ch != '\\' && ch != '/')
- strcat(buf, "\\");
+ if (ch != wxT('\\') && ch != wxT('/'))
+ wxStrcat(buf, wxT("\\"));
#else
- if (ch != '/')
- strcat(buf, "/");
+ if (ch != wxT('/'))
+ wxStrcat(buf, wxT("/"));
#endif
- strcat(buf, wxBuffer);
+ wxStrcat(buf, wxFileFunctionsBuffer);
return copystring( wxRealPath(buf) );
}
- return copystring( wxBuffer );
+ return copystring( wxFileFunctionsBuffer );
}
/*-
/* input name in name, pathname output to buf. */
-char *wxExpandPath(char *buf, const char *name)
+wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
{
- register char *d, *s, *nm;
- char lnm[_MAXPATHLEN];
+ register wxChar *d, *s, *nm;
+ wxChar lnm[_MAXPATHLEN];
int q;
// Some compilers don't like this line.
-// const char trimchars[] = "\n \t";
+// const wxChar trimchars[] = wxT("\n \t");
- char trimchars[4];
- trimchars[0] = '\n';
- trimchars[1] = ' ';
- trimchars[2] = '\t';
+ wxChar trimchars[4];
+ trimchars[0] = wxT('\n');
+ trimchars[1] = wxT(' ');
+ trimchars[2] = wxT('\t');
trimchars[3] = 0;
#ifdef __WXMSW__
- const char SEP = '\\';
+ const wxChar SEP = wxT('\\');
#else
- const char SEP = '/';
+ const wxChar SEP = wxT('/');
#endif
- buf[0] = '\0';
- if (name == NULL || *name == '\0')
+ buf[0] = wxT('\0');
+ if (name == NULL || *name == wxT('\0'))
return buf;
nm = copystring(name); // Make a scratch copy
- char *nm_tmp = nm;
+ wxChar *nm_tmp = nm;
/* Skip leading whitespace and cr */
- while (strchr((char *)trimchars, *nm) != NULL)
+ while (wxStrchr((wxChar *)trimchars, *nm) != NULL)
nm++;
/* And strip off trailing whitespace and cr */
- s = nm + (q = strlen(nm)) - 1;
- while (q-- && strchr((char *)trimchars, *s) != NULL)
- *s = '\0';
+ s = nm + (q = wxStrlen(nm)) - 1;
+ while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)
+ *s = wxT('\0');
s = nm;
d = lnm;
#ifdef __WXMSW__
q = FALSE;
#else
- q = nm[0] == '\\' && nm[1] == '~';
+ q = nm[0] == wxT('\\') && nm[1] == wxT('~');
#endif
/* Expand inline environment variables */
+#ifdef __VISAGECPP__
+ while (*d)
+ {
+ *d++ = *s;
+ if(*s == wxT('\\'))
+ {
+ *(d - 1) = *++s;
+ if (*d)
+ {
+ s++;
+ continue;
+ }
+ else
+ break;
+ }
+ else
+#else
while ((*d++ = *s)) {
-#ifndef __WXMSW__
- if (*s == '\\') {
+# ifndef __WXMSW__
+ if (*s == wxT('\\')) {
if ((*(d - 1) = *++s)) {
s++;
continue;
} else
break;
} else
+# endif
#endif
#ifdef __WXMSW__
- if (*s++ == '$' && (*s == '{' || *s == ')'))
+ if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
#else
- if (*s++ == '$')
+ if (*s++ == wxT('$'))
#endif
{
- register char *start = d;
- register int braces = (*s == '{' || *s == '(');
- register char *value;
+ register wxChar *start = d;
+ register int braces = (*s == wxT('{') || *s == wxT('('));
+ register wxChar *value;
+#ifdef __VISAGECPP__
+ // VA gives assignment in logical expr warning
+ while (*d)
+ *d++ = *s;
+#else
while ((*d++ = *s))
- if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )
+#endif
+ if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
break;
else
s++;
*--d = 0;
- value = getenv(braces ? start + 1 : start);
+ value = wxGetenv(braces ? start + 1 : start);
if (value) {
+#ifdef __VISAGECPP__
+ // VA gives assignment in logical expr warning
+ for ((d = start - 1); (*d); *d++ = *value++);
+#else
for ((d = start - 1); (*d++ = *value++););
+#endif
d--;
if (braces && *s)
s++;
/* Expand ~ and ~user */
nm = lnm;
- s = "";
- if (nm[0] == '~' && !q)
+ s = wxT("");
+ if (nm[0] == wxT('~') && !q)
{
/* prefix ~ */
if (nm[1] == SEP || nm[1] == 0)
{ /* ~/filename */
- if ((s = wxGetUserHome("")) != NULL) {
+ // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+ if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
if (*++nm)
nm++;
}
} else
{ /* ~user/filename */
- register char *nnm;
- register char *home;
+ register wxChar *nnm;
+ register wxChar *home;
for (s = nm; *s && *s != SEP; s++);
int was_sep; /* MATTHEW: Was there a separator, or NULL? */
was_sep = (*s == SEP);
nnm = *s ? s + 1 : s;
*s = 0;
- if ((home = wxGetUserHome(wxString(nm + 1))) == NULL) {
+ // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+ if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
if (was_sep) /* replace only if it was there: */
*s = SEP;
- s = "";
+ s = wxT("");
} else {
nm = nnm;
s = home;
d = buf;
if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
/* Copy home dir */
- while ('\0' != (*d++ = *s++))
+ while (wxT('\0') != (*d++ = *s++))
/* loop */;
// Handle root home
if (d - 1 > buf && *(d - 2) != SEP)
*(d - 1) = SEP;
}
s = nm;
+#ifdef __VISAGECPP__
+ // VA gives assignment in logical expr warning
+ while (*d)
+ *d++ = *s++;
+#else
while ((*d++ = *s++));
-
+#endif
delete[] nm_tmp; // clean up alloc
/* Now clean up the buffer */
return wxRealPath(buf);
The call wxExpandPath can convert these back!
*/
-char *
+wxChar *
wxContractPath (const wxString& filename, const wxString& envname, const wxString& user)
{
- static char dest[_MAXPATHLEN];
+ static wxChar dest[_MAXPATHLEN];
- if (filename == "")
- return (char *) NULL;
+ if (filename == wxT(""))
+ return (wxChar *) NULL;
- strcpy (dest, WXSTRINGCAST filename);
+ wxStrcpy (dest, WXSTRINGCAST filename);
#ifdef __WXMSW__
Unix2DosFilename(dest);
#endif
// Handle environment
- char *val = (char *) NULL;
- char *tcp = (char *) NULL;
- if (envname != WXSTRINGCAST NULL && (val = getenv (WXSTRINGCAST envname)) != NULL &&
- (tcp = strstr (dest, val)) != NULL)
+ const wxChar *val = (const wxChar *) NULL;
+ wxChar *tcp = (wxChar *) NULL;
+ if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
+ (tcp = wxStrstr (dest, val)) != NULL)
{
- strcpy (wxBuffer, tcp + strlen (val));
- *tcp++ = '$';
- *tcp++ = '{';
- strcpy (tcp, WXSTRINGCAST envname);
- strcat (tcp, "}");
- strcat (tcp, wxBuffer);
+ wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
+ *tcp++ = wxT('$');
+ *tcp++ = wxT('{');
+ wxStrcpy (tcp, WXSTRINGCAST envname);
+ wxStrcat (tcp, wxT("}"));
+ wxStrcat (tcp, wxFileFunctionsBuffer);
}
// Handle User's home (ignore root homes!)
size_t len = 0;
if ((val = wxGetUserHome (user)) != NULL &&
- (len = strlen(val)) > 2 &&
- strncmp(dest, val, len) == 0)
+ (len = wxStrlen(val)) > 2 &&
+ wxStrncmp(dest, val, len) == 0)
{
- strcpy(wxBuffer, "~");
- if (user != "")
- strcat(wxBuffer, (const char*) user);
+ wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
+ if (user != wxT(""))
+ wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
#ifdef __WXMSW__
-// strcat(wxBuffer, "\\");
+// strcat(wxFileFunctionsBuffer, "\\");
#else
-// strcat(wxBuffer, "/");
+// strcat(wxFileFunctionsBuffer, "/");
#endif
- strcat(wxBuffer, dest + len);
- strcpy (dest, wxBuffer);
+ wxStrcat(wxFileFunctionsBuffer, dest + len);
+ wxStrcpy (dest, wxFileFunctionsBuffer);
}
return dest;
// Return just the filename, not the path
// (basename)
-char *wxFileNameFromPath (char *path)
+wxChar *wxFileNameFromPath (wxChar *path)
{
if (path)
{
- register char *tcp;
+ register wxChar *tcp;
- tcp = path + strlen (path);
+ tcp = path + wxStrlen (path);
while (--tcp >= path)
{
- if (*tcp == '/' || *tcp == '\\'
+ if (*tcp == wxT('/') || *tcp == wxT('\\')
#ifdef __VMS__
- || *tcp == ':' || *tcp == ']')
+ || *tcp == wxT(':') || *tcp == wxT(']'))
#else
)
#endif
return tcp + 1;
} /* while */
-#ifdef __WXMSW__
- if (isalpha (*path) && *(path + 1) == ':')
+#if defined(__WXMSW__) || defined(__WXPM__)
+ if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return path + 2;
#endif
}
wxString wxFileNameFromPath (const wxString& path1)
{
- if (path1 != "")
+ if (path1 != wxT(""))
{
- char *path = WXSTRINGCAST path1 ;
- register char *tcp;
+ wxChar *path = WXSTRINGCAST path1 ;
+ register wxChar *tcp;
- tcp = path + strlen (path);
+ tcp = path + wxStrlen (path);
while (--tcp >= path)
{
- if (*tcp == '/' || *tcp == '\\'
+ if (*tcp == wxT('/') || *tcp == wxT('\\')
#ifdef __VMS__
- || *tcp == ':' || *tcp == ']')
+ || *tcp == wxT(':') || *tcp == wxT(']'))
#else
)
#endif
return wxString(tcp + 1);
} /* while */
-#ifdef __WXMSW__
- if (isalpha (*path) && *(path + 1) == ':')
+#if defined(__WXMSW__) || defined(__WXPM__)
+ if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return wxString(path + 2);
#endif
}
}
// Return just the directory, or NULL if no directory
-char *
-wxPathOnly (char *path)
+wxChar *
+wxPathOnly (wxChar *path)
{
if (path && *path)
{
- static char buf[_MAXPATHLEN];
+ static wxChar buf[_MAXPATHLEN];
// Local copy
- strcpy (buf, path);
+ wxStrcpy (buf, path);
- int l = strlen(path);
+ int l = wxStrlen(path);
bool done = FALSE;
int i = l - 1;
while (!done && i > -1)
{
// ] is for VMS
- if (path[i] == '/' || path[i] == '\\' || path[i] == ']')
+ if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
{
done = TRUE;
#ifdef __VMS__
else i --;
}
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
// Try Drive specifier
- if (isalpha (buf[0]) && buf[1] == ':')
+ if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
// A:junk --> A:. (since A:.\junk Not A:\junk)
- buf[2] = '.';
- buf[3] = '\0';
+ buf[2] = wxT('.');
+ buf[3] = wxT('\0');
return buf;
}
#endif
}
- return (char *) NULL;
+ return (wxChar *) NULL;
}
// Return just the directory, or NULL if no directory
wxString wxPathOnly (const wxString& path)
{
- if (path != "")
+ if (path != wxT(""))
{
- char buf[_MAXPATHLEN];
+ wxChar buf[_MAXPATHLEN];
// Local copy
- strcpy (buf, WXSTRINGCAST path);
+ wxStrcpy (buf, WXSTRINGCAST path);
int l = path.Length();
bool done = FALSE;
while (!done && i > -1)
{
// ] is for VMS
- if (path[i] == '/' || path[i] == '\\' || path[i] == ']')
+ if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
{
done = TRUE;
#ifdef __VMS__
else i --;
}
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
// Try Drive specifier
- if (isalpha (buf[0]) && buf[1] == ':')
+ if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
// A:junk --> A:. (since A:.\junk Not A:\junk)
- buf[2] = '.';
- buf[3] = '\0';
+ buf[2] = wxT('.');
+ buf[3] = wxT('\0');
return wxString(buf);
}
#endif
}
- return wxString("");
+ return wxString(wxT(""));
}
// Utility for converting delimiters in DOS filenames to UNIX style
#ifdef __WXMAC__
void
-wxMac2UnixFilename (char *s)
+wxMac2UnixFilename (wxChar *s)
{
if (s)
{
- memmove( s+1 , s ,strlen( s ) + 1) ;
- if ( *s == ':' )
- *s = '.' ;
+ memmove( s+1 , s ,(strlen( s ) + 1)*sizeof(wxChar)) ;
+ if ( *s == wxT(':') )
+ *s = wxT('.') ;
else
- *s = '/' ;
+ *s = wxT('/') ;
while (*s)
{
- if (*s == ':')
- *s = '/';
+ if (*s == wxT(':'))
+ *s = wxT('/');
else
- *s = wxToLower (*s); // Case INDEPENDENT
+ *s = wxTolower(*s); // Case INDEPENDENT
s++;
}
}
}
void
-wxUnix2MacFilename (char *s)
+wxUnix2MacFilename (wxChar *s)
{
if (s)
{
- if ( *s == '.' )
+ if ( *s == wxT('.') )
{
// relative path , since it goes on with slash which is translated to a :
- memmove( s , s+1 ,strlen( s ) ) ;
+ memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ;
}
- else if ( *s == '/' )
+ else if ( *s == wxT('/') )
{
// absolute path -> on mac just start with the drive name
- memmove( s , s+1 ,strlen( s ) ) ;
+ memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ;
}
else
{
- wxASSERT_MSG( 1 , "unkown path beginning" ) ;
+ wxASSERT_MSG( 1 , wxT("unknown path beginning") ) ;
}
while (*s)
{
- if (*s == '/' || *s == '\\')
- *s = ':';
+ if (*s == wxT('/') || *s == wxT('\\'))
+ *s = wxT(':');
s++ ;
}
}
#endif
void
-wxDos2UnixFilename (char *s)
+wxDos2UnixFilename (wxChar *s)
{
if (s)
while (*s)
{
- if (*s == '\\')
- *s = '/';
-#ifdef __WXMSW__
+ if (*s == wxT('\\'))
+ *s = wxT('/');
+#if defined(__WXMSW__) || defined(__WXPM__)
else
- *s = wxToLower (*s); // Case INDEPENDENT
+ *s = wxTolower(*s); // Case INDEPENDENT
#endif
s++;
}
}
void
-#ifdef __WXMSW__
-wxUnix2DosFilename (char *s)
+#if defined(__WXMSW__) || defined(__WXPM__)
+wxUnix2DosFilename (wxChar *s)
#else
-wxUnix2DosFilename (char *WXUNUSED(s))
+wxUnix2DosFilename (wxChar *WXUNUSED(s))
#endif
{
// Yes, I really mean this to happen under DOS only! JACS
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
if (s)
while (*s)
{
- if (*s == '/')
- *s = '\\';
+ if (*s == wxT('/'))
+ *s = wxT('\\');
s++;
}
#endif
bool
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
{
- char *outfile = wxGetTempFileName("cat");
+ wxChar *outfile = wxGetTempFileName("cat");
FILE *fp1 = (FILE *) NULL;
FILE *fp2 = (FILE *) NULL;
FILE *fp3 = (FILE *) NULL;
// Open the inputs and outputs
#ifdef __WXMAC__
- strcpy( gwxMacFileName , file1 ) ;
+ wxStrcpy( gwxMacFileName , file1 ) ;
wxUnix2MacFilename( gwxMacFileName ) ;
- strcpy( gwxMacFileName2 , file2) ;
+ wxStrcpy( gwxMacFileName2 , file2) ;
wxUnix2MacFilename( gwxMacFileName2 ) ;
- strcpy( gwxMacFileName3 , outfile) ;
+ wxStrcpy( gwxMacFileName3 , outfile) ;
wxUnix2MacFilename( gwxMacFileName3 ) ;
if ((fp1 = fopen (gwxMacFileName, "rb")) == NULL ||
(fp2 = fopen (gwxMacFileName2, "rb")) == NULL ||
(fp3 = fopen (gwxMacFileName3, "wb")) == NULL)
#else
- if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
- (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
- (fp3 = fopen (outfile, "wb")) == NULL)
+ if ((fp1 = fopen (wxFNSTRINGCAST file1.fn_str(), "rb")) == NULL ||
+ (fp2 = fopen (wxFNSTRINGCAST file2.fn_str(), "rb")) == NULL ||
+ (fp3 = fopen (wxFNCONV(outfile), "wb")) == NULL)
#endif
{
if (fp1)
int ch;
#ifdef __WXMAC__
- strcpy( gwxMacFileName , file1 ) ;
+ wxStrcpy( gwxMacFileName , file1 ) ;
wxUnix2MacFilename( gwxMacFileName ) ;
- strcpy( gwxMacFileName2 , file2) ;
+ wxStrcpy( gwxMacFileName2 , file2) ;
wxUnix2MacFilename( gwxMacFileName2 ) ;
if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL)
return FALSE;
if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL)
#else
- if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL)
+ if ((fd1 = fopen (wxFNSTRINGCAST file1.fn_str(), "rb")) == NULL)
return FALSE;
- if ((fd2 = fopen (WXSTRINGCAST file2, "wb")) == NULL)
+ if ((fd2 = fopen (wxFNSTRINGCAST file2.fn_str(), "wb")) == NULL)
#endif
{
fclose (fd1);
wxRenameFile (const wxString& file1, const wxString& file2)
{
#ifdef __WXMAC__
- strcpy( gwxMacFileName , file1 ) ;
+ wxStrcpy( gwxMacFileName , file1 ) ;
wxUnix2MacFilename( gwxMacFileName ) ;
- strcpy( gwxMacFileName2 , file2) ;
+ wxStrcpy( gwxMacFileName2 , file2) ;
wxUnix2MacFilename( gwxMacFileName2 ) ;
if (0 == rename (gwxMacFileName, gwxMacFileName2))
return TRUE;
#else
// Normal system call
- if (0 == rename (WXSTRINGCAST file1, WXSTRINGCAST file2))
+ if (0 == rename (wxFNSTRINGCAST file1.fn_str(), wxFNSTRINGCAST file2.fn_str()))
return TRUE;
#endif
// Try to copy
bool wxRemoveFile(const wxString& file)
{
#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
- int flag = remove(WXSTRINGCAST file);
+ int flag = remove(wxFNSTRINGCAST file.fn_str());
#elif defined( __WXMAC__ )
- strcpy( gwxMacFileName , file ) ;
+ wxStrcpy( gwxMacFileName , file ) ;
wxUnix2MacFilename( gwxMacFileName ) ;
int flag = unlink(gwxMacFileName);
#else
- int flag = unlink(WXSTRINGCAST file);
+ int flag = unlink(wxFNSTRINGCAST file.fn_str());
#endif
return (flag == 0) ;
}
-bool wxMkdir(const wxString& dir)
+bool wxMkdir(const wxString& dir, int perm)
{
-#if defined(__WXSTUBS__)
- return FALSE;
-#elif defined(__VMS__)
+#if defined( __WXMAC__ )
+ wxStrcpy( gwxMacFileName , dir ) ;
+ wxUnix2MacFilename( gwxMacFileName ) ;
+ const wxChar *dirname = gwxMacFileName;
+#else // !Mac
+ const wxChar *dirname = dir.c_str();
+#endif // Mac/!Mac
+
+ // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
+ // for the GNU compiler
+#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
+ if ( mkdir(wxFNCONV(dirname), perm) != 0 )
+#else // MSW and OS/2
+ if ( mkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+#endif // !MSW/MSW
+ {
+ wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
+
return FALSE;
-#elif defined( __WXMAC__ )
- strcpy( gwxMacFileName , dir ) ;
- wxUnix2MacFilename( gwxMacFileName ) ;
- return (mkdir(gwxMacFileName , 0 ) == 0);
-#elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
- return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
-#else
- return (mkdir(WXSTRINGCAST dir) == 0);
-#endif
+ }
+
+ return TRUE;
}
bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
#ifdef __VMS__
return FALSE;
#elif defined( __WXMAC__ )
- strcpy( gwxMacFileName , dir ) ;
+ wxStrcpy( gwxMacFileName , dir ) ;
wxUnix2MacFilename( gwxMacFileName ) ;
return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);
#else
#ifdef __SALFORDC__
return FALSE; // What to do?
#else
- return (rmdir(WXSTRINGCAST dir) == 0);
+ return (rmdir(wxFNSTRINGCAST dir.fn_str()) == 0);
#endif
#endif
return FALSE;
#elif !defined(__WXMSW__)
struct stat sbuf;
- return (stat(dir, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
+ return (stat(dir.fn_str(), &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
#else
/* MATTHEW: [6] Always use same code for Win32, call FindClose */
#endif
// does the path exists? (may have or not '/' or '\\' at the end)
-bool wxPathExists(const char *pszPathName)
+bool wxPathExists(const wxChar *pszPathName)
{
- // Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists
- // OTOH, we should change "d:" to "d:\" and leave "\" as is.
+ /* Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists
+ * OTOH, we should change "d:" to "d:\" and leave "\" as is. */
wxString strPath(pszPathName);
- if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != '\0' )
- strPath.Last() = '\0';
+ if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != wxT('\0') )
+ strPath.Last() = wxT('\0');
#ifdef __SALFORDC__
struct _stat st;
struct stat st;
#endif
- return stat((char*) (const char*) strPath, &st) == 0 && (st.st_mode & S_IFDIR);
+ return stat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR);
}
// Get a temporary filename, opening and closing the file.
-char *wxGetTempFileName(const wxString& prefix, char *buf)
+wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
{
#ifdef __WINDOWS__
#ifndef __WIN32__
- char tmp[144];
+ wxChar tmp[144];
::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp);
#else
- char tmp[MAX_PATH];
- char tmpPath[MAX_PATH];
+ wxChar tmp[MAX_PATH];
+ wxChar tmpPath[MAX_PATH];
::GetTempPath(MAX_PATH, tmpPath);
::GetTempFileName(tmpPath, WXSTRINGCAST prefix, 0, tmp);
#endif
- if (buf) strcpy(buf, tmp);
+ if (buf) wxStrcpy(buf, tmp);
else buf = copystring(tmp);
return buf;
#else
static short last_temp = 0; // cache last to speed things a bit
// At most 1000 temp files to a process! We use a ring count.
- char tmp[100]; // FIXME static buffer
+ wxChar tmp[100]; // FIXME static buffer
for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000)
{
- sprintf (tmp, "/tmp/%s%d.%03x", WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
+ wxSprintf (tmp, wxT("/tmp/%s%d.%03x"), WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
if (!wxFileExists( tmp ))
{
// Touch the file to create it (reserve name)
- FILE *fd = fopen (tmp, "w");
+ FILE *fd = fopen (wxFNCONV(tmp), "w");
if (fd)
fclose (fd);
last_temp = suffix;
if (buf)
- strcpy( buf, tmp);
+ wxStrcpy( buf, tmp);
else
buf = copystring( tmp );
return buf;
}
wxLogError( _("wxWindows: error finding temporary file name.\n") );
if (buf) buf[0] = 0;
- return (char *) NULL;
+ return (wxChar *) NULL;
#endif
}
static int gs_findFlags = 0;
#endif
-wxString wxFindFirstFile(const char *spec, int flags)
+wxString wxFindFirstFile(const wxChar *spec, int flags)
{
wxString result;
wxString path(wxPathOnly(gs_strFileSpec));
// special case: path is really "/"
- if ( !path && gs_strFileSpec[0u] == '/' )
- path = '/';
+ if ( !path && gs_strFileSpec[0u] == wxT('/') )
+ path = wxT('/');
// path is empty => Local directory
if ( !path )
- path = '.';
+ path = wxT('.');
- gs_dirStream = opendir(path);
+ gs_dirStream = opendir(path.fn_str());
if ( !gs_dirStream )
{
wxLogSysError(_("Can not enumerate files in directory '%s'"),
wxString result;
#ifndef __VMS__
- wxCHECK_MSG( gs_dirStream, result, "must call wxFindFirstFile first" );
+ wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") );
// Find path only so we can concatenate
// found file onto path
wxString name(wxFileNameFromPath(gs_strFileSpec));
/* MATTHEW: special case: path is really "/" */
- if ( !path && gs_strFileSpec[0u] == '/')
- path = '/';
+ if ( !path && gs_strFileSpec[0u] == wxT('/'))
+ path = wxT('/');
// Do the reading
struct dirent *nextDir;
if ( !path.IsEmpty() )
{
result = path;
- if ( path != '/' )
- result += '/';
+ if ( path != wxT('/') )
+ result += wxT('/');
}
result += nextDir->d_name;
static wxString gs_strFileSpec;
static int gs_findFlags = 0;
-wxString wxFindFirstFile(const char *spec, int flags)
+wxString wxFindFirstFile(const wxChar *spec, int flags)
{
wxString result;
// Find path only so we can concatenate found file onto path
wxString path(wxPathOnly(gs_strFileSpec));
if ( !path.IsEmpty() )
- result << path << '\\';
+ result << path << wxT('\\');
#ifdef __WIN32__
if ( gs_hFileStruct != INVALID_HANDLE_VALUE )
if ( gs_hFileStruct == INVALID_HANDLE_VALUE )
{
- wxLogSysError(_("Can not enumerate files in directory '%s'"),
- path.c_str());
-
result.Empty();
return result;
goto try_again;
if ( !path.IsEmpty() )
- result << path << '\\';
+ result << path << wxT('\\');
result << gs_findDataStruct.cFileName;
}
// Get current working directory.
// If buf is NULL, allocates space using new, else
// copies into buf.
-char *wxGetWorkingDirectory(char *buf, int sz)
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
{
if (!buf)
- buf = new char[sz+1];
+ buf = new wxChar[sz+1];
+#if wxUSE_UNICODE
+ char *cbuf = new char[sz+1];
+#ifdef _MSC_VER
+ if (_getcwd(cbuf, sz) == NULL) {
+#else
+ if (getcwd(cbuf, sz) == NULL) {
+#endif
+ delete [] cbuf;
+#else
#ifdef _MSC_VER
if (_getcwd(buf, sz) == NULL) {
#else
if (getcwd(buf, sz) == NULL) {
#endif
- buf[0] = '.';
- buf[1] = '\0';
+#endif
+ buf[0] = wxT('.');
+ buf[1] = wxT('\0');
}
+#if wxUSE_UNICODE
+ else {
+ wxConvFile.MB2WC(buf, cbuf, sz);
+ delete [] cbuf;
+ }
+#endif
return buf;
}
wxString wxGetCwd()
{
- return wxString(wxGetWorkingDirectory());
+ static const size_t maxPathLen = 1024;
+
+ wxString str;
+ wxGetWorkingDirectory(str.GetWriteBuf(maxPathLen), maxPathLen);
+ str.UngetWriteBuf();
+
+ return str;
}
bool wxSetWorkingDirectory(const wxString& d)
{
-#if defined( __UNIX__ ) || defined( __WXMAC__ )
- return (chdir(d) == 0);
+#if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__)
+ return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
#elif defined(__WINDOWS__)
#ifdef __WIN32__
bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
if (isDriveSpec)
{
- char firstChar = d[0];
+ wxChar firstChar = d[0];
// To upper case
if (firstChar > 90)
wxString wxGetOSDirectory()
{
#ifdef __WINDOWS__
- char buf[256];
+ wxChar buf[256];
GetWindowsDirectory(buf, 256);
return wxString(buf);
#else
#endif
}
-bool wxEndsWithPathSeparator(const char *pszFileName)
+bool wxEndsWithPathSeparator(const wxChar *pszFileName)
{
- size_t len = Strlen(pszFileName);
+ size_t len = wxStrlen(pszFileName);
if ( len == 0 )
return FALSE;
else
}
// find a file in a list of directories, returns false if not found
-bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
+bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
{
- // we assume that it's not empty
- wxCHECK_MSG( !IsEmpty(pszFile), FALSE,
- _("empty file name in wxFindFileInPath"));
-
- // skip path separator in the beginning of the file name if present
- if ( wxIsPathSeparator(*pszFile) )
- pszFile++;
-
- // copy the path (strtok will modify it)
- char *szPath = new char[strlen(pszPath) + 1];
- strcpy(szPath, pszPath);
-
- wxString strFile;
- char *pc;
- for ( pc = strtok(szPath, wxPATH_SEP);
- pc != NULL;
- pc = strtok((char *) NULL, wxPATH_SEP) )
- {
- // search for the file in this directory
- strFile = pc;
- if ( !wxEndsWithPathSeparator(pc) )
- strFile += wxFILE_SEP_PATH;
- strFile += pszFile;
-
- if ( FileExists(strFile) ) {
- *pStr = strFile;
- break;
+ // we assume that it's not empty
+ wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
+ _("empty file name in wxFindFileInPath"));
+
+ // skip path separator in the beginning of the file name if present
+ if ( wxIsPathSeparator(*pszFile) )
+ pszFile++;
+
+ // copy the path (strtok will modify it)
+ wxChar *szPath = new wxChar[wxStrlen(pszPath) + 1];
+ wxStrcpy(szPath, pszPath);
+
+ wxString strFile;
+ wxChar *pc, *save_ptr;
+ for ( pc = wxStrtok(szPath, wxPATH_SEP, &save_ptr);
+ pc != NULL;
+ pc = wxStrtok((wxChar *) NULL, wxPATH_SEP, &save_ptr) )
+ {
+ // search for the file in this directory
+ strFile = pc;
+ if ( !wxEndsWithPathSeparator(pc) )
+ strFile += wxFILE_SEP_PATH;
+ strFile += pszFile;
+
+ if ( FileExists(strFile) ) {
+ *pStr = strFile;
+ break;
+ }
}
- }
- delete [] szPath;
+ // suppress warning about unused variable save_ptr when wxStrtok() is a
+ // macro which throws away its third argument
+ save_ptr = pc;
+
+ delete [] szPath;
- return pc != NULL; // if true => we breaked from the loop
+ return pc != NULL; // if true => we breaked from the loop
}
-void WXDLLEXPORT wxSplitPath(const char *pszFileName,
+void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
wxString *pstrPath,
wxString *pstrName,
wxString *pstrExt)
{
- wxCHECK_RET( pszFileName, "NULL file name in wxSplitPath" );
+ // it can be empty, but it shouldn't be NULL
+ wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
- const char *pDot = strrchr(pszFileName, wxFILE_SEP_EXT);
- const char *pSepUnix = strrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
- const char *pSepDos = strrchr(pszFileName, wxFILE_SEP_PATH_DOS);
+ const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT);
- // take the last of the two: nPosUnix containts the last slash in the
- // filename
- size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
- size_t nPosDos = pSepDos ? pSepDos - pszFileName : 0;
- if ( nPosDos > nPosUnix )
- nPosUnix = nPosDos;
+#ifdef __WXMSW__
+ // under Windows we understand both separators
+ const wxChar *pSepUnix = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
+ const wxChar *pSepDos = wxStrrchr(pszFileName, wxFILE_SEP_PATH_DOS);
+ const wxChar *pLastSeparator = pSepUnix > pSepDos ? pSepUnix : pSepDos;
+#else // assume Unix
+ const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
+
+ if ( pDot == pszFileName )
+ {
+ // under Unix files like .profile are treated in a special way
+ pDot = NULL;
+ }
+#endif // MSW/Unix
- if ( pstrPath )
- *pstrPath = wxString(pszFileName, nPosUnix);
+ if ( pDot < pLastSeparator )
+ {
+ // the dot is part of the path, not the start of the extension
+ pDot = NULL;
+ }
- size_t nPosDot = 0;
- if ( pDot )
- nPosDot = pDot - pszFileName;
+ if ( pstrPath )
+ {
+ if ( pLastSeparator )
+ *pstrPath = wxString(pszFileName, pLastSeparator - pszFileName);
+ else
+ pstrPath->Empty();
+ }
- if ( nPosDot > nPosUnix ) {
- // the file name looks like "path/name.ext"
if ( pstrName )
- *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix - 1);
- if ( pstrExt )
- *pstrExt = wxString(pszFileName + nPosDot + 1);
- }
- else {
- // there is either no dot at all or there is a '/' after it
- if ( pstrName )
- *pstrName = wxString(pszFileName + nPosUnix + 1);
+ {
+ const wxChar *start = pLastSeparator ? pLastSeparator + 1 : pszFileName;
+ const wxChar *end = pDot ? pDot : pszFileName + wxStrlen(pszFileName);
+
+ *pstrName = wxString(start, end - start);
+ }
+
if ( pstrExt )
- pstrExt->Empty();
- }
+ {
+ if ( pDot )
+ *pstrExt = wxString(pDot + 1);
+ else
+ pstrExt->Empty();
+ }
}
//------------------------------------------------------------------------
bool wxIsWild( const wxString& pattern )
{
wxString tmp = pattern;
- char *pat = WXSTRINGCAST(tmp);
+ wxChar *pat = WXSTRINGCAST(tmp);
while (*pat) {
switch (*pat++) {
- case '?': case '*': case '[': case '{':
+ case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
return TRUE;
- case '\\':
+ case wxT('\\'):
if (!*pat++)
return FALSE;
}
#if defined(HAVE_FNMATCH_H)
{
+// this probably won't work well for multibyte chars in Unicode mode?
if(dot_special)
- return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;
+ return fnmatch(pat.fn_str(), text.fn_str(), FNM_PERIOD) == 0;
else
- return fnmatch(pat.c_str(), text.c_str(), 0) == 0;
+ return fnmatch(pat.fn_str(), text.fn_str(), 0) == 0;
}
#else
*/
{
wxString tmp1 = pat;
- char *pattern = WXSTRINGCAST(tmp1);
+ wxChar *pattern = WXSTRINGCAST(tmp1);
wxString tmp2 = text;
- char *str = WXSTRINGCAST(tmp2);
- char c;
- char *cp;
+ wxChar *str = WXSTRINGCAST(tmp2);
+ wxChar c;
+ wxChar *cp;
bool done = FALSE, ret_code, ok;
// Below is for vi fans
- const char OB = '{', CB = '}';
+ const wxChar OB = wxT('{'), CB = wxT('}');
// dot_special means '.' only matches '.'
- if (dot_special && *str == '.' && *pattern != *str)
+ if (dot_special && *str == wxT('.') && *pattern != *str)
return FALSE;
- while ((*pattern != '\0') && (!done)
- && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
+ while ((*pattern != wxT('\0')) && (!done)
+ && (((*str==wxT('\0'))&&((*pattern==OB)||(*pattern==wxT('*'))))||(*str!=wxT('\0')))) {
switch (*pattern) {
- case '\\':
+ case wxT('\\'):
pattern++;
- if (*pattern != '\0')
+ if (*pattern != wxT('\0'))
pattern++;
break;
- case '*':
+ case wxT('*'):
pattern++;
ret_code = FALSE;
- while ((*str!='\0')
+ while ((*str!=wxT('\0'))
&& (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
/*loop*/;
if (ret_code) {
- while (*str != '\0')
+ while (*str != wxT('\0'))
str++;
- while (*pattern != '\0')
+ while (*pattern != wxT('\0'))
pattern++;
}
break;
- case '[':
+ case wxT('['):
pattern++;
repeat:
- if ((*pattern == '\0') || (*pattern == ']')) {
+ if ((*pattern == wxT('\0')) || (*pattern == wxT(']'))) {
done = TRUE;
break;
}
- if (*pattern == '\\') {
+ if (*pattern == wxT('\\')) {
pattern++;
- if (*pattern == '\0') {
+ if (*pattern == wxT('\0')) {
done = TRUE;
break;
}
}
- if (*(pattern + 1) == '-') {
+ if (*(pattern + 1) == wxT('-')) {
c = *pattern;
pattern += 2;
- if (*pattern == ']') {
+ if (*pattern == wxT(']')) {
done = TRUE;
break;
}
- if (*pattern == '\\') {
+ if (*pattern == wxT('\\')) {
pattern++;
- if (*pattern == '\0') {
+ if (*pattern == wxT('\0')) {
done = TRUE;
break;
}
goto repeat;
}
pattern++;
- while ((*pattern != ']') && (*pattern != '\0')) {
- if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
+ while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) {
+ if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0')))
pattern++;
pattern++;
}
- if (*pattern != '\0') {
+ if (*pattern != wxT('\0')) {
pattern++, str++;
}
break;
- case '?':
+ case wxT('?'):
pattern++;
str++;
break;
case OB:
pattern++;
- while ((*pattern != CB) && (*pattern != '\0')) {
+ while ((*pattern != CB) && (*pattern != wxT('\0'))) {
cp = str;
ok = TRUE;
- while (ok && (*cp != '\0') && (*pattern != '\0')
- && (*pattern != ',') && (*pattern != CB)) {
- if (*pattern == '\\')
+ while (ok && (*cp != wxT('\0')) && (*pattern != wxT('\0'))
+ && (*pattern != wxT(',')) && (*pattern != CB)) {
+ if (*pattern == wxT('\\'))
pattern++;
ok = (*pattern++ == *cp++);
}
- if (*pattern == '\0') {
+ if (*pattern == wxT('\0')) {
ok = FALSE;
done = TRUE;
break;
} else if (ok) {
str = cp;
- while ((*pattern != CB) && (*pattern != '\0')) {
- if (*++pattern == '\\') {
+ while ((*pattern != CB) && (*pattern != wxT('\0'))) {
+ if (*++pattern == wxT('\\')) {
if (*++pattern == CB)
pattern++;
}
}
} else {
- while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
- if (*++pattern == '\\') {
- if (*++pattern == CB || *pattern == ',')
+ while (*pattern!=CB && *pattern!=wxT(',') && *pattern!=wxT('\0')) {
+ if (*++pattern == wxT('\\')) {
+ if (*++pattern == CB || *pattern == wxT(','))
pattern++;
}
}
}
- if (*pattern != '\0')
+ if (*pattern != wxT('\0'))
pattern++;
}
break;
}
}
}
- while (*pattern == '*')
+ while (*pattern == wxT('*'))
pattern++;
- return ((*str == '\0') && (*pattern == '\0'));
+ return ((*str == wxT('\0')) && (*pattern == wxT('\0')));
};
#endif
projects / wxWidgets.git / blobdiff