// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "filefn.h"
#endif
#include "wx/mac/private.h" // includes mac headers
#endif
+#ifdef __WXWINCE__
+#include "wx/msw/wince/time.h"
+#include "wx/msw/private.h"
+#else
#include <time.h>
+#endif
-#ifndef __MWERKS__
+#ifdef __WXWINCE__
+// Nothing
+#elif !defined(__MWERKS__)
#include <sys/types.h>
#include <sys/stat.h>
+#else
+#ifdef __MACH__
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>
#else
#include <stat.h>
#include <unistd.h>
#include <unix.h>
+ #include <fcntl.h>
+#endif
#endif
-#ifdef __UNIX__
+#ifdef __OS2__
+// need to check for __OS2__ first since currently both
+// __OS2__ and __UNIX__ are defined.
+ #include <process.h>
+ #include "wx/os2/private.h"
+#ifdef __EMX__
+ #include <unistd.h>
+#endif
+#elif defined(__UNIX__)
#include <unistd.h>
#include <dirent.h>
#include <fcntl.h>
#endif
-#ifdef __WXPM__
- #include <process.h>
- #include "wx/os2/private.h"
-#endif
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) && !defined(__WXWINE__)
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__)
#include <direct.h>
#include <dos.h>
#include <io.h>
#include <unix.h>
#endif
-#include "wx/setup.h"
#include "wx/log.h"
// No, Cygwin doesn't appear to have fnmatch.h after all.
#endif
#ifdef __WINDOWS__
- #include <windows.h>
+ #include "wx/msw/wrapwin.h"
#include "wx/msw/mslu.h"
+ // for _getcwd
+ #ifdef __MINGW32__
+ #include <io.h>
+ #endif
+
// sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
//
// note that it must be included after <windows.h>
#ifdef __CYGWIN__
#include <sys/cygwin.h>
#endif
- #include <wchar.h>
- #ifndef __TWIN32__
- #include <sys/unistd.h>
- #endif
#endif // __GNUWIN32__
#endif // __WINDOWS__
#endif
#ifdef __WXMAC__
+# ifdef __DARWIN__
+# include "MoreFilesX.h"
+# else
# include "MoreFiles.h"
# include "MoreFilesExtras.h"
# include "FullPath.h"
# include "FSpCompat.h"
+# endif
#endif
// ----------------------------------------------------------------------------
// wxPathList
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
+// IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
+
+static inline wxChar* MYcopystring(const wxString& s)
+{
+ wxChar* copy = new wxChar[s.length() + 1];
+ return wxStrcpy(copy, s.c_str());
+}
+
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+ wxChar* copy = new wxChar[wxStrlen(s) + 1];
+ return wxStrcpy(copy, s);
+}
void wxPathList::Add (const wxString& path)
{
// Add paths e.g. from the PATH environment variable
void wxPathList::AddEnvList (const wxString& envVariable)
{
- static const wxChar PATH_TOKS[] =
-#ifdef __WINDOWS__
- wxT(" ;"); // Don't seperate with colon in DOS (used for drive)
+ // No environment variables on WinCE
+#ifndef __WXWINCE__
+ static const wxChar PATH_TOKS[] =
+#if defined(__WINDOWS__) || defined(__OS2__)
+ /*
+ The space has been removed from the tokenizers, otherwise a
+ path such as "C:\Program Files" would be split into 2 paths:
+ "C:\Program" and "Files"
+ */
+// wxT(" ;"); // Don't seperate with colon in DOS (used for drive)
+ wxT(";"); // Don't seperate with colon in DOS (used for drive)
#else
wxT(" :;");
#endif
- wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
- if (val && *val)
+ wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
+ if (val && *val)
{
- wxChar *s = copystring (val);
- wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
+ wxChar *s = MYcopystring (val);
+ 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));
- }
- }
+ if (token)
+ {
+ Add(token);
+ while (token)
+ {
+ if ( (token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr))
+ != NULL )
+ {
+ Add(token);
+ }
+ }
+ }
- // suppress warning about unused variable save_ptr when wxStrtok() is a
- // macro which throws away its third argument
- save_ptr = token;
+ // suppress warning about unused variable save_ptr when wxStrtok() is a
+ // macro which throws away its third argument
+ save_ptr = token;
- delete [] s;
+ delete [] s;
}
+#endif
}
// Given a full filename (with path), ensure that that file can
bool wxPathList::Member (const wxString& path)
{
- for (wxNode * node = First (); node != NULL; node = node->Next ())
+ for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
{
- wxString path2((wxChar *) node->Data ());
+ wxString path2( node->GetData() );
if (
-#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
+#if defined(__WINDOWS__) || defined(__OS2__) || defined(__VMS__) || defined (__WXMAC__)
// Case INDEPENDENT
path.CompareTo (path2, wxString::ignoreCase) == 0
#else
wxChar buf[_MAXPATHLEN];
wxStrcpy(buf, wxFileFunctionsBuffer);
- wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
- filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
+ wxChar *filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
- for (wxNode * node = First (); node; node = node->Next ())
+ for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
{
- wxChar *path = (wxChar *) node->Data ();
+ const wxChar *path = node->GetData();
wxStrcpy (wxFileFunctionsBuffer, path);
wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
if (ch != wxT('\\') && ch != wxT('/'))
wxStrcat (wxFileFunctionsBuffer, wxT("/"));
wxStrcat (wxFileFunctionsBuffer, filename);
#ifdef __WINDOWS__
- Unix2DosFilename (wxFileFunctionsBuffer);
+ wxUnix2DosFilename (wxFileFunctionsBuffer);
#endif
if (wxFileExists (wxFileFunctionsBuffer))
{
}
} // for()
- return wxString(wxT("")); // Not found
+ return wxEmptyString; // Not found
}
wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
bool
wxFileExists (const wxString& filename)
{
+ // we must use GetFileAttributes() instead of the ANSI C functions because
+ // it can cope with network (UNC) paths unlike them
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
- // GetFileAttributes can copy with network paths unlike stat()
DWORD ret = ::GetFileAttributes(filename);
return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
-#else
- wxStructStat stbuf;
- if ( !filename.empty() && wxStat( filename, &stbuf) == 0 )
- return TRUE;
-
- return FALSE;
-#endif
+#else // !__WIN32__
+ wxStructStat st;
+ return wxStat(filename, &st) == 0 && (st.st_mode & S_IFREG);
+#endif // __WIN32__/!__WIN32__
}
bool
if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
return TRUE;
#endif
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) || defined(__OS2__)
// MSDOS like
if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
return TRUE;
{
#ifdef __WXMSW__
static const wxChar SEP = wxT('\\');
- Unix2DosFilename(path);
+ wxUnix2DosFilename(path);
#else
static const wxChar SEP = wxT('/');
#endif
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--);
+ for (q = p - 1; q >= path && *q != SEP; q--)
+ {
+ // Empty
+ }
+
if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
&& (q - 1 <= path || q[-1] != SEP))
{
path[0] = SEP;
path[1] = wxT('\0');
}
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__OS2__)
/* Check that path[2] is NULL! */
else if (path[1] == wxT(':') && !path[2])
{
if (filename == wxT(""))
return (wxChar *) NULL;
- if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
+ if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
wxChar buf[_MAXPATHLEN];
buf[0] = wxT('\0');
wxGetWorkingDirectory(buf, WXSIZEOF(buf));
wxStrcat(buf, wxT("/"));
#endif
wxStrcat(buf, wxFileFunctionsBuffer);
- return copystring( wxRealPath(buf) );
+ return MYcopystring( wxRealPath(buf) );
}
- return copystring( wxFileFunctionsBuffer );
+ return MYcopystring( wxFileFunctionsBuffer );
}
/*-
buf[0] = wxT('\0');
if (name == NULL || *name == wxT('\0'))
return buf;
- nm = copystring(name); // Make a scratch copy
+ nm = MYcopystring(name); // Make a scratch copy
wxChar *nm_tmp = nm;
/* Skip leading whitespace and cr */
} else
# endif
#endif
+ // No env variables on WinCE
+#ifndef __WXWINCE__
#ifdef __WXMSW__
if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
#else
*--d = 0;
value = wxGetenv(braces ? start + 1 : start);
if (value) {
- for ((d = start - 1); (*d++ = *value++) != 0;);
+ for ((d = start - 1); (*d++ = *value++) != 0;)
+ {
+ // Empty
+ }
+
d--;
if (braces && *s)
s++;
}
}
+#endif
+ // __WXWINCE__
}
/* Expand ~ and ~user */
{ /* ~user/filename */
register wxChar *nnm;
register wxChar *home;
- for (s = nm; *s && *s != SEP; s++);
+ for (s = nm; *s && *s != SEP; s++)
+ {
+ // Empty
+ }
int was_sep; /* MATTHEW: Was there a separator, or NULL? */
was_sep = (*s == SEP);
nnm = *s ? s + 1 : s;
*(d - 1) = SEP;
}
s = nm;
- while ((*d++ = *s++) != 0);
+ while ((*d++ = *s++) != 0)
+ {
+ // Empty
+ }
delete[] nm_tmp; // clean up alloc
/* Now clean up the buffer */
return wxRealPath(buf);
wxStrcpy (dest, WXSTRINGCAST filename);
#ifdef __WXMSW__
- Unix2DosFilename(dest);
+ wxUnix2DosFilename(dest);
#endif
// Handle environment
- const wxChar *val = (const wxChar *) NULL;
- wxChar *tcp = (wxChar *) NULL;
+ const wxChar *val;
+#ifndef __WXWINCE__
+ wxChar *tcp;
if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
(tcp = wxStrstr (dest, val)) != NULL)
{
wxStrcat (tcp, wxT("}"));
wxStrcat (tcp, wxFileFunctionsBuffer);
}
+#endif
// Handle User's home (ignore root homes!)
- size_t len = 0;
+ size_t len;
if ((val = wxGetUserHome (user)) != NULL &&
(len = wxStrlen(val)) > 2 &&
wxStrncmp(dest, val, len) == 0)
i --;
}
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)
// Try Drive specifier
if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
i --;
}
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)
// Try Drive specifier
if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
int i;
int j;
OSErr theErr;
- OSStatus theStatus;
- Boolean isDirectory = false;
- Str255 theParentPath = "\p";
+ OSStatus theStatus = noErr;
+ Boolean isDirectory = FALSE;
+ Str255 theParentPath = "\p";
FSSpec theParentSpec;
FSRef theParentRef;
char theFileName[FILENAME_MAX];
}
// create path string for return value
- wxString result( thePath ) ;
+ wxString result( thePath , wxConvLocal) ;
#else
Handle myPath ;
short length ;
(*myPath)[length-1] = 0 ;
// create path string for return value
- wxString result( (char*) *myPath ) ;
+ wxString result( *myPath , wxConvLocal) ;
// free allocated handle
::HUnlock( myPath ) ;
// Mac file names are POSIX (Unix style) under Darwin
// therefore the conversion functions below are not needed
-static char sMacFileNameConversion[ 1000 ] ;
+static wxChar sMacFileNameConversion[ 1000 ] ;
+static char scMacFileNameConversion[ 1000 ] ;
#endif
void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
{
- OSStatus err = noErr ;
+ OSStatus err = noErr ;
#ifdef __DARWIN__
FSRef theRef;
// convert the FSRef to an FSSpec
err = FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
#else
- if ( strchr( path , ':' ) == NULL )
+ if ( strchr( path , ':' ) == NULL )
{
- // try whether it is a volume / or a mounted volume
- strncpy( sMacFileNameConversion , path , 1000 ) ;
- sMacFileNameConversion[998] = 0 ;
- strcat( sMacFileNameConversion , ":" ) ;
- err = FSpLocationFromFullPath( strlen(sMacFileNameConversion) , sMacFileNameConversion , spec ) ;
+ // try whether it is a volume / or a mounted volume
+ strncpy( scMacFileNameConversion , path , 1000 ) ;
+ scMacFileNameConversion[998] = 0 ;
+ strcat( scMacFileNameConversion , ":" ) ;
+ err = FSpLocationFromFullPath( strlen(scMacFileNameConversion) , scMacFileNameConversion , spec ) ;
}
else
{
- err = FSpLocationFromFullPath( strlen(path) , path , spec ) ;
+ err = FSpLocationFromFullPath( strlen(path) , path , spec ) ;
}
#endif
}
+#if wxUSE_UNICODE
+WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec )
+{
+ return wxMacFilename2FSSpec( wxConvFile.cWC2MB(path) , spec ) ;
+}
+#endif
+
#ifndef __DARWIN__
-wxString wxMac2UnixFilename (const char *str)
+wxString wxMac2UnixFilename (const wxChar *str)
{
- char *s = sMacFileNameConversion ;
- strcpy( s , str ) ;
+ wxChar *s = sMacFileNameConversion ;
+ wxStrcpy( s , str ) ;
if (s)
{
- memmove( s+1 , s ,strlen( s ) + 1) ;
+ memmove( s+1 , s ,wxStrlen( s ) + 1 * sizeof(wxChar)) ;
if ( *s == ':' )
*s = '.' ;
else
return wxString(sMacFileNameConversion) ;
}
-wxString wxUnix2MacFilename (const char *str)
+wxString wxUnix2MacFilename (const wxChar *str)
{
- char *s = sMacFileNameConversion ;
- strcpy( s , str ) ;
+ wxChar *s = sMacFileNameConversion ;
+ wxStrcpy( s , str ) ;
if (s)
{
if ( *s == '.' )
{
// relative path , since it goes on with slash which is translated to a :
- memmove( s , s+1 ,strlen( s ) ) ;
+ memmove( s , s+1 ,wxStrlen( s ) * sizeof(wxChar)) ;
}
else if ( *s == '/' )
{
// absolute path -> on mac just start with the drive name
- memmove( s , s+1 ,strlen( s ) ) ;
+ memmove( s , s+1 ,wxStrlen( s ) * sizeof(wxChar) ) ;
}
else
{
- wxASSERT_MSG( 1 , "unkown path beginning" ) ;
+ wxASSERT_MSG( 1 , wxT("unkown path beginning") ) ;
}
while (*s)
{
if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
{
*s = ':';
- memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ;
+ memmove( s+1 , s+3 ,(wxStrlen( s+3 ) + 1)*sizeof(wxChar) ) ;
}
else
*s = ':';
s++ ;
}
}
- return wxString (sMacFileNameConversion) ;
+ return wxString(sMacFileNameConversion) ;
}
wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
#endif // __WXMAC__
void
-wxDos2UnixFilename (char *s)
+wxDos2UnixFilename (wxChar *s)
{
if (s)
while (*s)
{
- if (*s == '\\')
- *s = '/';
+ if (*s == _T('\\'))
+ *s = _T('/');
#ifdef __WXMSW__
else
*s = wxTolower (*s); // Case INDEPENDENT
}
void
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)
wxUnix2DosFilename (wxChar *s)
#else
wxUnix2DosFilename (wxChar *WXUNUSED(s) )
#endif
{
// Yes, I really mean this to happen under DOS only! JACS
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)
if (s)
while (*s)
{
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
{
wxString outfile;
- if ( !wxGetTempFileName("cat", outfile) )
+ if ( !wxGetTempFileName( wxT("cat"), outfile) )
return FALSE;
- FILE *fp1 = (FILE *) NULL;
- FILE *fp2 = (FILE *) NULL;
- FILE *fp3 = (FILE *) NULL;
+ FILE *fp1 wxDUMMY_INITIALIZE(NULL);
+ FILE *fp2 = NULL;
+ FILE *fp3 = NULL;
// Open the inputs and outputs
if ((fp1 = wxFopen ( file1, wxT("rb"))) == NULL ||
(fp2 = wxFopen ( file2, wxT("rb"))) == NULL ||
return FALSE;
}
-#elif defined(__WXPM__)
+#elif defined(__OS2__)
if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
return FALSE;
#else // !Win32
// create file2 with the same permissions than file1 and open it for
// writing
-
+
wxFile fileOut;
if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
return FALSE;
bool
wxRenameFile (const wxString& file1, const wxString& file2)
{
- // Normal system call
+#ifndef __WXWINCE__
+ // Normal system call
if ( wxRename (file1, file2) == 0 )
return TRUE;
+#endif
// Try to copy
if (wxCopyFile(file1, file2)) {
#if defined(__VISUALC__) \
|| defined(__BORLANDC__) \
|| defined(__WATCOMC__) \
+ || defined(__DMC__) \
|| defined(__GNUWIN32__)
int res = wxRemove(file);
+#elif defined(__WXMAC__)
+ int res = unlink(wxFNCONV(file));
#else
int res = unlink(OS_FILENAME(file));
#endif
bool wxMkdir(const wxString& dir, int perm)
{
#if defined(__WXMAC__) && !defined(__UNIX__)
- return (mkdir( dir , 0 ) == 0);
+ return (mkdir( wxFNCONV(dir) , 0 ) == 0);
#else // !Mac
const wxChar *dirname = dir.c_str();
// 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(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__)
+#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
+ #ifndef MSVCRT
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
-#elif defined(__WXPM__)
+ #else
+ if ( mkdir(wxFNCONV(dirname)) != 0 )
+ #endif
+#elif defined(__OS2__)
if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
#elif defined(__DOS__)
#if defined(__WATCOMC__)
#endif
#else // !MSW, !DOS and !OS/2 VAC++
(void)perm;
+#ifdef __WXWINCE__
+ if ( !CreateDirectory(dirname, NULL) )
+#else
if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+#endif
#endif // !MSW/MSW
{
wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
{
#ifdef __VMS__
- return FALSE; //to be changed since rmdir exists in VMS7.x
-#elif defined(__WXPM__)
- return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
+ return FALSE; //to be changed since rmdir exists in VMS7.x
+#elif defined(__OS2__)
+ return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
#else
-#ifdef __SALFORDC__
- return FALSE; // What to do?
+#ifdef __WXWINCE__
+ return (CreateDirectory(dir, NULL) != 0);
#else
- return (wxRmDir(OS_FILENAME(dir)) == 0);
+ return (wxRmDir(OS_FILENAME(dir)) == 0);
#endif
#endif
{
wxString strPath(pszPathName);
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) || defined(__OS2__)
// Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
// so remove all trailing backslashes from the path - but don't do this for
// the pathes "d:\" (which are different from "d:") nor for just "\"
}
#endif // __WINDOWS__
+#ifdef __OS2__
+ // OS/2 can't handle "d:", it wants either "d:\" or "d:."
+ if (strPath.length() == 2 && strPath[1u] == _T(':'))
+ strPath << _T('.');
+#endif
+
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
// stat() can't cope with network paths
DWORD ret = ::GetFileAttributes(strPath);
wxStructStat st;
#ifndef __VISAGECPP__
- return wxStat(pszPathName, &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);
+ return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);
#else
// S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
return wxStat(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR);
if ( buf )
wxStrcpy(buf, filename);
else
- buf = copystring(filename);
+ buf = MYcopystring(filename);
return buf;
}
wxSplitPath(spec, &gs_dirPath, NULL, NULL);
if ( gs_dirPath.IsEmpty() )
gs_dirPath = wxT(".");
- if ( gs_dirPath.Last() != wxFILE_SEP_PATH )
+ if ( !wxEndsWithPathSeparator(gs_dirPath ) )
gs_dirPath << wxFILE_SEP_PATH;
if (gs_dir)
return wxEmptyString;
}
- int dirFlags = 0;
+ int dirFlags;
switch (flags)
{
case wxDIR: dirFlags = wxDIR_DIRS; break;
// copies into buf.
wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
{
+#ifdef __WXWINCE__
+ return NULL;
+#else
if ( !buf )
{
buf = new wxChar[sz + 1];
}
- bool ok = FALSE;
+ bool ok wxDUMMY_INITIALIZE(FALSE);
// for the compilers which have Unicode version of _getcwd(), call it
// directly, for the others call the ANSI version and do the translation
bool needsANSI = TRUE;
#if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
- // This is not legal code as the compiler
+ // This is not legal code as the compiler
// is allowed destroy the wxCharBuffer.
// wxCharBuffer c_buffer(sz);
// char *cbuf = (char*)(const char*)c_buffer;
if ( needsANSI )
#endif // wxUSE_UNICODE
{
- #ifdef _MSC_VER
+ #if defined(_MSC_VER) || defined(__MINGW32__)
ok = _getcwd(cbuf, sz) != NULL;
#elif defined(__WXMAC__) && !defined(__DARWIN__)
FSSpec cwdSpec ;
cwdSpec.parID = pb.ioFCBParID;
cwdSpec.name[0] = 0 ;
wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
-
- strcpy( cbuf , res ) ;
- cbuf[res.length()]=0 ;
-
+ wxStrcpy( buf , res ) ;
ok = TRUE;
}
else
{
ok = FALSE;
}
- #elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__))
+ #elif defined(__OS2__)
APIRET rc;
- rc = ::DosQueryCurrentDir( 0 // current drive
- ,cbuf
- ,(PULONG)&sz
- );
- ok = rc != 0;
+ ULONG ulDriveNum = 0;
+ ULONG ulDriveMap = 0;
+ rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+ ok = rc == 0;
+ if (ok)
+ {
+ sz -= 3;
+ rc = ::DosQueryCurrentDir( 0 // current drive
+ ,cbuf + 3
+ ,(PULONG)&sz
+ );
+ cbuf[0] = 'A' + (ulDriveNum - 1);
+ cbuf[1] = ':';
+ cbuf[2] = '\\';
+ ok = rc == 0;
+ }
#else // !Win32/VC++ !Mac !OS2
ok = getcwd(cbuf, sz) != NULL;
#endif // platform
- #if wxUSE_UNICODE
+ #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__))
// finally convert the result to Unicode if needed
wxConvFile.MB2WC(buf, cbuf, sz);
#endif // wxUSE_UNICODE
#if !wxUSE_UNICODE
#undef cbuf
#endif
+
+#endif
+ // __WXWINCE__
}
wxString wxGetCwd()
wxGetWorkingDirectory(buffer, _MAXPATHLEN);
wxString str( buffer );
delete [] buffer;
-
+
return str;
}
bool wxSetWorkingDirectory(const wxString& d)
{
-#if defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
- return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
-#elif defined(__WXPM__)
- return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+#if defined(__OS2__)
+ return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
+ return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
#elif defined(__WINDOWS__)
-
+
#ifdef __WIN32__
- return (bool)(SetCurrentDirectory(d) != 0);
+#ifdef __WXWINCE__
+ // No equivalent in WinCE
+ return FALSE;
#else
- // Must change drive, too.
- bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
- if (isDriveSpec)
- {
- wxChar firstChar = d[0];
-
- // To upper case
- if (firstChar > 90)
- firstChar = firstChar - 32;
-
- // To a drive number
- unsigned int driveNo = firstChar - 64;
- if (driveNo > 0)
+ return (bool)(SetCurrentDirectory(d) != 0);
+#endif
+#else
+ // Must change drive, too.
+ bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
+ if (isDriveSpec)
{
- unsigned int noDrives;
- _dos_setdrive(driveNo, &noDrives);
+ wxChar firstChar = d[0];
+
+ // To upper case
+ if (firstChar > 90)
+ firstChar = firstChar - 32;
+
+ // To a drive number
+ unsigned int driveNo = firstChar - 64;
+ if (driveNo > 0)
+ {
+ unsigned int noDrives;
+ _dos_setdrive(driveNo, &noDrives);
+ }
}
- }
- bool success = (chdir(WXSTRINGCAST d) == 0);
-
- return success;
+ bool success = (chdir(WXSTRINGCAST d) == 0);
+
+ return success;
#endif
-
+
#endif
}
// On non-Windows platform, probably just return the empty string.
wxString wxGetOSDirectory()
{
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+#ifdef __WXWINCE__
+ return wxString(wxT("\\Windows"));
+#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
wxChar buf[256];
GetWindowsDirectory(buf, 256);
return wxString(buf);
+#elif defined(__WXMAC__)
+ return wxMacFindFolder(kOnSystemDisk, 'macs', false);
#else
return wxEmptyString;
#endif
return len && wxIsPathSeparator(pszFileName[len - 1]);
}
-// find a file in a list of directories, returns false if not found
+// 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
strFile += wxFILE_SEP_PATH;
strFile += pszFile;
- if ( FileExists(strFile) ) {
+ if ( wxFileExists(strFile) ) {
*pStr = strFile;
break;
}
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,
time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
{
+#ifdef __WXWINCE__
+ FILETIME creationTime, lastAccessTime, lastWriteTime;
+ HANDLE fileHandle = ::CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
+ 0, FILE_ATTRIBUTE_NORMAL, 0);
+ if (fileHandle == INVALID_HANDLE_VALUE)
+ return 0;
+ else
+ {
+ if (GetFileTime(fileHandle, & creationTime, & lastAccessTime, & lastWriteTime))
+ {
+ CloseHandle(fileHandle);
+
+ wxDateTime dateTime;
+ FILETIME ftLocal;
+ if ( !::FileTimeToLocalFileTime(&lastWriteTime, &ftLocal) )
+ {
+ wxLogLastError(_T("FileTimeToLocalFileTime"));
+ }
+
+ SYSTEMTIME st;
+ if ( !::FileTimeToSystemTime(&ftLocal, &st) )
+ {
+ wxLogLastError(_T("FileTimeToSystemTime"));
+ }
+
+ dateTime.Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
+ st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+ return dateTime.GetTicks();
+ }
+ else
+ return 0;
+ }
+#else
wxStructStat buf;
wxStat( filename, &buf);
-
+
return buf.st_mtime;
+#endif
}
bool wxIsWild( const wxString& pattern )
{
- wxString tmp = pattern;
- wxChar *pat = WXSTRINGCAST(tmp);
- while (*pat) {
- switch (*pat++) {
+ wxString tmp = pattern;
+ wxChar *pat = WXSTRINGCAST(tmp);
+ while (*pat)
+ {
+ switch (*pat++)
+ {
case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
return TRUE;
case wxT('\\'):
}
}
return FALSE;
-};
-
-bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
-
-#ifdef HAVE_FNMATCH
-{
-// 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 // !HAVE_FNMATCH
-// #pragma error Broken implementation of wxMatchWild() -- needs fixing!
+/*
+* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
+*
+* The match procedure is public domain code (from ircII's reg.c)
+*/
- /*
- * WARNING: this code is broken!
- */
+bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
{
- 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 = wxT('{'), CB = wxT('}');
-
- // dot_special means '.' only matches '.'
- if (dot_special && *str == wxT('.') && *pattern != *str)
- return FALSE;
+ if (text.empty())
+ {
+ /* Match if both are empty. */
+ return pat.empty();
+ }
- while ((*pattern != wxT('\0')) && (!done)
- && (((*str==wxT('\0'))&&((*pattern==OB)||(*pattern==wxT('*'))))||(*str!=wxT('\0')))) {
- switch (*pattern) {
- case wxT('\\'):
- pattern++;
- if (*pattern != wxT('\0'))
- pattern++;
- break;
- case wxT('*'):
- pattern++;
- ret_code = FALSE;
- while ((*str!=wxT('\0'))
- && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0))
- /*loop*/;
- if (ret_code) {
- while (*str != wxT('\0'))
- str++;
- while (*pattern != wxT('\0'))
- pattern++;
- }
- break;
- case wxT('['):
- pattern++;
- repeat:
- if ((*pattern == wxT('\0')) || (*pattern == wxT(']'))) {
- done = TRUE;
- break;
- }
- if (*pattern == wxT('\\')) {
- pattern++;
- if (*pattern == wxT('\0')) {
- done = TRUE;
- break;
- }
- }
- if (*(pattern + 1) == wxT('-')) {
- c = *pattern;
- pattern += 2;
- if (*pattern == wxT(']')) {
- done = TRUE;
- break;
- }
- if (*pattern == wxT('\\')) {
- pattern++;
- if (*pattern == wxT('\0')) {
- done = TRUE;
- break;
- }
- }
- if ((*str < c) || (*str > *pattern)) {
- pattern++;
- goto repeat;
+ const wxChar *m = pat.c_str(),
+ *n = text.c_str(),
+ *ma = NULL,
+ *na = NULL,
+ *mp = NULL,
+ *np = NULL;
+ int just = 0,
+ pcount = 0,
+ acount = 0,
+ count = 0;
+
+ if (dot_special && (*n == wxT('.')))
+ {
+ /* Never match so that hidden Unix files
+ * are never found. */
+ return FALSE;
+ }
+
+ for (;;)
+ {
+ if (*m == wxT('*'))
+ {
+ ma = ++m;
+ na = n;
+ just = 1;
+ mp = NULL;
+ acount = count;
}
- } else if (*pattern != *str) {
- pattern++;
- goto repeat;
- }
- pattern++;
- while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) {
- if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0')))
- pattern++;
- pattern++;
- }
- if (*pattern != wxT('\0')) {
- pattern++, str++;
- }
- break;
- case wxT('?'):
- pattern++;
- str++;
- break;
- case OB:
- pattern++;
- while ((*pattern != CB) && (*pattern != wxT('\0'))) {
- cp = str;
- ok = TRUE;
- while (ok && (*cp != wxT('\0')) && (*pattern != wxT('\0'))
- && (*pattern != wxT(',')) && (*pattern != CB)) {
- if (*pattern == wxT('\\'))
- pattern++;
- ok = (*pattern++ == *cp++);
+ else if (*m == wxT('?'))
+ {
+ m++;
+ if (!*n++)
+ return FALSE;
}
- if (*pattern == wxT('\0')) {
- ok = FALSE;
- done = TRUE;
- break;
- } else if (ok) {
- str = cp;
- while ((*pattern != CB) && (*pattern != wxT('\0'))) {
- if (*++pattern == wxT('\\')) {
- if (*++pattern == CB)
- pattern++;
+ else
+ {
+ if (*m == wxT('\\'))
+ {
+ m++;
+ /* Quoting "nothing" is a bad thing */
+ if (!*m)
+ return FALSE;
+ }
+ if (!*m)
+ {
+ /*
+ * If we are out of both strings or we just
+ * saw a wildcard, then we can say we have a
+ * match
+ */
+ if (!*n)
+ return TRUE;
+ if (just)
+ return TRUE;
+ just = 0;
+ goto not_matched;
+ }
+ /*
+ * We could check for *n == NULL at this point, but
+ * since it's more common to have a character there,
+ * check to see if they match first (m and n) and
+ * then if they don't match, THEN we can check for
+ * the NULL of n
+ */
+ just = 0;
+ if (*m == *n)
+ {
+ m++;
+ if (*n == wxT(' '))
+ mp = NULL;
+ count++;
+ n++;
}
- }
- } else {
- while (*pattern!=CB && *pattern!=wxT(',') && *pattern!=wxT('\0')) {
- if (*++pattern == wxT('\\')) {
- if (*++pattern == CB || *pattern == wxT(','))
- pattern++;
+ else
+ {
+
+ not_matched:
+
+ /*
+ * If there are no more characters in the
+ * string, but we still need to find another
+ * character (*m != NULL), then it will be
+ * impossible to match it
+ */
+ if (!*n)
+ return FALSE;
+ if (mp)
+ {
+ m = mp;
+ if (*np == wxT(' '))
+ {
+ mp = NULL;
+ goto check_percent;
+ }
+ n = ++np;
+ count = pcount;
+ }
+ else
+ check_percent:
+
+ if (ma)
+ {
+ m = ma;
+ n = ++na;
+ count = acount;
+ }
+ else
+ return FALSE;
}
- }
}
- if (*pattern != wxT('\0'))
- pattern++;
- }
- break;
- default:
- if (*str == *pattern) {
- str++, pattern++;
- } else {
- done = TRUE;
- }
}
- }
- while (*pattern == wxT('*'))
- pattern++;
- return ((*str == wxT('\0')) && (*pattern == wxT('\0')));
-};
+}
-#endif // HAVE_FNMATCH/!HAVE_FNMATCH
#ifdef __VISUALC__
#pragma warning(default:4706) // assignment within conditional expression
projects / wxWidgets.git / blobdiff