#include "wx/utils.h"
#include "wx/intl.h"
-#include "wx/file.h"
+#include "wx/file.h" // This does include filefn.h
#include "wx/filename.h"
#include "wx/dir.h"
#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
-
-#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 __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
-
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__)
- #include <direct.h>
- #include <dos.h>
- #include <io.h>
-#endif // __WINDOWS__
-#endif // native Win compiler
-
-#if defined(__DOS__)
- #ifdef __WATCOMC__
- #include <direct.h>
- #include <dos.h>
- #include <io.h>
- #endif
- #ifdef __DJGPP__
- #include <unistd.h>
- #endif
-#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 <dir.h>
-#endif
-
-#ifdef __SALFORDC__
- #include <dir.h>
- #include <unix.h>
-#endif
-
#include "wx/log.h"
// No, Cygwin doesn't appear to have fnmatch.h after all.
#endif
#ifdef __WINDOWS__
- #include "wx/msw/wrapwin.h"
+ #include "wx/msw/private.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>
#include <sys/cygwin.h>
#endif
#endif // __GNUWIN32__
+
+ // io.h is needed for _get_osfhandle()
+ // Already included by filefn.h for many Windows compilers
+ #if defined __MWERKS__ || defined __CYGWIN__
+ #include <io.h>
+ #endif
#endif // __WINDOWS__
+#if defined(__VMS__)
+ #include <fab.h>
+#endif
+
// TODO: Borland probably has _wgetcwd as well?
#ifdef _MSC_VER
#define HAVE_WGETCWD
#endif
#ifdef __WXMAC__
-# ifdef __DARWIN__
# include "MoreFilesX.h"
-# else
-# include "MoreFiles.h"
-# include "MoreFilesExtras.h"
-# include "FullPath.h"
-# include "FSpCompat.h"
-# endif
#endif
// ----------------------------------------------------------------------------
// 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;
+const int wxInvalidOffset = -1;
#endif
// ----------------------------------------------------------------------------
delete [] s;
}
-#endif
+#else // __WXWINCE__
+ wxUnusedVar(envVariable);
+#endif // !__WXWINCE__/__WXWINCE__
}
// Given a full filename (with path), ensure that that file can
void wxPathList::EnsureFileAccessible (const wxString& path)
{
wxString path_only(wxPathOnly(path));
- if ( !path_only.IsEmpty() )
+ if ( !path_only.empty() )
{
if ( !Member(path_only) )
Add(path_only);
{
wxString path2( node->GetData() );
if (
-#if defined(__WINDOWS__) || defined(__OS2__) || defined(__VMS__) || defined (__WXMAC__)
+#if defined(__WINDOWS__) || defined(__OS2__) || defined(__VMS__) || defined(__WXMAC__)
// Case INDEPENDENT
path.CompareTo (path2, wxString::ignoreCase) == 0
#else
path.CompareTo (path2) == 0
#endif
)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
wxString wxPathList::FindValidPath (const wxString& file)
bool
wxFileExists (const wxString& filename)
{
+#if defined(__WXPALMOS__)
+ return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
// 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__)
DWORD ret = ::GetFileAttributes(filename);
return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
#else // !__WIN32__
wxStructStat st;
- return wxStat(filename, &st) == 0 && (st.st_mode & S_IFREG);
+#ifndef wxNEED_WX_UNISTD_H
+ return wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG);
+#else
+ return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG);
+#endif
#endif // __WIN32__/!__WIN32__
}
bool
wxIsAbsolutePath (const wxString& filename)
{
- if (filename != wxT(""))
+ if (!filename.empty())
{
#if defined(__WXMAC__) && !defined(__DARWIN__)
// Classic or Carbon CodeWarrior like
// "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 true ;
#else
// Unix like or Windows
if (filename[0] == wxT('/'))
- return TRUE;
+ return true;
#endif
#ifdef __VMS__
if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
- return TRUE;
+ return true;
#endif
#if defined(__WINDOWS__) || defined(__OS2__)
// MSDOS like
if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
- return TRUE;
+ return true;
#endif
}
- return FALSE ;
+ return false ;
}
/*
void wxStripExtension(wxString& buffer)
{
- size_t len = buffer.Length();
- size_t i = len-1;
- while (i > 0)
- {
- if (buffer.GetChar(i) == wxT('.'))
+ //RN: Be careful about the handling the case where
+ //buffer.Length() == 0
+ for(size_t i = buffer.Length() - 1; i != wxString::npos; --i)
{
- buffer = buffer.Left(i);
- break;
+ if (buffer.GetChar(i) == wxT('.'))
+ {
+ buffer = buffer.Left(i);
+ break;
+ }
}
- i --;
- }
}
// Destructive removal of /./ and /../ stuff
// Must be destroyed
wxChar *wxCopyAbsolutePath(const wxString& filename)
{
- if (filename == wxT(""))
+ if (filename.empty())
return (wxChar *) NULL;
if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
trimchars[3] = 0;
#ifdef __WXMSW__
- const wxChar SEP = wxT('\\');
+ const wxChar SEP = wxT('\\');
#else
- const wxChar SEP = wxT('/');
+ const wxChar SEP = wxT('/');
#endif
buf[0] = wxT('\0');
if (name == NULL || *name == wxT('\0'))
if (nm[1] == SEP || nm[1] == 0)
{ /* ~/filename */
// FIXME: wxGetUserHome could return temporary storage in Unicode mode
- if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
+ if ((s = WXSTRINGCAST wxGetUserHome(wxEmptyString)) != NULL) {
if (*++nm)
nm++;
}
{
static wxChar dest[_MAXPATHLEN];
- if (filename == wxT(""))
+ if (filename.empty())
return (wxChar *) NULL;
wxStrcpy (dest, WXSTRINGCAST filename);
wxStrcat (tcp, wxT("}"));
wxStrcat (tcp, wxFileFunctionsBuffer);
}
+#else
+ wxUnusedVar(envname);
#endif
// Handle User's home (ignore root homes!)
if (wxStrncmp(dest, val, len) == 0)
{
wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
- if (user != wxT(""))
+ if (!user.empty())
wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
wxStrcat(wxFileFunctionsBuffer, dest + len);
wxStrcpy (dest, wxFileFunctionsBuffer);
// Return just the directory, or NULL if no directory
wxString wxPathOnly (const wxString& path)
{
- if (path != wxT(""))
+ if (!path.empty())
{
wxChar buf[_MAXPATHLEN];
// Unix like or Windows
if (path[i] == wxT('/') || path[i] == wxT('\\'))
{
+ // Don't return an empty string
+ if (i == 0)
+ i ++;
buf[i] = 0;
return wxString(buf);
}
}
#endif
}
- return wxString(wxT(""));
+ return wxEmptyString;
}
// Utility for converting delimiters in DOS filenames to UNIX style
// Also, convert to lower case, since case is significant in UNIX.
#if defined(__WXMAC__)
-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
-#ifdef __DARWIN__
- int i;
- int j;
- OSErr theErr;
- OSStatus theStatus = noErr;
- Boolean isDirectory = FALSE;
- Str255 theParentPath = "\p";
- FSSpec theParentSpec;
- FSRef theParentRef;
- FSRef theRef ;
- char theFileName[FILENAME_MAX];
- char thePath[FILENAME_MAX];
-
- // we loose the long filename by merely copying the spec->name
- // so try the built-ins, which only work if the file exists, but still...
-
- theErr = FSpMakeFSRef(spec, &theRef);
- if ( theErr == noErr )
- {
- CFURLRef fullURLRef;
- fullURLRef = ::CFURLCreateFromFSRef(NULL, &theRef);
-#ifdef __UNIX__
- CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle;
-#else
- CFURLPathStyle pathstyle = kCFURLHFSPathStyle;
-#endif
- CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
- ::CFRelease( fullURLRef ) ;
- return wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());
- }
- strcpy(thePath, "");
-
- // GD: Separate file name from path and make a FSRef to the parent
- // directory. This is necessary since FSRefs cannot reference files
- // that have not yet been created.
- // Based on example code from Apple Technical Note TN2022
- // http://developer.apple.com/technotes/tn/tn2022.html
-
- // check whether we are converting a directory
- isDirectory = ((spec->name)[spec->name[0]] == ':');
- // count length of file name
- for (i = spec->name[0] - (isDirectory ? 1 : 0); ((spec->name[i] != ':') && (i > 0)); i--);
- // copy file name
- // prepend path separator since it will later be appended to the path
- theFileName[0] = wxFILE_SEP_PATH;
- for (j = i + 1; j <= spec->name[0] - (isDirectory ? 1 : 0); j++) {
- theFileName[j - i] = spec->name[j];
- }
- theFileName[j - i] = '\0';
- // copy path if any
- for (j = 1; j <= i; j++) {
- theParentPath[++theParentPath[0]] = spec->name[j];
- }
- theErr = FSMakeFSSpec(spec->vRefNum, spec->parID, theParentPath, &theParentSpec);
- if (theErr == noErr) {
- // convert the FSSpec to an FSRef
- theErr = FSpMakeFSRef(&theParentSpec, &theParentRef);
- }
- if (theErr == noErr) {
- // get the POSIX path associated with the FSRef
- theStatus = FSRefMakePath(&theParentRef,
- (UInt8 *)thePath, sizeof(thePath));
- }
- if (theStatus == noErr) {
- // append file name to path
- // includes previously prepended path separator
- strcat(thePath, theFileName);
- }
-
- // create path string for return value
- wxString result( thePath , wxConvLocal) ;
+#if TARGET_API_MAC_OSX
+#define kDefaultPathStyle kCFURLPOSIXPathStyle
#else
- Handle myPath ;
- short length ;
-
- // get length of path and allocate handle
- FSpGetFullPath( spec , &length , &myPath ) ;
- ::SetHandleSize( myPath , length + 1 ) ;
- ::HLock( myPath ) ;
- (*myPath)[length] = 0 ;
- if ((length > 0) && ((*myPath)[length-1] == ':'))
- (*myPath)[length-1] = 0 ;
-
- // create path string for return value
- wxString result( *myPath , wxConvLocal) ;
-
- // free allocated handle
- ::HUnlock( myPath ) ;
- ::DisposeHandle( myPath ) ;
+#define kDefaultPathStyle kCFURLHFSPathStyle
#endif
- return result ;
+wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
+{
+ CFURLRef fullURLRef;
+ fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
+ if ( additionalPathComponent )
+ {
+ CFURLRef parentURLRef = fullURLRef ;
+ fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef,
+ additionalPathComponent,false);
+ CFRelease( parentURLRef ) ;
+ }
+ CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+ CFRelease( fullURLRef ) ;
+ return wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());
}
-#ifndef __DARWIN__
-// Mac file names are POSIX (Unix style) under Darwin
-// therefore the conversion functions below are not needed
-
-static wxChar sMacFileNameConversion[ 1000 ] ;
-static char scMacFileNameConversion[ 1000 ] ;
-#endif
-void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
{
OSStatus err = noErr ;
-#ifdef __DARWIN__
- FSRef theRef;
-
- // get the FSRef associated with the POSIX path
- err = FSPathMakeRef((const UInt8 *) path, &theRef, NULL);
- // convert the FSRef to an FSSpec
- err = FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
-#else
- if ( strchr( path , ':' ) == NULL )
+ CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, wxMacCFStringHolder(path ,wxLocale::GetSystemEncoding() ) , kDefaultPathStyle, false);
+ if ( NULL != url )
{
- // 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 ) ;
+ if ( CFURLGetFSRef(url, fsRef) == false )
+ err = fnfErr ;
+ CFRelease( url ) ;
}
else
{
- err = FSpLocationFromFullPath( strlen(path) , path , spec ) ;
+ err = fnfErr ;
}
-#endif
+ return err ;
}
-#if wxUSE_UNICODE
-WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec )
+wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
{
- return wxMacFilename2FSSpec( wxConvFile.cWC2MB(path) , spec ) ;
-}
-#endif
-
-#ifndef __DARWIN__
-
-wxString wxMac2UnixFilename (const wxChar *str)
-{
- wxChar *s = sMacFileNameConversion ;
- wxStrcpy( s , str ) ;
- if (s)
- {
- memmove( s+1 , s ,wxStrlen( s ) + 1 * sizeof(wxChar)) ;
- if ( *s == ':' )
- *s = '.' ;
- else
- *s = '/' ;
-
- while (*s)
- {
- if (*s == ':')
- *s = '/';
- else
- *s = wxTolower(*s); // Case INDEPENDENT
- s++;
- }
- }
- return wxString(sMacFileNameConversion) ;
+ CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+ uniname->unicode,
+ uniname->length );
+ return wxMacCFStringHolder(cfname).AsString() ;
}
-wxString wxUnix2MacFilename (const wxChar *str)
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
{
- wxChar *s = sMacFileNameConversion ;
- wxStrcpy( s , str ) ;
- if (s)
+ FSRef fsRef ;
+ if ( FSpMakeFSRef( spec , &fsRef) == noErr )
{
- if ( *s == '.' )
- {
- // relative path , since it goes on with slash which is translated to a :
- 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 ,wxStrlen( s ) * sizeof(wxChar) ) ;
- }
- else
- {
- wxASSERT_MSG( 1 , wxT("unkown path beginning") ) ;
- }
- while (*s)
- {
- if (*s == '/' || *s == '\\')
- {
- // convert any back-directory situations
- if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
- {
- *s = ':';
- memmove( s+1 , s+3 ,(wxStrlen( s+3 ) + 1)*sizeof(wxChar) ) ;
- }
- else
- *s = ':';
- }
- s++ ;
- }
+ return wxMacFSRefToPath( &fsRef ) ;
}
- return wxString(sMacFileNameConversion) ;
+ return wxEmptyString ;
}
-wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
+void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
{
- return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
-}
-
-void wxUnixFilename2FSSpec( const wxChar *path , FSSpec *spec )
-{
- wxString var = wxUnix2MacFilename( path ) ;
- wxMacFilename2FSSpec( var , spec ) ;
+ OSStatus err = noErr ;
+ FSRef fsRef ;
+ wxMacPathToFSRef( path , &fsRef ) ;
+ err = FSRefMakeFSSpec( &fsRef , spec ) ;
}
-#endif // ! __DARWIN__
#endif // __WXMAC__
*s = _T('/');
#ifdef __WXMSW__
else
- *s = wxTolower (*s); // Case INDEPENDENT
+ *s = (wxChar)wxTolower (*s); // Case INDEPENDENT
#endif
s++;
}
{
wxString outfile;
if ( !wxGetTempFileName( wxT("cat"), outfile) )
- return FALSE;
+ return false;
FILE *fp1 wxDUMMY_INITIALIZE(NULL);
FILE *fp2 = NULL;
fclose (fp2);
if (fp3)
fclose (fp3);
- return FALSE;
+ return false;
}
int ch;
wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
file1.c_str(), file2.c_str());
- return FALSE;
+ return false;
}
#elif defined(__OS2__)
if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
- return FALSE;
+ return false;
+#elif defined(__PALMOS__)
+ // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/
+ return false;
#else // !Win32
wxStructStat fbuf;
// from it anyhow
wxLogSysError(_("Impossible to get permissions for file '%s'"),
file1.c_str());
- return FALSE;
+ return false;
}
// open file1 for reading
wxFile fileIn(file1, wxFile::read);
if ( !fileIn.IsOpened() )
- return FALSE;
+ return false;
// remove file2, if it exists. This is needed for creating
// file2 with the correct permissions in the next step
{
wxLogSysError(_("Impossible to overwrite the file '%s'"),
file2.c_str());
- return FALSE;
+ 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__
+ wxCHANGE_UMASK(0);
// 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__
+ return false;
// copy contents of file1 to file2
char buf[4096];
{
count = fileIn.Read(buf, WXSIZEOF(buf));
if ( fileIn.Error() )
- return FALSE;
+ return false;
// end of file?
if ( !count )
break;
if ( fileOut.Write(buf, count) < count )
- return FALSE;
+ return false;
}
// 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;
+ return false;
#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
// no chmod in VA. Should be some permission API for HPFS386 partitions
{
wxLogSysError(_("Impossible to set permissions for the file '%s'"),
file2.c_str());
- return FALSE;
+ return false;
}
#endif // OS/2 || Mac
#endif // __WXMSW__ && __WIN32__
- return TRUE;
+ return true;
}
bool
wxRenameFile (const wxString& file1, const wxString& file2)
{
-#ifndef __WXWINCE__
+#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
// Normal system call
if ( wxRename (file1, file2) == 0 )
- return TRUE;
+ return true;
#endif
// Try to copy
if (wxCopyFile(file1, file2)) {
wxRemoveFile(file1);
- return TRUE;
+ return true;
}
// Give up
- return FALSE;
+ return false;
}
bool wxRemoveFile(const wxString& file)
|| defined(__DMC__) \
|| defined(__GNUWIN32__) \
|| (defined(__MWERKS__) && defined(__MSL__))
- int res = wxRemove(file);
+ int res = wxRemove(file);
#elif defined(__WXMAC__)
- int res = unlink(wxFNCONV(file));
+ int res = unlink(wxFNCONV(file));
+#elif defined(__WXPALMOS__)
+ int res = 1;
+ // TODO with VFSFileDelete()
#else
- int res = unlink(OS_FILENAME(file));
+ int res = unlink(OS_FILENAME(file));
#endif
- return res == 0;
+ return res == 0;
}
bool wxMkdir(const wxString& dir, int perm)
{
-#if defined(__WXMAC__) && !defined(__UNIX__)
- return (mkdir( wxFNCONV(dir) , 0 ) == 0);
+#if defined(__WXPALMOS__)
+ return false;
+#elif defined(__WXMAC__) && !defined(__UNIX__)
+ return (mkdir( wxFNCONV(dir) , 0 ) == 0);
#else // !Mac
const wxChar *dirname = dir.c_str();
// for the GNU compiler
#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
#if defined(MSVCRT)
+ wxUnusedVar(perm);
if ( mkdir(wxFNCONV(dirname)) != 0 )
#else
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
#error "Unsupported DOS compiler!"
#endif
#else // !MSW, !DOS and !OS/2 VAC++
- (void)perm;
+ wxUnusedVar(perm);
#ifdef __WXWINCE__
if ( !CreateDirectory(dirname, NULL) )
#else
- if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+ if ( wxMkDir(dir.fn_str()) != 0 )
#endif
#endif // !MSW/MSW
{
wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
#endif // Mac/!Mac
}
bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
{
-#ifdef __VMS__
- return FALSE; //to be changed since rmdir exists in VMS7.x
+#if defined(__VMS__)
+ return false; //to be changed since rmdir exists in VMS7.x
#elif defined(__OS2__)
return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
-#else
-
-#ifdef __WXWINCE__
+#elif defined(__WXWINCE__)
return (CreateDirectory(dir, NULL) != 0);
+#elif defined(__WXPALMOS__)
+ // TODO with VFSFileRename()
+ return false;
#else
return (wxRmDir(OS_FILENAME(dir)) == 0);
#endif
-
-#endif
}
// does the path exists? (may have or not '/' or '\\' at the end)
strPath << _T('.');
#endif
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#if defined(__WXPALMOS__)
+ return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
// stat() can't cope with network paths
DWORD ret = ::GetFileAttributes(strPath);
// Get a temporary filename, opening and closing the file.
wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
{
+#if wxUSE_FILE
wxString filename = wxFileName::CreateTempFileName(prefix);
if ( filename.empty() )
return NULL;
buf = MYcopystring(filename);
return buf;
+#else
+ // wxFileName::CreateTempFileName needs wxFile class enabled
+ return NULL;
+#endif
}
bool wxGetTempFileName(const wxString& prefix, wxString& buf)
{
- buf = wxFileName::CreateTempFileName(prefix);
+ buf = wxGetTempFileName(prefix);
return !buf.empty();
}
wxString wxFindFirstFile(const wxChar *spec, int flags)
{
wxSplitPath(spec, &gs_dirPath, NULL, NULL);
- if ( gs_dirPath.IsEmpty() )
+ if ( gs_dirPath.empty() )
gs_dirPath = wxT(".");
if ( !wxEndsWithPathSeparator(gs_dirPath ) )
gs_dirPath << wxFILE_SEP_PATH;
wxString result;
gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
- if ( result.IsEmpty() )
+ if ( result.empty() )
{
wxDELETE(gs_dir);
return result;
wxString result;
gs_dir->GetNext(&result);
- if ( result.IsEmpty() )
+ if ( result.empty() )
{
wxDELETE(gs_dir);
return result;
// copies into buf.
wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
{
-#ifdef __WXWINCE__
+#if defined(__WXPALMOS__)
+ // TODO ?
+ return NULL;
+#elif defined(__WXWINCE__)
+ // TODO
+ wxUnusedVar(buf);
+ wxUnusedVar(sz);
return NULL;
#else
if ( !buf )
buf = new wxChar[sz + 1];
}
- bool ok wxDUMMY_INITIALIZE(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
#if !wxUSE_UNICODE
#define cbuf buf
#else // wxUSE_UNICODE
- bool needsANSI = TRUE;
+ bool needsANSI = true;
#if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
// This is not legal code as the compiler
#if wxUSE_UNICODE_MSLU
if ( wxGetOsVersion() != wxWIN95 )
#else
- char *cbuf = NULL; // never really used because needsANSI will always be FALSE
+ char *cbuf = NULL; // never really used because needsANSI will always be false
#endif
{
ok = _wgetcwd(buf, sz) != NULL;
- needsANSI = FALSE;
+ needsANSI = false;
}
#endif
#if defined(_MSC_VER) || defined(__MINGW32__)
ok = _getcwd(cbuf, sz) != NULL;
#elif defined(__WXMAC__) && !defined(__DARWIN__)
- 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 )
+ char lbuf[1024] ;
+ if ( getcwd( lbuf , sizeof( lbuf ) ) )
{
- cwdSpec.vRefNum = pb.ioFCBVRefNum;
- cwdSpec.parID = pb.ioFCBParID;
- cwdSpec.name[0] = 0 ;
- wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
- wxStrcpy( buf , res ) ;
- ok = TRUE;
+ wxString res( lbuf , *wxConvCurrent ) ;
+ wxStrcpy( buf , res ) ;
+ ok = true;
}
else
- {
- ok = FALSE;
- }
+ ok = false ;
#elif defined(__OS2__)
APIRET rc;
ULONG ulDriveNum = 0;
ULONG ulDriveMap = 0;
- rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+ rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
ok = rc == 0;
- if (ok)
- {
- sz -= 3;
- rc = ::DosQueryCurrentDir( 0 // current drive
+ if (ok)
+ {
+ sz -= 3;
+ rc = ::DosQueryCurrentDir( 0 // current drive
,cbuf + 3
,(PULONG)&sz
);
#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
#elif defined(__WINDOWS__)
-
+
#ifdef __WIN32__
#ifdef __WXWINCE__
// No equivalent in WinCE
- return FALSE;
+ wxUnusedVar(d);
+ return false;
#else
return (bool)(SetCurrentDirectory(d) != 0);
#endif
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)
}
}
bool success = (chdir(WXSTRINGCAST d) == 0);
-
+
return success;
#endif
-
+
#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
- wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
+ wxCHECK_MSG( !wxIsEmpty(pszFile), false,
_T("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present
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__
+#if defined(__WXPALMOS__)
+ return 0;
+#elif defined(__WXWINCE__)
FILETIME creationTime, lastAccessTime, lastWriteTime;
HANDLE fileHandle = ::CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
0, FILE_ATTRIBUTE_NORMAL, 0);
{
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();
switch (*pat++)
{
case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
- return TRUE;
+ return true;
case wxT('\\'):
if (!*pat++)
- return FALSE;
+ return false;
}
}
- return FALSE;
+ return false;
}
/*
{
/* Never match so that hidden Unix files
* are never found. */
- return FALSE;
+ return false;
}
for (;;)
{
m++;
if (!*n++)
- return FALSE;
+ return false;
}
else
{
m++;
/* Quoting "nothing" is a bad thing */
if (!*m)
- return FALSE;
+ return false;
}
if (!*m)
{
* match
*/
if (!*n)
- return TRUE;
+ return true;
if (just)
- return TRUE;
+ return true;
just = 0;
goto not_matched;
}
* impossible to match it
*/
if (!*n)
- return FALSE;
+ return false;
if (mp)
{
m = mp;
count = acount;
}
else
- return FALSE;
+ return false;
}
}
}
}
+// Return the type of an open file
+//
+// Some file types on some platforms seem seekable but in fact are not.
+// The main use of this function is to allow such cases to be detected
+// (IsSeekable() is implemented as wxGetFileKind() == wxFILE_KIND_DISK).
+//
+// This is important for the archive streams, which benefit greatly from
+// being able to seek on a stream, but which will produce corrupt archives
+// if they unknowingly seek on a non-seekable stream.
+//
+// wxFILE_KIND_DISK is a good catch all return value, since other values
+// disable features of the archive streams. Some other value must be returned
+// for a file type that appears seekable but isn't.
+//
+// Known examples:
+// * Pipes on Windows
+// * Files on VMS with a record format other than StreamLF
+//
+wxFileKind wxGetFileKind(int fd)
+{
+#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle
+ switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
+ {
+ case FILE_TYPE_CHAR:
+ return wxFILE_KIND_TERMINAL;
+ case FILE_TYPE_DISK:
+ return wxFILE_KIND_DISK;
+ case FILE_TYPE_PIPE:
+ return wxFILE_KIND_PIPE;
+ }
+
+ return wxFILE_KIND_UNKNOWN;
+
+#elif defined(__UNIX__)
+ if (isatty(fd))
+ return wxFILE_KIND_TERMINAL;
+
+ struct stat st;
+ fstat(fd, &st);
+
+ if (S_ISFIFO(st.st_mode))
+ return wxFILE_KIND_PIPE;
+ if (!S_ISREG(st.st_mode))
+ return wxFILE_KIND_UNKNOWN;
+
+ #if defined(__VMS__)
+ if (st.st_fab_rfm != FAB$C_STMLF)
+ return wxFILE_KIND_UNKNOWN;
+ #endif
+
+ return wxFILE_KIND_DISK;
+
+#else
+ #define wxFILEKIND_STUB
+ (void)fd;
+ return wxFILE_KIND_DISK;
+#endif
+}
+
+wxFileKind wxGetFileKind(FILE *fp)
+{
+ // note: the watcom rtl dll doesn't have fileno (the static lib does)
+#if !defined wxFILEKIND_STUB && !(defined __WATCOMC__ && defined __SW_BR)
+ return wxGetFileKind(fileno(fp));
+#else
+ (void)fp;
+ return wxFILE_KIND_DISK;
+#endif
+}
#ifdef __VISUALC__
#pragma warning(default:4706) // assignment within conditional expression
projects / wxWidgets.git / blobdiff