X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..c17bcb844883451b564446bf7843e7b3f862fe48:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 0c3cb57f31..13ecedef05 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -6,11 +6,11 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "filefn.h" + #pragma implementation "filefn.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -18,97 +18,127 @@ #include "wx/defs.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/defs.h" + #include "wx/defs.h" #endif #include "wx/utils.h" +#include + +// there are just too many of those... +#ifdef __VISUALC__ + #pragma warning(disable:4706) // assignment within conditional expression +#endif // VC++ #include #include #include #include #if !defined(__WATCOMC__) -#if !(defined(_MSC_VER) && (_MSC_VER > 800)) -#include + #if !(defined(_MSC_VER) && (_MSC_VER > 800)) + #include + #endif #endif -#endif -#include -#include -#include -#include -#include +#include -#ifdef __WINDOWS__ -#ifndef __GNUWIN32__ -#include -#include +#ifndef __MWERKS__ + #include + #include +#else + #include + #include #endif + +#ifdef __UNIX__ + #include + #include #endif -#ifdef __GNUWIN32__ -#include -// #include +#ifdef __WINDOWS__ +#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) + #include + #include +#endif // __WINDOWS__ +#endif // native Win compiler -#ifndef __MINGW32__ -#include -#endif +#ifdef __GNUWIN32__ + #ifndef __TWIN32__ + #include + #endif -#define stricmp strcasecmp + #define stricmp strcasecmp #endif #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs // this (3.1 I believe) and how to test for it. // If this works for Borland 4.0 as well, then no worries. -#include + #include +#endif + +#ifdef __SALFORDC__ + #include + #include +#endif + +#include "wx/setup.h" +#include "wx/log.h" + +// No, Cygwin doesn't appear to have fnmatch.h after all. +#if defined(HAVE_FNMATCH_H) + #include "fnmatch.h" #endif #ifdef __WINDOWS__ -#include "windows.h" + #include "windows.h" #endif #define _MAXPATHLEN 500 -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) +extern wxChar *wxBuffer; +#ifdef __WXMAC__ + extern wxChar gwxMacFileName[] ; + extern wxChar gwxMacFileName2[] ; + extern wxChar gwxMacFileName3[] ; #endif -extern char *wxBuffer; +#if !USE_SHARED_LIBRARIES + IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) +#endif 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) + _T(" ;"); // Don't seperate with colon in DOS (used for drive) #else - " :;"; + _T(" :;"); #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 (NULL, PATH_TOKS)) != NULL) - Add (wxString(token)); - } - } + { + Add (copystring (token)); + while (token) + { + if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL) + Add (wxString(token)); + } + } delete[]s; } } @@ -118,30 +148,29 @@ void wxPathList::AddEnvList (const wxString& envVariable) // to the list if not already there. void wxPathList::EnsureFileAccessible (const wxString& path) { - wxString path1(path); - char *path_only = wxPathOnly (WXSTRINGCAST path1); - if (path_only) - { - if (!Member (wxString(path_only))) - Add (wxString(path_only)); - } + wxString path_only(wxPathOnly(path)); + if ( !path_only.IsEmpty() ) + { + if ( !Member(path_only) ) + Add(path_only); + } } bool wxPathList::Member (const wxString& path) { 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__) +#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__) // Case INDEPENDENT - path.CompareTo (path2, wxString::ignoreCase) == 0 + path.CompareTo (path2, wxString::ignoreCase) == 0 #else - // Case sensitive File System - path.CompareTo (path2) == 0 + // Case sensitive File System + path.CompareTo (path2) == 0 #endif - ) - return TRUE; + ) + return TRUE; } return FALSE; } @@ -151,29 +180,30 @@ wxString wxPathList::FindValidPath (const wxString& file) if (wxFileExists (wxExpandPath(wxBuffer, file))) return wxString(wxBuffer); - char buf[_MAXPATHLEN]; - strcpy(buf, wxBuffer); + wxChar buf[_MAXPATHLEN]; + wxStrcpy(buf, wxBuffer); - char *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 (wxBuffer, path); + wxChar ch = wxBuffer[wxStrlen(wxBuffer)-1]; + if (ch != _T('\\') && ch != _T('/')) + wxStrcat (wxBuffer, _T("/")); + wxStrcat (wxBuffer, filename); #ifdef __WINDOWS__ Unix2DosFilename (wxBuffer); #endif if (wxFileExists (wxBuffer)) { - return wxString(wxBuffer); // Found! + return wxString(wxBuffer); // Found! } - } // for() + } // for() - return wxString(""); // Not found + return wxString(_T("")); // Not found } wxString wxPathList::FindAbsoluteValidPath (const wxString& file) @@ -183,34 +213,53 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) return f; else { - char buf[500]; + wxChar buf[500]; wxGetWorkingDirectory(buf, 499); - int len = (int)strlen(buf); - char lastCh = 0; + int len = (int)wxStrlen(buf); + wxChar lastCh = 0; if (len > 0) lastCh = buf[len-1]; - if (lastCh != '/' && lastCh != '\\') + if (lastCh != _T('/') && lastCh != _T('\\')) { #ifdef __WINDOWS__ - strcat(buf, "\\"); + wxStrcat(buf, _T("\\")); #else - strcat(buf, "/"); + wxStrcat(buf, _T("/")); #endif } - strcat(buf, (const char *)f); - strcpy(wxBuffer, buf); + wxStrcat(buf, (const wxChar *)f); + wxStrcpy(wxBuffer, buf); return wxString(wxBuffer); } } -bool +bool wxFileExists (const wxString& filename) { +#ifdef __GNUWIN32__ // (fix a B20 bug) + if (GetFileAttributes(filename) == 0xFFFFFFFF) + return FALSE; + else + return TRUE; +#elif defined(__WXMAC__) + struct stat stbuf; + wxStrcpy( gwxMacFileName , filename ) ; + wxUnix2MacFilename( gwxMacFileName ) ; + if (gwxMacFileName && stat (WXSTRINGCAST gwxMacFileName, &stbuf) == 0) + return TRUE; + return FALSE ; +#else + +#ifdef __SALFORDC__ + struct _stat stbuf; +#else struct stat stbuf; +#endif - if (filename && stat ((char *)(const char *)filename, &stbuf) == 0) + if ((filename != _T("")) && stat (FNSTRINGCAST filename.fn_str(), &stbuf) == 0) return TRUE; return FALSE; +#endif } /* Vadim's alternative implementation @@ -225,21 +274,21 @@ bool wxFileExists(const char *pszFileName) } */ -bool +bool wxIsAbsolutePath (const wxString& filename) { - if (filename != "") + if (filename != _T("")) { - if (filename[0] == '/' + if (filename[0] == _T('/') #ifdef __VMS__ - || (filename[0] == '[' && filename[1] != '.') + || (filename[0] == _T('[') && filename[1] != _T('.')) #endif #ifdef __WINDOWS__ /* MSDOS */ - || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':') + || filename[0] == _T('\\') || (wxIsalpha (filename[0]) && filename[1] == _T(':')) #endif - ) - return TRUE; + ) + return TRUE; } return FALSE; } @@ -249,14 +298,14 @@ wxIsAbsolutePath (const wxString& filename) * IF one exists. Inserts zero into buffer. * */ - -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] == _T('.')) { buffer[i] = 0; break; @@ -265,77 +314,92 @@ void wxStripExtension(char *buffer) } } +void wxStripExtension(wxString& buffer) +{ + size_t len = buffer.Length(); + size_t i = len-1; + while (i > 0) + { + if (buffer.GetChar(i) == _T('.')) + { + buffer = buffer.Left(i); + break; + } + i --; + } +} + // Destructive removal of /./ and /../ stuff -char *wxRealPath (char *path) +wxChar *wxRealPath (wxChar *path) { -#ifdef __WINDOWS__ - static const char SEP = '\\'; +#ifdef __WXMSW__ + static const wxChar SEP = _T('\\'); Unix2DosFilename(path); #else - static const char SEP = '/'; + static const wxChar SEP = _T('/'); #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] == _T('.')) p = &path[0]; else p = &path[2]; for (; *p; p++) { - if (*p == SEP) - { - if (p[1] == '.' && p[2] == '.' && (p[3] == SEP || p[3] == '\0')) - { - char *q; - for (q = p - 1; q >= path && *q != SEP; q--); - if (q[0] == SEP && (q[1] != '.' || q[2] != '.' || q[3] != SEP) - && (q - 1 <= path || q[-1] != SEP)) - { - strcpy (q, p + 3); - if (path[0] == '\0') - { - path[0] = SEP; - path[1] = '\0'; - } -#ifdef __WINDOWS__ - /* Check that path[2] is NULL! */ - else if (path[1] == ':' && !path[2]) - { - path[2] = SEP; - path[3] = '\0'; - } -#endif - p = q - 1; - } - } - else if (p[1] == '.' && (p[2] == SEP || p[2] == '\0')) - strcpy (p, p + 2); - } + if (*p == SEP) + { + if (p[1] == _T('.') && p[2] == _T('.') && (p[3] == SEP || p[3] == _T('\0'))) + { + wxChar *q; + for (q = p - 1; q >= path && *q != SEP; q--); + if (q[0] == SEP && (q[1] != _T('.') || q[2] != _T('.') || q[3] != SEP) + && (q - 1 <= path || q[-1] != SEP)) + { + wxStrcpy (q, p + 3); + if (path[0] == _T('\0')) + { + path[0] = SEP; + path[1] = _T('\0'); + } +#ifdef __WXMSW__ + /* Check that path[2] is NULL! */ + else if (path[1] == _T(':') && !path[2]) + { + path[2] = SEP; + path[3] = _T('\0'); + } +#endif + p = q - 1; + } + } + else if (p[1] == _T('.') && (p[2] == SEP || p[2] == _T('\0'))) + wxStrcpy (p, p + 2); + } } } return path; } // Must be destroyed -char *wxCopyAbsolutePath(const wxString& filename) +wxChar *wxCopyAbsolutePath(const wxString& filename) { - if (filename == "") - return NULL; + if (filename == _T("")) + return (wxChar *) NULL; if (! IsAbsolutePath(wxExpandPath(wxBuffer, filename))) { - char buf[_MAXPATHLEN]; - buf[0] = '\0'; - wxGetWorkingDirectory(buf, sizeof(buf)/sizeof(char)); - char ch = buf[strlen(buf) - 1]; -#ifdef __WINDOWS__ - if (ch != '\\' && ch != '/') - strcat(buf, "\\"); + wxChar buf[_MAXPATHLEN]; + buf[0] = _T('\0'); + wxGetWorkingDirectory(buf, WXSIZEOF(buf)); + wxChar ch = buf[wxStrlen(buf) - 1]; +#ifdef __WXMSW__ + if (ch != _T('\\') && ch != _T('/')) + wxStrcat(buf, _T("\\")); #else - if (ch != '/') - strcat(buf, "/"); + if (ch != _T('/')) + wxStrcat(buf, _T("/")); #endif - strcat(buf, wxBuffer); + wxStrcat(buf, wxBuffer); return copystring( wxRealPath(buf) ); } return copystring( wxBuffer ); @@ -347,141 +411,143 @@ char *wxCopyAbsolutePath(const wxString& filename) ~user/ => user's home dir If the environment variable a = "foo" and b = "bar" then: Unix: - $a => foo - $a$b => foobar - $a.c => foo.c - xxx$a => xxxfoo - ${a}! => foo! - $(b)! => bar! - \$a => \$a + $a => foo + $a$b => foobar + $a.c => foo.c + xxx$a => xxxfoo + ${a}! => foo! + $(b)! => bar! + \$a => \$a MSDOS: - $a ==> $a - $(a) ==> foo - $(a)$b ==> foo$b - $(a)$(b)==> foobar - test.$$ ==> test.$$ + $a ==> $a + $(a) ==> foo + $(a)$b ==> foo$b + $(a)$(b)==> foobar + test.$$ ==> test.$$ */ /* 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]; - int q; + 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[] = _T("\n \t"); - char trimchars[4]; - trimchars[0] = '\n'; - trimchars[1] = ' '; - trimchars[2] = '\t'; + wxChar trimchars[4]; + trimchars[0] = _T('\n'); + trimchars[1] = _T(' '); + trimchars[2] = _T('\t'); trimchars[3] = 0; -#ifdef __WINDOWS__ - const char SEP = '\\'; +#ifdef __WXMSW__ + const wxChar SEP = _T('\\'); #else - const char SEP = '/'; + const wxChar SEP = _T('/'); #endif - buf[0] = '\0'; - if (name == NULL || *name == '\0') - return buf; + buf[0] = _T('\0'); + if (name == NULL || *name == _T('\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) - nm++; + 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 = _T('\0'); s = nm; d = lnm; -#ifdef __WINDOWS__ +#ifdef __WXMSW__ q = FALSE; #else - q = nm[0] == '\\' && nm[1] == '~'; + q = nm[0] == _T('\\') && nm[1] == _T('~'); #endif /* Expand inline environment variables */ while ((*d++ = *s)) { -#ifndef __WINDOWS__ - if (*s == '\\') { - if ((*(d - 1) = *++s)) { - s++; - continue; - } else - break; - } else +#ifndef __WXMSW__ + if (*s == _T('\\')) { + if ((*(d - 1) = *++s)) { + s++; + continue; + } else + break; + } else #endif -#ifdef __WINDOWS__ - if (*s++ == '$' && (*s == '{' || *s == ')')) +#ifdef __WXMSW__ + if (*s++ == _T('$') && (*s == _T('{') || *s == _T(')'))) #else - if (*s++ == '$') -#endif - { - register char *start = d; - register braces = (*s == '{' || *s == '('); - register char *value; - while ((*d++ = *s)) - if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') ) - break; - else - s++; - *--d = 0; - value = getenv(braces ? start + 1 : start); - if (value) { - for ((d = start - 1); (*d++ = *value++);); - d--; - if (braces && *s) - s++; - } - } + if (*s++ == _T('$')) +#endif + { + register wxChar *start = d; + register int braces = (*s == _T('{') || *s == _T('(')); + register wxChar *value; + while ((*d++ = *s)) + if (braces ? (*s == _T('}') || *s == _T(')')) : !(wxIsalnum(*s) || *s == _T('_')) ) + break; + else + s++; + *--d = 0; + value = wxGetenv(braces ? start + 1 : start); + if (value) { + for ((d = start - 1); (*d++ = *value++);); + d--; + if (braces && *s) + s++; + } + } } /* Expand ~ and ~user */ nm = lnm; - s = ""; - if (nm[0] == '~' && !q) + s = _T(""); + if (nm[0] == _T('~') && !q) { - /* prefix ~ */ - if (nm[1] == SEP || nm[1] == 0) - { /* ~/filename */ - if ((s = wxGetUserHome("")) != NULL) { - if (*++nm) - nm++; - } + /* prefix ~ */ + if (nm[1] == SEP || nm[1] == 0) + { /* ~/filename */ + // FIXME: wxGetUserHome could return temporary storage in Unicode mode + if ((s = WXSTRINGCAST wxGetUserHome(_T(""))) != NULL) { + if (*++nm) + nm++; + } } else - { /* ~user/filename */ - register char *nnm; - register char *home; - for (s = nm; *s && *s != SEP; s++); - int was_sep; /* MATTHEW: Was there a separator, or NULL? */ + { /* ~user/filename */ + 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) { + nnm = *s ? s + 1 : s; + *s = 0; + // 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 = ""; - } else { - nm = nnm; - s = home; - } - } + *s = SEP; + s = _T(""); + } 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++)) - /* loop */; - // Handle root home - if (d - 1 > buf && *(d - 2) != SEP) - *(d - 1) = SEP; + /* Copy home dir */ + while (_T('\0') != (*d++ = *s++)) + /* loop */; + // Handle root home + if (d - 1 > buf && *(d - 2) != SEP) + *(d - 1) = SEP; } s = nm; while ((*d++ = *s++)); @@ -499,49 +565,49 @@ char *wxExpandPath(char *buf, const char *name) 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 NULL; + if (filename == _T("")) + return (wxChar *) NULL; - strcpy (dest, WXSTRINGCAST filename); -#ifdef __WINDOWS__ + wxStrcpy (dest, WXSTRINGCAST filename); +#ifdef __WXMSW__ Unix2DosFilename(dest); #endif // Handle environment - char *val = NULL; - char *tcp = NULL; - if (envname != 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 (wxBuffer, tcp + wxStrlen (val)); + *tcp++ = _T('$'); + *tcp++ = _T('{'); + wxStrcpy (tcp, WXSTRINGCAST envname); + wxStrcat (tcp, _T("}")); + wxStrcat (tcp, wxBuffer); } // 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 && *user) - strcat(wxBuffer, user); -#ifdef __WINDOWS__ + wxStrcpy(wxBuffer, _T("~")); + if (user != _T("")) + wxStrcat(wxBuffer, (const wxChar*) user); +#ifdef __WXMSW__ // strcat(wxBuffer, "\\"); #else // strcat(wxBuffer, "/"); #endif - strcat(wxBuffer, dest + len); - strcpy (dest, wxBuffer); + wxStrcat(wxBuffer, dest + len); + wxStrcpy (dest, wxBuffer); } return dest; @@ -549,26 +615,26 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin // 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 == _T('/') || *tcp == _T('\\') #ifdef __VMS__ - || *tcp == ':' || *tcp == ']') + || *tcp == _T(':') || *tcp == _T(']')) #else ) #endif - return tcp + 1; - } /* while */ -#ifdef __WINDOWS__ - if (isalpha (*path) && *(path + 1) == ':') - return path + 2; + return tcp + 1; + } /* while */ +#ifdef __WXMSW__ + if (wxIsalpha (*path) && *(path + 1) == _T(':')) + return path + 2; #endif } return path; @@ -576,43 +642,45 @@ char *wxFileNameFromPath (char *path) wxString wxFileNameFromPath (const wxString& path1) { - if (path1 != "") + if (path1 != _T("")) { - 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 == _T('/') || *tcp == _T('\\') #ifdef __VMS__ - || *tcp == ':' || *tcp == ']') + || *tcp == _T(':') || *tcp == _T(']')) #else ) #endif - return wxString(tcp + 1); - } /* while */ -#ifdef __WINDOWS__ - if (isalpha (*path) && *(path + 1) == ':') - return wxString(path + 2); + return wxString(tcp + 1); + } /* while */ +#ifdef __WXMSW__ + if (wxIsalpha (*path) && *(path + 1) == _T(':')) + return wxString(path + 2); #endif } - return wxString(""); + // Yes, this should return the path, not an empty string, otherwise + // we get "thing.txt" -> "". + return path1; } // 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; @@ -621,7 +689,7 @@ wxPathOnly (char *path) while (!done && i > -1) { // ] is for VMS - if (path[i] == '/' || path[i] == '\\' || path[i] == ']') + if (path[i] == _T('/') || path[i] == _T('\\') || path[i] == _T(']')) { done = TRUE; #ifdef __VMS__ @@ -635,30 +703,30 @@ wxPathOnly (char *path) else i --; } -#ifdef __WINDOWS__ +#ifdef __WXMSW__ // Try Drive specifier - if (isalpha (buf[0]) && buf[1] == ':') - { - // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = '.'; - buf[3] = '\0'; - return buf; - } + if (wxIsalpha (buf[0]) && buf[1] == _T(':')) + { + // A:junk --> A:. (since A:.\junk Not A:\junk) + buf[2] = _T('.'); + buf[3] = _T('\0'); + return buf; + } #endif } - return NULL; + return (wxChar *) NULL; } // Return just the directory, or NULL if no directory wxString wxPathOnly (const wxString& path) { - if (path != "") + if (path != _T("")) { - char buf[_MAXPATHLEN]; + wxChar buf[_MAXPATHLEN]; // Local copy - strcpy (buf, WXSTRINGCAST path); + wxStrcpy (buf, WXSTRINGCAST path); int l = path.Length(); bool done = FALSE; @@ -669,7 +737,7 @@ wxString wxPathOnly (const wxString& path) while (!done && i > -1) { // ] is for VMS - if (path[i] == '/' || path[i] == '\\' || path[i] == ']') + if (path[i] == _T('/') || path[i] == _T('\\') || path[i] == _T(']')) { done = TRUE; #ifdef __VMS__ @@ -683,76 +751,145 @@ wxString wxPathOnly (const wxString& path) else i --; } -#ifdef __WINDOWS__ +#ifdef __WXMSW__ // Try Drive specifier - if (isalpha (buf[0]) && buf[1] == ':') - { - // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = '.'; - buf[3] = '\0'; - return wxString(buf); - } + if (wxIsalpha (buf[0]) && buf[1] == _T(':')) + { + // A:junk --> A:. (since A:.\junk Not A:\junk) + buf[2] = _T('.'); + buf[3] = _T('\0'); + return wxString(buf); + } #endif } - return wxString(""); + return wxString(_T("")); } // Utility for converting delimiters in DOS filenames to UNIX style // and back again - or we get nasty problems with delimiters. // Also, convert to lower case, since case is significant in UNIX. -void -wxDos2UnixFilename (char *s) +#ifdef __WXMAC__ +void +wxMac2UnixFilename (wxChar *s) +{ + if (s) + { + memmove( s+1 , s ,(strlen( s ) + 1)*sizeof(wxChar)) ; + if ( *s == _T(':') ) + *s = _T('.') ; + else + *s = _T('/') ; + + while (*s) + { + if (*s == _T(':')) + *s = _T('/'); + else + *s = wxTolower(*s); // Case INDEPENDENT + s++; + } + } +} + +void +wxUnix2MacFilename (wxChar *s) +{ + if (s) + { + if ( *s == _T('.') ) + { + // relative path , since it goes on with slash which is translated to a : + memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ; + } + else if ( *s == _T('/') ) + { + // absolute path -> on mac just start with the drive name + memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ; + } + else + { + wxASSERT_MSG( 1 , _T("unknown path beginning") ) ; + } + while (*s) + { + if (*s == _T('/') || *s == _T('\\')) + *s = _T(':'); + + s++ ; + } + } +} +#endif +void +wxDos2UnixFilename (wxChar *s) { if (s) while (*s) { - if (*s == '\\') - *s = '/'; -#ifdef __WINDOWS__ - else - *s = wxToLower (*s); // Case INDEPENDENT + if (*s == _T('\\')) + *s = _T('/'); +#ifdef __WXMSW__ + else + *s = wxTolower(*s); // Case INDEPENDENT #endif - s++; + s++; } } -void -wxUnix2DosFilename (char *WXUNUSED(s)) +void +#ifdef __WXMSW__ +wxUnix2DosFilename (wxChar *s) +#else +wxUnix2DosFilename (wxChar *WXUNUSED(s)) +#endif { // Yes, I really mean this to happen under DOS only! JACS -#ifdef __WINDOWS__ +#ifdef __WXMSW__ if (s) while (*s) { - if (*s == '/') - *s = '\\'; - s++; + if (*s == _T('/')) + *s = _T('\\'); + s++; } #endif } // Concatenate two files to form third -bool +bool wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3) { - char *outfile = wxGetTempFileName("cat"); + wxChar *outfile = wxGetTempFileName("cat"); - FILE *fp1 = NULL; - FILE *fp2 = NULL; - FILE *fp3 = NULL; + FILE *fp1 = (FILE *) NULL; + FILE *fp2 = (FILE *) NULL; + FILE *fp3 = (FILE *) NULL; // Open the inputs and outputs - if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL || - (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL || - (fp3 = fopen (outfile, "wb")) == NULL) +#ifdef __WXMAC__ + wxStrcpy( gwxMacFileName , file1 ) ; + wxUnix2MacFilename( gwxMacFileName ) ; + wxStrcpy( gwxMacFileName2 , file2) ; + wxUnix2MacFilename( gwxMacFileName2 ) ; + 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 (FNSTRINGCAST file1.fn_str(), "rb")) == NULL || + (fp2 = fopen (FNSTRINGCAST file2.fn_str(), "rb")) == NULL || + (fp3 = fopen (wxFNCONV(outfile), "wb")) == NULL) +#endif { if (fp1) - fclose (fp1); + fclose (fp1); if (fp2) - fclose (fp2); + fclose (fp2); if (fp3) - fclose (fp3); + fclose (fp3); return FALSE; } @@ -772,16 +909,27 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil } // Copy files -bool +bool wxCopyFile (const wxString& file1, const wxString& file2) { FILE *fd1; FILE *fd2; int ch; - if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL) +#ifdef __WXMAC__ + wxStrcpy( gwxMacFileName , file1 ) ; + wxUnix2MacFilename( gwxMacFileName ) ; + wxStrcpy( gwxMacFileName2 , file2) ; + wxUnix2MacFilename( gwxMacFileName2 ) ; + + if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL) + return FALSE; + if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL) +#else + if ((fd1 = fopen (FNSTRINGCAST file1.fn_str(), "rb")) == NULL) return FALSE; - if ((fd2 = fopen (WXSTRINGCAST file2, "wb")) == NULL) + if ((fd2 = fopen (FNSTRINGCAST file2.fn_str(), "wb")) == NULL) +#endif { fclose (fd1); return FALSE; @@ -795,12 +943,22 @@ wxCopyFile (const wxString& file1, const wxString& file2) return TRUE; } -bool +bool wxRenameFile (const wxString& file1, const wxString& file2) { +#ifdef __WXMAC__ + wxStrcpy( gwxMacFileName , file1 ) ; + wxUnix2MacFilename( gwxMacFileName ) ; + 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 (FNSTRINGCAST file1.fn_str(), FNSTRINGCAST file2.fn_str())) return TRUE; +#endif // Try to copy if (wxCopyFile(file1, file2)) { wxRemoveFile(file1); @@ -812,31 +970,60 @@ wxRenameFile (const wxString& file1, const wxString& file2) bool wxRemoveFile(const wxString& file) { -#if defined(_MSC_VER) || defined(__BORLANDC__) - int flag = remove(WXSTRINGCAST file); +#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) + int flag = remove(FNSTRINGCAST file.fn_str()); +#elif defined( __WXMAC__ ) + wxStrcpy( gwxMacFileName , file ) ; + wxUnix2MacFilename( gwxMacFileName ) ; + int flag = unlink(gwxMacFileName); #else - int flag = unlink(WXSTRINGCAST file); + int flag = unlink(FNSTRINGCAST file.fn_str()); #endif return (flag == 0) ; } -bool wxMkdir(const wxString& dir) +bool wxMkdir(const wxString& dir, int perm) { -#ifdef __VMS__ - return FALSE; -#elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WINDOWS__) - 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 +#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 platforms and on Windows too + // for the GNU compiler +#if !defined(__WXMSW__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) + if ( mkdir(wxFNCONV(dirname), perm) != 0 ) +#else // MSW + if ( mkdir(wxFNCONV(dirname)) != 0 ) +#endif // !MSW/MSW + { + wxLogSysError(_("Directory '%s' couldn't be created"), dirname); + + return FALSE; + } + + return TRUE; } bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) { #ifdef __VMS__ return FALSE; +#elif defined( __WXMAC__ ) + 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(FNSTRINGCAST dir.fn_str()) == 0); +#endif + #endif } @@ -845,9 +1032,9 @@ bool wxDirExists(const wxString& dir) { #ifdef __VMS__ return FALSE; -#elif !defined(__WINDOWS__) +#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 */ @@ -862,14 +1049,14 @@ bool wxDirExists(const wxString& dir) #endif #if defined(__WIN32__) - HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo); - - if (h==INVALID_HANDLE_VALUE) - return FALSE; - else { - FindClose(h); - return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY); - } + HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo); + + if (h==INVALID_HANDLE_VALUE) + return FALSE; + else { + FindClose(h); + return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY); + } #else // In Borland findfirst has a different argument // ordering from _dos_findfirst. But _dos_findfirst @@ -887,61 +1074,66 @@ bool wxDirExists(const wxString& dir) #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] != _T('\0') ) + strPath.Last() = _T('\0'); +#ifdef __SALFORDC__ + struct _stat st; +#else struct stat st; - return stat(strPath, &st) == 0 && (st.st_mode & S_IFDIR); +#endif + + return stat(FNSTRINGCAST 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]; +#ifndef __WIN32__ + 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 + 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]; + 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, _T("/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"); - if (fd) - fclose (fd); - last_temp = suffix; + { + // Touch the file to create it (reserve name) + FILE *fd = fopen (wxFNCONV(tmp), "w"); + if (fd) + fclose (fd); + last_temp = suffix; if (buf) - strcpy( buf, tmp); - else - buf = copystring( tmp ); - return buf; - } + wxStrcpy( buf, tmp); + else + buf = copystring( tmp ); + return buf; + } } - cerr << "wxWindows: error finding temporary file name.\n"; + wxLogError( _("wxWindows: error finding temporary file name.\n") ); if (buf) buf[0] = 0; - return NULL; + return (wxChar *) NULL; #endif } @@ -953,291 +1145,327 @@ char *wxGetTempFileName(const wxString& prefix, char *buf) // Flags are reserved for future use. #ifndef __VMS__ -static DIR *wxDirStream = NULL; -static char *wxFileSpec = NULL; -static int wxFindFileFlags = 0; + static DIR *gs_dirStream = (DIR *) NULL; + static wxString gs_strFileSpec; + static int gs_findFlags = 0; #endif -char *wxFindFirstFile(const char *spec, int flags) +wxString wxFindFirstFile(const wxChar *spec, int flags) { + wxString result; + #ifndef __VMS__ - if (wxDirStream) - closedir(wxDirStream); // edz 941103: better housekeping + if (gs_dirStream) + closedir(gs_dirStream); // edz 941103: better housekeping - wxFindFileFlags = flags; + gs_findFlags = flags; - if (wxFileSpec) - delete[] wxFileSpec; - wxFileSpec = copystring(spec); + gs_strFileSpec = spec; - // Find path only so we can concatenate - // found file onto path - char *p = wxPathOnly(wxFileSpec); + // Find path only so we can concatenate + // found file onto path + wxString path(wxPathOnly(gs_strFileSpec)); - /* MATTHEW: special case: path is really "/" */ - if (p && !*p && *wxFileSpec == '/') - p = "/"; - /* MATTHEW: p is NULL => Local directory */ - if (!p) - p = "."; - - if ((wxDirStream=opendir(p))==NULL) - return NULL; + // special case: path is really "/" + if ( !path && gs_strFileSpec[0u] == _T('/') ) + path = _T('/'); + // path is empty => Local directory + if ( !path ) + path = _T('.'); - /* MATTHEW: [5] wxFindNextFile can do the rest of the work */ - return wxFindNextFile(); -#endif - // ifndef __VMS__ - return NULL; + gs_dirStream = opendir(path.fn_str()); + if ( !gs_dirStream ) + { + wxLogSysError(_("Can not enumerate files in directory '%s'"), + path.c_str()); + } + else + { + result = wxFindNextFile(); + } +#endif // !VMS + + return result; } -char *wxFindNextFile(void) +wxString wxFindNextFile() { -#ifndef __VMS__ - static char buf[400]; + wxString result; - /* MATTHEW: [2] Don't crash if we read too many times */ - if (!wxDirStream) - return NULL; +#ifndef __VMS__ + wxCHECK_MSG( gs_dirStream, result, _T("must call wxFindFirstFile first") ); + + // Find path only so we can concatenate + // found file onto path + wxString path(wxPathOnly(gs_strFileSpec)); + wxString name(wxFileNameFromPath(gs_strFileSpec)); + + /* MATTHEW: special case: path is really "/" */ + if ( !path && gs_strFileSpec[0u] == _T('/')) + path = _T('/'); + + // Do the reading + struct dirent *nextDir; + for ( nextDir = readdir(gs_dirStream); + nextDir != NULL; + nextDir = readdir(gs_dirStream) ) + { + if (wxMatchWild(name, nextDir->d_name)) + { + result.Empty(); + if ( !path.IsEmpty() ) + { + result = path; + if ( path != _T('/') ) + result += _T('/'); + } + + result += nextDir->d_name; + + // Only return "." and ".." when they match + bool isdir; + if ( (strcmp(nextDir->d_name, ".") == 0) || + (strcmp(nextDir->d_name, "..") == 0)) + { + if ( (gs_findFlags & wxDIR) != 0 ) + isdir = TRUE; + else + continue; + } + else + isdir = wxDirExists(result); + + // and only return directories when flags & wxDIR + if ( !gs_findFlags || + ((gs_findFlags & wxDIR) && isdir) || + ((gs_findFlags & wxFILE) && !isdir) ) + { + return result; + } + } + } - // Find path only so we can concatenate - // found file onto path - char *p = wxPathOnly(wxFileSpec); - char *n = wxFileNameFromPath(wxFileSpec); + result.Empty(); // not found - /* MATTHEW: special case: path is really "/" */ - if (p && !*p && *wxFileSpec == '/') - p = "/"; + closedir(gs_dirStream); + gs_dirStream = (DIR *) NULL; +#endif // !VMS - // Do the reading - struct dirent *nextDir; - for (nextDir = readdir(wxDirStream); nextDir != NULL; nextDir = readdir(wxDirStream)) - { + return result; +} - /* MATTHEW: [5] Only return "." and ".." when they match, and only return - directories when flags & wxDIR */ - if (wxMatchWild(n, nextDir->d_name)) { - bool isdir; +#elif defined(__WXMSW__) - buf[0] = 0; - if (p && *p) { - strcpy(buf, p); - if (strcmp(p, "/") != 0) - strcat(buf, "/"); - } - strcat(buf, nextDir->d_name); - - if ((strcmp(nextDir->d_name, ".") == 0) || - (strcmp(nextDir->d_name, "..") == 0)) { - if (wxFindFileFlags && !(wxFindFileFlags & wxDIR)) - continue; - isdir = TRUE; - } else - isdir = wxDirExists(buf); - - if (!wxFindFileFlags - || ((wxFindFileFlags & wxDIR) && isdir) - || ((wxFindFileFlags & wxFILE) && !isdir)) - return buf; - } - } - closedir(wxDirStream); - wxDirStream = NULL; -#endif - // ifndef __VMS__ +#ifdef __WIN32__ + static HANDLE gs_hFileStruct = INVALID_HANDLE_VALUE; + static WIN32_FIND_DATA gs_findDataStruct; +#else // Win16 + #ifdef __BORLANDC__ + static struct ffblk gs_findDataStruct; + #else + static struct _find_t gs_findDataStruct; + #endif // Borland +#endif // Win32/16 + +static wxString gs_strFileSpec; +static int gs_findFlags = 0; + +wxString wxFindFirstFile(const wxChar *spec, int flags) +{ + wxString result; - return NULL; -} + gs_strFileSpec = spec; + gs_findFlags = flags; /* MATTHEW: [5] Remember flags */ -#elif defined(__WINDOWS__) + // Find path only so we can concatenate found file onto path + wxString path(wxPathOnly(gs_strFileSpec)); + if ( !path.IsEmpty() ) + result << path << _T('\\'); #ifdef __WIN32__ -HANDLE wxFileStrucHandle = INVALID_HANDLE_VALUE; -WIN32_FIND_DATA wxFileStruc; -#else -#ifdef __BORLANDC__ -static struct ffblk wxFileStruc; -#else -static struct _find_t wxFileStruc; -#endif -#endif -static wxString wxFileSpec = ""; -static int wxFindFileFlags; + if ( gs_hFileStruct != INVALID_HANDLE_VALUE ) + FindClose(gs_hFileStruct); -char *wxFindFirstFile(const wxString& spec, int flags) -{ - wxFileSpec = spec; - wxFindFileFlags = flags; /* MATTHEW: [5] Remember flags */ - - // Find path only so we can concatenate - // found file onto path - wxString path1(wxFileSpec); - char *p = wxPathOnly(WXSTRINGCAST path1); - if (p && (strlen(p) > 0)) - strcpy(wxBuffer, p); - else - wxBuffer[0] = 0; + gs_hFileStruct = ::FindFirstFile(WXSTRINGCAST spec, &gs_findDataStruct); -#ifdef __WIN32__ - if (wxFileStrucHandle != INVALID_HANDLE_VALUE) - FindClose(wxFileStrucHandle); + if ( gs_hFileStruct == INVALID_HANDLE_VALUE ) + { + result.Empty(); - wxFileStrucHandle = ::FindFirstFile(WXSTRINGCAST spec, &wxFileStruc); + return result; + } - if (wxFileStrucHandle == INVALID_HANDLE_VALUE) - return NULL; + bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + if (isdir && !(flags & wxDIR)) + return wxFindNextFile(); + else if (!isdir && flags && !(flags & wxFILE)) + return wxFindNextFile(); - if (isdir && !(flags & wxDIR)) - return wxFindNextFile(); - else if (!isdir && flags && !(flags & wxFILE)) - return wxFindNextFile(); + result += gs_findDataStruct.cFileName; - if (wxBuffer[0] != 0) - strcat(wxBuffer, "\\"); - strcat(wxBuffer, wxFileStruc.cFileName); - return wxBuffer; + return result; #else - - int flag = _A_NORMAL; - if (flags & wxDIR) /* MATTHEW: [5] Use & */ - flag = _A_SUBDIR; + int flag = _A_NORMAL; + if (flags & wxDIR) /* MATTHEW: [5] Use & */ + flag = _A_SUBDIR; #ifdef __BORLANDC__ - if (findfirst(WXSTRINGCAST spec, &wxFileStruc, flag) == 0) + if (findfirst(WXSTRINGCAST spec, &gs_findDataStruct, flag) == 0) #else - if (_dos_findfirst(WXSTRINGCAST spec, flag, &wxFileStruc) == 0) + if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0) #endif - { - /* MATTHEW: [5] Check directory flag */ - char attrib; + { + /* MATTHEW: [5] Check directory flag */ + char attrib; #ifdef __BORLANDC__ - attrib = wxFileStruc.ff_attrib; + attrib = gs_findDataStruct.ff_attrib; #else - attrib = wxFileStruc.attrib; + attrib = gs_findDataStruct.attrib; #endif - if (attrib & _A_SUBDIR) { - if (!(wxFindFileFlags & wxDIR)) - return wxFindNextFile(); - } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE)) - return wxFindNextFile(); - - if (wxBuffer[0] != 0) - strcat(wxBuffer, "\\"); + if (attrib & _A_SUBDIR) { + if (!(gs_findFlags & wxDIR)) + return wxFindNextFile(); + } else if (gs_findFlags && !(gs_findFlags & wxFILE)) + return wxFindNextFile(); + result += #ifdef __BORLANDC__ - strcat(wxBuffer, wxFileStruc.ff_name); + gs_findDataStruct.ff_name #else - strcat(wxBuffer, wxFileStruc.name); + gs_findDataStruct.name #endif - return wxBuffer; - } - else - return NULL; + ; + } #endif // __WIN32__ + + return result; } -char *wxFindNextFile(void) +wxString wxFindNextFile() { - // Find path only so we can concatenate - // found file onto path - wxString p2(wxFileSpec); - char *p = wxPathOnly(WXSTRINGCAST p2); - if (p && (strlen(p) > 0)) - strcpy(wxBuffer, p); - else - wxBuffer[0] = 0; - - try_again: + wxString result; + + // Find path only so we can concatenate found file onto path + wxString path(wxPathOnly(gs_strFileSpec)); + +try_again: #ifdef __WIN32__ - if (wxFileStrucHandle == INVALID_HANDLE_VALUE) - return NULL; - - bool success = (FindNextFile(wxFileStrucHandle, &wxFileStruc) != 0); - if (!success) { - FindClose(wxFileStrucHandle); - wxFileStrucHandle = INVALID_HANDLE_VALUE; - return NULL; - } + if (gs_hFileStruct == INVALID_HANDLE_VALUE) + return result; - bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + bool success = (FindNextFile(gs_hFileStruct, &gs_findDataStruct) != 0); + if (!success) + { + FindClose(gs_hFileStruct); + gs_hFileStruct = INVALID_HANDLE_VALUE; + } + else + { + bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - if (isdir && !(wxFindFileFlags & wxDIR)) - goto try_again; - else if (!isdir && wxFindFileFlags && !(wxFindFileFlags & wxFILE)) - goto try_again; + if (isdir && !(gs_findFlags & wxDIR)) + goto try_again; + else if (!isdir && gs_findFlags && !(gs_findFlags & wxFILE)) + goto try_again; - if (wxBuffer[0] != 0) - strcat(wxBuffer, "\\"); - strcat(wxBuffer, wxFileStruc.cFileName); - return wxBuffer; -#else + if ( !path.IsEmpty() ) + result << path << _T('\\'); + result << gs_findDataStruct.cFileName; + } + + return result; +#else // Win16 #ifdef __BORLANDC__ - if (findnext(&wxFileStruc) == 0) + if (findnext(&gs_findDataStruct) == 0) #else - if (_dos_findnext(&wxFileStruc) == 0) + if (_dos_findnext(&gs_findDataStruct) == 0) #endif - { - /* MATTHEW: [5] Check directory flag */ - char attrib; + { + /* MATTHEW: [5] Check directory flag */ + char attrib; #ifdef __BORLANDC__ - attrib = wxFileStruc.ff_attrib; + attrib = gs_findDataStruct.ff_attrib; #else - attrib = wxFileStruc.attrib; + attrib = gs_findDataStruct.attrib; #endif - if (attrib & _A_SUBDIR) { - if (!(wxFindFileFlags & wxDIR)) - goto try_again; - } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE)) - goto try_again; + if (attrib & _A_SUBDIR) { + if (!(gs_findFlags & wxDIR)) + goto try_again; + } else if (gs_findFlags && !(gs_findFlags & wxFILE)) + goto try_again; - if (wxBuffer[0] != 0) - strcat(wxBuffer, "\\"); + result += #ifdef __BORLANDC__ - strcat(wxBuffer, wxFileStruc.ff_name); + gs_findDataStruct.ff_name #else - strcat(wxBuffer, wxFileStruc.name); -#endif - return wxBuffer; - } - else - return NULL; + gs_findDataStruct.name #endif + ; + } +#endif // Win32/16 + + return result; } -#endif - // __WINDOWS__ +#endif // Unix/Windows // 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] = _T('.'); + buf[1] = _T('\0'); } +#if wxUSE_UNICODE + else { + wxConvFile.MB2WC(buf, cbuf, sz); + delete [] cbuf; + } +#endif return buf; } +wxString wxGetCwd() +{ + static const size_t maxPathLen = 1024; + + wxString str; + wxGetWorkingDirectory(str.GetWriteBuf(maxPathLen), maxPathLen); + str.UngetWriteBuf(); + + return str; +} + bool wxSetWorkingDirectory(const wxString& d) { -#ifdef __UNIX__ - return (chdir(d) == 0); +#if defined( __UNIX__ ) || defined( __WXMAC__ ) + return (chdir(d.fn_str()) == 0); #elif defined(__WINDOWS__) #ifdef __WIN32__ @@ -1247,7 +1475,7 @@ bool wxSetWorkingDirectory(const wxString& d) bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':')); if (isDriveSpec) { - char firstChar = d[0]; + wxChar firstChar = d[0]; // To upper case if (firstChar > 90) @@ -1269,9 +1497,22 @@ bool wxSetWorkingDirectory(const wxString& d) #endif } -bool wxEndsWithPathSeparator(const char *pszFileName) +// Get the OS directory if appropriate (such as the Windows directory). +// On non-Windows platform, probably just return the empty string. +wxString wxGetOSDirectory() { - size_t len = Strlen(pszFileName); +#ifdef __WINDOWS__ + wxChar buf[256]; + GetWindowsDirectory(buf, 256); + return wxString(buf); +#else + return wxEmptyString; +#endif +} + +bool wxEndsWithPathSeparator(const wxChar *pszFileName) +{ + size_t len = wxStrlen(pszFileName); if ( len == 0 ) return FALSE; else @@ -1279,26 +1520,30 @@ bool wxEndsWithPathSeparator(const char *pszFileName) } // 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_RET( Strlen(pszFile) != 0, FALSE); + 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) - char *szPath = new char[strlen(pszPath) + 1]; - strcpy(szPath, pszPath); + wxChar *szPath = new wxChar[wxStrlen(pszPath) + 1]; + wxStrcpy(szPath, pszPath); wxString strFile; - char *pc; - for ( pc = strtok(szPath, PATH_SEP); pc; pc = strtok(NULL, PATH_SEP) ) { + 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 += FILE_SEP_PATH; + strFile += wxFILE_SEP_PATH; strFile += pszFile; if ( FileExists(strFile) ) { @@ -1312,3 +1557,235 @@ bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile) return pc != NULL; // if true => we breaked from the loop } +void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, + wxString *pstrPath, + wxString *pstrName, + wxString *pstrExt) +{ + // it can be empty, but it shouldn't be NULL + wxCHECK_RET( pszFileName, _T("NULL file name in wxSplitPath") ); + + const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT); + +#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 ( pDot < pLastSeparator ) + { + // the dot is part of the path, not the start of the extension + pDot = NULL; + } + + if ( pstrPath ) + { + if ( pLastSeparator ) + *pstrPath = wxString(pszFileName, pLastSeparator - pszFileName); + else + pstrPath->Empty(); + } + + if ( pstrName ) + { + const wxChar *start = pLastSeparator ? pLastSeparator + 1 : pszFileName; + const wxChar *end = pDot ? pDot : pszFileName + wxStrlen(pszFileName); + + *pstrName = wxString(start, end - start); + } + + if ( pstrExt ) + { + if ( pDot ) + *pstrExt = wxString(pDot + 1); + else + pstrExt->Empty(); + } +} + +//------------------------------------------------------------------------ +// wild character routines +//------------------------------------------------------------------------ + +bool wxIsWild( const wxString& pattern ) +{ + wxString tmp = pattern; + wxChar *pat = WXSTRINGCAST(tmp); + while (*pat) { + switch (*pat++) { + case _T('?'): case _T('*'): case _T('['): case _T('{'): + return TRUE; + case _T('\\'): + if (!*pat++) + return FALSE; + } + } + return FALSE; +}; + +bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) + +#if defined(HAVE_FNMATCH_H) +{ +// this probably won't work well for multibyte chars in Unicode mode? + if(dot_special) + return fnmatch(pat.fn_str(), text.fn_str(), FNM_PERIOD) == 0; + else + return fnmatch(pat.fn_str(), text.fn_str(), 0) == 0; +} +#else + +// #pragma error Broken implementation of wxMatchWild() -- needs fixing! + + /* + * WARNING: this code is broken! + */ +{ + wxString tmp1 = pat; + wxChar *pattern = WXSTRINGCAST(tmp1); + wxString tmp2 = text; + wxChar *str = WXSTRINGCAST(tmp2); + wxChar c; + wxChar *cp; + bool done = FALSE, ret_code, ok; + // Below is for vi fans + const wxChar OB = _T('{'), CB = _T('}'); + + // dot_special means '.' only matches '.' + if (dot_special && *str == _T('.') && *pattern != *str) + return FALSE; + + while ((*pattern != _T('\0')) && (!done) + && (((*str==_T('\0'))&&((*pattern==OB)||(*pattern==_T('*'))))||(*str!=_T('\0')))) { + switch (*pattern) { + case _T('\\'): + pattern++; + if (*pattern != _T('\0')) + pattern++; + break; + case _T('*'): + pattern++; + ret_code = FALSE; + while ((*str!=_T('\0')) + && (!(ret_code=wxMatchWild(pattern, str++, FALSE)))) + /*loop*/; + if (ret_code) { + while (*str != _T('\0')) + str++; + while (*pattern != _T('\0')) + pattern++; + } + break; + case _T('['): + pattern++; + repeat: + if ((*pattern == _T('\0')) || (*pattern == _T(']'))) { + done = TRUE; + break; + } + if (*pattern == _T('\\')) { + pattern++; + if (*pattern == _T('\0')) { + done = TRUE; + break; + } + } + if (*(pattern + 1) == _T('-')) { + c = *pattern; + pattern += 2; + if (*pattern == _T(']')) { + done = TRUE; + break; + } + if (*pattern == _T('\\')) { + pattern++; + if (*pattern == _T('\0')) { + done = TRUE; + break; + } + } + if ((*str < c) || (*str > *pattern)) { + pattern++; + goto repeat; + } + } else if (*pattern != *str) { + pattern++; + goto repeat; + } + pattern++; + while ((*pattern != _T(']')) && (*pattern != _T('\0'))) { + if ((*pattern == _T('\\')) && (*(pattern + 1) != _T('\0'))) + pattern++; + pattern++; + } + if (*pattern != _T('\0')) { + pattern++, str++; + } + break; + case _T('?'): + pattern++; + str++; + break; + case OB: + pattern++; + while ((*pattern != CB) && (*pattern != _T('\0'))) { + cp = str; + ok = TRUE; + while (ok && (*cp != _T('\0')) && (*pattern != _T('\0')) + && (*pattern != _T(',')) && (*pattern != CB)) { + if (*pattern == _T('\\')) + pattern++; + ok = (*pattern++ == *cp++); + } + if (*pattern == _T('\0')) { + ok = FALSE; + done = TRUE; + break; + } else if (ok) { + str = cp; + while ((*pattern != CB) && (*pattern != _T('\0'))) { + if (*++pattern == _T('\\')) { + if (*++pattern == CB) + pattern++; + } + } + } else { + while (*pattern!=CB && *pattern!=_T(',') && *pattern!=_T('\0')) { + if (*++pattern == _T('\\')) { + if (*++pattern == CB || *pattern == _T(',')) + pattern++; + } + } + } + if (*pattern != _T('\0')) + pattern++; + } + break; + default: + if (*str == *pattern) { + str++, pattern++; + } else { + done = TRUE; + } + } + } + while (*pattern == _T('*')) + pattern++; + return ((*str == _T('\0')) && (*pattern == _T('\0'))); +}; + +#endif + +#ifdef __VISUALC__ + #pragma warning(default:4706) // assignment within conditional expression +#endif // VC++