X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..d9ff0f91fbddae88286567cab74dcfb59c91fc0f:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index f9aa7c75ea..1cfa5825c5 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -78,6 +78,7 @@ #endif // native Win compiler #ifdef __GNUWIN32__ + #include #ifndef __TWIN32__ #include #endif @@ -142,11 +143,7 @@ const off_t wxInvalidOffset = (off_t)-1; // ---------------------------------------------------------------------------- // we need to translate Mac filenames before passing them to OS functions -#ifdef __MAC__ - #define OS_FILENAME(s) (wxUnix2MacFilename(s)) -#else #define OS_FILENAME(s) (s.fn_str()) -#endif // ============================================================================ // implementation @@ -289,6 +286,18 @@ wxFileExists (const wxString& filename) 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('/') @@ -303,6 +312,7 @@ wxIsAbsolutePath (const wxString& filename) return TRUE; } return FALSE; +#endif } /* @@ -500,7 +510,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) } else #else - while ((*d++ = *s) != NULL) { + while ((*d++ = *s) != 0) { # ifndef __WXMSW__ if (*s == wxT('\\')) { if ((*(d - 1) = *++s)) { @@ -520,7 +530,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) register wxChar *start = d; register int braces = (*s == wxT('{') || *s == wxT('(')); register wxChar *value; - while ((*d++ = *s) != NULL) + while ((*d++ = *s) != 0) if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) ) break; else @@ -528,7 +538,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) *--d = 0; value = wxGetenv(braces ? start + 1 : start); if (value) { - for ((d = start - 1); (*d++ = *value++) != NULL;); + for ((d = start - 1); (*d++ = *value++) != 0;); d--; if (braces && *s) s++; @@ -580,7 +590,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) *(d - 1) = SEP; } s = nm; - while ((*d++ = *s++) != NULL); + while ((*d++ = *s++) != 0); delete[] nm_tmp; // clean up alloc /* Now clean up the buffer */ return wxRealPath(buf); @@ -652,11 +662,15 @@ wxChar *wxFileNameFromPath (wxChar *path) 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 */ @@ -679,11 +693,15 @@ wxString wxFileNameFromPath (const wxString& path1) 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 */ @@ -717,7 +735,11 @@ wxPathOnly (wxChar *path) 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__ @@ -766,7 +788,11 @@ wxString wxPathOnly (const wxString& path) 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__ @@ -801,6 +827,28 @@ wxString wxPathOnly (const wxString& path) // Also, convert to lower case, since case is significant in UNIX. #if defined(__WXMAC__) && !defined(__UNIX__) +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 ] ; @@ -868,34 +916,11 @@ wxString wxUnix2MacFilename (const char *str) 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 ) ; -} - void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) { wxString var = wxUnix2MacFilename( path ) ; @@ -950,9 +975,9 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil FILE *fp2 = (FILE *) NULL; FILE *fp3 = (FILE *) NULL; // Open the inputs and outputs - if ((fp1 = fopen (OS_FILENAME( file1 ), "rb")) == NULL || - (fp2 = fopen (OS_FILENAME( file2 ), "rb")) == NULL || - (fp3 = fopen (OS_FILENAME( outfile ), "wb")) == NULL) + 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); @@ -981,7 +1006,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil bool wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) { -#if defined(__WIN32__) +#if defined(__WIN32__) && !defined(__WXMICROWIN__) // CopyFile() copies file attributes and modification time too, so use it // instead of our code if available // @@ -1087,7 +1112,10 @@ wxRenameFile (const wxString& file1, const wxString& file2) bool wxRemoveFile(const wxString& file) { -#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) +#if defined(__VISUALC__) \ + || defined(__BORLANDC__) \ + || defined(__WATCOMC__) \ + || defined(__GNUWIN32__) int res = wxRemove(file); #else int res = unlink(OS_FILENAME(file)); @@ -1099,13 +1127,13 @@ bool wxRemoveFile(const wxString& file) bool wxMkdir(const wxString& dir, int perm) { #if defined(__WXMAC__) && !defined(__UNIX__) - return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0); + 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 ) #elif defined(__WXPM__) if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? @@ -1173,7 +1201,7 @@ bool wxPathExists(const wxChar *pszPathName) // 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]; @@ -1395,7 +1423,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags) FSSpec fsspec ; - wxUnixFilename2FSSpec( result , &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 ; @@ -1443,7 +1471,7 @@ wxString wxFindNextFile() g_iter.m_name, &spec) ; - return wxMacFSSpec2UnixFilename( &spec ) ; + return wxMacFSSpec2MacFilename( &spec ) ; } #elif defined(__WXMSW__) @@ -1697,7 +1725,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) cwdSpec.vRefNum = pb.ioFCBVRefNum; cwdSpec.parID = pb.ioFCBParID; cwdSpec.name[0] = 0 ; - wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ; + wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ; strcpy( buf , res ) ; buf[res.length()-1]=0 ; @@ -1792,7 +1820,7 @@ bool wxSetWorkingDirectory(const wxString& d) // 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);