#pragma hdrstop
#endif
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
#include "wx/utils.h"
#include "wx/intl.h"
+#include "wx/file.h"
+#include "wx/filename.h"
// there are just too many of those...
#ifdef __VISUALC__
#else
#include <stat.h>
#include <unistd.h>
+ #include <unix.h>
#endif
#ifdef __UNIX__
#include <dirent.h>
#endif
-#ifdef __OS2__
- #include <direct.h>
+#ifdef __WXPM__
#include <process.h>
+ #include "wx/os2/private.h"
#endif
#ifdef __WINDOWS__
#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
#include <direct.h>
#include <dos.h>
+ #include <io.h>
#endif // __WINDOWS__
#endif // native Win compiler
#ifdef __GNUWIN32__
+ #include <wchar.h>
#ifndef __TWIN32__
#include <sys/unistd.h>
#endif
#endif
#ifdef __WINDOWS__
- #include "windows.h"
+ #include <windows.h>
#endif
// ----------------------------------------------------------------------------
#define _MAXPATHLEN 500
-extern char *wxBuffer;
+extern wxChar *wxBuffer;
#ifdef __WXMAC__
-
-#include "morefile.h"
-#include "moreextr.h"
-#include "fullpath.h"
-#include "fspcompa.h"
+# include "MoreFiles.h"
+# include "MoreFilesExtras.h"
+# include "FullPath.h"
+# include "FSpCompat.h"
#endif
-#if !USE_SHARED_LIBRARIES
- IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
// ----------------------------------------------------------------------------
// private globals
static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+//
+// VisualAge C++ V4.0 cannot have any external linkage const decs
+// in headers included by more than one primary source
+//
+const off_t wxInvalidOffset = (off_t)-1;
+#endif
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// we need to translate Mac filenames before passing them to OS functions
+#if defined(__WXMAC__) && defined(__DARWIN__)
+ #define OS_FILENAME(s) wxMac2UnixFilename(s.fn_str())
+#else
+ #define OS_FILENAME(s) (s.fn_str())
+#endif
+
// ============================================================================
// implementation
// ============================================================================
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;
- if (filename && stat (wxUnix2MacFilename(filename), &stbuf) == 0 )
- return TRUE;
- return FALSE ;
-#else
-
-#ifdef __SALFORDC__
- struct _stat stbuf;
+#ifdef __WINDOWS__
+ // GetFileAttributes can copy with network paths
+ DWORD ret = GetFileAttributes(filename);
+ DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY);
+ return ((ret != 0xffffffff) && (isDir == 0));
#else
- struct stat stbuf;
-#endif
+ wxStructStat stbuf;
+ if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 )
+ return TRUE;
- if ((filename != wxT("")) && stat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0)
- return TRUE;
- return FALSE;
+ return FALSE;
#endif
}
-/* Vadim's alternative implementation
-
-// does the file exist?
-bool wxFileExists(const char *pszFileName)
-{
- struct stat st;
- return !access(pszFileName, 0) &&
- !stat(pszFileName, &st) &&
- (st.st_mode & S_IFREG);
-}
-*/
-
bool
wxIsAbsolutePath (const wxString& filename)
{
+#ifdef __WXMAC__
+ if (filename != wxT(""))
+ {
+ // This seems wrong to me, but there is no fix. since
+ // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
+ // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
+
+ if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
+ return TRUE ;
+ }
+ return FALSE ;
+#else
if (filename != wxT(""))
{
if (filename[0] == wxT('/')
return TRUE;
}
return FALSE;
+#endif
}
/*
{
register wxChar *d, *s, *nm;
wxChar lnm[_MAXPATHLEN];
- int q;
+ int q;
// Some compilers don't like this line.
// const wxChar trimchars[] = wxT("\n \t");
}
else
#else
- while ((*d++ = *s)) {
+ while ((*d++ = *s) != 0) {
# ifndef __WXMSW__
if (*s == wxT('\\')) {
if ((*(d - 1) = *++s)) {
register wxChar *start = d;
register int braces = (*s == wxT('{') || *s == wxT('('));
register wxChar *value;
-#ifdef __VISAGECPP__
- // VA gives assignment in logical expr warning
- while (*d)
- *d++ = *s;
-#else
- while ((*d++ = *s))
-#endif
+ while ((*d++ = *s) != 0)
if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
break;
else
*--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
+ for ((d = start - 1); (*d++ = *value++) != 0;);
d--;
if (braces && *s)
s++;
/* prefix ~ */
if (nm[1] == SEP || nm[1] == 0)
{ /* ~/filename */
- // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+ // FIXME: wxGetUserHome could return temporary storage in Unicode mode
if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
if (*++nm)
nm++;
was_sep = (*s == SEP);
nnm = *s ? s + 1 : s;
*s = 0;
- // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+ // 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;
*(d - 1) = SEP;
}
s = nm;
-#ifdef __VISAGECPP__
- // VA gives assignment in logical expr warning
- while (*d)
- *d++ = *s++;
-#else
- while ((*d++ = *s++));
-#endif
+ while ((*d++ = *s++) != 0);
delete[] nm_tmp; // clean up alloc
/* Now clean up the buffer */
return wxRealPath(buf);
}
-
/* Contract Paths to be build upon an environment variable
component:
tcp = path + wxStrlen (path);
while (--tcp >= path)
{
+#ifdef __WXMAC__
+ if (*tcp == wxT(':') )
+#else
if (*tcp == wxT('/') || *tcp == wxT('\\')
#ifdef __VMS__
|| *tcp == wxT(':') || *tcp == wxT(']'))
#else
)
+#endif
#endif
return tcp + 1;
} /* while */
tcp = path + wxStrlen (path);
while (--tcp >= path)
{
+#ifdef __WXMAC__
+ if (*tcp == wxT(':') )
+#else
if (*tcp == wxT('/') || *tcp == wxT('\\')
#ifdef __VMS__
|| *tcp == wxT(':') || *tcp == wxT(']'))
#else
)
+#endif
#endif
return wxString(tcp + 1);
} /* while */
while (!done && i > -1)
{
// ] is for VMS
+#ifdef __WXMAC__
+ if (path[i] == wxT(':') )
+#else
if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+#endif
{
done = TRUE;
#ifdef __VMS__
- buf[i+1] = 0;
-#else
- buf[i] = 0;
+ if ( path[i] == wxT(']') )
+ buf[i+1] = 0;
+ else
#endif
+ buf[i] = 0;
return buf;
}
while (!done && i > -1)
{
// ] is for VMS
+#ifdef __WXMAC__
+ if (path[i] == wxT(':') )
+#else
if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+#endif
{
done = TRUE;
#ifdef __VMS__
- buf[i+1] = 0;
-#else
- buf[i] = 0;
+ if ( path[i] == wxT(']') )
+ buf[i+1] = 0;
+ else
#endif
+ buf[i] = 0;
return wxString(buf);
}
// and back again - or we get nasty problems with delimiters.
// Also, convert to lower case, since case is significant in UNIX.
-#ifdef __WXMAC__
+#if defined(__WXMAC__)
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
+{
+ Handle myPath ;
+ short length ;
+
+ FSpGetFullPath( spec , &length , &myPath ) ;
+ ::SetHandleSize( myPath , length + 1 ) ;
+ ::HLock( myPath ) ;
+ (*myPath)[length] = 0 ;
+ if ( length > 0 && (*myPath)[length-1] ==':' )
+ (*myPath)[length-1] = 0 ;
+
+ wxString result( (char*) *myPath ) ;
+ ::HUnlock( myPath ) ;
+ ::DisposeHandle( myPath ) ;
+ return result ;
+}
+
+void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+{
+ FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+}
static char sMacFileNameConversion[ 1000 ] ;
wxString wxMac2UnixFilename (const char *str)
{
- char *s = sMacFileNameConversion ;
- strcpy( s , str ) ;
+ char *s = sMacFileNameConversion ;
+ strcpy( s , str ) ;
if (s)
{
memmove( s+1 , s ,strlen( s ) + 1) ;
wxString wxUnix2MacFilename (const char *str)
{
- char *s = sMacFileNameConversion ;
- strcpy( s , str ) ;
+ char *s = sMacFileNameConversion ;
+ strcpy( s , str ) ;
if (s)
{
if ( *s == '.' )
{
if (*s == '/' || *s == '\\')
{
- // convert any back-directory situations
- if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
- {
+ // convert any back-directory situations
+ if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
+ {
*s = ':';
- memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ;
- }
- else
+ memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ;
+ }
+ else
*s = ':';
}
return wxString (sMacFileNameConversion) ;
}
-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
- Handle myPath ;
- short length ;
-
- FSpGetFullPath( spec , &length , &myPath ) ;
- ::SetHandleSize( myPath , length + 1 ) ;
- ::HLock( myPath ) ;
- (*myPath)[length] = 0 ;
- if ( length > 0 && (*myPath)[length-1] ==':' )
- (*myPath)[length-1] = 0 ;
-
- wxString result( (char*) *myPath ) ;
- ::HUnlock( myPath ) ;
- ::DisposeHandle( myPath ) ;
- return result ;
-}
-
wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
{
- return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
-}
-
-void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
-{
- FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+ return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
}
void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
{
- wxString var = wxUnix2MacFilename( path ) ;
- wxMacFilename2FSSpec( var , spec ) ;
+ wxString var = wxUnix2MacFilename( path ) ;
+ wxMacFilename2FSSpec( var , spec ) ;
}
#endif
void
#if defined(__WXMSW__) || defined(__WXPM__)
-wxUnix2DosFilename (char *s)
+wxUnix2DosFilename (wxChar *s)
#else
-wxUnix2DosFilename (char *WXUNUSED(s) )
+wxUnix2DosFilename (wxChar *WXUNUSED(s) )
#endif
{
// Yes, I really mean this to happen under DOS only! JACS
bool
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
{
- wxChar *outfile = wxGetTempFileName("cat");
+ wxString outfile;
+ if ( !wxGetTempFileName("cat", outfile) )
+ return FALSE;
FILE *fp1 = (FILE *) NULL;
FILE *fp2 = (FILE *) NULL;
FILE *fp3 = (FILE *) NULL;
// Open the inputs and outputs
-#ifdef __WXMAC__
- if ((fp1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL ||
- (fp2 = fopen (wxUnix2MacFilename( file2 ), "rb")) == NULL ||
- (fp3 = fopen (wxUnix2MacFilename( outfile ), "wb")) == NULL)
-#else
- if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
- (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
- (fp3 = fopen (outfile, "wb")) == NULL)
-#endif
+ if ((fp1 = wxFopen (OS_FILENAME( file1 ), wxT("rb"))) == NULL ||
+ (fp2 = wxFopen (OS_FILENAME( file2 ), wxT("rb"))) == NULL ||
+ (fp3 = wxFopen (OS_FILENAME( outfile ), wxT("wb"))) == NULL)
{
if (fp1)
fclose (fp1);
fclose (fp3);
bool result = wxRenameFile(outfile, file3);
- delete[] outfile;
return result;
}
// Copy files
bool
-wxCopyFile (const wxString& file1, const wxString& file2)
+wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{
- FILE *fd1;
- FILE *fd2;
- int ch;
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+ // CopyFile() copies file attributes and modification time too, so use it
+ // instead of our code if available
+ //
+ // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
+ return ::CopyFile(file1, file2, !overwrite) != 0;
+#elif defined(__WXPM__)
+ if (::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) == 0)
+ return TRUE;
+ else
+ return FALSE;
+#else // !Win32
+ wxStructStat fbuf;
-#ifdef __WXMAC__
- if ((fd1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL)
- return FALSE;
- if ((fd2 = fopen (wxUnix2MacFilename( file2 ), "wb")) == NULL)
-#else
- if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL)
- return FALSE;
- if ((fd2 = fopen (WXSTRINGCAST file2, "wb")) == NULL)
-#endif
+ // get permissions of file1
+ if ( wxStat(OS_FILENAME(file1), &fbuf) != 0 )
{
- fclose (fd1);
- return FALSE;
+ // the file probably doesn't exist or we haven't the rights to read
+ // from it anyhow
+ wxLogSysError(_("Impossible to get permissions for file '%s'"),
+ file1.c_str());
+ return FALSE;
+ }
+
+ // open file1 for reading
+ wxFile fileIn(file1, wxFile::read);
+ if ( !fileIn.IsOpened() )
+ return FALSE;
+
+ // remove file2, if it exists. This is needed for creating
+ // file2 with the correct permissions in the next step
+ if ( wxFileExists(file2) && (!overwrite || !wxRemoveFile(file2)))
+ {
+ wxLogSysError(_("Impossible to overwrite the file '%s'"),
+ file2.c_str());
+ return FALSE;
+ }
+
+#ifdef __UNIX__
+ // reset the umask as we want to create the file with exactly the same
+ // permissions as the original one
+ mode_t oldUmask = umask( 0 );
+#endif // __UNIX__
+
+ // 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;
+
+#ifdef __UNIX__
+ /// restore the old umask
+ umask(oldUmask);
+#endif // __UNIX__
+
+ // copy contents of file1 to file2
+ char buf[4096];
+ size_t count;
+ for ( ;; )
+ {
+ count = fileIn.Read(buf, WXSIZEOF(buf));
+ if ( fileIn.Error() )
+ return FALSE;
+
+ // end of file?
+ if ( !count )
+ break;
+
+ if ( fileOut.Write(buf, count) < count )
+ return FALSE;
}
- while ((ch = getc (fd1)) != EOF)
- (void) putc (ch, fd2);
+ // we can expect fileIn to be closed successfully, but we should ensure
+ // that fileOut was closed as some write errors (disk full) might not be
+ // detected before doing this
+ if ( !fileIn.Close() || !fileOut.Close() )
+ return FALSE;
- fclose (fd1);
- fclose (fd2);
- return TRUE;
+#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
+ // no chmod in VA. Should be some permission API for HPFS386 partitions
+ // however
+ if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )
+ {
+ wxLogSysError(_("Impossible to set permissions for the file '%s'"),
+ file2.c_str());
+ return FALSE;
+ }
+#endif // OS/2 || Mac
+
+ return TRUE;
+#endif // __WXMSW__ && __WIN32__
}
bool
wxRenameFile (const wxString& file1, const wxString& file2)
{
-#ifdef __WXMAC__
- if (0 == rename (wxUnix2MacFilename( file1 ), wxUnix2MacFilename( file2 )))
- return TRUE;
-#else
// Normal system call
- if (0 == rename (wxFNSTRINGCAST file1.fn_str(), wxFNSTRINGCAST file2.fn_str()))
+ if ( wxRename (file1, file2) == 0 )
return TRUE;
-#endif
+
// Try to copy
if (wxCopyFile(file1, file2)) {
wxRemoveFile(file1);
bool wxRemoveFile(const wxString& file)
{
-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
- int flag = remove(wxFNSTRINGCAST file.fn_str());
-#elif defined( __WXMAC__ )
- int flag = unlink(wxUnix2MacFilename( file ));
+#if defined(__VISUALC__) \
+ || defined(__BORLANDC__) \
+ || defined(__WATCOMC__) \
+ || defined(__GNUWIN32__)
+ int res = wxRemove(file);
#else
- int flag = unlink(wxFNSTRINGCAST file.fn_str());
+ int res = unlink(OS_FILENAME(file));
#endif
- return (flag == 0) ;
+
+ return res == 0;
}
bool wxMkdir(const wxString& dir, int perm)
{
-#if defined( __WXMAC__ )
- return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0);
+#if defined(__WXMAC__) && !defined(__UNIX__)
+ return (mkdir( 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(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
+#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__)
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
-#else // MSW and OS/2
- if ( mkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+#elif defined(__WXPM__)
+ if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
+#else // !MSW and !OS/2 VAC++
+ (void)perm;
+ if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
#endif // !MSW/MSW
{
wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
{
#ifdef __VMS__
- return FALSE;
-#elif defined( __WXMAC__ )
- return (rmdir(wxUnix2MacFilename( dir )) == 0);
+ return FALSE; //to be changed since rmdir exists in VMS7.x
+#elif defined(__WXPM__)
+ return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
#else
#ifdef __SALFORDC__
return FALSE; // What to do?
#else
- return (rmdir(wxFNSTRINGCAST dir.fn_str()) == 0);
+ return (wxRmDir(OS_FILENAME(dir)) == 0);
#endif
#endif
}
-#if 0
-bool wxDirExists(const wxString& dir)
+// does the path exists? (may have or not '/' or '\\' at the end)
+bool wxPathExists(const wxChar *pszPathName)
{
-#ifdef __VMS__
- return FALSE;
-#elif !defined(__WXMSW__)
- struct stat sbuf;
- 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 */
-#if defined(__WIN32__)
- WIN32_FIND_DATA fileInfo;
-#else
-#ifdef __BORLANDC__
- struct ffblk fileInfo;
-#else
- struct find_t fileInfo;
-#endif
-#endif
+ wxString strPath(pszPathName);
+#ifdef __WINDOWS__
+ // 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 "\"
+ while ( wxEndsWithPathSeparator(strPath) )
+ {
+ size_t len = strPath.length();
+ if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) )
+ break;
-#if defined(__WIN32__)
- HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
+ strPath.Truncate(len - 1);
+ }
+#endif // __WINDOWS__
- 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
- // _should_ be ok in both MS and Borland... why not?
-#ifdef __BORLANDC__
- return ((findfirst(WXSTRINGCAST dir, &fileInfo, _A_SUBDIR) == 0 && (fileInfo.ff_attrib & _A_SUBDIR) != 0));
+#ifdef __WINDOWS__
+ // Stat can't cope with network paths
+ DWORD ret = GetFileAttributes(strPath.c_str());
+ DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY);
+ return ((ret != 0xffffffff) && (isDir != 0));
#else
- return (((_dos_findfirst(WXSTRINGCAST dir, _A_SUBDIR, &fileInfo) == 0) && (fileInfo.attrib & _A_SUBDIR)) != 0);
-#endif
-#endif
-
-#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. */
- wxString strPath(pszPathName);
- if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != wxT('\0') )
- strPath.Last() = wxT('\0');
-#ifdef __SALFORDC__
- struct _stat st;
+ wxStructStat st;
+#ifndef __VISAGECPP__
+ return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
+ ((st.st_mode & S_IFMT) == S_IFDIR);
#else
- struct stat st;
+ // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
+ return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
+ (st.st_mode == S_IFDIR);
#endif
- return stat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR);
+#endif
}
// Get a temporary filename, opening and closing the file.
wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
{
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
#ifndef __WIN32__
wxChar tmp[144];
#endif
}
+bool wxGetTempFileName(const wxString& prefix, wxString& buf)
+{
+ wxChar buf2[512];
+ if (wxGetTempFileName(prefix, buf2) != (wxChar*) NULL)
+ {
+ buf = buf2;
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
// Get first file name matching given wild card.
#ifdef __UNIX__
// Get first file name matching given wild card.
// Flags are reserved for future use.
-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
static DIR *gs_dirStream = (DIR *) NULL;
static wxString gs_strFileSpec;
static int gs_findFlags = 0;
wxString wxFindFirstFile(const wxChar *spec, int flags)
{
wxString result;
+#ifdef __VMS
+ wxChar *specvms = NULL;
+#endif
-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
if (gs_dirStream)
closedir(gs_dirStream); // edz 941103: better housekeping
// special case: path is really "/"
if ( !path && gs_strFileSpec[0u] == wxT('/') )
- path = wxT('/');
- // path is empty => Local directory
+#ifdef __VMS
+ {
+ wxStrcpy( specvms , wxT( "[000000]" ) );
+ gs_strFileSpec = specvms;
+ wxString path_vms(wxPathOnly(gs_strFileSpec));
+ path = path_vms;
+ }
+#else
+ path = wxT('/');
+#endif
+ // path is empty => Local directory
if ( !path )
- path = wxT('.');
+#ifdef __VMS
+ {
+ wxStrcpy( specvms , wxT( "[]" ) );
+ gs_strFileSpec = specvms;
+ wxString path_vms1(wxPathOnly(gs_strFileSpec));
+ path = path_vms1;
+ }
+#else
+ path = wxT('.');
+#endif
gs_dirStream = opendir(path.fn_str());
if ( !gs_dirStream )
{
result = wxFindNextFile();
}
-#endif // !VMS
+#endif // !VMS6.x or earlier
return result;
}
{
wxString result;
-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") );
// Find path only so we can concatenate
nextDir != NULL;
nextDir = readdir(gs_dirStream) )
{
- if (wxMatchWild(name, nextDir->d_name))
+ if (wxMatchWild(name, nextDir->d_name, FALSE) && // RR: added FALSE to find hidden files
+ strcmp(nextDir->d_name, ".") &&
+ strcmp(nextDir->d_name, "..") )
{
result.Empty();
if ( !path.IsEmpty() )
closedir(gs_dirStream);
gs_dirStream = (DIR *) NULL;
-#endif // !VMS
+#endif // !VMS6.2 or earlier
return result;
}
+#elif defined(__WXMAC__)
+
+struct MacDirectoryIterator
+{
+ CInfoPBRec m_CPB ;
+ wxInt16 m_index ;
+ long m_dirId ;
+ Str255 m_name ;
+} ;
+
+static int g_iter_flags ;
+
+static MacDirectoryIterator g_iter ;
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+ wxString result;
+
+ g_iter_flags = flags; /* MATTHEW: [5] Remember flags */
+
+ // Find path only so we can concatenate found file onto path
+ wxString path(wxPathOnly(spec));
+ if ( !path.IsEmpty() )
+ result << path << wxT('\\');
+
+ FSSpec fsspec ;
+
+ wxMacFilename2FSSpec( result , &fsspec ) ;
+ g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
+ g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
+ g_iter.m_index = 0 ;
+
+ Boolean isDir ;
+ FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ;
+ if ( !isDir )
+ return wxEmptyString ;
+
+ return wxFindNextFile( ) ;
+}
+
+wxString wxFindNextFile()
+{
+ wxString result;
+
+ short err = noErr ;
+
+ while ( err == noErr )
+ {
+ g_iter.m_index++ ;
+ g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index;
+ g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId; /* we need to do this every time */
+ err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB);
+ if ( err != noErr )
+ break ;
+
+ if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) // we have a directory
+ break ;
+
+ if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
+ continue ;
+
+ // hit !
+ break ;
+ }
+ if ( err != noErr )
+ {
+ return wxEmptyString ;
+ }
+ FSSpec spec ;
+
+ FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum,
+ g_iter.m_dirId,
+ g_iter.m_name,
+ &spec) ;
+
+ return wxMacFSSpec2MacFilename( &spec ) ;
+}
+
#elif defined(__WXMSW__)
#ifdef __WIN32__
result += gs_findDataStruct.cFileName;
return result;
-#else
+#else // !Win32
int flag = _A_NORMAL;
- if (flags & wxDIR) /* MATTHEW: [5] Use & */
+ if (flags & wxDIR)
flag = _A_SUBDIR;
#ifdef __BORLANDC__
if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
#endif
{
- /* MATTHEW: [5] Check directory flag */
char attrib;
#ifdef __BORLANDC__
#endif
;
}
-#endif // __WIN32__
return result;
+#endif // __WIN32__
}
+
wxString wxFindNextFile()
{
wxString result;
#endif
;
}
+
+ return result;
#endif // Win32/16
+}
+
+#elif defined(__WXPM__)
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+ wxString result;
+
+ /*
+ // TODO: figure something out here for OS/2
+ gs_strFileSpec = spec;
+ gs_findFlags = flags;
+
+ // Find path only so we can concatenate found file onto path
+ wxString path(wxPathOnly(gs_strFileSpec));
+ if ( !path.IsEmpty() )
+ result << path << wxT('\\');
+
+ int flag = _A_NORMAL;
+ if (flags & wxDIR)
+ flag = _A_SUBDIR;
+
+ if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
+ {
+ char attrib;
+ attrib = gs_findDataStruct.attrib;
+
+ if (attrib & _A_SUBDIR) {
+ if (!(gs_findFlags & wxDIR))
+ return wxFindNextFile();
+ } else if (gs_findFlags && !(gs_findFlags & wxFILE))
+ return wxFindNextFile();
+
+ result += gs_findDataStruct.name;
+ }
+ */
+ return result;
+}
+wxString wxFindNextFile()
+{
+ wxString result;
+ // TODO:
return result;
}
-#endif // Unix/Windows
+#endif // Unix/Windows/OS/2
// Get current working directory.
// If buf is NULL, allocates space using new, else
char *cbuf = new char[sz+1];
#ifdef _MSC_VER
if (_getcwd(cbuf, sz) == NULL) {
-#elif defined( __WXMAC__)
- enum
- {
- SFSaveDisk = 0x214, CurDirStore = 0x398
- };
- FSSpec cwdSpec ;
-
- FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
- wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
- strcpy( buf , res ) ;
- if (0)
+#elif defined(__WXMAC__)
+ enum
+ {
+ SFSaveDisk = 0x214, CurDirStore = 0x398
+ };
+ FSSpec cwdSpec ;
+
+ FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+ wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+ strcpy( buf , res ) ;
+ if (0) {
#else
if (getcwd(cbuf, sz) == NULL) {
#endif
delete [] cbuf;
-#else
+#else // wxUnicode
#ifdef _MSC_VER
if (_getcwd(buf, sz) == NULL) {
+#elif defined(__WXMAC__) && !defined(__UNIX__)
+ FSSpec cwdSpec ;
+ FCBPBRec pb;
+ OSErr error;
+ Str255 fileName ;
+ pb.ioNamePtr = (StringPtr) &fileName;
+ pb.ioVRefNum = 0;
+ pb.ioRefNum = LMGetCurApRefNum();
+ pb.ioFCBIndx = 0;
+ error = PBGetFCBInfoSync(&pb);
+ if ( error == noErr )
+ {
+ cwdSpec.vRefNum = pb.ioFCBVRefNum;
+ cwdSpec.parID = pb.ioFCBParID;
+ cwdSpec.name[0] = 0 ;
+ wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
+
+ strcpy( buf , res ) ;
+ buf[res.length()]=0 ;
+ }
+ else
+ buf[0] = 0 ;
+ /*
+ this version will not always give back the application directory on mac
+ enum
+ {
+ SFSaveDisk = 0x214, CurDirStore = 0x398
+ };
+ FSSpec cwdSpec ;
+
+ FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+ wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+ strcpy( buf , res ) ;
+ */
+ if (0) {
+#elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__))
+ APIRET rc;
+ rc = ::DosQueryCurrentDir( 0 // current drive
+ ,buf
+ ,(PULONG)&sz
+ );
+ if (rc != 0) {
#else
if (getcwd(buf, sz) == NULL) {
#endif
bool wxSetWorkingDirectory(const wxString& d)
{
-#if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__)
+#if defined( __UNIX__ ) || defined( __WXMAC__ )
return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
+#elif defined(__WXPM__)
+ return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
#elif defined(__WINDOWS__)
#ifdef __WIN32__
// On non-Windows platform, probably just return the empty string.
wxString wxGetOSDirectory()
{
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
wxChar buf[256];
GetWindowsDirectory(buf, 256);
return wxString(buf);
{
// we assume that it's not empty
wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
- _("empty file name in wxFindFileInPath"));
+ _T("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present
if ( wxIsPathSeparator(*pszFile) )
// it can be empty, but it shouldn't be NULL
wxCHECK_RET( pszFileName, wxT("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);
+ wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+}
- *pstrName = wxString(start, end - start);
- }
+time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+{
+ wxStructStat buf;
- if ( pstrExt )
- {
- if ( pDot )
- *pstrExt = wxString(pDot + 1);
- else
- pstrExt->Empty();
- }
+ wxStat(filename.fn_str(), &buf);
+ return buf.st_mtime;
}
+
//------------------------------------------------------------------------
// wild character routines
//------------------------------------------------------------------------
pattern++;
ret_code = FALSE;
while ((*str!=wxT('\0'))
- && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+ && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0))
/*loop*/;
if (ret_code) {
while (*str != wxT('\0'))
projects / wxWidgets.git / blobdiff