// 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 wxChar *wxBuffer;
#ifdef __WXMAC__
extern wxChar gwxMacFileName[] ;
extern wxChar gwxMacFileName2[] ;
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
#endif
+// ----------------------------------------------------------------------------
+// private globals
+// ----------------------------------------------------------------------------
+
+static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
+
+// ============================================================================
+// implementation
+// ============================================================================
+
void wxPathList::Add (const wxString& path)
{
wxStringList::Add (WXSTRINGCAST path);
{
static const wxChar PATH_TOKS[] =
#ifdef __WINDOWS__
- _T(" ;"); // Don't seperate with colon in DOS (used for drive)
+ wxT(" ;"); // Don't seperate with colon in DOS (used for drive)
#else
- _T(" :;");
+ wxT(" :;");
#endif
wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
if (token)
- {
+ {
Add (copystring (token));
while (token)
- {
+ {
if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL)
- Add (wxString(token));
- }
- }
- delete[]s;
+ 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;
}
}
wxString wxPathList::FindValidPath (const wxString& file)
{
- if (wxFileExists (wxExpandPath(wxBuffer, file)))
- return wxString(wxBuffer);
+ if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file)))
+ return wxString(wxFileFunctionsBuffer);
wxChar buf[_MAXPATHLEN];
- wxStrcpy(buf, wxBuffer);
+ wxStrcpy(buf, wxFileFunctionsBuffer);
wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
for (wxNode * node = First (); node; node = node->Next ())
{
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);
+ 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(_T("")); // Not found
+ return wxString(wxT("")); // Not found
}
wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
{
- wxString f = FindValidPath(file);
- if (wxIsAbsolutePath(f))
- return f;
- else
- {
- wxChar buf[500];
- wxGetWorkingDirectory(buf, 499);
- int len = (int)wxStrlen(buf);
- wxChar lastCh = 0;
- if (len > 0)
- lastCh = buf[len-1];
- if (lastCh != _T('/') && lastCh != _T('\\'))
+ wxString f = FindValidPath(file);
+ if ( wxIsAbsolutePath(f) )
+ return f;
+
+ wxString buf;
+ wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1);
+ buf.UngetWriteBuf();
+ if ( !wxEndsWithPathSeparator(buf) )
{
-#ifdef __WINDOWS__
- wxStrcat(buf, _T("\\"));
-#else
- wxStrcat(buf, _T("/"));
-#endif
+ buf += wxFILE_SEP_PATH;
}
- wxStrcat(buf, (const wxChar *)f);
- wxStrcpy(wxBuffer, buf);
- return wxString(wxBuffer);
- }
+ buf += f;
+
+ return buf;
}
bool
struct stat stbuf;
#endif
- if ((filename != _T("")) && stat (FNSTRINGCAST filename.fn_str(), &stbuf) == 0)
+ if ((filename != wxT("")) && stat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0)
return TRUE;
return FALSE;
#endif
bool
wxIsAbsolutePath (const wxString& filename)
{
- if (filename != _T(""))
+ if (filename != wxT(""))
{
- if (filename[0] == _T('/')
+ if (filename[0] == wxT('/')
#ifdef __VMS__
- || (filename[0] == _T('[') && filename[1] != _T('.'))
+ || (filename[0] == wxT('[') && filename[1] != wxT('.'))
#endif
#ifdef __WINDOWS__
/* MSDOS */
- || filename[0] == _T('\\') || (wxIsalpha (filename[0]) && filename[1] == _T(':'))
+ || filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))
#endif
)
return TRUE;
int i = len-1;
while (i > 0)
{
- if (buffer[i] == _T('.'))
+ if (buffer[i] == wxT('.'))
{
buffer[i] = 0;
break;
size_t i = len-1;
while (i > 0)
{
- if (buffer.GetChar(i) == _T('.'))
+ if (buffer.GetChar(i) == wxT('.'))
{
buffer = buffer.Left(i);
break;
wxChar *wxRealPath (wxChar *path)
{
#ifdef __WXMSW__
- static const wxChar SEP = _T('\\');
+ static const wxChar SEP = wxT('\\');
Unix2DosFilename(path);
#else
- static const wxChar SEP = _T('/');
+ static const wxChar SEP = wxT('/');
#endif
if (path[0] && path[1]) {
/* MATTHEW: special case "/./x" */
wxChar *p;
- if (path[2] == SEP && path[1] == _T('.'))
+ if (path[2] == SEP && path[1] == wxT('.'))
p = &path[0];
else
p = &path[2];
{
if (*p == SEP)
{
- if (p[1] == _T('.') && p[2] == _T('.') && (p[3] == SEP || p[3] == _T('\0')))
+ if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\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)
+ if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
&& (q - 1 <= path || q[-1] != SEP))
{
wxStrcpy (q, p + 3);
- if (path[0] == _T('\0'))
+ if (path[0] == wxT('\0'))
{
path[0] = SEP;
- path[1] = _T('\0');
+ path[1] = wxT('\0');
}
#ifdef __WXMSW__
/* Check that path[2] is NULL! */
- else if (path[1] == _T(':') && !path[2])
+ else if (path[1] == wxT(':') && !path[2])
{
path[2] = SEP;
- path[3] = _T('\0');
+ path[3] = wxT('\0');
}
#endif
p = q - 1;
}
}
- else if (p[1] == _T('.') && (p[2] == SEP || p[2] == _T('\0')))
+ else if (p[1] == wxT('.') && (p[2] == SEP || p[2] == wxT('\0')))
wxStrcpy (p, p + 2);
}
}
// Must be destroyed
wxChar *wxCopyAbsolutePath(const wxString& filename)
{
- if (filename == _T(""))
+ if (filename == wxT(""))
return (wxChar *) NULL;
- if (! IsAbsolutePath(wxExpandPath(wxBuffer, filename))) {
+ if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
wxChar buf[_MAXPATHLEN];
- buf[0] = _T('\0');
+ buf[0] = wxT('\0');
wxGetWorkingDirectory(buf, WXSIZEOF(buf));
wxChar ch = buf[wxStrlen(buf) - 1];
#ifdef __WXMSW__
- if (ch != _T('\\') && ch != _T('/'))
- wxStrcat(buf, _T("\\"));
+ if (ch != wxT('\\') && ch != wxT('/'))
+ wxStrcat(buf, wxT("\\"));
#else
- if (ch != _T('/'))
- wxStrcat(buf, _T("/"));
+ if (ch != wxT('/'))
+ wxStrcat(buf, wxT("/"));
#endif
- wxStrcat(buf, wxBuffer);
+ wxStrcat(buf, wxFileFunctionsBuffer);
return copystring( wxRealPath(buf) );
}
- return copystring( wxBuffer );
+ return copystring( wxFileFunctionsBuffer );
}
/*-
int q;
// Some compilers don't like this line.
-// const wxChar trimchars[] = _T("\n \t");
+// const wxChar trimchars[] = wxT("\n \t");
wxChar trimchars[4];
- trimchars[0] = _T('\n');
- trimchars[1] = _T(' ');
- trimchars[2] = _T('\t');
+ trimchars[0] = wxT('\n');
+ trimchars[1] = wxT(' ');
+ trimchars[2] = wxT('\t');
trimchars[3] = 0;
#ifdef __WXMSW__
- const wxChar SEP = _T('\\');
+ const wxChar SEP = wxT('\\');
#else
- const wxChar SEP = _T('/');
+ const wxChar SEP = wxT('/');
#endif
- buf[0] = _T('\0');
- if (name == NULL || *name == _T('\0'))
+ buf[0] = wxT('\0');
+ if (name == NULL || *name == wxT('\0'))
return buf;
nm = copystring(name); // Make a scratch copy
wxChar *nm_tmp = nm;
/* And strip off trailing whitespace and cr */
s = nm + (q = wxStrlen(nm)) - 1;
while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)
- *s = _T('\0');
+ *s = wxT('\0');
s = nm;
d = lnm;
#ifdef __WXMSW__
q = FALSE;
#else
- q = nm[0] == _T('\\') && nm[1] == _T('~');
+ 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 == _T('\\')) {
+# ifndef __WXMSW__
+ if (*s == wxT('\\')) {
if ((*(d - 1) = *++s)) {
s++;
continue;
} else
break;
} else
+# endif
#endif
#ifdef __WXMSW__
- if (*s++ == _T('$') && (*s == _T('{') || *s == _T(')')))
+ if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
#else
- if (*s++ == _T('$'))
+ if (*s++ == wxT('$'))
#endif
{
register wxChar *start = d;
- register int braces = (*s == _T('{') || *s == _T('('));
+ 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 == _T('}') || *s == _T(')')) : !(wxIsalnum(*s) || *s == _T('_')) )
+#endif
+ if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
break;
else
s++;
*--d = 0;
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 = _T("");
- if (nm[0] == _T('~') && !q)
+ s = wxT("");
+ if (nm[0] == wxT('~') && !q)
{
/* 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 ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
if (*++nm)
nm++;
}
if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
if (was_sep) /* replace only if it was there: */
*s = SEP;
- s = _T("");
+ 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 (_T('\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);
{
static wxChar dest[_MAXPATHLEN];
- if (filename == _T(""))
+ if (filename == wxT(""))
return (wxChar *) NULL;
wxStrcpy (dest, WXSTRINGCAST filename);
if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
(tcp = wxStrstr (dest, val)) != NULL)
{
- wxStrcpy (wxBuffer, tcp + wxStrlen (val));
- *tcp++ = _T('$');
- *tcp++ = _T('{');
+ wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
+ *tcp++ = wxT('$');
+ *tcp++ = wxT('{');
wxStrcpy (tcp, WXSTRINGCAST envname);
- wxStrcat (tcp, _T("}"));
- wxStrcat (tcp, wxBuffer);
+ wxStrcat (tcp, wxT("}"));
+ wxStrcat (tcp, wxFileFunctionsBuffer);
}
// Handle User's home (ignore root homes!)
(len = wxStrlen(val)) > 2 &&
wxStrncmp(dest, val, len) == 0)
{
- wxStrcpy(wxBuffer, _T("~"));
- if (user != _T(""))
- wxStrcat(wxBuffer, (const wxChar*) user);
+ wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
+ if (user != wxT(""))
+ wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
#ifdef __WXMSW__
-// strcat(wxBuffer, "\\");
+// strcat(wxFileFunctionsBuffer, "\\");
#else
-// strcat(wxBuffer, "/");
+// strcat(wxFileFunctionsBuffer, "/");
#endif
- wxStrcat(wxBuffer, dest + len);
- wxStrcpy (dest, wxBuffer);
+ wxStrcat(wxFileFunctionsBuffer, dest + len);
+ wxStrcpy (dest, wxFileFunctionsBuffer);
}
return dest;
tcp = path + wxStrlen (path);
while (--tcp >= path)
{
- if (*tcp == _T('/') || *tcp == _T('\\')
+ if (*tcp == wxT('/') || *tcp == wxT('\\')
#ifdef __VMS__
- || *tcp == _T(':') || *tcp == _T(']'))
+ || *tcp == wxT(':') || *tcp == wxT(']'))
#else
)
#endif
return tcp + 1;
} /* while */
-#ifdef __WXMSW__
- if (wxIsalpha (*path) && *(path + 1) == _T(':'))
+#if defined(__WXMSW__) || defined(__WXPM__)
+ if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return path + 2;
#endif
}
wxString wxFileNameFromPath (const wxString& path1)
{
- if (path1 != _T(""))
+ if (path1 != wxT(""))
{
wxChar *path = WXSTRINGCAST path1 ;
tcp = path + wxStrlen (path);
while (--tcp >= path)
{
- if (*tcp == _T('/') || *tcp == _T('\\')
+ if (*tcp == wxT('/') || *tcp == wxT('\\')
#ifdef __VMS__
- || *tcp == _T(':') || *tcp == _T(']'))
+ || *tcp == wxT(':') || *tcp == wxT(']'))
#else
)
#endif
return wxString(tcp + 1);
} /* while */
-#ifdef __WXMSW__
- if (wxIsalpha (*path) && *(path + 1) == _T(':'))
+#if defined(__WXMSW__) || defined(__WXPM__)
+ if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return wxString(path + 2);
#endif
}
while (!done && i > -1)
{
// ] is for VMS
- if (path[i] == _T('/') || path[i] == _T('\\') || path[i] == _T(']'))
+ 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 (wxIsalpha (buf[0]) && buf[1] == _T(':'))
+ if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
// A:junk --> A:. (since A:.\junk Not A:\junk)
- buf[2] = _T('.');
- buf[3] = _T('\0');
+ buf[2] = wxT('.');
+ buf[3] = wxT('\0');
return buf;
}
#endif
// Return just the directory, or NULL if no directory
wxString wxPathOnly (const wxString& path)
{
- if (path != _T(""))
+ if (path != wxT(""))
{
wxChar buf[_MAXPATHLEN];
while (!done && i > -1)
{
// ] is for VMS
- if (path[i] == _T('/') || path[i] == _T('\\') || path[i] == _T(']'))
+ 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 (wxIsalpha (buf[0]) && buf[1] == _T(':'))
+ if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
// A:junk --> A:. (since A:.\junk Not A:\junk)
- buf[2] = _T('.');
- buf[3] = _T('\0');
+ buf[2] = wxT('.');
+ buf[3] = wxT('\0');
return wxString(buf);
}
#endif
}
- return wxString(_T(""));
+ return wxString(wxT(""));
}
// Utility for converting delimiters in DOS filenames to UNIX style
if (s)
{
memmove( s+1 , s ,(strlen( s ) + 1)*sizeof(wxChar)) ;
- if ( *s == _T(':') )
- *s = _T('.') ;
+ if ( *s == wxT(':') )
+ *s = wxT('.') ;
else
- *s = _T('/') ;
+ *s = wxT('/') ;
while (*s)
{
- if (*s == _T(':'))
- *s = _T('/');
+ if (*s == wxT(':'))
+ *s = wxT('/');
else
*s = wxTolower(*s); // Case INDEPENDENT
s++;
{
if (s)
{
- if ( *s == _T('.') )
+ if ( *s == wxT('.') )
{
// 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('/') )
+ else if ( *s == wxT('/') )
{
// 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") ) ;
+ wxASSERT_MSG( 1 , wxT("unknown path beginning") ) ;
}
while (*s)
{
- if (*s == _T('/') || *s == _T('\\'))
- *s = _T(':');
+ if (*s == wxT('/') || *s == wxT('\\'))
+ *s = wxT(':');
s++ ;
}
if (s)
while (*s)
{
- if (*s == _T('\\'))
- *s = _T('/');
-#ifdef __WXMSW__
+ if (*s == wxT('\\'))
+ *s = wxT('/');
+#if defined(__WXMSW__) || defined(__WXPM__)
else
*s = wxTolower(*s); // Case INDEPENDENT
#endif
}
void
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
wxUnix2DosFilename (wxChar *s)
#else
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 == _T('/'))
- *s = _T('\\');
+ if (*s == wxT('/'))
+ *s = wxT('\\');
s++;
}
#endif
(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 ||
+ if ((fp1 = fopen (wxFNSTRINGCAST file1.fn_str(), "rb")) == NULL ||
+ (fp2 = fopen (wxFNSTRINGCAST file2.fn_str(), "rb")) == NULL ||
(fp3 = fopen (wxFNCONV(outfile), "wb")) == NULL)
#endif
{
return FALSE;
if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL)
#else
- if ((fd1 = fopen (FNSTRINGCAST file1.fn_str(), "rb")) == NULL)
+ if ((fd1 = fopen (wxFNSTRINGCAST file1.fn_str(), "rb")) == NULL)
return FALSE;
- if ((fd2 = fopen (FNSTRINGCAST file2.fn_str(), "wb")) == NULL)
+ if ((fd2 = fopen (wxFNSTRINGCAST file2.fn_str(), "wb")) == NULL)
#endif
{
fclose (fd1);
return TRUE;
#else
// Normal system call
- if (0 == rename (FNSTRINGCAST file1.fn_str(), FNSTRINGCAST file2.fn_str()))
+ 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(FNSTRINGCAST file.fn_str());
+ int flag = remove(wxFNSTRINGCAST file.fn_str());
#elif defined( __WXMAC__ )
wxStrcpy( gwxMacFileName , file ) ;
wxUnix2MacFilename( gwxMacFileName ) ;
int flag = unlink(gwxMacFileName);
#else
- int flag = unlink(FNSTRINGCAST file.fn_str());
+ int flag = unlink(wxFNSTRINGCAST file.fn_str());
#endif
return (flag == 0) ;
}
const wxChar *dirname = dir.c_str();
#endif // Mac/!Mac
- // assume mkdir() has 2 args on non Windows platforms and on Windows too
+ // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
// for the GNU compiler
-#if !defined(__WXMSW__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
+#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
-#else // MSW
- if ( mkdir(wxFNCONV(dirname)) != 0 )
+#else // MSW and OS/2
+ if ( mkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
#endif // !MSW/MSW
{
wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
#ifdef __SALFORDC__
return FALSE; // What to do?
#else
- return (rmdir(FNSTRINGCAST dir.fn_str()) == 0);
+ return (rmdir(wxFNSTRINGCAST dir.fn_str()) == 0);
#endif
#endif
// does the path exists? (may have or not '/' or '\\' at the end)
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] != _T('\0') )
- strPath.Last() = _T('\0');
+ if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != wxT('\0') )
+ strPath.Last() = wxT('\0');
#ifdef __SALFORDC__
struct _stat st;
struct stat st;
#endif
- return stat(FNSTRINGCAST strPath.fn_str(), &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.
for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000)
{
- wxSprintf (tmp, _T("/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)
wxString path(wxPathOnly(gs_strFileSpec));
// special case: path is really "/"
- if ( !path && gs_strFileSpec[0u] == _T('/') )
- path = _T('/');
+ if ( !path && gs_strFileSpec[0u] == wxT('/') )
+ path = wxT('/');
// path is empty => Local directory
if ( !path )
- path = _T('.');
+ path = wxT('.');
gs_dirStream = opendir(path.fn_str());
if ( !gs_dirStream )
wxString result;
#ifndef __VMS__
- wxCHECK_MSG( gs_dirStream, result, _T("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] == _T('/'))
- path = _T('/');
+ if ( !path && gs_strFileSpec[0u] == wxT('/'))
+ path = wxT('/');
// Do the reading
struct dirent *nextDir;
if ( !path.IsEmpty() )
{
result = path;
- if ( path != _T('/') )
- result += _T('/');
+ if ( path != wxT('/') )
+ result += wxT('/');
}
result += nextDir->d_name;
// Find path only so we can concatenate found file onto path
wxString path(wxPathOnly(gs_strFileSpec));
if ( !path.IsEmpty() )
- result << path << _T('\\');
+ result << path << wxT('\\');
#ifdef __WIN32__
if ( gs_hFileStruct != INVALID_HANDLE_VALUE )
goto try_again;
if ( !path.IsEmpty() )
- result << path << _T('\\');
+ result << path << wxT('\\');
result << gs_findDataStruct.cFileName;
}
if (getcwd(buf, sz) == NULL) {
#endif
#endif
- buf[0] = _T('.');
- buf[1] = _T('\0');
+ buf[0] = wxT('.');
+ buf[1] = wxT('\0');
}
#if wxUSE_UNICODE
else {
- wxConv_file.MB2WC(buf, cbuf, sz);
+ wxConvFile.MB2WC(buf, cbuf, sz);
delete [] cbuf;
}
#endif
bool wxSetWorkingDirectory(const wxString& d)
{
-#if defined( __UNIX__ ) || defined( __WXMAC__ )
- return (chdir(d.fn_str()) == 0);
+#if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__)
+ return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
#elif defined(__WINDOWS__)
#ifdef __WIN32__
// find a file in a list of directories, returns false if not found
bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
{
- // 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;
+ // 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 wxChar *pszFileName,
wxString *pstrExt)
{
// it can be empty, but it shouldn't be NULL
- wxCHECK_RET( pszFileName, _T("NULL file name in wxSplitPath") );
+ wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT);
pDot = NULL;
}
#endif // MSW/Unix
-
+
if ( pDot < pLastSeparator )
{
// the dot is part of the path, not the start of the extension
if ( pstrPath )
{
- if ( pLastSeparator )
+ if ( pLastSeparator )
*pstrPath = wxString(pszFileName, pLastSeparator - pszFileName);
else
pstrPath->Empty();
wxChar *pat = WXSTRINGCAST(tmp);
while (*pat) {
switch (*pat++) {
- case _T('?'): case _T('*'): case _T('['): case _T('{'):
+ case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
return TRUE;
- case _T('\\'):
+ case wxT('\\'):
if (!*pat++)
return FALSE;
}
wxChar *cp;
bool done = FALSE, ret_code, ok;
// Below is for vi fans
- const wxChar OB = _T('{'), CB = _T('}');
+ const wxChar OB = wxT('{'), CB = wxT('}');
// dot_special means '.' only matches '.'
- if (dot_special && *str == _T('.') && *pattern != *str)
+ if (dot_special && *str == wxT('.') && *pattern != *str)
return FALSE;
- while ((*pattern != _T('\0')) && (!done)
- && (((*str==_T('\0'))&&((*pattern==OB)||(*pattern==_T('*'))))||(*str!=_T('\0')))) {
+ while ((*pattern != wxT('\0')) && (!done)
+ && (((*str==wxT('\0'))&&((*pattern==OB)||(*pattern==wxT('*'))))||(*str!=wxT('\0')))) {
switch (*pattern) {
- case _T('\\'):
+ case wxT('\\'):
pattern++;
- if (*pattern != _T('\0'))
+ if (*pattern != wxT('\0'))
pattern++;
break;
- case _T('*'):
+ case wxT('*'):
pattern++;
ret_code = FALSE;
- while ((*str!=_T('\0'))
+ while ((*str!=wxT('\0'))
&& (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
/*loop*/;
if (ret_code) {
- while (*str != _T('\0'))
+ while (*str != wxT('\0'))
str++;
- while (*pattern != _T('\0'))
+ while (*pattern != wxT('\0'))
pattern++;
}
break;
- case _T('['):
+ case wxT('['):
pattern++;
repeat:
- if ((*pattern == _T('\0')) || (*pattern == _T(']'))) {
+ if ((*pattern == wxT('\0')) || (*pattern == wxT(']'))) {
done = TRUE;
break;
}
- if (*pattern == _T('\\')) {
+ if (*pattern == wxT('\\')) {
pattern++;
- if (*pattern == _T('\0')) {
+ if (*pattern == wxT('\0')) {
done = TRUE;
break;
}
}
- if (*(pattern + 1) == _T('-')) {
+ if (*(pattern + 1) == wxT('-')) {
c = *pattern;
pattern += 2;
- if (*pattern == _T(']')) {
+ if (*pattern == wxT(']')) {
done = TRUE;
break;
}
- if (*pattern == _T('\\')) {
+ if (*pattern == wxT('\\')) {
pattern++;
- if (*pattern == _T('\0')) {
+ if (*pattern == wxT('\0')) {
done = TRUE;
break;
}
goto repeat;
}
pattern++;
- while ((*pattern != _T(']')) && (*pattern != _T('\0'))) {
- if ((*pattern == _T('\\')) && (*(pattern + 1) != _T('\0')))
+ while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) {
+ if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0')))
pattern++;
pattern++;
}
- if (*pattern != _T('\0')) {
+ if (*pattern != wxT('\0')) {
pattern++, str++;
}
break;
- case _T('?'):
+ case wxT('?'):
pattern++;
str++;
break;
case OB:
pattern++;
- while ((*pattern != CB) && (*pattern != _T('\0'))) {
+ while ((*pattern != CB) && (*pattern != wxT('\0'))) {
cp = str;
ok = TRUE;
- while (ok && (*cp != _T('\0')) && (*pattern != _T('\0'))
- && (*pattern != _T(',')) && (*pattern != CB)) {
- if (*pattern == _T('\\'))
+ while (ok && (*cp != wxT('\0')) && (*pattern != wxT('\0'))
+ && (*pattern != wxT(',')) && (*pattern != CB)) {
+ if (*pattern == wxT('\\'))
pattern++;
ok = (*pattern++ == *cp++);
}
- if (*pattern == _T('\0')) {
+ if (*pattern == wxT('\0')) {
ok = FALSE;
done = TRUE;
break;
} else if (ok) {
str = cp;
- while ((*pattern != CB) && (*pattern != _T('\0'))) {
- if (*++pattern == _T('\\')) {
+ while ((*pattern != CB) && (*pattern != wxT('\0'))) {
+ if (*++pattern == wxT('\\')) {
if (*++pattern == CB)
pattern++;
}
}
} else {
- while (*pattern!=CB && *pattern!=_T(',') && *pattern!=_T('\0')) {
- if (*++pattern == _T('\\')) {
- if (*++pattern == CB || *pattern == _T(','))
+ while (*pattern!=CB && *pattern!=wxT(',') && *pattern!=wxT('\0')) {
+ if (*++pattern == wxT('\\')) {
+ if (*++pattern == CB || *pattern == wxT(','))
pattern++;
}
}
}
- if (*pattern != _T('\0'))
+ if (*pattern != wxT('\0'))
pattern++;
}
break;
}
}
}
- while (*pattern == _T('*'))
+ while (*pattern == wxT('*'))
pattern++;
- return ((*str == _T('\0')) && (*pattern == _T('\0')));
+ return ((*str == wxT('\0')) && (*pattern == wxT('\0')));
};
#endif
projects / wxWidgets.git / blobdiff